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

Improve checkupdates regex, support quotes better for build.gradle

Browse source
This commit is contained in:
Daniel Martí 2014-01-07 10:04:11 +01:00
parent 525fc14407
commit 7f6761c436
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
fdroidserver/common.py
View file

@ -683,9 +683,9 @@ def parse_androidmanifests(paths):
vnsearch = re.compile(r'.*android:versionName="([^"]+?)".*').search
psearch = re.compile(r'.*package="([^"]+)".*').search
vcsearch_g = re.compile(r'.*versionCode[ =]*([0-9]+?)[^\d].*').search
vnsearch_g = re.compile(r'.*versionName[ =]*"([^"]+?)".*').search
psearch_g = re.compile(r'.*packageName[ =]*"([^"]+)".*').search
vcsearch_g = re.compile(r'.*versionCode[ ]*=[ ]*["\']*([0-9]+?)[^\d].*').search
vnsearch_g = re.compile(r'.*versionName[ ]*=[ ]*(["\'])((?:(?=(\\?))\3.)*?)\1.*').search
psearch_g = re.compile(r'.*packageName[ ]*=[ ]*["\']([^"]+)["\'].*').search
max_version = None
max_vercode = None
@ -713,7 +713,7 @@ def parse_androidmanifests(paths):
else:
matches = vnsearch(line)
if matches:
version = matches.group(1)
version = matches.group(2 if gradle else 1)
if not vercode:
if gradle:
matches = vcsearch_g(line)