mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 15:00:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only overwrite index.html/css files which were created by fdroid update

Browse source 
Further changes:
* use real value for icon instead of hard coded value
* Move qrcode.make() to top
* fix identation of css file generation
This commit is contained in:
Benedikt Brückmann 2021-01-26 13:06:06 +01:00
parent 8d51566a70
commit 96854be84a
1 changed files with 30 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

43
fdroidserver/index.py
View file

@ -133,21 +133,36 @@ def make(apps, apks, repodir, archive):
make_website(sortedapps, repodir, repodict) make_website(sortedapps, repodir, repodict)
def _should_file_be_generated(path, magic_string):
if os.path.exists(path):
with open(path) as f:
if not magic_string in f.readline(): # if the magic_string is not in the first line the file should be overwritten
return False
return True
def make_website(apps, repodir, repodict): def make_website(apps, repodir, repodict):
_, repo_pubkey_fingerprint = extract_pubkey() _, repo_pubkey_fingerprint = extract_pubkey()
repo_pubkey_fingerprint_stripped = repo_pubkey_fingerprint.replace(" ", "") repo_pubkey_fingerprint_stripped = repo_pubkey_fingerprint.replace(" ", "")
link = repodict["address"] link = repodict["address"]
link_fingerprinted = "{link}?fingerprint={fingerprint}".format(link=link, fingerprint=repo_pubkey_fingerprint_stripped) link_fingerprinted = "{link}?fingerprint={fingerprint}".format(link=link, fingerprint=repo_pubkey_fingerprint_stripped)
autogenerate_comment = "auto-generated - fdroid index updates will overwrite this file" # do not change this string, as it will break the updates for existing files with older versions of this string
if not os.path.exists(repodir): if not os.path.exists(repodir):
os.makedirs(repodir) os.makedirs(repodir)
html_name = 'index.html'
qrcode.make(link_fingerprinted).save(os.path.join(repodir, "index.png"))
html_name = 'index.html'
html_file = os.path.join(repodir, html_name) html_file = os.path.join(repodir, html_name)
with open(html_file, 'w') as f:
name = repodict["name"] if _should_file_be_generated(html_file, autogenerate_comment):
description = repodict["description"] with open(html_file, 'w') as f:
f.write("""<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'> name = repodict["name"]
description = repodict["description"]
icon = repodict["icon"]
f.write("""<!-- {autogenerate_comment} -->
<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>
<HTML> <HTML>
<HEAD> <HEAD>
<META HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=UTF-8'/> <META HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=UTF-8'/>
@ -155,8 +170,8 @@ def make_website(apps, repodir, repodict):
<TITLE>{name}</TITLE> <TITLE>{name}</TITLE>
<BASE HREF='index.html'/> <BASE HREF='index.html'/>
<LINK REL='stylesheet' TYPE='text/css' HREF='index.css' /> <LINK REL='stylesheet' TYPE='text/css' HREF='index.css' />
<LINK REL='icon' HREF='icons/fdroid-icon.png' TYPE='image/png' /> <LINK REL='icon' HREF='icons/{icon}' TYPE='image/png' />
<LINK REL='shortcut icon' HREF='icons/fdroid-icon.png' TYPE='image/png' /> <LINK REL='shortcut icon' HREF='icons/{icon}' TYPE='image/png' />
<META property="og:site_name" content="{name}" /> <META property="og:site_name" content="{name}" />
<META property="og:title" content="{name}" /> <META property="og:title" content="{name}" />
<META property="og:determiner" content="" /> <META property="og:determiner" content="" />
@ -188,16 +203,20 @@ def make_website(apps, repodir, repodict):
</blockcode> </blockcode>
</p> </p>
</div> </div>
</BODY>""".format(name=name, </BODY>""".format(autogenerate_comment=autogenerate_comment,
description=description, description=description,
details="Currently it serves <kbd>{}</kbd> apps. To add it to your F-Droid client, scan the QR code (click it to enlarge) or use this URL:".format(len(apps)), details="Currently it serves <kbd>{}</kbd> apps. To add it to your F-Droid client, scan the QR code (click it to enlarge) or use this URL:".format(len(apps)),
fingerprint=repo_pubkey_fingerprint, fingerprint=repo_pubkey_fingerprint,
icon=icon,
link=link, link=link,
link_fingerprinted=link_fingerprinted)) link_fingerprinted=link_fingerprinted,
name=name))
css_file = os.path.join(repodir, "index.css") css_file = os.path.join(repodir, "index.css")
if _should_file_be_generated(css_file, autogenerate_comment):
with open(css_file, "w") as f: with open(css_file, "w") as f:
f.write(""" # this auto generated comment was not included via .format(), as python seems to have problems with css files in combination with .format()
f.write("""/* auto-generated - fdroid index updates will overwrite this file */
BODY { BODY {
font-family: Arial, Helvetica, Sans-Serif; font-family: Arial, Helvetica, Sans-Serif;
color: #0000ee; color: #0000ee;
@ -308,8 +327,6 @@ fieldset select, fieldset input, #reposelect select, #reposelect input { font-si
.appdetailcell { display:block; float:left; line-height:1.5em; } .appdetailcell { display:block; float:left; line-height:1.5em; }
}""") }""")
qrcode.make(link_fingerprinted).save(os.path.join(repodir, "index.png"))
def make_v1(apps, packages, repodir, repodict, requestsdict, fdroid_signing_key_fingerprints): def make_v1(apps, packages, repodir, repodict, requestsdict, fdroid_signing_key_fingerprints):