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

checkupdates improvements for gradle projects

Browse Source 
* Let the package name override the one found in AndroidManifest.xml
* Support the newer applicationId
This commit is contained in:
Daniel Martí 2015-09-08 13:12:28 -07:00
parent 41443edd55
commit 03deda914f
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fdroidserver/common.py
View File

@ -991,7 +991,7 @@ def parse_androidmanifests(paths, ignoreversions=None):
vcsearch_g = re.compile(r'.*versionCode *=* *["\']*([0-9]+)["\']*').search
vnsearch_g = re.compile(r'.*versionName *=* *(["\'])((?:(?=(\\?))\3.)*?)\1.*').search
psearch_g = re.compile(r'.*packageName *=* *["\']([^"]+)["\'].*').search
psearch_g = re.compile(r'.*(packageName|applicationId) *=* *["\']([^"]+)["\'].*').search
ignoresearch = re.compile(ignoreversions).search if ignoreversions else None
@ -1008,15 +1008,16 @@ def parse_androidmanifests(paths, ignoreversions=None):
gradle = has_extension(path, 'gradle')
version = None
vercode = None
# Remember package name, may be defined separately from version+vercode
package = max_package
package = None
if gradle:
for line in file(path):
# Grab first occurence of each to avoid running into
# alternative flavours and builds.
if not package:
matches = psearch_g(line)
if matches:
package = matches.group(1)
package = matches.group(2)
if not version:
matches = vnsearch_g(line)
if matches:
@ -1038,6 +1039,10 @@ def parse_androidmanifests(paths, ignoreversions=None):
if string_is_integer(a):
vercode = a
# Remember package name, may be defined separately from version+vercode
if package is None:
package = max_package
logging.debug("..got package={0}, version={1}, vercode={2}"
.format(package, version, vercode))