Changeset 4741 for lang/python

Timestamp:

01/17/08 02:34:56 (5 years ago)

Author:

elim

Message:

lang/python/misc/woof: added zip support.

Files:

• lang/python/misc/woof (modified) (11 diffs)

lang/python/misc/woof

@@ -31 +31 @@
 maxdownloads = 1
 cpid = -1
-compressed = True
+compress_type_alist = {'tar.gz': 'tar czf - "$woof_file"',
+                       'tar'   : 'tar cf - "$woof_file"',
+                       'zip'   : 'zip -qr - "$woof_file"'}
+compress_type = 'tar.gz'
 
 
@@ -111 +114 @@
 
    def do_GET (self):
-      global maxdownloads, cpid, compressed
+      global maxdownloads, cpid, compress_type
 
       # Redirect any request to the filename of the file to serve.
@@ -119 +122 @@
       location = "/" + urllib.quote (os.path.basename (self.filename))
       if os.path.isdir (self.filename):
-         if compressed:
-            location += ".tar.gz"
-         else:
-            location += ".tar"
+         location += ("." + compress_type)
 
       if self.path != location:
@@ -157 +157 @@
          elif os.path.isdir (self.filename):
             os.environ['woof_dir'], os.environ['woof_file'] = os.path.split (self.filename)
-            if compressed:
-               arg = 'z'
-            else:
-               arg = ''
-            child = popen2.Popen3 ('cd "$woof_dir";tar c%sf - "$woof_file"' % arg)
+            cmdline = compress_type_alist[compress_type]
+            child = popen2.Popen3 ('cd "$woof_dir";%(cmdline)s' % locals())
             datafile = child.fromchild
 
@@ -220 +217 @@
    name = os.path.basename (sys.argv[0])
    print >>sys.stderr, """
-    Usage: %s [-i <ip_addr>] [-p <port>] [-c <count>] [-u] <file/dir>
-           %s [-i <ip_addr>] [-p <port>] [-c <count>] [-u] -s
+    Usage: %s [-i <ip_addr>] [-p <port>] [-c <count>] [-u <suffix>] <file/dir>
+           %s [-i <ip_addr>] [-p <port>] [-c <count>] [-u <suffix>] -s
    
     Serves a single file <count> times via http on port <port> on IP
@@ -242 +239 @@
         count = 2
         ip = 127.0.0.1
-        compressed = true
+        compress_type = 'tar.gz'
    """ % (name, name, name, defmaxdown, defport)
    if errmsg:
@@ -250 +247 @@
 
 
-
 def main ():
-   global cpid, compressed
+   global cpid, compress_type
 
    maxdown = 1
@@ -270 +266 @@
       ip_addr = config.get ('main', 'ip')
 
-   if config.has_option ('main', 'compressed'):
-      compressed = config.getboolean ('main', 'compressed')
+   if config.has_option ('main', 'compress_type'):
+      compress_type = config.get ('main', 'compress_type')
 
    defaultport = port
@@ -277 +273 @@
 
    try:
-      options, filenames = getopt.getopt (sys.argv[1:], "hsui:c:p:")
+      options, filenames = getopt.getopt (sys.argv[1:], "hsu:i:c:p:")
    except getopt.GetoptError, desc:
       usage (defaultport, defaultmaxdown, desc)
@@ -309 +305 @@
 
       elif option == '-u':
-         compressed = False
-
+         if val[0] == ".":
+            val = val[1:]
+         try:
+            compress_type = val
+            compress_type_alist[compress_type]
+         except KeyError:
+            usage (defaultport, defaultmaxdown, 
+                   "acceptable suffix is: %s" % compress_type_alist.keys())
       else:
          usage (defaultport, defaultmaxdown, "Unknown option: %r" % option)
@@ -345 +347 @@
    except KeyboardInterrupt:
       pass
-