fb: add --extension option

Signed-off-by: Florian Pritz <bluewind@xssn.at>

1 files changed, 15 insertions, 10 deletions

diff --git a/fb b/fb
index 22a5d78..21255f9 100755
--- a/fb
+++ b/fb
@@ -32,13 +32,17 @@ def password():
         return None
     return auth[2]
 
-def do_upload(file):
+def do_upload(file, extension=None):
     pw = password()
     curl_args = []
     if pw:
         curl_args.append('-F')
-        curl_args.append('password='+pw)
-    url = Popen(merge([['curl', '-#', '-L', '-F', 'userfile=@'+file,
+        curl_args.append('password=%s' % pw)
+    if extension:
+        curl_args.append('-F')
+        curl_args.append('extension=%s' % extension)
+
+    url = Popen(merge([['curl', '-#', '-L', '-F', 'userfile=@%s' % file,
                       ], curl_args, ['http://paste.xinu.at/file/do_upload']]),
                 stdout=PIPE).communicate()[0]
     print url
@@ -52,9 +56,10 @@ def delete(id):
         sys.exit(1)
     else:
         curl_args.append('-F')
-        curl_args.append('password='+pw)
+        curl_args.append('password=%s' % pw)
+
     Popen(merge([['curl', '-#', '-L'], curl_args,
-                 ['http://paste.xinu.at/file/delete/'+id]]
+                 ['http://paste.xinu.at/file/delete/%s' % id]]
                ),).communicate()[0]
 
 def get(id):
@@ -89,7 +94,7 @@ def main():
     p.add_option('-d', '--delete', action='store_true', dest='delete',
                  help='delete IDs', default=False)
     p.add_option('-e', '--extension', action='store', dest='extension',
-                 help='extension for tempfiles when pipeing (e.g. "diff")', default='')
+                 help='extension for default highlighting (e.g. "diff")', default=None)
     p.add_option('-g', '--get', action='store_true', dest='get',
                  help='Download File IDs and output to stdout (use with care!)', default=False)
     options, args = p.parse_args()
@@ -112,13 +117,13 @@ def main():
                 tmpfiles.append(tmpdir)
                 Popen(['wget', '-q', arg]).communicate()[0]
                 for file in os.listdir(tmpdir):
-                    do_upload(file)
+                    do_upload(file, extension=options.extension)
             else:
-                do_upload(arg)
+                do_upload(arg, extension=options.extension)
     else:
-        tmpfile = read_stdin(tmpdir+"/stdin."+options.extension)
+        tmpfile = read_stdin(tmpdir+"/stdin")
         tmpfiles.append(tmpfile)
-        do_upload(tmpfile)
+        do_upload(tmpfile, extension=options.extension)
 
     os.chdir('/tmp')
     for path in tmpfiles: