From c2304b33156ef91fef7ddd40356ac80319de3c91 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 7 Dec 2015 20:12:26 +0100
Subject: [PATCH] lint: optionally check format

---
 fdroidserver/lint.py        | 12 ++++++++++--
 fdroidserver/rewritemeta.py | 31 +++++++++++++++++--------------
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/fdroidserver/lint.py b/fdroidserver/lint.py
index f09ac007..5932bd61 100644
--- a/fdroidserver/lint.py
+++ b/fdroidserver/lint.py
@@ -19,11 +19,13 @@
 
 from argparse import ArgumentParser
 import re
-import common
-import metadata
 import sys
 from sets import Set
 
+import common
+import metadata
+import rewritemeta
+
 config = None
 options = None
 
@@ -306,6 +308,8 @@ def main():
     # Parse command line...
     parser = ArgumentParser(usage="%(prog)s [options] [APPID [APPID ...]]")
     common.setup_global_opts(parser)
+    parser.add_argument("-f", "--format", action="store_true", default=False,
+                        help="Also warn about formatting issues, like rewritemeta -l")
     parser.add_argument("appid", nargs='*', help="app-id in the form APPID")
     options = parser.parse_args()
 
@@ -337,6 +341,10 @@ def main():
                 ]:
             warns += check_func(app)
 
+        if options.format:
+            if not rewritemeta.proper_format(app):
+                warns.append("Run rewritemeta to fix formatting")
+
         if warns:
             anywarns = True
             for warn in warns:
diff --git a/fdroidserver/rewritemeta.py b/fdroidserver/rewritemeta.py
index ae02db3a..51d82c37 100644
--- a/fdroidserver/rewritemeta.py
+++ b/fdroidserver/rewritemeta.py
@@ -33,6 +33,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
@@ -62,10 +74,9 @@ def main():
         parser.error("Must give a valid format to --to")
 
     for appid, app in apps.iteritems():
-        metadatapath = app.metadatapath
-        base, ext = common.get_extension(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, metadatapath))
+            logging.info("Ignoring %s file at '%s'" % (ext, app.metadatapath))
             continue
 
         to_ext = ext
@@ -73,23 +84,15 @@ def main():
             to_ext = options.to
 
         if options.list:
-            s = 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_txt_metadata(s, app)
-            content = s.getvalue()
-            s.close()
-            if content != cur_content:
-                print(metadatapath)
+            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(metadatapath)
+            os.remove(app.metadatapath)
 
     logging.debug("Finished.")
 
-- 
2.30.2