From 141e0e24c779b9ed7be6b0164a778aab3c541ca3 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 20 Jul 2015 16:55:15 -0700 Subject: [PATCH] metadata: rename parse_metadata() to parse_txt_metadata() This makes the code clear as support for other metadata formats is added. --- fdroidserver/import.py | 2 +- fdroidserver/metadata.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fdroidserver/import.py b/fdroidserver/import.py index 27a93ca6..5c47f780 100644 --- a/fdroidserver/import.py +++ b/fdroidserver/import.py @@ -198,7 +198,7 @@ def main(): sys.exit(1) # Construct the metadata... - app = metadata.parse_metadata(None)[1] + app = metadata.parse_txt_metadata(None)[1] app['Web Site'] = website app['Source Code'] = sourcecode if issuetracker: diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 2ec38b0a..587c4aab 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -470,7 +470,7 @@ def read_srclibs(): # Read all metadata. Returns a list of 'app' objects (which are dictionaries as -# returned by the parse_metadata function. +# returned by the parse_txt_metadata function. def read_metadata(xref=True): # Always read the srclibs before the apps, since they can use a srlib as @@ -484,7 +484,7 @@ def read_metadata(xref=True): os.makedirs(basedir) for metafile in sorted(glob.glob(os.path.join('metadata', '*.txt'))): - appid, appinfo = parse_metadata(metafile) + appid, appinfo = parse_txt_metadata(metafile) check_metadata(appinfo) apps[appid] = appinfo @@ -584,7 +584,7 @@ def split_list_values(s): # 'descriptionlines' - original lines of description as formatted in the # metadata file. # -def parse_metadata(metafile): +def parse_txt_metadata(metafile): appid = None linedesc = None