Tour/aupi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix troostwijk changes

Browse Source
This commit is contained in:
Computerboer
2024-10-13 15:42:38 +02:00
parent a82ec6a7a5
commit 41795462fb
907 changed files with 197002 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
utils/auctionutils.py
View File

@@ -1,4 +1,3 @@
import imp
import requests
from traceback import print_exc
from cache import Cache, FileCache
@@ -53,7 +52,7 @@ def getAuctionlocations(countrycode: Countrycode):
location = geoauctions[0].geonamelocation
if(location):
maplocation = Maplocation(location.latitude, location.longitude, len(geoauctions), location, geoauctions)
maplocations.append(maplocation);
maplocations.append(maplocation)
for location in maplocations:
del location.geonamelocation #removes object which is not used anymore
@@ -90,29 +89,29 @@ def getTwkAuctions(countrycode):
return res
# buildidresponse = requests.get('https://www.troostwijkauctions.com/')
twkDataUrl = getTWKUrl();
twkDataUrl = getTWKUrl()
if(twkDataUrl is None):
return [];
return []
response = requests.get(twkDataUrl + "auctions.json?countries=" + countrycode)
if(response.status_code ==200):
log('Got Twk Auctions')
data = response.json();
auctions = [];
data = response.json()
auctions = []
totalAuctionCount = data['pageProps']['auctionList']['totalSize'];
pages = math.ceil(totalAuctionCount / len(data['pageProps']['auctionList']['results']))
totalAuctionCount = data['pageProps']['totalSize'];
pages = math.ceil(totalAuctionCount / data['pageProps']['pageSize'])
# for result in data['pageProps']['auctionList']:
for i in range(1,pages,1):
log("getting page " + str(i) + ' of ' + str(pages))
if(i > 1):
response = requests.get(twkDataUrl + "auctions.json?countries=" + countrycode + "&page=" + str(i));
data = response.json();
data = response.json()
for twka in data['pageProps']['auctionList']['results']:
for twka in data['pageProps']['listData']:
# print(twka['urlSlug'])
auction = getTWKAuction(twkDataUrl, twka['urlSlug'])
if(auction):
@@ -125,18 +124,18 @@ def getTwkAuctions(countrycode):
def getTWKAuction(twkDataUrl, auctionurlslug):
response = requests.get(twkDataUrl + "a/" + auctionurlslug + '.json')
if(response.status_code == 200):
data = response.json();
data = response.json()
if(len(data['pageProps']['lots']['results']) ==0):
return None;
return None
twka = data['pageProps']['auction'];
twka = data['pageProps']['auction']
firstlot = data['pageProps']['lots']['results'][0]
city = "Nederland" if firstlot['location']['city'].lower() == 'online' or firstlot['location']['city'].lower() == "free delivery" else firstlot['location']['city']
# if(firstlot['location']['city'].lower() != 'online'):
# city = firstlot['location']['city'];
a = Auction(Auctionbrand.TWK, city, firstlot['location']['countryCode'].upper(), twka['name'], datetime.fromtimestamp(twka['startDate']), datetime.fromtimestamp(twka['minEndDate']), '/a/' + auctionurlslug, twka['image']['url'], twka['lotCount'] )
# print(a);
return a;
return a
return None
@@ -164,7 +163,7 @@ def getOVMAuctions():
cityname = "Nederland" if cityname is None else cityname #there can be auctions where you have to make an appointment to retrieve the lots
startdatetime = result['openingsDatumISO'].replace("T", " ").replace("Z", "")
enddatetime = result['sluitingsDatumISO'].replace("T", " ").replace("Z", "")
image = "";
image = ""
#if hasattr(result, 'image') : #result['image'] :
image = result.get('image', "") #['image']
if image == "":

16
utils/locationutils.py
View File

@@ -19,7 +19,7 @@ def getLocationArray(countrycode: Countrycode):
geonames = []
for line in f:
line = line.rstrip('\n');
line = line.rstrip('\n')
data = line.split("\t")
alternatenames = []
if data[3] != "":
@@ -46,23 +46,23 @@ def getGeoLocationByCity(city = "", countrycode: Countrycode = Countrycode.NL ):
geo = list(filter(lambda g: g.name == cityname, geonames))
if(geo): geo = geo[0]
# print('first try' + repr(geo))
if (geo): return geo;
if (geo): return geo
#also tries in the alternatenames
geo = list(filter(lambda g: inAlternatenames(g.alternatenames, cityname), geonames))
if(geo): geo = geo[0]
#print('alternatenames'+ repr( geo))
if (geo): return geo;
if (geo): return geo
#then tries name without 'gemeente as prefix'
geo = list(filter(lambda g: g.name == city, geonames))
if(geo): geo = geo[0]
#print('without gemeente' + repr( geo))
if (geo): return geo;
if (geo): return geo
#also tries in the alternatenames
geo = list(filter(lambda g: inAlternatenames(g.alternatenames, city), geonames))
if(geo): geo = geo[0]
#print('alternatenames without gemeente' + repr( geo))
if (geo): return geo;
if (geo): return geo
#removes everything between () and then removes the leading and trailing spaces;
@@ -75,17 +75,17 @@ def getGeoLocationByCity(city = "", countrycode: Countrycode = Countrycode.NL ):
geo = list(filter(lambda g: g.name == city, geonames))
if(geo): geo = geo[0]
#print('without anything between ()' + repr( geo))
if (geo): return geo;
if (geo): return geo
#also tries in the alternatenames
geo = list(filter(lambda g: inAlternatenames(g.alternatenames, city), geonames))
if(geo): geo = geo[0]
#print('alternatenames without ()'+ repr( geo))
if (geo): return geo;
if (geo): return geo
print('city not found: '+ city)
return None;
return None
def inAlternatenames(alternatenames = [], name = ""):
return name in alternatenames