diff --git a/bookstack b/bookstack index 5d2e08e..8f6e38c 160000 --- a/bookstack +++ b/bookstack @@ -1 +1 @@ -Subproject commit 5d2e08eabc8186848630f1aa790c72260b9751b0 +Subproject commit 8f6e38cb337bcf51b0790f2db7001681ceb9338f diff --git a/wiki_pages/ViewingsCsv.py b/wiki_pages/ViewingsCsv.py index 13aaedb..5e02c4f 100644 --- a/wiki_pages/ViewingsCsv.py +++ b/wiki_pages/ViewingsCsv.py @@ -1,5 +1,4 @@ from bs4 import BeautifulSoup -import hashlib from bookstack import Bookstack from vcinema_utils import VCinemaUtils @@ -8,25 +7,14 @@ from vcinema_utils import VCinemaUtils PAGE_ID = 11 -def update_viewings_csv(token_id, token_secret, check_existing=True): +def update_viewings_csv(token_id, token_secret): print("Retrieving viewings page") html_page = Bookstack.get_page_html(VCinemaUtils.JACKNET_WIKI_URL, token_id, token_secret, PAGE_ID) soup = BeautifulSoup(html_page, 'html.parser') csv_data = soup.find("code").text.strip().encode('utf-8') - if check_existing: - print("Retrieving existing file") - existing_attachment_id = VCinemaUtils.get_viewings_csv_attachment_id(token_id, token_secret) - attachment = Bookstack.get_attachment(VCinemaUtils.JACKNET_WIKI_URL, token_id, token_secret, existing_attachment_id) - existing_attachment_hash = hashlib.md5(attachment).hexdigest() - page_hash = hashlib.md5(csv_data).hexdigest() - - if not check_existing or page_hash != existing_attachment_hash: - print("Updating file") - # bookstack update file via api doesn't work - Bookstack.post_attachment(VCinemaUtils.JACKNET_WIKI_URL, token_id, token_secret, "vcinema.csv", csv_data, PAGE_ID) - Bookstack.delete_attachment(VCinemaUtils.JACKNET_WIKI_URL, token_id, token_secret, existing_attachment_id) - print("File updated") - else: - print("File already up-to-date") + existing_attachment_id = VCinemaUtils.get_viewings_csv_attachment_id(token_id, token_secret) + print("Updating file") + Bookstack.update_attachment(VCinemaUtils.JACKNET_WIKI_URL, token_id, token_secret, existing_attachment_id, "vcinema.csv", csv_data, PAGE_ID) + print("File updated")