mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-04 14:30:30 +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(

38
tests/test_update.py
View file

@ -286,6 +286,44 @@ class UpdateTest(unittest.TestCase):
fdroidserver.update.insert_localized_app_metadata(apps)
self.assertEqual(second_value, apps[app.id]['localized']['en-US']['name'])
def test_fastlane_with_schildichat(self):
"""Test if fastlane is found in this tangle of dirs and symlinks.
https://github.com/SchildiChat/schildichat-android-next/tree/sc_v0.10.3-ex_25_6_2
"""
os.chdir(self.testdir)
config = dict()
fdroidserver.common.fill_config_defaults(config)
fdroidserver.update.config = config
app = fdroidserver.metadata.App()
app.id = 'chat.schildi.android'
build_dir = f'build/{app.id}'
flavors = ['fdroid', 'sc', 'default']
subdir = 'app'
apps = {app.id: app}
build = fdroidserver.metadata.Build()
build.versionCode = 42
build.gradle = flavors
build.subdir = subdir
app['Builds'] = [build]
wrong_value = 'wrong'
wrong_dir = Path(f'{build_dir}/upstream_infra/fastlane/metadata/android/en-US')
wrong_dir.mkdir(parents=True)
(wrong_dir / 'title.txt').write_text(wrong_value)
right_value = 'right'
right_dir = Path(f'{build_dir}/metadata/en-US')
right_dir.mkdir(parents=True)
(right_dir / 'title.txt').write_text(right_value)
_fastlane = Path('.fastlane/metadata')
_fastlane.mkdir(parents=True)
os.symlink('../../metadata', _fastlane / 'android')
os.symlink('.fastlane', 'fastlane')
fdroidserver.update.insert_localized_app_metadata(apps)
self.assertEqual(right_value, apps[app.id]['localized']['en-US']['name'])
def test_fastlane_with_multi_level_subdir(self):
"""Test if fastlane in multi-level subdir is found."""
os.chdir(self.testdir)