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

Map apps in memory from appid to appinfo

Browse source 
Instead of storing them in a list and doing linear searches by appinfo['id']
This commit is contained in:
Daniel Martí 2014-08-16 12:46:02 +02:00
parent 880f75110e
commit 94c29f9c37
11 changed files with 108 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

18
fdroidserver/scanner.py
View file

@ -57,20 +57,20 @@ def main():
srclib_dir = os.path.join(build_dir, 'srclib')
extlib_dir = os.path.join(build_dir, 'extlib')
for app in apps:
for appid, app in apps.iteritems():
if app['Disabled']:
logging.info("Skipping %s: disabled" % app['id'])
logging.info("Skipping %s: disabled" % appid)
continue
if not app['builds']:
logging.info("Skipping %s: no builds specified" % app['id'])
logging.info("Skipping %s: no builds specified" % appid)
continue
logging.info("Processing " + app['id'])
logging.info("Processing " + appid)
try:
build_dir = 'build/' + app['id']
build_dir = 'build/' + appid
# Set up vcs interface and make sure we have the latest code...
vcs = common.getvcs(app['Repo Type'], app['Repo'], build_dir)
@ -91,17 +91,17 @@ def main():
# Do the scan...
buildprobs = common.scan_source(build_dir, root_dir, thisbuild)
for problem in buildprobs:
problems.append(problem + ' in ' + app['id']
problems.append(problem + ' in ' + appid
+ ' ' + thisbuild['version'])
except BuildException as be:
msg = "Could not scan app %s due to BuildException: %s" % (app['id'], be)
msg = "Could not scan app %s due to BuildException: %s" % (appid, be)
problems.append(msg)
except VCSException as vcse:
msg = "VCS error while scanning app %s: %s" % (app['id'], vcse)
msg = "VCS error while scanning app %s: %s" % (appid, vcse)
problems.append(msg)
except Exception:
msg = "Could not scan app %s due to unknown error: %s" % (app['id'], traceback.format_exc())
msg = "Could not scan app %s due to unknown error: %s" % (appid, traceback.format_exc())
problems.append(msg)
logging.info("Finished:")