mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 15:00:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'gradleFlavor' into 'master'

Browse source 
gradle file: use flavour specific versionCode/versionName, fall back to parsing line by line

See merge request fdroid/fdroidserver!389
This commit is contained in:
Hans-Christoph Steiner 2017-11-30 13:44:47 +01:00
commit dcbc78d238
3 changed files with 94 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

69
fdroidserver/common.py
View file

@ -1302,27 +1302,58 @@ def parse_androidmanifests(paths, app):
vercode = None
package = None
flavour = ""
if app.builds and 'gradle' in app.builds[-1] and app.builds[-1].gradle:
flavour = app.builds[-1].gradle[-1]
if has_extension(path, 'gradle'):
# first try to get version name and code from correct flavour
with open(path, 'r') as f:
for line in f:
if gradle_comment.match(line):
continue
# Grab first occurence of each to avoid running into
# alternative flavours and builds.
if not package:
matches = psearch_g(line)
if matches:
s = matches.group(2)
if app_matches_packagename(app, s):
package = s
if not version:
matches = vnsearch_g(line)
if matches:
version = matches.group(2)
if not vercode:
matches = vcsearch_g(line)
if matches:
vercode = matches.group(1)
buildfile = f.read()
regex_string = r"" + flavour + ".*?}"
search = re.compile(regex_string, re.DOTALL)
result = search.search(buildfile)
if result is not None:
resultgroup = result.group()
if not package:
matches = psearch_g(resultgroup)
if matches:
s = matches.group(2)
if app_matches_packagename(app, s):
package = s
if not version:
matches = vnsearch_g(resultgroup)
if matches:
version = matches.group(2)
if not vercode:
matches = vcsearch_g(resultgroup)
if matches:
vercode = matches.group(1)
else:
# fall back to parse file line by line
with open(path, 'r') as f:
for line in f:
if gradle_comment.match(line):
continue
# Grab first occurence of each to avoid running into
# alternative flavours and builds.
if not package:
matches = psearch_g(line)
if matches:
s = matches.group(2)
if app_matches_packagename(app, s):
package = s
if not version:
matches = vnsearch_g(line)
if matches:
version = matches.group(2)
if not vercode:
matches = vcsearch_g(line)
if matches:
vercode = matches.group(1)
else:
try:
xml = parse_xml(path)