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

work towards switching fdroidserver/metadata.py to black

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2023-04-24 14:46:03 +02:00
parent e5fda54693
commit e794ccb38c
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
fdroidserver/metadata.py
View File

@ -397,8 +397,13 @@ class FieldValidator:
values = [v] values = [v]
for v in values: for v in values:
if not self.compiled.match(v): if not self.compiled.match(v):
_warn_or_exception(_("'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}") _warn_or_exception(
.format(value=v, field=self.name, appid=appid, pattern=self.matching)) _(
"'{value}' is not a valid {field} in {appid}. Regex pattern: {pattern}"
).format(
value=v, field=self.name, appid=appid, pattern=self.matching
)
)
# Generic value types # Generic value types
@ -469,16 +474,14 @@ def check_metadata(app):
def parse_yaml_srclib(metadatapath): def parse_yaml_srclib(metadatapath):
thisinfo = {'RepoType': '', 'Repo': '', 'Subdir': None, 'Prepare': None}
thisinfo = {'RepoType': '',
'Repo': '',
'Subdir': None,
'Prepare': None}
if not metadatapath.exists(): if not metadatapath.exists():
_warn_or_exception(_("Invalid scrlib metadata: '{file}' " _warn_or_exception(
"does not exist" _("Invalid scrlib metadata: '{file}' does not exist").format(
.format(file=metadatapath))) file=metadatapath
)
)
return thisinfo return thisinfo
with metadatapath.open("r", encoding="utf-8") as f: with metadatapath.open("r", encoding="utf-8") as f:
@ -984,5 +987,9 @@ def write_metadata(metadatapath, app):
def add_metadata_arguments(parser): def add_metadata_arguments(parser):
"""Add common command line flags related to metadata processing.""" """Add common command line flags related to metadata processing."""
parser.add_argument("-W", choices=['error', 'warn', 'ignore'], default='error', parser.add_argument(
help=_("force metadata errors (default) to be warnings, or to be ignored.")) "-W",
choices=['error', 'warn', 'ignore'],
default='error',
help=_("force metadata errors (default) to be warnings, or to be ignored."),
)