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

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

Browse source
This commit is contained in:
mimi89999 2017-12-23 14:36:38 +01:00
parent 5cfa4d487f
commit 90c7dd29df
No known key found for this signature in database
GPG key ID: 4B054AC4922D7B18
3 changed files with 110 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

68
fdroidserver/common.py
View file

@ -1336,27 +1336,63 @@ def parse_androidmanifests(paths, app):
vercode = None
package = None
flavour = None
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'):
with open(path, 'r') as f:
inside_flavour_group = 0
inside_required_flavour = 0
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)
if inside_flavour_group > 0:
if inside_required_flavour > 0:
matches = psearch_g(line)
if matches:
s = matches.group(2)
if app_matches_packagename(app, s):
package = s
matches = vnsearch_g(line)
if matches:
version = matches.group(2)
matches = vcsearch_g(line)
if matches:
vercode = matches.group(1)
if '{' in line:
inside_required_flavour += 1
if '}' in line:
inside_required_flavour -= 1
else:
if flavour and (flavour in line):
inside_required_flavour = 1
if '{' in line:
inside_flavour_group += 1
if '}' in line:
inside_flavour_group -= 1
else:
if "productFlavors" in line:
inside_flavour_group = 1
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)