Improved XMLRPC interface and updated lodgeit.py for better mac support and private pastes.

lodgeit/controllers/pastes.py

@@ -50,9 +50,8 @@ class PasteController(BaseController):
                         error += ' and the CAPTCHA solution was incorrect'
                 show_captcha = True
             if code and language and not error:
-                paste = Paste(code, language, parent, ctx.request.user_hash)
-                if 'private' in ctx.request.form:
-                    paste.private = True
+                paste = Paste(code, language, parent, ctx.request.user_hash,
+                              'private' in ctx.request.form)
                 session.flush()
                 return redirect(paste.url)
 

lodgeit/controllers/xmlrpc.py

@@ -26,7 +26,7 @@ class XmlRpcController(BaseController):
 
 @exported('pastes.newPaste')
 def pastes_new_paste(language, code, parent_id=None,
-                     filename='', mimetype=''):
+                     filename='', mimetype='', private=False):
     """Create a new paste. Return the new ID.
 
     `language` can be None, in which case the language will be
@@ -40,7 +40,7 @@ def pastes_new_paste(language, code, parent_id=None,
         if parent is None:
             raise ValueError('parent paste not found')
 
-    paste = Paste(code, language, parent)
+    paste = Paste(code, language, parent, private=private)
     session.flush()
     return paste.identifier
 

lodgeit/database.py

@@ -43,7 +43,8 @@ pastes = Table('pastes', metadata,
 class Paste(object):
     """Represents a paste."""
 
-    def __init__(self, code, language, parent=None, user_hash=None):
+    def __init__(self, code, language, parent=None, user_hash=None,
+                 private=False):
         if language not in LANGUAGES:
             language = 'text'
         self.code = u'\n'.join(code.splitlines())
@@ -55,6 +56,7 @@ class Paste(object):
         self.pub_date = datetime.now()
         self.handled = False
         self.user_hash = user_hash
+        self.private = private
 
     @staticmethod
     def get(identifier):

scripts/lodgeit.py

@@ -113,20 +113,32 @@ def get_xmlrpc_service():
 
 def copy_url(url):
     """Copy the url into the clipboard."""
+    # try windows first
     try:
         import win32clipboard
         import win32con
     except ImportError:
+        # then give pbcopy a try.  do that before gtk because
+        # gtk might be installed on os x but nobody is interested
+        # in the X11 clipboard there.
+        from subprocess import Popen, PIPE
         try:
-            import pygtk
-            pygtk.require('2.0')
-            import gtk
-            import gobject
-        except ImportError:
-            return
-        gtk.clipboard_get(gtk.gdk.SELECTION_CLIPBOARD).set_text(url)
-        gobject.idle_add(gtk.main_quit)
-        gtk.main()
+            client = Popen(['pbcopy'], stdin=PIPE)
+        except OSError:
+            try:
+                import pygtk
+                pygtk.require('2.0')
+                import gtk
+                import gobject
+            except ImportError:
+                return
+            gtk.clipboard_get(gtk.gdk.SELECTION_CLIPBOARD).set_text(url)
+            gobject.idle_add(gtk.main_quit)
+            gtk.main()
+        else:
+            client.stdin.write(url)
+            client.stdin.close()
+            client.wait()
     else:
         win32clipboard.OpenClipboard()
         win32clipboard.EmptyClipboard()
@@ -152,7 +164,9 @@ def get_mimetype(data, filename):
     try:
         import gnomevfs
     except ImportError:
-        pass
+        from mimetypes import guess_type
+        if filename:
+            return guess_type(filename)[0]
     else:
         if filename:
             return gnomevfs.get_mime_type(os.path.abspath(filename))
@@ -176,9 +190,10 @@ def download_paste(uid):
     print paste['code'].encode('utf-8')
 
 
-def create_paste(code, language, filename, mimetype):
+def create_paste(code, language, filename, mimetype, private):
     xmlrpc = get_xmlrpc_service()
-    rv = xmlrpc.pastes.newPaste(language, code, None, filename, mimetype)
+    rv = xmlrpc.pastes.newPaste(language, code, None, filename, mimetype,
+                                private)
     if not rv:
         fail('Could not commit paste. Something went wrong', 4)
     return rv
@@ -210,6 +225,8 @@ if __name__ == '__main__':
                       help='Retrieve a list of supported languages')
     parser.add_option('--download', metavar='UID',
                       help='Download a given paste')
+    parser.add_option('--private', action='store_true', default=False,
+                      help='Paste as private')
 
     opts, args = parser.parse_args()
 
@@ -257,7 +274,7 @@ if __name__ == '__main__':
 
     # create paste
     code = make_utf8(data, opts.encoding)
-    id = create_paste(code, opts.language, filename, mimetype)
+    id = create_paste(code, opts.language, filename, mimetype, opts.private)
     url = '%sshow/%s/' % (SERVICE_URL, id)
     print url
     if opts.open_browser: