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

eliminate Boolean metadata type, only 'bool' is needed

Browse Source 
No need for a specific metadata type for 'Requires Root'.  Just use 'bool',
then convert on output.  This keeps the internal representation consistent
since all boolean-ish values will be Python bools.  This in turn makes
parsing metadata in various formats easier.  This also makes setting
booleans more tolerant since all these values are valid:

 Yes yes No no True true False false
This commit is contained in:
Hans-Christoph Steiner 2015-07-23 16:33:08 -07:00
parent ab145de6bc
commit 014df8426f
2 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
fdroidserver/metadata.py
View File

@ -195,14 +195,9 @@ valuetypes = {
["Dogecoin"],
[]),
FieldValidator("Boolean",
['Yes', 'No'], None,
["Requires Root"],
[]),
FieldValidator("bool",
['yes', 'no'], None,
[],
r'([Yy]es|[Nn]o|[Tt]rue|[Ff]alse)', None,
["Requires Root"],
['submodules', 'oldsdkloc', 'forceversion', 'forcevercode',
'novcheck']),
@ -598,11 +593,6 @@ def post_metadata_parse(thisinfo):
elif k == 'versionName':
build['version'] = str(v)
del build['versionName']
elif flagtype(k) == 'bool':
if v == 'no':
build[k] = False
else:
build[k] = True
if not thisinfo['Description']:
thisinfo['Description'].append('No description available')
@ -683,17 +673,6 @@ def parse_json_metadata(metafile):
parse_float=lambda s: s)
supported_metadata = app_defaults.keys() + ['builds', 'comments']
for k, v in jsoninfo.iteritems():
if k == 'Requires Root':
if isinstance(v, basestring):
if re.match('^\s*(yes|true).*', v, flags=re.IGNORECASE):
jsoninfo[k] = 'Yes'
elif re.match('^\s*(no|false).*', v, flags=re.IGNORECASE):
jsoninfo[k] = 'No'
if isinstance(v, bool):
if v:
jsoninfo[k] = 'Yes'
else:
jsoninfo[k] = 'No'
if k not in supported_metadata:
logging.warn(metafile + ' contains unknown metadata key, ignoring: ' + k)
thisinfo.update(jsoninfo)
@ -754,6 +733,13 @@ def parse_xml_metadata(metafile):
builds.append(builddict)
thisinfo['builds'] = builds
# TODO handle this using <xsd:element type="xsd:boolean> in a schema
if not isinstance(thisinfo['Requires Root'], bool):
if thisinfo['Requires Root'] == 'true':
thisinfo['Requires Root'] = True
else:
thisinfo['Requires Root'] = False
# convert to the odd internal format
for k in ('Description', 'Maintainer Notes'):
if isinstance(thisinfo[k], basestring):
@ -1040,7 +1026,7 @@ def write_metadata(dest, app):
mf.write('.\n')
mf.write('\n')
if app['Requires Root']:
writefield('Requires Root', 'Yes')
writefield('Requires Root', 'yes')
mf.write('\n')
if app['Repo Type']:
writefield('Repo Type')

6
fdroidserver/update.py
View File

@ -95,6 +95,10 @@ def update_wiki(apps, sortedids, apks):
if 'AntiFeatures' in app:
for af in app['AntiFeatures']:
wikidata += '{{AntiFeature|' + af + '}}\n'
if app['Requires Root']:
requiresroot = 'Yes'
else:
requiresroot = 'No'
wikidata += '{{App|id=%s|name=%s|added=%s|lastupdated=%s|source=%s|tracker=%s|web=%s|changelog=%s|donate=%s|flattr=%s|bitcoin=%s|litecoin=%s|dogecoin=%s|license=%s|root=%s}}\n' % (
appid,
app['Name'],
@ -110,7 +114,7 @@ def update_wiki(apps, sortedids, apks):
app['Litecoin'],
app['Dogecoin'],
app['License'],
app.get('Requires Root', 'No'))
requiresroot)
if app['Provides']:
wikidata += "This app provides: %s" % ', '.join(app['Summary'].split(','))