Add a pastebin_helper config option to name an executable for pastebin upload.

eikehein · eikehein · commit 63b07a2bc812 · 2012-05-27T03:07:59.000+02:00
If pastebin_helper is set it takes precedence over the pastebin configured for
XML-RPC upload.

The data is delivered to the executable via STDIN, and it is expected to
return an URL on STDOUT.
diff --git a/bpython/config.py b/bpython/config.py
@@ -70,6 +70,7 @@ def loadini(struct, configfile):
             'pastebin_url': 'http://bpaste.net/xmlrpc/',
             'pastebin_private': True,
             'pastebin_show_url': 'http://bpaste.net/show/$paste_id/',
+            'pastebin_helper': '',
         },
         'keyboard': {
             'clear_line': 'C-u',
@@ -137,6 +138,7 @@ def loadini(struct, configfile):
     struct.pastebin_url = config.get('general', 'pastebin_url')
     struct.pastebin_private = config.get('general', 'pastebin_private')
     struct.pastebin_show_url = config.get('general', 'pastebin_show_url')
+    struct.pastebin_helper = config.get('general', 'pastebin_helper')
 
     struct.cli_suggestion_width = config.getfloat('cli',
                                                   'suggestion_width')
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -29,6 +29,7 @@
 import pydoc
 import re
 import rlcompleter
+import subprocess
 import sys
 import textwrap
 import traceback
@@ -770,10 +771,13 @@ def pastebin(self, s=None):
             not self.interact.confirm("Pastebin buffer? (y/N) ")):
             self.interact.notify("Pastebin aborted")
             return
-        return self.do_pastebin(s)
+        if self.config.pastebin_helper:
+            return self.do_pastebin_helper(s)
+        else:
+            return self.do_pastebin_xmlrpc(s)
 
-    def do_pastebin(self, s):
-        """Actually perform the upload."""
+    def do_pastebin_xmlrpc(self, s):
+        """Upload to pastebin via XML-RPC."""
         try:
             pasteservice = ServerProxy(self.config.pastebin_url)
         except IOError, e:
@@ -803,6 +807,40 @@ def do_pastebin(self, s):
         self.interact.notify('Pastebin URL: %s' % (paste_url, ), 10)
         return paste_url
 
+    def do_pastebin_helper(self, s):
+        """Call out to helper program for pastebin upload."""
+        if s == self.prev_pastebin_content:
+            self.interact.notify('Duplicate pastebin. Previous URL: ' +
+                                  self.prev_pastebin_url)
+            return self.prev_pastebin_url
+
+        self.interact.notify('Posting data to pastebin...')
+
+        try:
+            helper = subprocess.Popen('', executable=self.config.pastebin_helper,
+                                      stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+            helper.stdin.write(s.encode())
+            paste_url = helper.communicate()[0].decode().strip()
+        except OSError, e:
+            if e.errno == 2:
+                self.interact.notify('Upload failed: Helper program not found.')
+            else:
+                self.interact.notify('Upload failed: Helper program could not be run.')
+            return
+
+        if helper.returncode != 0:
+            self.interact.notify('Upload failed: Helper program returned non-zero exit status %s.' %
+                                 (helper.returncode, ))
+            return
+
+        if not paste_url:
+            self.interact.notify('Upload failed: No output from helper program.')
+            return
+
+        self.prev_pastebin_content = s
+        self.interact.notify('Pastebin URL: %s' % (paste_url, ), 10)
+        return paste_url
+
     def push(self, s, insert_into_history=True):
         """Push a line of code onto the buffer so it can process it all
         at once when a code block ends"""
