diff --git a/.gitignore b/.gitignore index aabcc734..2d27892e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +venv/ VERSION DATE NX-60FPS-RES-GFX-Cheats-main diff --git a/database_builder.py b/database_builder.py index aeb3e0e4..2e35ae2c 100644 --- a/database_builder.py +++ b/database_builder.py @@ -6,7 +6,7 @@ import cloudscraper import json import shutil from pathlib import Path -from datetime import date +from datetime import date, datetime from bs4 import BeautifulSoup import process_cheats @@ -40,12 +40,10 @@ class GbatempCheatsInfo: self.gbatemp_version = self.fetch_gbatemp_version() def fetch_gbatemp_version(self): - page = self.scraper.get(self.page_url) + page = self.scraper.get(f"{self.page_url}/updates") soup = BeautifulSoup(page.content, "html.parser") - # There are two occurances of the version, we pick the biggest one - version1 = version_parser(soup.find("ol", {"class": "block-body"}).find("div").getText()) - version2 = version_parser(soup.find("span", {"class": "u-muted"}).getText()) - return max(version1, version2) + version = datetime.fromisoformat(soup.find("div", {"class": "block-container"}).find("time").get("datetime")) + return version.date() def has_new_cheats(self, database_version): return self.gbatemp_version > database_version diff --git a/process_cheats.py b/process_cheats.py index 00537580..44e7ae2c 100755 --- a/process_cheats.py +++ b/process_cheats.py @@ -39,7 +39,7 @@ class ProcessCheats: lines = cheatSheet.readlines() for i in range(len(lines)): - titles = re.search("(\[.+\]|\{.+\})", lines[i]) + titles = re.search(r"(\[.+\]|\{.+\})", lines[i]) if titles: pos.append(i)