Use SSH more safely from configure

[oweals/gnunet.git] / src / util / gnunet-qr.py.in

diff --git a/src/util/gnunet-qr.py.in b/src/util/gnunet-qr.py.in
index cb0545b96f0d4033fee1855b093ceea6ba12a321..ced7a5441155a0222c8ddcaa0c3506b6ef9155f9 100755 (executable)
--- a/src/util/gnunet-qr.py.in
+++ b/src/util/gnunet-qr.py.in
@@ -1,12 +1,13 @@
 #!@PYTHON@
 import sys
 import getopt
+import subprocess
 from sys import argv
 try:
-    import zbar
+       import zbar
 except ImportError as e:
-    print 'Cannot run gnunet-qr, please install zbar-python'
-    sys.exit (1)
+       print 'Cannot run gnunet-qr, please install zbar-python'
+       sys.exit (1)
 
 def help ():
  print 'gnunet-qr\n\
@@ -16,6 +17,7 @@ Arguments mandatory for long options are also mandatory for short options.\n\
   -d, --device=DEVICE        use device DEVICE\n\
   -s, --silent               do not show preview windows\n\
   -h, --help                 print this help\n\
+  -v, --verbose                                                         be verbose\n\
 Report bugs to gnunet-developers@gnu.org.\n\
 GNUnet home page: http://www.gnu.org/software/gnunet/\n\
 General help using GNU software: http://www.gnu.org/gethelp/'
@@ -24,25 +26,30 @@ General help using GNU software: http://www.gnu.org/gethelp/'
 if __name__ == '__main__':
        configuration = ''
        device = '/dev/video0'
+       url = ''
+       verbose = False 
        silent = False
        # Parse arguments
        try:
-               opts, args = getopt.gnu_getopt(sys.argv[1:], "c:hd:s", ["config","help", "device","silent"])
+               opts, args = getopt.gnu_getopt(sys.argv[1:], "c:hd:sv", ["config","help", "device","silent","verbose"])
        except getopt.GetoptError as e:
                help ()
                print str (e)
                exit (1)
-
-               for o,a in opts:
-                       if o in ("-h", "--help"):
-                               help ()            
-                               sys.exit (0)
-                       elif o in ("-c", "--config"):
-                               configuration = a
-                       elif o in ("-d", "--device"):
-                               device = a
-                       elif o in ("-s", "--silent"):
-                               silent = True
+       for o,a in opts:
+               if o in ("-h", "--help"):
+                       help ()            
+                       sys.exit (0)
+               elif o in ("-c", "--config"):
+                       configuration = a
+               elif o in ("-d", "--device"):
+                       device = a
+               elif o in ("-s", "--silent"):
+                       silent = True
+               elif o in ("-v", "--verbose"):
+                       verbose = True                  
+       if (True == verbose):
+               print 'Initializing'
        # create a Processor
        proc = zbar.Processor()
 
@@ -51,19 +58,24 @@ if __name__ == '__main__':
 
        # initialize the Processor
        try:
+               if (True == verbose):
+                       print 'Opening video device ' + device
                proc.init(device)
        except Exception as e:
                print 'Failed to open device ' + device
                exit (1)
        
        # enable the preview window
-       if (True == silent):
-               proc.visible = False
-       else:
-               proc.visible = True
+       #if (True == silent):
+       #       proc.visible = True
+       #else:
+       #               proc.visible = False
        
+       proc.visible = True
        # read at least one barcode (or until window closed)
        try:
+               if (True == verbose):
+                       print 'Capturing'
                proc.process_one()
        except Exception as e:
                # Window was closed without finding code
@@ -74,5 +86,23 @@ if __name__ == '__main__':
        
        # extract results
        for symbol in proc.results:
-       # do something useful with results
-               print 'Found ', symbol.type, ' symbol ', '"%s"' % symbol.data
\ No newline at end of file
+               # do something useful with results
+               if (True == verbose):
+                       print 'Found ', symbol.type, ' symbol ', '"%s"' % symbol.data
+               args = list()
+               args.append("gnunet-uri")
+               if (configuration != ''):
+                       args.append (str("-c " + str(configuration)))
+               args.append (str(symbol.data))
+               cmd = ''
+               for a in args:
+                       cmd += " " + str(a)
+               if (verbose):
+                       print 'Running `' + cmd +'`'
+               res=subprocess.call(args)
+               if (0 != res):
+                       print 'Failed to add URI ' + str(symbol.data)
+               else: 
+                       print 'Added URI ' + str(symbol.data)
+               exit (res)
+       exit (1)