kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-20 13:50:12 +01:00
Code Activity

Revert: 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 12:43:16 +01:00
parent 8c243ee7eb
commit 918bd15c45
No known key found for this signature in database
GPG Key ID: 4B054AC4922D7B18
3 changed files with 19 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
fdroidserver/common.py
View File

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

43
tests/common.TestCase
View File

@ -612,49 +612,6 @@ class CommonTest(unittest.TestCase):
sig = fdroidserver.common.metadata_find_developer_signature('org.smssecure.smssecure') sig = fdroidserver.common.metadata_find_developer_signature('org.smssecure.smssecure')
self.assertEqual('b30bb971af0d134866e158ec748fcd553df97c150f58b0a963190bbafbeb0868', sig) self.assertEqual('b30bb971af0d134866e158ec748fcd553df97c150f58b0a963190bbafbeb0868', sig)
def test_parse_androidmanifests(self):
source_files_dir = os.path.join(os.path.dirname(__file__), 'source-files')
app = fdroidserver.metadata.App()
app.id = 'org.fdroid.fdroid'
paths = [
os.path.join(source_files_dir, 'fdroid', 'fdroidclient', 'AndroidManifest.xml'),
os.path.join(source_files_dir, 'fdroid', 'fdroidclient', 'build.gradle'),
]
for path in paths:
self.assertTrue(os.path.isfile(path))
self.assertEqual(('0.94-test', '940', 'org.fdroid.fdroid'),
fdroidserver.common.parse_androidmanifests(paths, app))
def test_parse_androidmanifests_with_flavor(self):
source_files_dir = os.path.join(os.path.dirname(__file__), 'source-files')
app = fdroidserver.metadata.App()
build = fdroidserver.metadata.Build()
build.gradle = ['devVersion']
app.builds = [build]
app.id = 'org.fdroid.fdroid.dev'
paths = [
os.path.join(source_files_dir, 'fdroid', 'fdroidclient', 'AndroidManifest.xml'),
os.path.join(source_files_dir, 'fdroid', 'fdroidclient', 'build.gradle'),
]
for path in paths:
self.assertTrue(os.path.isfile(path))
self.assertEqual(('0.95-dev', '949', 'org.fdroid.fdroid.dev'),
fdroidserver.common.parse_androidmanifests(paths, app))
app = fdroidserver.metadata.App()
build = fdroidserver.metadata.Build()
build.gradle = ['free']
app.builds = [build]
app.id = 'eu.siacs.conversations'
paths = [
os.path.join(source_files_dir, 'eu.siacs.conversations', 'build.gradle'),
]
for path in paths:
self.assertTrue(os.path.isfile(path))
self.assertEqual(('1.23.1', '245', 'eu.siacs.conversations'),
fdroidserver.common.parse_androidmanifests(paths, app))
if __name__ == "__main__": if __name__ == "__main__":
parser = optparse.OptionParser() parser = optparse.OptionParser()

15
tests/source-files/fdroid/fdroidclient/build.gradle
View File

@ -129,21 +129,6 @@ android {
compileSdkVersion 21 compileSdkVersion 21
buildToolsVersion '22.0.1' buildToolsVersion '22.0.1'
defaultConfig {
flavorDimensions "default"
productFlavors {
devVersion {
applicationId "org.fdroid.fdroid.dev"
dimension "default"
versionCode 949
versionName "0.95-dev"
}
}
}
sourceSets { sourceSets {
main { main {
manifest.srcFile 'AndroidManifest.xml' manifest.srcFile 'AndroidManifest.xml'