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

Merge branch 'triple-t' into 'master'

Browse source 
update.py: fix triple-t metadata extract when there is no subdir

See merge request fdroid/fdroidserver!1599
This commit is contained in:
Hans-Christoph Steiner 2025-01-27 13:49:11 +00:00
commit 9215f5e4b1
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
fdroidserver/update.py
View file

@ -1026,19 +1026,20 @@ def copy_triple_t_store_metadata(apps):
for packageName, app in apps.items(): for packageName, app in apps.items():
builds = app.get('Builds', []) builds = app.get('Builds', [])
gradle_subdirs = set() gradle_subdirs = set()
if builds and builds[-1].subdir: if builds:
subdir = builds[-1].subdir or ''
for flavor in builds[-1].gradle: for flavor in builds[-1].gradle:
if flavor not in ('yes', 'no', True, False): if flavor not in ('yes', 'no', True, False):
p = os.path.join('build', packageName, builds[-1].subdir, 'src', flavor, 'play') p = os.path.join('build', packageName, subdir, 'src', flavor, 'play')
if os.path.exists(p): if os.path.exists(p):
gradle_subdirs.add(p) gradle_subdirs.add(p)
if not gradle_subdirs: if not gradle_subdirs:
gradle_subdirs.update(glob.glob(os.path.join('build', packageName, builds[-1].subdir, 'src', '*', 'play'))) gradle_subdirs.update(glob.glob(os.path.join('build', packageName, subdir, 'src', '*', 'play')))
if not gradle_subdirs: if not gradle_subdirs:
gradle_subdirs.update(glob.glob(os.path.join('build', packageName, builds[-1].subdir, '*', 'src', '*', 'play'))) gradle_subdirs.update(glob.glob(os.path.join('build', packageName, subdir, '*', 'src', '*', 'play')))
if not gradle_subdirs: if not gradle_subdirs:
# Flutter-style android subdir # Flutter-style android subdir
gradle_subdirs.update(glob.glob(os.path.join('build', packageName, builds[-1].subdir, 'android', 'app', 'src', '*', 'play'))) gradle_subdirs.update(glob.glob(os.path.join('build', packageName, subdir, 'android', 'app', 'src', '*', 'play')))
if not gradle_subdirs: if not gradle_subdirs:
sg_list = sorted(glob.glob(os.path.join('build', packageName, 'settings.gradle*'))) sg_list = sorted(glob.glob(os.path.join('build', packageName, 'settings.gradle*')))
if sg_list: if sg_list: