From 721de491045b9bec923023ab46f45ef0f8c31cc7 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 30 Apr 2025 21:31:21 +0200 Subject: [PATCH] make_website: only parse repo_pubkey if its needed This makes writing tests a lot easier, since the test cases no longer need to provide a value for `repo_pubkey:`. --- fdroidserver/index.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/fdroidserver/index.py b/fdroidserver/index.py index fb1c4279..b65aa2b1 100644 --- a/fdroidserver/index.py +++ b/fdroidserver/index.py @@ -152,11 +152,6 @@ def _should_file_be_generated(path, magic_string): def make_website(apps, repodir, repodict): - _ignored, repo_pubkey_fingerprint = extract_pubkey() - repo_pubkey_fingerprint_stripped = repo_pubkey_fingerprint.replace(" ", "") - link = repodict["address"] - link_fingerprinted = ('{link}?fingerprint={fingerprint}' - .format(link=link, fingerprint=repo_pubkey_fingerprint_stripped)) # do not change this string, as it will break updates for files with older versions of this string autogenerate_comment = "auto-generated - fdroid index updates will overwrite this file" @@ -168,6 +163,13 @@ def make_website(apps, repodir, repodict): if _should_file_be_generated(html_file, autogenerate_comment): import qrcode + + _ignored, repo_pubkey_fingerprint = extract_pubkey() + repo_pubkey_fingerprint_stripped = repo_pubkey_fingerprint.replace(" ", "") + link = repodict["address"] + link_fingerprinted = '{link}?fingerprint={fingerprint}'.format( + link=link, fingerprint=repo_pubkey_fingerprint_stripped + ) qrcode.make(link_fingerprinted).save(os.path.join(repodir, "index.png")) with open(html_file, 'w') as f: name = repodict["name"]