Browse Source

fixed --compressions

Graham Northup 7 years ago
parent
commit
1a64df3ce3
1 changed files with 7 additions and 7 deletions
  1. 7 7
      mkiv.py

+ 7 - 7
mkiv.py

@@ -109,10 +109,6 @@ had been specified, again containing only the programs that were observed in the
 Groups for which no streams are generated are not written to the resulting file.'''
 Groups for which no streams are generated are not written to the resulting file.'''
     exit()
     exit()
 
 
-if not args:
-    parser.print_usage()
-    exit()
-
 COMPRESSIONS = {}
 COMPRESSIONS = {}
 def compression(name, desc='Not described.'):
 def compression(name, desc='Not described.'):
     def inner(f):
     def inner(f):
@@ -123,12 +119,12 @@ def compression(name, desc='Not described.'):
 def comp_none(bn):
 def comp_none(bn):
     return open(bn + '.iv', 'wb')
     return open(bn + '.iv', 'wb')
 
 
-@compression('gzip', 'GZip compression')
+@compression('gzip', 'GZip compression (.ivz format)')
 def comp_gzip(bn):
 def comp_gzip(bn):
     import gzip
     import gzip
     return gzip.open(bn + '.ivz', 'wb')
     return gzip.open(bn + '.ivz', 'wb')
 
 
-@compression('bz2', 'BZip2 compression')
+@compression('bz2', 'BZip2 compression (.ivb format)')
 def comp_bz2(bn):
 def comp_bz2(bn):
     import bz2
     import bz2
     return bz2.BZ2File(bn + '.ivb', 'w')
     return bz2.BZ2File(bn + '.ivb', 'w')
@@ -136,7 +132,11 @@ def comp_bz2(bn):
 if options.compressions:
 if options.compressions:
     for nm, tp in COMPRESSIONS.iteritems():
     for nm, tp in COMPRESSIONS.iteritems():
         f, desc = tp
         f, desc = tp
-        print(nm, ':', desc)
+        print nm, ':', desc
+    exit()
+
+if not args:
+    parser.print_usage()
     exit()
     exit()
 
 
 opener = COMPRESSIONS[options.compression][0]
 opener = COMPRESSIONS[options.compression][0]