Switch all headers to python3

[fdroidserver.git] / fdroidserver / rewritemeta.py

diff --git a/fdroidserver/rewritemeta.py b/fdroidserver/rewritemeta.py
index 7ae9f9d5b2900f67323d780f00e6544fc6f2fad8..651349cd3fe60cc98663d3e57a6379550fd72540 100644 (file)
--- a/fdroidserver/rewritemeta.py
+++ b/fdroidserver/rewritemeta.py
@@ -1,5 +1,4 @@
-#!/usr/bin/env python2
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
 #
 # rewritemeta.py - part of the FDroid server tools
 # This cleans up the original .txt metadata file format.
@@ -19,8 +18,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from argparse import ArgumentParser
+import os
 import logging
-import StringIO
+try:
+    from cStringIO import StringIO
+except:
+    from StringIO import StringIO
 
 import common
 import metadata
@@ -29,6 +32,18 @@ config = None
 options = None
 
 
+def proper_format(app):
+    s = StringIO()
+    # TODO: currently reading entire file again, should reuse first
+    # read in metadata.py
+    with open(app.metadatapath, 'r') as f:
+        cur_content = f.read()
+    metadata.write_txt_metadata(s, app)
+    content = s.getvalue()
+    s.close()
+    return content == cur_content
+
+
 def main():
 
     global config, options
@@ -38,6 +53,8 @@ def main():
     common.setup_global_opts(parser)
     parser.add_argument("-l", "--list", action="store_true", default=False,
                         help="List files that would be reformatted")
+    parser.add_argument("-t", "--to", default=None,
+                        help="Rewrite to a specific format")
     parser.add_argument("appid", nargs='*', help="app-id in the form APPID")
     options = parser.parse_args()
 
@@ -47,28 +64,34 @@ def main():
     allapps = metadata.read_metadata(xref=True)
     apps = common.read_app_args(options.appid, allapps, False)
 
+    if options.list and options.to is not None:
+        parser.error("Cannot use --list and --to at the same time")
+
+    supported = ['txt', 'yaml']
+
+    if options.to is not None and options.to not in supported:
+        parser.error("Must give a valid format to --to")
+
     for appid, app in apps.iteritems():
-        metadatapath = app['metadatapath']
-        ext = common.get_extension(metadatapath)
-        if ext not in ['txt']:
-            logging.info("Ignoring %s file at '%s'"
-                         % (ext.upper(), metadatapath))
+        base, ext = common.get_extension(app.metadatapath)
+        if not options.to and ext not in supported:
+            logging.info("Ignoring %s file at '%s'" % (ext, app.metadatapath))
             continue
-        logging.debug("Rewriting " + metadatapath)
+
+        to_ext = ext
+        if options.to is not None:
+            to_ext = options.to
+
         if options.list:
-            s = StringIO.StringIO()
-            # TODO: currently reading entire file again, should reuse first
-            # read in metadata.py
-            with open(metadatapath, 'r') as f:
-                cur_content = f.read()
-            metadata.write_metadata(s, app)
-            content = s.getvalue()
-            s.close()
-            if content != cur_content:
-                print(metadatapath)
-        else:
-            with open(metadatapath, 'w') as f:
-                metadata.write_metadata(f, app)
+            if not proper_format(app):
+                print app.metadatapath
+            continue
+
+        with open(base + '.' + to_ext, 'w') as f:
+            metadata.write_metadata(to_ext, f, app)
+
+        if ext != to_ext:
+            os.remove(app.metadatapath)
 
     logging.debug("Finished.")