Merge lp:~schplurtz/terminator/cmf into lp:terminator/trunk

[Schplurtz le déboulonné]

Hi

I found some problems with file drag and drop in terminator. This merge request fixes them.

Dropping multiple files from filemanager into terminator does not work at all :
when multiple files are dragged from a file manager and dropped in terminator, their filenames
are sent to the terminal as a single sh string enclosed in ' '. More exactly, their file://
URL are sent to the terminal, except for the first filename where file:// is stripped.

Current quoting that just surrounds filenames with ' can't handle filename that contain '.
The solution is: surround filename with '. and then, if there are ' in filename, for each
of them, close the string with a ', add \', and reopen the string with '. example :
that's true! -> 'that'\''s true!' which is a valid sh string

It also fixes LP#1311481 .

Regards,
Schplurtz

[Stephen Boddy (stephen-j-boddy)]

Thanks for the contribution.

=== modified file 'terminatorlib/terminal.py'
--- terminatorlib/terminal.py	2015-03-02 21:02:57 +0000
+++ terminatorlib/terminal.py	2015-03-27 05:29:44 +0000
@@ -1010,12 +1010,21 @@
         dbg('drag data received of type: %s' % selection_data.type)
         if gtk.targets_include_text(drag_context.targets) or \
            gtk.targets_include_uri(drag_context.targets):
-            # copy text to destination
-            txt = selection_data.data.strip(' ')
+            # copy text with no modification yet to destination
+            txt = selection_data.data
             if txt[0:7] == 'file://':
-                txt = "'%s'" % urllib.unquote(txt[7:])
+                # It is a list of crlf terminated file:// URL. let's iterate
+                # over all elements.
+                str=''
+                for fname in txt.split( "\r\n" ):
+                    dbg('drag data fname: %s' % fname)
+                    if fname == '':
+                        break # last elem is empty since each URL is terminated bye crlf
+                    fname = "'%s'" % urllib.unquote(fname[7:].replace( "'", '\'\\\'\''))
+                    str += fname + ' '
+                txt=str
             else:
-                txt = txt.split('\n')[0]
+                txt = txt.strip(' ').split('\n')[0]
             for term in self.terminator.get_target_terms(self):
                 term.feed(txt)
             return