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

Merge branch 'remove_unused_function' into 'master'

Browse source 
remove unused function

See merge request fdroid/fdroidserver!697
This commit is contained in:
Marcus 2019-12-23 00:52:18 +00:00
commit bc4655f437
1 changed files with 0 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

34
fdroidserver/metadata.py
View file

@ -848,40 +848,6 @@ def split_list_values(s):
return res
def get_default_app_info(metadatapath=None):
if metadatapath is None:
appid = None
else:
appid, _ignored = fdroidserver.common.get_extension(os.path.basename(metadatapath))
if appid == '.fdroid': # we have local metadata in the app's source
if os.path.exists('AndroidManifest.xml'):
manifestroot = fdroidserver.common.parse_xml('AndroidManifest.xml')
else:
pattern = re.compile(r""".*manifest\.srcFile\s+'AndroidManifest\.xml'.*""")
for root, dirs, files in os.walk(os.getcwd()):
if 'build.gradle' in files:
p = os.path.join(root, 'build.gradle')
with open(p, 'rb') as f:
data = f.read()
m = pattern.search(data)
if m:
logging.debug('Using: ' + os.path.join(root, 'AndroidManifest.xml'))
manifestroot = fdroidserver.common.parse_xml(os.path.join(root, 'AndroidManifest.xml'))
break
if manifestroot is None:
warn_or_exception(_("Cannot find an appid for {path}!")
.format(path=metadatapath))
appid = manifestroot.attrib['package']
app = App()
app.metadatapath = metadatapath
if appid is not None:
app.id = appid
return app
def sorted_builds(builds):
return sorted(builds, key=lambda build: int(build.versionCode))