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

update: more accurate fastlane subdir/flavor matching

Browse source 
This should fix Schildichat showing Element X's metadata.
This commit is contained in:
Hans-Christoph Steiner 2025-07-25 16:04:25 +02:00
parent 546821fc3d
commit 6a3758d3c4
2 changed files with 49 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
fdroidserver/update.py
View file

@ -1148,6 +1148,7 @@ def insert_localized_app_metadata(apps):
metadata/<locale>/
fastlane/metadata/android/<locale>/
<subdir>/fastlane/metadata/android/<locale>/
src/<buildFlavor>/fastlane/metadata/android/<locale>/
...as well as the /metadata/<packageName>/<locale> directory.
@ -1186,7 +1187,7 @@ def insert_localized_app_metadata(apps):
builds = apps.get(packageName, {}).get('Builds', [])
found_in_subdir = (
builds
and len(segments) > 7
and len(segments) > 6
and segments[-4] == "fastlane"
and segments[-3] == "metadata"
and segments[-2] == "android"
@ -1199,12 +1200,18 @@ def insert_localized_app_metadata(apps):
build_flavors = common.calculate_gradle_flavor_combination(
builds[-1]['gradle']
)
found_in_flavor = (
len(segments) > 7
and segments[2] == 'src'
and segments[4] == "fastlane"
and segments[3] in build_flavors
)
if (
not found_in_subdir
and len(segments) >= 5
and segments[4] == "fastlane"
and segments[3] not in build_flavors
and not found_in_flavor
and segments[0] == 'build'
and segments[2] not in ('metadata', 'fastlane')
):
logging.debug(
'Not scanning "{dir}" with unknown subdir or gradle flavor "{value}"'.format(