From c09e70364118264804510ee4b06f3ff8d38933b1 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sat, 16 May 2015 12:57:58 +0100
Subject: Refactor query extraction to Utils.extractQuery().

If we go with this and #1662, then we can share the utility.
---
 lib/utils.coffee | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'lib')

diff --git a/lib/utils.coffee b/lib/utils.coffee
index cbc937b6..cd466b9b 100644
--- a/lib/utils.coffee
+++ b/lib/utils.coffee
@@ -114,6 +114,21 @@ Utils =
     searchUrl += "%s" unless 0 <= searchUrl.indexOf "%s"
     searchUrl.replace /%s/g, @createSearchQuery query
 
+  # Extract a query from url if it appears to be a URL created by createSearchQuery.
+  # For example, map "https://www.google.ie/search?q=star+wars&foo&bar" to "star wars".
+  extractQuery: do =>
+    queryTerminator = new RegExp "[?&#/]"
+    httpProtocolRegexp = new RegExp "^https?://"
+    (searchUrl, url) ->
+      url = url.replace httpProtocolRegexp
+      searchUrl = searchUrl.split("%s")[0].replace httpProtocolRegexp
+      # We use try/catch because decodeURIComponent can throw an exception.
+      try
+        if url.startsWith searchUrl
+          url[searchUrl.length..].split(queryTerminator)[0].split("+").map(decodeURIComponent).join " "
+      catch
+        null
+
   # Converts :string into a Google search if it's not already a URL. We don't bother with escaping characters
   # as Chrome will do that for us.
   convertToUrl: (string) ->
-- 
cgit v1.2.3