kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-10 17:30:11 +01:00
Code Activity

Make sure to match filename extensions without being case sensitive

Browse Source
This commit is contained in:
Daniel Martí 2013-12-30 11:33:37 +01:00
parent ecd074c196
commit 23aa016a8d
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fdroidserver/common.py
View File

@ -169,6 +169,11 @@ def read_app_args(args, allapps, allow_vercodes=False):
return apps return apps
def has_extension(filename, extension):
name, ext = os.path.splitext(filename)
ext = ext.lower()[1:]
return ext == extension
apk_regex = None apk_regex = None
def apknameinfo(filename): def apknameinfo(filename):
@ -619,7 +624,7 @@ def fetch_real_name(app_dir, flavour):
name_search = re.compile(r'.*android:label="([^"]+)".*').search name_search = re.compile(r'.*android:label="([^"]+)".*').search
app_found = False app_found = False
for f in manifest_paths(app_dir, flavour): for f in manifest_paths(app_dir, flavour):
if not f.endswith(".xml"): if not has_extension(f, 'xml'):
continue continue
xml_dir = os.path.join(f[:-19], 'res', 'values') xml_dir = os.path.join(f[:-19], 'res', 'values')
for line in file(f): for line in file(f):
@ -635,7 +640,7 @@ def fetch_real_name(app_dir, flavour):
# Retrieve the version name # Retrieve the version name
def version_name(original, app_dir, flavour): def version_name(original, app_dir, flavour):
for f in manifest_paths(app_dir, flavour): for f in manifest_paths(app_dir, flavour):
if not f.endswith(".xml"): if not has_extension(f, 'xml'):
continue continue
xml_dir = os.path.join(f[:-19], 'res', 'values') xml_dir = os.path.join(f[:-19], 'res', 'values')
string = retrieve_string(xml_dir, original) string = retrieve_string(xml_dir, original)
@ -683,7 +688,7 @@ def parse_androidmanifests(paths):
for path in paths: for path in paths:
gradle = path.endswith("gradle") gradle = has_extension(path, 'gradle')
version = None version = None
vercode = None vercode = None
# Remember package name, may be defined separately from version+vercode # Remember package name, may be defined separately from version+vercode
@ -1009,12 +1014,12 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
for path in manifest_paths(root_dir, flavour): for path in manifest_paths(root_dir, flavour):
if not os.path.isfile(path): if not os.path.isfile(path):
continue continue
if path.endswith('.xml'): if has_extension(path, 'xml'):
if subprocess.call(['sed','-i', if subprocess.call(['sed','-i',
's/android:versionName="[^"]*"/android:versionName="' + build['version'] + '"/g', 's/android:versionName="[^"]*"/android:versionName="' + build['version'] + '"/g',
path]) != 0: path]) != 0:
raise BuildException("Failed to amend manifest") raise BuildException("Failed to amend manifest")
elif path.endswith('.gradle'): elif has_extension(path, 'gradle'):
if subprocess.call(['sed','-i', if subprocess.call(['sed','-i',
's/versionName[ ]*=[ ]*"[^"]*"/versionName = "' + build['version'] + '"/g', 's/versionName[ ]*=[ ]*"[^"]*"/versionName = "' + build['version'] + '"/g',
path]) != 0: path]) != 0:
@ -1024,12 +1029,12 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
for path in manifest_paths(root_dir, flavour): for path in manifest_paths(root_dir, flavour):
if not os.path.isfile(path): if not os.path.isfile(path):
continue continue
if path.endswith('.xml'): if has_extension(path, 'xml'):
if subprocess.call(['sed','-i', if subprocess.call(['sed','-i',
's/android:versionCode="[^"]*"/android:versionCode="' + build['vercode'] + '"/g', 's/android:versionCode="[^"]*"/android:versionCode="' + build['vercode'] + '"/g',
path]) != 0: path]) != 0:
raise BuildException("Failed to amend manifest") raise BuildException("Failed to amend manifest")
elif path.endswith('.gradle'): elif has_extension(path, 'gradle'):
if subprocess.call(['sed','-i', if subprocess.call(['sed','-i',
's/versionCode[ ]*=[ ]*[0-9]*/versionCode = ' + build['vercode'] + '/g', 's/versionCode[ ]*=[ ]*[0-9]*/versionCode = ' + build['vercode'] + '/g',
path]) != 0: path]) != 0:
@ -1060,7 +1065,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
if build['fixapos']: if build['fixapos']:
for root, dirs, files in os.walk(os.path.join(root_dir, 'res')): for root, dirs, files in os.walk(os.path.join(root_dir, 'res')):
for filename in files: for filename in files:
if filename.endswith('.xml'): if has_extension(filename, 'xml'):
if subprocess.call(['sed','-i','s@' + if subprocess.call(['sed','-i','s@' +
r"\([^\\]\)'@\1\\'" + r"\([^\\]\)'@\1\\'" +
'@g', '@g',
@ -1071,7 +1076,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
if build['fixtrans']: if build['fixtrans']:
for root, dirs, files in os.walk(os.path.join(root_dir, 'res')): for root, dirs, files in os.walk(os.path.join(root_dir, 'res')):
for filename in files: for filename in files:
if filename.endswith('.xml'): if has_extension(filename, 'xml'):
f = open(os.path.join(root, filename)) f = open(os.path.join(root, filename))
changed = False changed = False
outlines = [] outlines = []
@ -1170,7 +1175,6 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
return (root_dir, srclibpaths) return (root_dir, srclibpaths)
# Scan the source code in the given directory (and all subdirectories) # Scan the source code in the given directory (and all subdirectories)
# and return a list of potential problems. # and return a list of potential problems.
def scan_source(build_dir, root_dir, thisbuild): def scan_source(build_dir, root_dir, thisbuild):
@ -1266,12 +1270,12 @@ def scan_source(build_dir, root_dir, thisbuild):
handleproblem('static library', fd, fp) handleproblem('static library', fd, fp)
elif mime == 'application/x-executable': elif mime == 'application/x-executable':
handleproblem('binary executable', fd, fp) handleproblem('binary executable', fd, fp)
elif mime == 'application/jar' and fp.endswith('.apk'): elif mime == 'application/jar' and has_extension(fp, 'apk'):
removeproblem('APK file', fd, fp) removeproblem('APK file', fd, fp)
elif mime == 'application/jar' and fp.endswith('.jar'): elif mime == 'application/jar' and has_extension(fp, 'jar'):
warnproblem('JAR file', fd, fp) warnproblem('JAR file', fd, fp)
elif curfile.endswith('.java'): elif has_extension(fp, 'java'):
for line in file(fp): for line in file(fp):
if 'DexClassLoader' in line: if 'DexClassLoader' in line:
handleproblem('DexClassLoader', fd, fp) handleproblem('DexClassLoader', fd, fp)