from distutils.version import LooseVersion
import logging
-import common, metadata
+import common
+import metadata
from common import BuildException
from common import VCSException
from metadata import MetaDataException
try:
- if not 'Update Check Data' in app:
+ if 'Update Check Data' not in app:
raise Exception('Missing Update Check Data')
urlcode, codeex, urlver, verex = app['Update Check Data'].split('|')
msg = "Could not complete http check for app {0} due to unknown error: {1}".format(app['id'], traceback.format_exc())
return (None, msg)
+
# Check for a new version by looking at the tags in the source repo.
# Whether this can be used reliably or not depends on
# the development procedures used by the project's developers. Use it with
if repotype not in ('git', 'git-svn', 'hg', 'bzr'):
return (None, 'Tags update mode only works for git, hg, bzr and git-svn repositories currently', None)
+ if repotype == 'git-svn' and ';' not in app['Repo']:
+ return (None, 'Tags update mode used in git-svn, but the repo was not set up with tags', None)
+
# Set up vcs interface and make sure we have the latest code...
vcs = common.getvcs(app['Repo Type'], app['Repo'], build_dir)
flavour = None
if len(app['builds']) > 0:
- if 'subdir' in app['builds'][-1]:
+ if app['builds'][-1]['subdir']:
build_dir = os.path.join(build_dir, app['builds'][-1]['subdir'])
- if 'gradle' in app['builds'][-1]:
+ if app['builds'][-1]['gradle']:
flavour = app['builds'][-1]['gradle']
if flavour == 'yes':
flavour = None
# Only process tags where the manifest exists...
paths = common.manifest_paths(build_dir, flavour)
- version, vercode, package = common.parse_androidmanifests(paths)
+ version, vercode, package = \
+ common.parse_androidmanifests(paths, app['Update Check Ignore'])
if not package or package != appid or not version or not vercode:
continue
- logging.debug("Manifest exists. Found version {0} ({1})".format(
- version, vercode))
+ logging.debug("Manifest exists. Found version {0} ({1})"
+ .format(version, vercode))
if int(vercode) > int(hcode):
htag = tag
hcode = str(int(vercode))
msg = "Could not scan app {0} due to unknown error: {1}".format(app['id'], traceback.format_exc())
return (None, msg, None)
+
# Check for a new version by looking at the AndroidManifest.xml at the HEAD
# of the source repo. Whether this can be used reliably or not depends on
# the development procedures used by the project's developers. Use it with
if repotype == 'git':
if branch:
- branch = 'origin/'+branch
+ branch = 'origin/' + branch
vcs.gotorevision(branch)
elif repotype == 'git-svn':
vcs.gotorevision(branch)
flavour = None
if len(app['builds']) > 0:
- if 'subdir' in app['builds'][-1]:
+ if app['builds'][-1]['subdir']:
build_dir = os.path.join(build_dir, app['builds'][-1]['subdir'])
- if 'gradle' in app['builds'][-1]:
+ if app['builds'][-1]['gradle']:
flavour = app['builds'][-1]['gradle']
if flavour == 'yes':
flavour = None
paths = common.manifest_paths(build_dir, flavour)
- version, vercode, package = common.parse_androidmanifests(paths)
+ version, vercode, package = \
+ common.parse_androidmanifests(paths, app['Update Check Ignore'])
if not package:
return (None, "Couldn't find package ID")
if package != appid:
if not version:
return (None, "Couldn't find latest version name")
if not vercode:
+ if "Ignore" == version:
+ return (None, "Latest version is ignored")
return (None, "Couldn't find latest version code")
vercode = str(int(vercode))
msg = "Could not scan app {0} due to unknown error: {1}".format(app['id'], traceback.format_exc())
return (None, msg)
+
def check_repotrunk(app, branch=None):
try:
msg = "Could not scan app {0} due to unknown error: {1}".format(app['id'], traceback.format_exc())
return (None, msg)
+
# Check for a new version by looking at the Google Play Store.
# Returns (None, "a message") if this didn't work, or (version, None) for
# the details of the current version.
config = None
options = None
+
def main():
global config, options
config = common.read_config(options)
# Get all apps...
- allapps = metadata.read_metadata(options.verbose)
+ allapps = metadata.read_metadata()
+ metadata.read_srclibs()
apps = common.read_app_args(args, allapps, False)
if version is not None:
stored = app['Current Version']
if not stored:
- logging.info("{0} has no Current Version but has version {1} on the Play Store".format(
- common.getappname(app), version))
+ logging.info("{0} has no Current Version but has version {1} on the Play Store"
+ .format(common.getappname(app), version))
elif LooseVersion(stored) < LooseVersion(version):
- logging.info("{0} has version {1} on the Play Store, which is bigger than {2}".format(
- common.getappname(app), version, stored))
+ logging.info("{0} has version {1} on the Play Store, which is bigger than {2}"
+ .format(common.getappname(app), version, stored))
else:
if stored != version:
- logging.info("{0} has version {1} on the Play Store, which differs from {2}".format(
- common.getappname(app), version, stored))
+ logging.info("{0} has version {1} on the Play Store, which differs from {2}"
+ .format(common.getappname(app), version, stored))
else:
- logging.info("{0} has the same version {1} on the Play Store".format(
- common.getappname(app), version))
+ logging.info("{0} has the same version {1} on the Play Store"
+ .format(common.getappname(app), version))
return
-
for app in apps:
if options.autoonly and app['Auto Update Mode'] in ('None', 'Static'):
flavour = None
if len(app['builds']) > 0:
- if 'subdir' in app['builds'][-1]:
+ if app['builds'][-1]['subdir']:
app_dir = os.path.join(app_dir, app['builds'][-1]['subdir'])
- if 'gradle' in app['builds'][-1]:
+ if app['builds'][-1]['gradle']:
flavour = app['builds'][-1]['gradle']
if flavour == 'yes':
flavour = None
logging.debug("...fetch auto name from " + app_dir +
- ((" (flavour: %s)" % flavour) if flavour else ""))
+ ((" (flavour: %s)" % flavour) if flavour else ""))
new_name = common.fetch_real_name(app_dir, flavour)
if new_name:
logging.debug("...got autoname '" + new_name + "'")
if not gotcur:
newbuild = latest.copy()
- for k in ('origlines', 'disable'):
- if k in newbuild:
- del newbuild[k]
+ if 'origlines' in newbuild:
+ del newbuild['origlines']
+ newbuild['disable'] = False
newbuild['vercode'] = app['Current Version Code']
newbuild['version'] = app['Current Version'] + suffix
logging.info("...auto-generating build for " + newbuild['version'])
metadata.write_metadata(metafile, app)
if options.commit:
logging.info("Commiting update for " + metafile)
- gitcmd = ["git", "commit", "-m",
- commitmsg]
+ gitcmd = ["git", "commit", "-m", commitmsg]
if 'auto_author' in config:
gitcmd.extend(['--author', config['auto_author']])
gitcmd.extend(["--", metafile])
if __name__ == "__main__":
main()
-
~ianmdlvl / fdroidserver.git / blobdiff