kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-14 02:50:12 +01:00
Code Activity

Merge branch 'fix_missing_icon' into 'master'

Browse Source 
Use default icon for index if the file does not exist

See merge request fdroid/fdroidserver!1374
This commit is contained in:
Jochen Sprickerhof 2024-06-07 11:02:33 +00:00
commit 390aaa0214
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fdroidserver/common.py
View File

@ -647,11 +647,16 @@ def load_localized_config(name, repodir):
ret[afname][key] = dict() ret[afname][key] = dict()
if key == "icon": if key == "icon":
icons_dir = os.path.join(repodir, 'icons') icons_dir = os.path.join(repodir, 'icons')
# make sure the icon filename contains only a file name
# to restrict files to the config directory.
icon = os.path.basename(value)
if not os.path.exists(icons_dir): if not os.path.exists(icons_dir):
os.makedirs(icons_dir, exist_ok=True) os.makedirs(icons_dir, exist_ok=True)
shutil.copy(os.path.join("config", value), icons_dir) if not os.path.exists(os.path.join("config", icon)):
ret[afname][key][locale] = ret[afname][key][DEFAULT_LOCALE]
shutil.copy(os.path.join("config", icon), icons_dir)
ret[afname][key][locale] = file_entry( ret[afname][key][locale] = file_entry(
os.path.join(icons_dir, value) os.path.join(icons_dir, icon)
) )
else: else:
ret[afname][key][locale] = value ret[afname][key][locale] = value