From 24a6217f26911ba4e934f4a7bff8bcd30c227163 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sun, 23 Oct 2016 16:50:48 +0100
Subject: Move SearchEngines to bg-utils.coffee.

`SearchEngines` was previously in `utils.coffee`, which means it was
loaded in *every* content frame.  This is unnecessary, since it is only
used on the background page.  So this PR moves it there.

Also:

- Simplify some unnecessarily complex logic in `vomnibar.coffee`.
- Re-use `Utils.parseLines()` to parse the custom search engine configuation text.
---
 background_scripts/bg_utils.coffee | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'background_scripts')

diff --git a/background_scripts/bg_utils.coffee b/background_scripts/bg_utils.coffee
index 26033476..b8e618ff 100644
--- a/background_scripts/bg_utils.coffee
+++ b/background_scripts/bg_utils.coffee
@@ -85,4 +85,35 @@ BgUtils =
       continue if line[0] in '#"'
       line
 
+# Utility for parsing and using the custom search-engine configuration.  We re-use the previous parse if the
+# search-engine configuration is unchanged.
+SearchEngines =
+  previousSearchEngines: null
+  searchEngines: null
+
+  refresh: (searchEngines) ->
+    unless @previousSearchEngines? and searchEngines == @previousSearchEngines
+      @previousSearchEngines = searchEngines
+      @searchEngines = new AsyncDataFetcher (callback) ->
+        engines = {}
+        for line in BgUtils.parseLines searchEngines
+          tokens = line.split /\s+/
+          if 2 <= tokens.length
+            keyword = tokens[0].split(":")[0]
+            searchUrl = tokens[1]
+            description = tokens[2..].join(" ") || "search (#{keyword})"
+            engines[keyword] = {keyword, searchUrl, description} if Utils.hasFullUrlPrefix searchUrl
+
+        callback engines
+
+  # Use the parsed search-engine configuration, possibly asynchronously.
+  use: (callback) ->
+    @searchEngines.use callback
+
+  # Both set (refresh) the search-engine configuration and use it at the same time.
+  refreshAndUse: (searchEngines, callback) ->
+    @refresh searchEngines
+    @use callback
+
+root.SearchEngines = SearchEngines
 root.BgUtils = BgUtils
-- 
cgit v1.2.3