Merge lp:~michaelh1/editmoin/template-query into lp:editmoin

[Michael Hope]

Contains two patches:
revno: 38
  Use sensible-editor instead of vi to pick up the system level editor preference.

revno: 37
  Add support for URLs that include query parameters. Useful for pages
  such as the Linaro wiki meetings:
   https://wiki.linaro.org/WorkingGroups/ToolChain/Meetings/

  where the query includes the template and action such as:
   https://wiki.linaro.org/WorkingGroups/ToolChain/Meetings/2011-04-11?action=edit&template=WorkingGroups/ToolChain/MeetingTemplate

  This patch allows you right-click copy the URL and then go 'editmoin
  http://foo.bar/baz?template=Template' and have the correct template
  come through.

  Uses features that are in Python 2.6+

[Gustavo Niemeyer (niemeyer)]

Very nice, thanks!

review: Approve

=== modified file 'editmoin'
--- editmoin	2010-09-15 03:09:40 +0000
+++ editmoin	2011-04-10 23:07:28 +0000
@@ -31,6 +31,8 @@
 import subprocess
 import getpass
 import Cookie
+import urlparse
+import urllib
 try:
     from hashlib import md5
 except ImportError:
@@ -258,6 +260,42 @@
 def get_user(moinurl):
     return get_token_with_url(USERSFILENAME, moinurl)
 
+def extract_args(moinurl):
+    """Given a URL with a query, strip those that conflict such
+    as 'action' and extract those that are equivalent to command line
+    arguments such as 'template'.
+
+    >>> extract_args('https://foo.org/Bar')
+    ('https://foo.org/Bar', None)
+
+    >>> extract_args('https://foo.org/Baz?action=edit')
+    ('https://foo.org/Baz', None)
+
+    >>> extract_args('https://foo.org/Dog?action=edit&template=Template')
+    ('https://foo.org/Dog', 'Template')
+    """
+    try:
+        parts = urlparse.urlparse(moinurl)
+        params = urlparse.parse_qs(parts.query)
+
+        # Pull out the template name
+        template = params.get('template', [None])[0]
+
+        # Delete all parameters that might interfere
+        for blacklist in 'action template'.split():
+            if blacklist in params:
+                del params[blacklist]
+
+        # Turn the parameters back into a query string
+        encoded = urllib.urlencode(params)
+
+        next = urlparse.urlunparse((parts.scheme, parts.netloc, parts.path, parts.params, encoded, parts.fragment))
+        
+        return next, template
+    except Exception, ex:
+        # Something went wrong.  Give up.
+        return moinurl, None
+
 def translate_shortcut(moinurl):
     if "://" in moinurl:
         return moinurl
@@ -328,7 +366,7 @@
     if moinfile.question:
         moinfile.answer = raw_input(moinfile.question + " ")
     filename = moinfile.write_raw()
-    editor = os.environ.get("EDITOR", "vi")
+    editor = os.environ.get("EDITOR", "sensible-editor")
     digest = md5(open(filename).read()).digest()
     subprocess.call("%s %s" % (editor, filename), shell=True)
     if digest != md5(open(filename).read()).digest():
@@ -415,6 +453,11 @@
     raise Error("Couldn't obtain session cookie from server")
 
 def edit(url, template=None, editfile_func=editfile):
+    url, url_template = extract_args(url)
+
+    if url_template and not template:
+        template = url_template
+
     url = translate_shortcut(url)
     user = get_user(url)
     if user: