bugzilla: Improve error reporting for adding attachments

crobinso · crobinso · commit 57f00f2ca9f7 · 2013-02-26T18:08:39.000-05:00
diff --git a/bin/bugzilla b/bin/bugzilla
@@ -796,9 +796,6 @@ def _do_set_attach(bz, opt, parser, args):
     if not args:
         parser.error("Bug ID must be specified for setting attachments")
 
-    if not opt.file and opt.desc:
-        parser.error("attaching a file requires --file and --description")
-
     if not opt.type:
         try:
             import magic
@@ -808,29 +805,39 @@ def _do_set_attach(bz, opt, parser, args):
         mimemagic.load()
 
     if sys.stdin.isatty():
-        # stdin is a tty -> normal CLI
+        if not opt.file:
+            parser.error("--file must be specified")
         if not opt.type:
             opt.type = mimemagic.file(opt.file)
         fileobj = open(opt.file)
-
     else:
         # piped input on stdin
-        # write it to a tempfile - and get the filetype if we need it
+        if not opt.desc:
+            parser.error("--description must be specified if passing "
+                         "file on stdin")
+
         fileobj = tempfile.NamedTemporaryFile(prefix="bugzilla-attach.")
         data = sys.stdin.read(4096)
+
         if not opt.type:
             opt.type = mimemagic.buffer(data)
         while data:
             fileobj.write(data)
             data = sys.stdin.read(4096)
         fileobj.seek(0)
 
+    kwargs = {}
+    if opt.file:
+        kwargs["filename"] = os.path.basename(opt.file)
+    if opt.type:
+        kwargs["contenttype"] = opt.type
+    if opt.type in ["text/x-patch"]:
+        kwargs["ispatch"] = True
+    desc = opt.desc or fileobj.name
+
     # Upload attachments
     for bugid in args:
-        attid = bz.attachfile(bugid, fileobj, opt.desc,
-                              filename=opt.file,
-                              contenttype=opt.type,
-                              ispatch=(opt.type == "text/x-patch"))
+        attid = bz.attachfile(bugid, fileobj, desc, **kwargs)
         print "Created attachment %i on bug %s" % (attid, bugid)
 
 
diff --git a/bugzilla/base.py b/bugzilla/base.py
@@ -886,7 +886,7 @@ def attachfile(self, idlist, attachfile, description, **kwargs):
         kwargs['data'] = xmlrpclib.Binary(f.read())
         kwargs['ids'] = self._listify(idlist)
 
-        if 'file_name' not in kwargs:
+        if 'file_name' not in kwargs and hasattr(f, "name"):
             kwargs['file_name'] = os.path.basename(f.name)
         if 'content_type' not in kwargs:
             kwargs['content_type'] = 'application/octet-stream'
