diff --git a/.gitignore b/.gitignore index 5ed4419..74ead4e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ Artists.html artists.xlsx Trackerhub.zip .env +/__pycache__ diff --git a/__pycache__/archive.cpython-313.pyc b/__pycache__/archive.cpython-313.pyc deleted file mode 100644 index 2decb8c..0000000 Binary files a/__pycache__/archive.cpython-313.pyc and /dev/null differ diff --git a/__pycache__/config.cpython-313.pyc b/__pycache__/config.cpython-313.pyc deleted file mode 100644 index 031482d..0000000 Binary files a/__pycache__/config.cpython-313.pyc and /dev/null differ diff --git a/__pycache__/diff.cpython-313.pyc b/__pycache__/diff.cpython-313.pyc deleted file mode 100644 index aeb9c53..0000000 Binary files a/__pycache__/diff.cpython-313.pyc and /dev/null differ diff --git a/__pycache__/downloader.cpython-313.pyc b/__pycache__/downloader.cpython-313.pyc deleted file mode 100644 index 09d984d..0000000 Binary files a/__pycache__/downloader.cpython-313.pyc and /dev/null differ diff --git a/__pycache__/notify.cpython-313.pyc b/__pycache__/notify.cpython-313.pyc deleted file mode 100644 index dd27b7d..0000000 Binary files a/__pycache__/notify.cpython-313.pyc and /dev/null differ diff --git a/__pycache__/parser.cpython-313.pyc b/__pycache__/parser.cpython-313.pyc deleted file mode 100644 index 2932428..0000000 Binary files a/__pycache__/parser.cpython-313.pyc and /dev/null differ diff --git a/__pycache__/update_loop.cpython-313.pyc b/__pycache__/update_loop.cpython-313.pyc deleted file mode 100644 index 0ad5949..0000000 Binary files a/__pycache__/update_loop.cpython-313.pyc and /dev/null differ diff --git a/__pycache__/utils.cpython-313.pyc b/__pycache__/utils.cpython-313.pyc deleted file mode 100644 index e5df640..0000000 Binary files a/__pycache__/utils.cpython-313.pyc and /dev/null differ diff --git a/config.py b/config.py index 5583b9a..656c7ad 100644 --- a/config.py +++ b/config.py @@ -1,7 +1,9 @@ import os -ZIP_URL = "https://docs.google.com/spreadsheets/d/1S6WwM05O277npQbaiNk-jZlXK3TdooSyWtqaWUvAI78/export?format=zip" -XLSX_URL = "https://docs.google.com/spreadsheets/d/1S6WwM05O277npQbaiNk-jZlXK3TdooSyWtqaWUvAI78/export?format=xlsx" +SHEET_URL = "https://docs.google.com/spreadsheets/d/1S6WwM05O277npQbaiNk-jZlXK3TdooSyWtqaWUvAI78" +ZIP_URL = SHEET_URL + "/export?format=zip" +XLSX_URL = SHEET_URL + "/export?format=xlsx" + ZIP_FILENAME = "Trackerhub.zip" HTML_FILENAME = "Artists.html" @@ -20,11 +22,10 @@ exclude_names = { USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/115.0 Safari/537.36" -BASE_URL = "https://artistgrid.cx/" +BASE_URL = "https://artistgrid.cx" ARCHIVE_URLS = [ f"{BASE_URL}/", - f"{BASE_URL}/index.html/", f"{BASE_URL}/artists.html", f"{BASE_URL}/artists.csv", f"{BASE_URL}/artists.xlsx", diff --git a/update_loop.py b/update_loop.py index a2cfe2f..68e05dd 100644 --- a/update_loop.py +++ b/update_loop.py @@ -7,11 +7,11 @@ from archive import archive_all_urls from notify import send_discord_message from utils import hash_file -last_csv_hash = None +last_html_hash = None last_csv_data = {} def update_loop(): - global last_csv_hash, last_csv_data + global last_html_hash, last_csv_data while True: try: @@ -19,29 +19,30 @@ def update_loop(): download_xlsx() generate_csv() - current_hash = hash_file("artists.csv") + # Hash the Artists.html instead of artists.csv + current_hash = hash_file("Artists.html") current_data = read_csv_to_dict("artists.csv") - if last_csv_hash is None: - print("ℹ️ Initial CSV hash stored.") - elif current_hash != last_csv_hash: - print("🔔 CSV has changed! Archiving URLs...") + if last_html_hash is None: + print("ℹ️ Initial HTML hash stored.") + elif current_hash != last_html_hash: + print("🔔 Artists.html has changed! Archiving URLs...") changes = detect_changes(last_csv_data, current_data) if changes: message = "**CSV Update Detected:**\n" + "\n".join(changes) send_discord_message(message) else: - print("ℹ️ No detectable content changes found.") + print("ℹ️ No detectable content changes found in CSV.") archive_all_urls() else: - print("ℹ️ CSV unchanged. No archiving needed.") + print("ℹ️ Artists.html unchanged. No archiving needed.") - last_csv_hash = current_hash + last_html_hash = current_hash last_csv_data = current_data except Exception as e: print(f"⚠️ Error updating files: {e}") - time.sleep(600) + time.sleep(6)