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

Support application names in the form of '&app_name;'

Browse source
This commit is contained in:
Daniel Martí 2013-12-02 15:09:59 +01:00
parent a42d00c2a7
commit bf61dcf708
1 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

25
fdroidserver/common.py
View file

@ -459,15 +459,22 @@ class vcs_bzr(vcs):
p.communicate()[0].splitlines()] p.communicate()[0].splitlines()]
def retrieve_string(xml_dir, string): def retrieve_string(xml_dir, string):
if not string.startswith('@string/'): if string.startswith('@string/'):
return string.replace("\\'","'") string_search = re.compile(r'.*"'+string[8:]+'".*>([^<]+?)<.*').search
string_search = re.compile(r'.*"'+string[8:]+'".*>([^<]+?)<.*').search for xmlfile in glob.glob(os.path.join(xml_dir, '*.xml')):
for xmlfile in glob.glob(os.path.join(xml_dir, '*.xml')): for line in file(xmlfile):
for line in file(xmlfile): matches = string_search(line)
matches = string_search(line) if matches:
if matches: return retrieve_string(xml_dir, matches.group(1))
return retrieve_string(xml_dir, matches.group(1)) elif string.startswith('&') and string.endswith(';'):
return '' string_search = re.compile(r'.*<!ENTITY.*'+string[1:-1]+'.*"([^"]+?)".*>').search
for xmlfile in glob.glob(os.path.join(xml_dir, '*.xml')):
for line in file(xmlfile):
matches = string_search(line)
if matches:
return retrieve_string(xml_dir, matches.group(1))
return string.replace("\\'","'")
# Return list of existing files that will be used to find the highest vercode # Return list of existing files that will be used to find the highest vercode
def manifest_paths(app_dir, flavour): def manifest_paths(app_dir, flavour):