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

improved loggin and added nullcheck on image

Browse Source
This commit is contained in:
Computerboer
2024-01-07 01:36:33 +01:00
parent bbd20f7915
commit b834333f56
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
utils/auctionutils.py
View File

@@ -1,5 +1,6 @@
import imp import imp
import requests import requests
from traceback import print_exc
from cache import Cache, FileCache from cache import Cache, FileCache
from models.location import Auction, Auctionbrand, Countrycode, Maplocation, JsonEncoder from models.location import Auction, Auctionbrand, Countrycode, Maplocation, JsonEncoder
from utils.locationutils import getGeoLocationByCity from utils.locationutils import getGeoLocationByCity
@@ -18,7 +19,9 @@ def getAuctionlocations(countrycode: Countrycode):
return res return res
twkauctions = getTwkAuctions(countrycode) twkauctions = getTwkAuctions(countrycode)
ovmauctions = getOVMAuctions() ovmauctions = getOVMAuctions()
auctions = [*twkauctions, *ovmauctions] auctions = [*twkauctions, *ovmauctions]
for auction in auctions: for auction in auctions:
@@ -137,7 +140,7 @@ def getOVMAuctions():
log("The OVM auctions call threw a error") log("The OVM auctions call threw a error")
if(response is None): if(response is None):
return None return []
if(response.status_code ==200): if(response.status_code ==200):
log('Got Ovm Auctions') log('Got Ovm Auctions')
@@ -149,13 +152,15 @@ 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 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", "") startdatetime = result['openingsDatumISO'].replace("T", " ").replace("Z", "")
enddatetime = result['sluitingsDatumISO'].replace("T", " ").replace("Z", "") enddatetime = result['sluitingsDatumISO'].replace("T", " ").replace("Z", "")
a = Auction(Auctionbrand.OVM, cityname,result['land'], result['naam'],startdatetime, enddatetime, str(result['land']).lower() + '/veilingen/' + str(result['id']) + '/kavels', 'images/150x150/' + str(result['id']) + '/' + result['image'], result['totaalKavels'] ) image = "" if result['image'] else image
a = Auction(Auctionbrand.OVM, cityname,result['land'], result['naam'],startdatetime, enddatetime, str(result['land']).lower() + '/veilingen/' + str(result['id']) + '/kavels', 'images/150x150/' + str(result['id']) + '/' + image, result['totaalKavels'] )
auctions.append(a) auctions.append(a)
Cache.add(cachename, auctions) Cache.add(cachename, auctions)
return auctions return auctions
except: except Exception as e:
log('Something went wrong in the mapping of OVM auctions to auctionviewer objects. The reason was: ' + response.reason + '. The response was: ' + JsonEncoder().encode(response.json())) log('Something went wrong in the mapping of OVM auctions to auctionviewer objects. The reason was: ' + response.reason + '. The response was: ' + JsonEncoder().encode(response.json()))
print_exc(e)
else: else:
log("The OVM auctions call didn't gave a 200 response but a " + str(response.status_code) + ". With the reason: " + response.reason) log("The OVM auctions call didn't gave a 200 response but a " + str(response.status_code) + ". With the reason: " + response.reason)
return None return []

6
utils/helperutils.py
View File

@@ -1,5 +1,5 @@
# from datetime import datetime, timedelta from datetime import datetime, timedelta
def log(value): def log(value):
# print(str(datetime.now()) + ' ' + str(value)) print(str(datetime.now()) + ' ' + value)
print( str(value)) # print( str(value))