Ticket #5059: 0003-use-argparse-instead-of-optparse.patch

mediagoblin/media_types/video/transcoders.py

@@ -384 +384 @@
 
 if __name__ == '__main__':
     os.nice(19)
-    from optparse import OptionParser
-
-    parser = OptionParser(
-        usage='%prog [-v] -a [ video | thumbnail | discover ] SRC [ DEST ]')
-
-    parser.add_option('-a', '--action',
-                      dest='action',
-                      help='One of "video", "discover" or "thumbnail"')
-
-    parser.add_option('-v',
-                      dest='verbose',
-                      action='store_true',
-                      help='Output debug information')
-
-    parser.add_option('-q',
-                      dest='quiet',
-                      action='store_true',
-                      help='Dear program, please be quiet unless *error*')
-
-    parser.add_option('-w', '--width',
-                      type=int,
-                      default=180)
-
-    (options, args) = parser.parse_args()
-
-    if options.verbose:
+    from argparse import ArgumentParser
+
+    parser = ArgumentParser()
+    parser.add_argument('--action', '-a',
+                        required=True,
+                        choices=['video', 'discover', 'thumbnail'])
+    parser.add_argument('--verbose', '-v',
+                        action='store_true',
+                        help='Output debug information')
+    parser.add_argument('--quiet', '-q',
+                        action='store_true',
+                        help='Dear program, please be quiet unless *error*')
+    parser.add_argument('--width', '-w',
+                        type=int,
+                        default=180)
+    parser.add_argument('source')
+    parser.add_argument('dest', nargs='?', default=None)
+
+    args = parser.parse_args()
+
+    if args.verbose:
         _log.setLevel(logging.DEBUG)
+    elif args.quiet:
+        _log.setLevel(logging.ERROR)
     else:
         _log.setLevel(logging.INFO)
 
-    if options.quiet:
-        _log.setLevel(logging.ERROR)
-
     _log.debug(args)
 
-    if not len(args) == 2 and not options.action == 'discover':
-        parser.print_help()
-        sys.exit()
+    if args.dest is None and args.action != 'discover':
+        parser.error('too few arguments')
 
     transcoder = VideoTranscoder()
 
-    if options.action == 'thumbnail':
-        args.append(options.width)
-        capture_thumb(*args)
-    elif options.action == 'video':
+    if args.action == 'thumbnail':
+        capture_thumb(args.source, args.dest, args.width)
+    elif args.action == 'video':
         def cb(data):
-            print('I\'m a callback!')
-        transcoder.transcode(*args, progress_callback=cb)
-    elif options.action == 'discover':
-        print transcoder.discover(*args)
+            print("I'm a callback!")
+        transcoder.transcode(args.source, args.dest, progress_callback=cb)
+    elif args.action == 'discover':
+        print transcoder.discover(args.source)