From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 6 Jul 2017 09:06:47 +0000 (+0200)
Subject: update: remove ruamel requirement, and improve '--create-metadata'
X-Git-Tag: 0.8~17^2~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3e6b7062b6a8a544b491fbd9fd7f5e17eb41ff22;p=fdroidserver.git

update: remove ruamel requirement, and improve '--create-metadata'

If ruamel.yaml is not available, this will fallback to using PyYAML. This
also adds some blank fields to the newly created template to make it easy
for human editors to fill in.

closes #343
---

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index f554987b..1349fbcf 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -1761,17 +1761,32 @@ def main():
         if apk['packageName'] not in apps:
             if options.create_metadata:
                 with open(os.path.join('metadata', apk['packageName'] + '.yml'), 'w') as f:
-                    app = metadata.App()
+                    # this should use metadata.App() and
+                    # metadata.write_yaml(), but since ruamel.yaml
+                    # 0.13 is not widely distributed yet, and it's
+                    # special tricks are not really needed here, this
+                    # uses the plain YAML lib
+                    app = dict()
                     if 'name' in apk:
-                        app.Name = apk['name']
-                        app.Summary = apk['name']
+                        app['Name'] = apk['name']
                     else:
-                        logging.warn(apk['packageName'] + ' does not have a name! Using package name instead.')
-                        app.Name = apk['packageName']
-                        app.Summary = apk['packageName']
-                    app.CurrentVersionCode = 2147483647  # Java's Integer.MAX_VALUE
-                    app.Categories = [os.path.basename(os.path.dirname(os.getcwd()))]
-                    metadata.write_yaml(f, app)
+                        logging.warning(apk['packageName'] + ' does not have a name! Using package name instead.')
+                        app['Name'] = apk['packageName']
+                    app['Categories'] = [os.path.basename(os.getcwd())]
+                    # include some blanks as part of the template
+                    app['AuthorName'] = ''
+                    app['Summary'] = ''
+                    app['WebSite'] = ''
+                    app['IssueTracker'] = ''
+                    app['SourceCode'] = ''
+                    app['CurrentVersionCode'] = 2147483647  # Java's Integer.MAX_VALUE
+                    try:
+                        import ruamel.yaml
+                        assert ruamel.yaml  # silence pyflakes
+                        metadata.write_yaml(f, metadata.App(app))
+                    except ImportError:
+                        import yaml
+                        yaml.dump(app, f, default_flow_style=False)
                     logging.info("Generated skeleton metadata for " + apk['packageName'])
                     newmetadata = True
             else: