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

update: never include empty elements in the index

Browse Source
This commit is contained in:
Daniel Martí 2015-06-26 17:41:19 +02:00
parent d866ab4cef
commit 7b68b90569
1 changed files with 26 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
fdroidserver/update.py
View File

@ -711,11 +711,15 @@ def make_index(apps, sortedids, apks, repodir, archive, categories):
doc = Document() doc = Document()
def addElement(name, value, doc, parent): def addElement(name, value, doc, parent):
if not value:
return
el = doc.createElement(name) el = doc.createElement(name)
el.appendChild(doc.createTextNode(value)) el.appendChild(doc.createTextNode(value))
parent.appendChild(el) parent.appendChild(el)
def addElementCDATA(name, value, doc, parent): def addElementCDATA(name, value, doc, parent):
if not value:
return
el = doc.createElement(name) el = doc.createElement(name)
el.appendChild(doc.createCDATASection(value)) el.appendChild(doc.createCDATASection(value))
parent.appendChild(el) parent.appendChild(el)
@ -795,8 +799,7 @@ def make_index(apps, sortedids, apks, repodir, archive, categories):
addElement('lastupdated', time.strftime('%Y-%m-%d', app['lastupdated']), doc, apel) addElement('lastupdated', time.strftime('%Y-%m-%d', app['lastupdated']), doc, apel)
addElement('name', app['Name'], doc, apel) addElement('name', app['Name'], doc, apel)
addElement('summary', app['Summary'], doc, apel) addElement('summary', app['Summary'], doc, apel)
if app['icon']: addElement('icon', app['icon'], doc, apel)
addElement('icon', app['icon'], doc, apel)
def linkres(appid): def linkres(appid):
if appid in apps: if appid in apps:
@ -807,7 +810,7 @@ def make_index(apps, sortedids, apks, repodir, archive, categories):
metadata.description_html(app['Description'], linkres), metadata.description_html(app['Description'], linkres),
doc, apel) doc, apel)
addElement('license', app['License'], doc, apel) addElement('license', app['License'], doc, apel)
if 'Categories' in app: if 'Categories' in app and app['Categories']:
addElement('categories', ','.join(app["Categories"]), doc, apel) addElement('categories', ','.join(app["Categories"]), doc, apel)
# We put the first (primary) category in LAST, which will have # We put the first (primary) category in LAST, which will have
# the desired effect of making clients that only understand one # the desired effect of making clients that only understand one
@ -816,18 +819,12 @@ def make_index(apps, sortedids, apks, repodir, archive, categories):
addElement('web', app['Web Site'], doc, apel) addElement('web', app['Web Site'], doc, apel)
addElement('source', app['Source Code'], doc, apel) addElement('source', app['Source Code'], doc, apel)
addElement('tracker', app['Issue Tracker'], doc, apel) addElement('tracker', app['Issue Tracker'], doc, apel)
if app['Changelog']: addElement('changelog', app['Changelog'], doc, apel)
addElement('changelog', app['Changelog'], doc, apel) addElement('donate', app['Donate'], doc, apel)
if app['Donate']: addElement('bitcoin', app['Bitcoin'], doc, apel)
addElement('donate', app['Donate'], doc, apel) addElement('litecoin', app['Litecoin'], doc, apel)
if app['Bitcoin']: addElement('dogecoin', app['Dogecoin'], doc, apel)
addElement('bitcoin', app['Bitcoin'], doc, apel) addElement('flattr', app['FlattrID'], doc, apel)
if app['Litecoin']:
addElement('litecoin', app['Litecoin'], doc, apel)
if app['Dogecoin']:
addElement('dogecoin', app['Dogecoin'], doc, apel)
if app['FlattrID']:
addElement('flattr', app['FlattrID'], doc, apel)
# These elements actually refer to the current version (i.e. which # These elements actually refer to the current version (i.e. which
# one is recommended. They are historically mis-named, and need # one is recommended. They are historically mis-named, and need
@ -835,19 +832,17 @@ def make_index(apps, sortedids, apks, repodir, archive, categories):
addElement('marketversion', app['Current Version'], doc, apel) addElement('marketversion', app['Current Version'], doc, apel)
addElement('marketvercode', app['Current Version Code'], doc, apel) addElement('marketvercode', app['Current Version Code'], doc, apel)
if app['AntiFeatures']: af = app['AntiFeatures'].split(',')
af = app['AntiFeatures'].split(',') # TODO: Temporarily not including UpstreamNonFree in the index,
# TODO: Temporarily not including UpstreamNonFree in the index, # because current F-Droid clients do not understand it, and also
# because current F-Droid clients do not understand it, and also # look ugly when they encounter an unknown antifeature. This
# look ugly when they encounter an unknown antifeature. This # filtering can be removed in time...
# filtering can be removed in time... if 'UpstreamNonFree' in af:
if 'UpstreamNonFree' in af: af.remove('UpstreamNonFree')
af.remove('UpstreamNonFree') if af:
if af: addElement('antifeatures', ','.join(af), doc, apel)
addElement('antifeatures', ','.join(af), doc, apel) pv = app['Provides'].split(',')
if app['Provides']: addElement('provides', ','.join(pv), doc, apel)
pv = app['Provides'].split(',')
addElement('provides', ','.join(pv), doc, apel)
if app['Requires Root']: if app['Requires Root']:
addElement('requirements', 'root', doc, apel) addElement('requirements', 'root', doc, apel)
@ -892,12 +887,10 @@ def make_index(apps, sortedids, apks, repodir, archive, categories):
addElement('maxsdkver', str(apk['maxsdkversion']), doc, apkel) addElement('maxsdkver', str(apk['maxsdkversion']), doc, apkel)
if 'added' in apk: if 'added' in apk:
addElement('added', time.strftime('%Y-%m-%d', apk['added']), doc, apkel) addElement('added', time.strftime('%Y-%m-%d', apk['added']), doc, apkel)
if len(apk['permissions']) > 0: addElement('permissions', ','.join(apk['permissions']), doc, apkel)
addElement('permissions', ','.join(apk['permissions']), doc, apkel) if 'nativecode' in apk:
if 'nativecode' in apk and len(apk['nativecode']) > 0:
addElement('nativecode', ','.join(apk['nativecode']), doc, apkel) addElement('nativecode', ','.join(apk['nativecode']), doc, apkel)
if len(apk['features']) > 0: addElement('features', ','.join(apk['features']), doc, apkel)
addElement('features', ','.join(apk['features']), doc, apkel)
if current_version_file is not None \ if current_version_file is not None \
and config['make_current_version_link'] \ and config['make_current_version_link'] \