1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-09-19 19:40:17 +02:00

Wiki update needs to include apks from archive and main, not just archive

This commit is contained in:
Ciaran Gultnieks 2013-05-10 15:04:59 +01:00
parent 48296df5b0
commit 678052b0e3

View File

@ -32,10 +32,13 @@ import time
import common import common
from common import MetaDataException from common import MetaDataException
# Update the wiki. 'apps' is a list of all applications and everything we know
# about them, and 'apks' likewise. Set 'verbose' to True for verbose output.
def update_wiki(apps, apks, verbose=False): def update_wiki(apps, apks, verbose=False):
"""Update the wiki
:param apps: fully populated list of all applications
:param apks: all apks, except...
:param verbose: True to make a lot of noise
"""
print "Updating wiki" print "Updating wiki"
wikicat = 'Apps' wikicat = 'Apps'
import mwclient import mwclient
@ -746,11 +749,12 @@ def main():
make_index(apps, apks, repodirs[0], False, categories) make_index(apps, apks, repodirs[0], False, categories)
archapks = None
if len(repodirs) > 1: if len(repodirs) > 1:
apks, cc = scan_apks(apps, apkcache, repodirs[1], knownapks) archapks , cc = scan_apks(apps, apkcache, repodirs[1], knownapks)
if cc: if cc:
cachechanged = True cachechanged = True
make_index(apps, apks, repodirs[1], True, categories) make_index(apps, archapks, repodirs[1], True, categories)
if update_stats: if update_stats:
@ -779,6 +783,8 @@ def main():
# Update the wiki... # Update the wiki...
if options.wiki: if options.wiki:
if archapks:
apks.extend(archapks)
update_wiki(apps, apks, options.verbose) update_wiki(apps, apks, options.verbose)
print "Finished." print "Finished."