diff --git a/known_properties.json b/known_properties.json index cb7f3ed..49a560f 100644 --- a/known_properties.json +++ b/known_properties.json @@ -1 +1 @@ -["9A0B42A2-6D9B-331A-DAA7-624A5FA49606", "F7992488-7C24-DFA9-F8B2-94DDC18E66A3", "id-193-1-13", "B57516F9-E364-7E54-A211-527ED54388E6", "C02892BE-F34F-5A8A-E174-4A79549DC9A9", "892BD779-F186-9BD1-A97A-5783EFB6F56D", "A979EBAE-EF87-FB51-152A-5453CD7DC794", 51624, 51628, "B4095706-A65C-F421-B02E-1D227B684B62", 51632, "803DF7B0-1125-2AA4-90AC-CF0CAEAC625A", "E7B71D28-C557-CFE4-805D-42C2793E9248", "BAAEC20A-F667-FE22-6693-E4B4CA366889", "21C20126-380D-9B0F-73F8-C4279897F189", "57446DF5-CB9F-951C-A40A-4BA775DA7426", 51656, "3B73B720-13F2-62A4-8829-557676725A95", 51660, "FA45C0B6-813C-DE65-496A-EDD8DA3F2526", "281A7F0B-FA5A-75AE-68DE-89AFD90EEF48", 51665, "665243A8-FD34-86F8-322F-FE9B0B392083", "id-105-12-78", "172DFAD2-7CDB-51B4-212E-E6F9C7F0601A", "id-154-2-71", "7421A7DD-D9B4-72D3-0A91-5C3DA60C26E4", "id-88-5-45", "BD41AC52-BADB-428F-AF4B-11BBC374F2F1"] \ No newline at end of file +[51968, "803DF7B0-1125-2AA4-90AC-CF0CAEAC625A", "B57516F9-E364-7E54-A211-527ED54388E6", "665243A8-FD34-86F8-322F-FE9B0B392083", "id-88-5-45", "C02892BE-F34F-5A8A-E174-4A79549DC9A9", "3B73B720-13F2-62A4-8829-557676725A95", "B4095706-A65C-F421-B02E-1D227B684B62", "id-193-1-13", -4432880139075606878, 51624, 51628, "F7992488-7C24-DFA9-F8B2-94DDC18E66A3", 3286076625991780524, 51632, "FA45C0B6-813C-DE65-496A-EDD8DA3F2526", "7421A7DD-D9B4-72D3-0A91-5C3DA60C26E4", "9A0B42A2-6D9B-331A-DAA7-624A5FA49606", "A979EBAE-EF87-FB51-152A-5453CD7DC794", "57446DF5-CB9F-951C-A40A-4BA775DA7426", "id-202-1-11", "E7B71D28-C557-CFE4-805D-42C2793E9248", 51656, "id-32-1-41", 51660, 51665, "21C20126-380D-9B0F-73F8-C4279897F189", "id-154-2-71", "281A7F0B-FA5A-75AE-68DE-89AFD90EEF48", "892BD779-F186-9BD1-A97A-5783EFB6F56D", "172DFAD2-7CDB-51B4-212E-E6F9C7F0601A", "id-105-12-78", -9017525000097635974, 51963, "BAAEC20A-F667-FE22-6693-E4B4CA366889", "BD41AC52-BADB-428F-AF4B-11BBC374F2F1"] \ No newline at end of file diff --git a/src/discord/__pycache__/webhook.cpython-310.pyc b/src/discord/__pycache__/webhook.cpython-310.pyc index 0afc5f9..f7450d2 100644 Binary files a/src/discord/__pycache__/webhook.cpython-310.pyc and b/src/discord/__pycache__/webhook.cpython-310.pyc differ diff --git a/src/lwb/__pycache__/scrape_image.cpython-310.pyc b/src/lwb/__pycache__/scrape_image.cpython-310.pyc index ba3170d..7e87a0f 100644 Binary files a/src/lwb/__pycache__/scrape_image.cpython-310.pyc and b/src/lwb/__pycache__/scrape_image.cpython-310.pyc differ diff --git a/src/lwb/__pycache__/scraper.cpython-310.pyc b/src/lwb/__pycache__/scraper.cpython-310.pyc index 7c9056a..5341b23 100644 Binary files a/src/lwb/__pycache__/scraper.cpython-310.pyc and b/src/lwb/__pycache__/scraper.cpython-310.pyc differ diff --git a/src/lwb/scrape_image.py b/src/lwb/scrape_image.py index 09f1eef..52de6b8 100644 --- a/src/lwb/scrape_image.py +++ b/src/lwb/scrape_image.py @@ -1,25 +1,5 @@ import requests - -EASYSQUARE_HEADERS = { - "DNT": "1", - "Host": "portal1s.easysquare.com", - "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8", - "Cookie": "SAP_SESSIONID_PP0_581=zqFIhvNbEsOs_n3cgRTIO1V7ZaLQCxHvhYgKELG5Agg%3d; sap-usercontext=sap-language=D&sap-client=581; cookiesession1=678ADA67ADF0813997206FE9F4133118", - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:134.0) Gecko/20100101 Firefox/134.0", - "Accept-Encoding": "gzip, deflate, br, zstd", - "Accept-Language": "de,en-US;q=0.7,en;q=0.3", - "Upgrade-Insecure-Requests": "1" -} -EASYSQUARE_PARAMS = { - "application": "ESQ_IA_REOBJ", - "sap-client": "581", - "command": "action", - "name": "boxlist", - "api": "6.169", - "head-oppc-version": "6.169.22", - "_": "1736595414769" -} - +from src.lwb.scraper import EASYSQUARE_HEADERS, EASYSQUARE_PARAMS def scrape_image(url): session = requests.Session() diff --git a/src/lwb/scraper.py b/src/lwb/scraper.py index ba1e579..ef41602 100644 --- a/src/lwb/scraper.py +++ b/src/lwb/scraper.py @@ -7,7 +7,7 @@ EASYSQUARE_HEADERS = { "DNT": "1", "Host": "portal1s.easysquare.com", "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8", - "Cookie": "SAP_SESSIONID_PP0_581=ePxgeqJDhl8MWlBQQ9-sjz1zLYTSYRHvhfgKELG5Agg%3d; sap-usercontext=sap-language=D&sap-client=581; cookiesession1=678ADA67ADF0813997206FE9F4133118", + "Cookie": "SAP_SESSIONID_PP0_581=zVLUPPaDGFVgBQTlA65yRXm5VdjdXBHvhiYKELG5Agg%3d; sap-usercontext=sap-language=D&sap-client=581; cookiesession1=678ADA67ADF0813997206FE9F4133118", "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:134.0) Gecko/20100101 Firefox/134.0", "Accept-Encoding": "gzip, deflate, br, zstd", "Accept-Language": "de,en-US;q=0.7,en;q=0.3", @@ -99,6 +99,10 @@ def scrape_easysquare(): # https://portal1s.easysquare.com/prorex/xmlforms/image.jpg?application=ESQ_IA_REOBJ&command=action&id=1EC8D4E6-191A-A827-47FF-72D8C5379070&name=get image_url = f"https://portal1s.easysquare.com/prorex/xmlforms/image.jpg?application=ESQ_IA_REOBJ&command=action&id={iamge_resourceId}&name=get" + # the id should be a hash create by the title, subtitle, rooms, size, rent, availability + hashID = f"{prop_title}{subtitle}{rooms}{size}{rent}{availability}" + id = hash(hashID) + properties.append({ "id": id, "title": "LWB - " + prop_title,