Switch all headers to python3

[fdroidserver.git] / fdroidserver / verify.py

diff --git a/fdroidserver/verify.py b/fdroidserver/verify.py
index a9f18392e4227695376b6f409f6ec31ad21c8911..6ffff876bf5336536904fc7f8fe2d4d5751e0947 100644 (file)
--- a/fdroidserver/verify.py
+++ b/fdroidserver/verify.py
@@ -1,5 +1,4 @@
-#!/usr/bin/env python2
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
 #
 # verify.py - part of the FDroid server tools
 # Copyright (C) 2013, Ciaran Gultnieks, ciaran@ciarang.com
@@ -19,42 +18,44 @@
 
 import sys
 import os
-import shutil
-import subprocess
 import glob
-from optparse import OptionParser
+from argparse import ArgumentParser
+import logging
 
 import common
+import net
+from common import FDroidException
 
 options = None
 config = None
 
+
 def main():
 
     global options, config
 
     # Parse command line...
-    parser = OptionParser(usage="Usage: %prog [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
-    parser.add_option("-v", "--verbose", action="store_true", default=False,
-                      help="Spew out even more information than normal")
-    (options, args) = parser.parse_args()
+    parser = ArgumentParser(usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
+    common.setup_global_opts(parser)
+    parser.add_argument("appid", nargs='*', help="app-id with optional versioncode in the form APPID[:VERCODE]")
+    options = parser.parse_args()
 
     config = common.read_config(options)
 
     tmp_dir = 'tmp'
     if not os.path.isdir(tmp_dir):
-        print "Creating temporary directory"
+        logging.info("Creating temporary directory")
         os.makedirs(tmp_dir)
 
     unsigned_dir = 'unsigned'
     if not os.path.isdir(unsigned_dir):
-        print "No unsigned directory - nothing to do"
+        logging.error("No unsigned directory - nothing to do")
         sys.exit(0)
 
     verified = 0
     notverified = 0
 
-    vercodes = common.read_pkg_args(args, True)
+    vercodes = common.read_pkg_args(options.appid, True)
 
     for apkfile in sorted(glob.glob(os.path.join(unsigned_dir, '*.apk'))):
 
@@ -68,54 +69,32 @@ def main():
 
         try:
 
-            print "Processing " + apkfilename
+            logging.info("Processing " + apkfilename)
 
             remoteapk = os.path.join(tmp_dir, apkfilename)
             if os.path.exists(remoteapk):
                 os.remove(remoteapk)
             url = 'https://f-droid.org/repo/' + apkfilename
-            print "...retrieving " + url
-            p = subprocess.Popen(['wget', url],
-                cwd=tmp_dir,
-                stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-            out = p.communicate()[0]
-            if p.returncode != 0:
-                raise Exception("Failed to get " + apkfilename)
-
-            thisdir = os.path.join(tmp_dir, 'this_apk')
-            thatdir = os.path.join(tmp_dir, 'that_apk')
-            for d in [thisdir, thatdir]:
-                if os.path.exists(d):
-                    shutil.rmtree(d)
-                os.mkdir(d)
-
-            if subprocess.call(['jar', 'xf',
-                os.path.join("..", "..", unsigned_dir, apkfilename)],
-                cwd=thisdir) != 0:
-                raise Exception("Failed to unpack local build of " + apkfilename)
-            if subprocess.call(['jar', 'xf', os.path.join("..", "..", remoteapk)],
-                cwd=thatdir) != 0:
-                raise Exception("Failed to unpack remote build of " + apkfilename)
-
-            p = subprocess.Popen(['diff', '-r', 'this_apk', 'that_apk'],
-                cwd=tmp_dir, stdout=subprocess.PIPE)
-            out = p.communicate()[0]
-            lines = out.splitlines()
-            if len(lines) != 1 or 'META-INF' not in lines[0]:
-                raise Exception("Unexpected diff output - " + out)
-
-            print "...successfully verified"
+            logging.info("...retrieving " + url)
+            net.download_file(url, dldir=tmp_dir)
+
+            compare_result = common.compare_apks(
+                os.path.join(unsigned_dir, apkfilename),
+                remoteapk,
+                tmp_dir)
+            if compare_result:
+                raise FDroidException(compare_result)
+
+            logging.info("...successfully verified")
             verified += 1
 
-        except Exception, e:
-            print "...NOT verified - {0}".format(e)
+        except FDroidException as e:
+            logging.info("...NOT verified - {0}".format(e))
             notverified += 1
 
-    print "\nFinished"
-    print "{0} successfully verified".format(verified)
-    print "{0} NOT verified".format(notverified)
+    logging.info("Finished")
+    logging.info("{0} successfully verified".format(verified))
+    logging.info("{0} NOT verified".format(notverified))
 
 if __name__ == "__main__":
     main()
-
-