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

metadata: handle TYPE_STRINGMAP when writing out YAML

Browse source
This commit is contained in:
Hans-Christoph Steiner 2023-05-08 22:03:25 +02:00
parent e8ab84b583
commit 0393e46af9
5 changed files with 218 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/metadata-rewrite-yml/app.with.special.build.params.yml
View file

@ -1,5 +1,5 @@
AntiFeatures:
UpstreamNonFree: {}
- UpstreamNonFree
Categories:
- System
License: GPL-3.0-only

139
tests/metadata.TestCase
View file

@ -1296,6 +1296,87 @@ class MetadataTest(unittest.TestCase):
),
)
def test_write_yaml_build_antifeatures(self):
mf = io.StringIO()
app = metadata.App(
{
'License': 'Apache-2.0',
'Builds': [
metadata.Build(
{
'versionCode': 102030,
'versionName': 'v1.2.3',
'gradle': ['yes'],
'antifeatures': {
'a': {},
'b': {'de': 'Probe', 'en-US': 'test'},
},
}
),
],
'id': 'placeholder',
}
)
metadata.write_yaml(mf, app)
mf.seek(0)
self.assertEqual(
mf.read(),
textwrap.dedent(
"""\
License: Apache-2.0
Builds:
- versionName: v1.2.3
versionCode: 102030
gradle:
- yes
antifeatures:
a: {}
b:
de: Probe
en-US: test
"""
),
)
def test_write_yaml_build_antifeatures_old_style(self):
mf = io.StringIO()
app = metadata.App(
{
'License': 'Apache-2.0',
'Builds': [
metadata.Build(
{
'versionCode': 102030,
'versionName': 'v1.2.3',
'gradle': ['yes'],
'antifeatures': {'b': {}, 'a': {}},
}
),
],
'id': 'placeholder',
}
)
metadata.write_yaml(mf, app)
mf.seek(0)
self.assertEqual(
mf.read(),
textwrap.dedent(
"""\
License: Apache-2.0
Builds:
- versionName: v1.2.3
versionCode: 102030
gradle:
- yes
antifeatures:
- a
- b
"""
),
)
def test_write_yaml_make_sure_provides_does_not_get_written(self):
mf = io.StringIO()
app = fdroidserver.metadata.App()
@ -1649,7 +1730,7 @@ class MetadataTest(unittest.TestCase):
textwrap.dedent(
"""\
AntiFeatures:
NonFreeNet: {}
- NonFreeNet
Categories:
- Time
License: GPL-3.0-only
@ -1669,9 +1750,9 @@ class MetadataTest(unittest.TestCase):
commit: 6a548e4b19
target: android-10
antifeatures:
KnownVuln: {}
UpstreamNonFree: {}
NonFreeAssets: {}
- KnownVuln
- NonFreeAssets
- UpstreamNonFree
ArchivePolicy: 4 versions
AutoUpdateMode: Version v%v
@ -1727,6 +1808,56 @@ class MetadataTest(unittest.TestCase):
cm = metadata._app_to_yaml(metadata.App({'CurrentVersionCode': 0}))
self.assertFalse('CurrentVersionCode' in cm)
def test_format_stringmap_empty(self):
self.assertEqual(
metadata._format_stringmap('🔥', 'test', dict()),
list(),
)
def test_format_stringmap_one_list(self):
self.assertEqual(
metadata._format_stringmap('🔥', 'test', {'Tracking': {}, 'Ads': {}}),
['Ads', 'Tracking'],
)
def test_format_stringmap_one_list_empty_desc(self):
self.assertEqual(
metadata._format_stringmap('🔥', 'test', {'NonFree': {}, 'Ads': {'en': ''}}),
['Ads', 'NonFree'],
)
def test_format_stringmap_three_list(self):
self.assertEqual(
metadata._format_stringmap('🔥', 'test', {'B': {}, 'A': {}, 'C': {}}),
['A', 'B', 'C'],
)
def test_format_stringmap_two_dict(self):
self.assertEqual(
metadata._format_stringmap('🔥', 'test', {'1': {'uz': 'a'}, '2': {}}),
{'1': {'uz': 'a'}, '2': {}},
)
def test_format_stringmap_three_locales(self):
self.assertEqual(
metadata._format_stringmap(
'🔥', 'test', {'AF': {'uz': 'a', 'ko': 'b', 'zh': 'c'}}
),
{'AF': {'ko': 'b', 'uz': 'a', 'zh': 'c'}},
)
def test_format_stringmap_move_build_antifeatures_to_filesystem(self):
os.chdir(self.testdir)
appid = 'a'
yml = Path('metadata/a.yml')
yml.parent.mkdir()
self.assertEqual(
metadata._format_stringmap(
appid, 'antifeatures', {'AF': {'uz': 'a', 'ko': 'b', 'zh': 'c'}}
),
{'AF': {'ko': 'b', 'uz': 'a', 'zh': 'c'}},
)
class PostMetadataParseTest(unittest.TestCase):
"""Test the functions that post process the YAML input.

24
tests/rewritemeta.TestCase
View file

@ -180,6 +180,30 @@ class RewriteMetaTest(unittest.TestCase):
},
)
def test_remove_blank_flags_from_builds_app_with_special_build_params_af(self):
"""Unset fields in Builds: entries should be removed."""
appid = 'app.with.special.build.params'
app = metadata.read_metadata({appid: -1})[appid]
builds = rewritemeta.remove_blank_flags_from_builds(app.get('Builds'))
self.assertEqual(
builds[-2],
{
'antifeatures': {
'Ads': {'en-US': 'includes ad lib\n', 'zh-CN': '包括广告图书馆\n'},
'Tracking': {'en-US': 'standard suspects\n'},
},
'commit': '2.1.1',
'maven': '2',
'patch': [
'manifest-ads.patch',
'mobilecore.patch',
],
'srclibs': ['FacebookSDK@sdk-version-3.0.2'],
'versionCode': 50,
'versionName': '2.1.1-c',
},
)
def test_rewrite_scenario_trivial(self):
sys.argv = ['rewritemeta', 'a', 'b']