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

update: finish porting permissions regex to remove group names

Browse Source 
Finish the job from 3011953d0e

closes #568
This commit is contained in:
Hans-Christoph Steiner 2018-09-17 23:11:19 +02:00
parent 807bf3d26b
commit 3e0d1beb09
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fdroidserver/update.py
View File

@ -59,7 +59,7 @@ APK_VERCODE_PAT = re.compile(".*versionCode='([0-9]*)'.*")
APK_VERNAME_PAT = re.compile(".*versionName='([^']*)'.*") APK_VERNAME_PAT = re.compile(".*versionName='([^']*)'.*")
APK_LABEL_ICON_PAT = re.compile(r".*\s+label='(.*)'\s+icon='(.*?)'") APK_LABEL_ICON_PAT = re.compile(r".*\s+label='(.*)'\s+icon='(.*?)'")
APK_SDK_VERSION_PAT = re.compile(".*'([0-9]*)'.*") APK_SDK_VERSION_PAT = re.compile(".*'([0-9]*)'.*")
APK_PERMISSION_PAT = re.compile(".*(name='(.*)')(.*maxSdkVersion='(.*)')?.*") APK_PERMISSION_PAT = re.compile(r".*(name='(.*)')(.*maxSdkVersion='(.*)')?.*")
APK_FEATURE_PAT = re.compile(".*name='([^']*)'.*") APK_FEATURE_PAT = re.compile(".*name='([^']*)'.*")
screen_densities = ['65534', '640', '480', '320', '240', '160', '120'] screen_densities = ['65534', '640', '480', '320', '240', '160', '120']
@ -1176,22 +1176,22 @@ def scan_apk_aapt(apk, apkfile):
for arch in line[13:].split(' '): for arch in line[13:].split(' '):
apk['nativecode'].append(arch[1:-1]) apk['nativecode'].append(arch[1:-1])
elif line.startswith('uses-permission:'): elif line.startswith('uses-permission:'):
perm_match = re.match(APK_PERMISSION_PAT, line).groupdict() perm_match = re.match(APK_PERMISSION_PAT, line).groups()
if perm_match['maxSdkVersion']: if perm_match[2]:
perm_match['maxSdkVersion'] = int(perm_match['maxSdkVersion']) perm_match[2] = int(perm_match[2]) # maxSdkVersion is an int
permission = UsesPermission( permission = UsesPermission(
perm_match['name'], perm_match[1], # name
perm_match['maxSdkVersion'] perm_match[2], # maxSdkVersion
) )
apk['uses-permission'].append(permission) apk['uses-permission'].append(permission)
elif line.startswith('uses-permission-sdk-23:'): elif line.startswith('uses-permission-sdk-23:'):
perm_match = re.match(APK_PERMISSION_PAT, line).groupdict() perm_match = re.match(APK_PERMISSION_PAT, line).groups()
if perm_match['maxSdkVersion']: if perm_match[2]:
perm_match['maxSdkVersion'] = int(perm_match['maxSdkVersion']) perm_match[2] = int(perm_match[2]) # maxSdkVersion is an int
permission_sdk_23 = UsesPermissionSdk23( permission_sdk_23 = UsesPermissionSdk23(
perm_match['name'], perm_match[1], # name
perm_match['maxSdkVersion'] perm_match[2], # maxSdkVersion
) )
apk['uses-permission-sdk-23'].append(permission_sdk_23) apk['uses-permission-sdk-23'].append(permission_sdk_23)