From 668ef4526e70715be69be09f705a1103d2f47cf0 Mon Sep 17 00:00:00 2001
From: nate-parrott <nateparro2t@gmail.com>
Date: Mon, 10 Nov 2014 14:36:40 -0500
Subject: [PATCH] add some features to better support web search

---
 FlashlightApp/EasySIMBL/Flashlight-Info.plist |   4 ++--
 .../_SS_InlineWebViewContainer.m              |  15 ++++++++++++++-
 PluginDirectory/websearch.bundle/plugin.py    |  14 ++++++++++++--
 PluginDirectory/websearch.bundle/plugin.pyc   | Bin 1124 -> 1542 bytes
 PluginDirectory/websearch.zip                 | Bin 9118 -> 9921 bytes
 5 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/FlashlightApp/EasySIMBL/Flashlight-Info.plist b/FlashlightApp/EasySIMBL/Flashlight-Info.plist
index 890c42b2..f5ff728d 100755
--- a/FlashlightApp/EasySIMBL/Flashlight-Info.plist
+++ b/FlashlightApp/EasySIMBL/Flashlight-Info.plist
@@ -32,11 +32,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.22</string>
+	<string>0.31</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3</string>
+	<string>5</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
diff --git a/FlashlightApp/SpotlightSIMBL/SpotlightSIMBL/_SS_InlineWebViewContainer.m b/FlashlightApp/SpotlightSIMBL/SpotlightSIMBL/_SS_InlineWebViewContainer.m
index 26a72fcb..cef28f25 100644
--- a/FlashlightApp/SpotlightSIMBL/SpotlightSIMBL/_SS_InlineWebViewContainer.m
+++ b/FlashlightApp/SpotlightSIMBL/SpotlightSIMBL/_SS_InlineWebViewContainer.m
@@ -12,6 +12,8 @@
 
 @interface _SS_InlineWebViewContainer ()
 
+@property (nonatomic) BOOL linksOpenInBrowser;
+
 @end
 
 @implementation _SS_InlineWebViewContainer
@@ -19,7 +21,12 @@ @implementation _SS_InlineWebViewContainer
 #pragma mark Navigation interception
 
 - (void)webView:(WebView *)webView decidePolicyForNavigationAction:(NSDictionary *)actionInformation request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id<WebPolicyDecisionListener>)listener {
-    NSLog(@"POLICY");
+    if (self.linksOpenInBrowser && [actionInformation[WebActionNavigationTypeKey] integerValue] == WebNavigationTypeLinkClicked) {
+        [listener ignore];
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [[NSWorkspace sharedWorkspace] openURL:request.URL];
+        });
+    }
     [listener use];
 }
 
@@ -59,6 +66,12 @@ - (void)setResult:(SPResult *)result {
         [self ensureWebview];
         NSString *pluginPath = [[_SS_PluginRunner pathForPlugin:sourcePlugin] stringByAppendingPathComponent:@"index.html"];
         [_webView.mainFrame loadHTMLString:json[@"html"] baseURL:[NSURL fileURLWithPath:pluginPath]];
+        if (json[@"webview_user_agent"]) {
+            [_webView setCustomUserAgent:json[@"webview_user_agent"]];
+        }
+        if ([json[@"webview_links_open_in_browser"] boolValue]) {
+            self.linksOpenInBrowser = YES;
+        }
     } else {
         for (NSView *v in self.subviews) {
             v.hidden = YES;
diff --git a/PluginDirectory/websearch.bundle/plugin.py b/PluginDirectory/websearch.bundle/plugin.py
index 3f8ec408..62a87f0f 100644
--- a/PluginDirectory/websearch.bundle/plugin.py
+++ b/PluginDirectory/websearch.bundle/plugin.py
@@ -1,4 +1,4 @@
-import urllib
+import urllib, json
 
 def results(parsed, original_query):
 	search_specs = [
@@ -8,9 +8,19 @@ def results(parsed, original_query):
 	]
 	for name, key, url in search_specs:
 		if key in parsed:
+			search_url = url + urllib.quote_plus(parsed[key])
 			return {
 				"title": "Search {0} for '{1}'".format(name, parsed[key]),
-				"run_args": [url + urllib.quote_plus(parsed[key])]
+				"run_args": [search_url],
+				"html": """
+				<script>
+				setTimeout(function() {
+					window.location = %s
+				}, 500);
+				</script>
+				"""%(json.dumps(search_url)),
+				"webview_user_agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53",
+				"webview_links_open_in_browser": True
 			}
 
 def run(url):
diff --git a/PluginDirectory/websearch.bundle/plugin.pyc b/PluginDirectory/websearch.bundle/plugin.pyc
index 401a9b516999c03d65a92d8b2a947f7c1d6593c0..cf00ce97ae31a501fec9203d696697b8cb3229ac 100644
GIT binary patch
delta 747
zcmYjP?`{%75TCoFP$(#^4b&Qw{bF*M=73Znrq<ZhL=!|Cpw<xea@=jp!f{J)7l{gK
zj7C2jo<yI*2l1nt7#~1q57TtBGduH}KQ}Ws-<Ln8`^KM4>f4IbcH#fg@x6y6EMy*D
z4SaykxvW7)15bw!2<qS&kzgpdmKnnk_7~4%SEWfH#gX=r#MjR+t+RJ9)#3h&*YMnc
z8QvJomS7r#DZn5OVHu`NAOZTCLJ+_DUW5EB4r~d$6!dkN8s`@L_zF~~aX7(x(opp>
zAPwkavN&K^&bx%zW$?04l^DJX)mG}X3`f{g%Ut{NGpn5m)paU~=Z<hgHj;NEMNrvh
zL(0d}JRS$GWIQkn<ZWb2PFUdaiRE+GQ3kS0ZivV-+ai@xsj#!iSG<@|s=@T+&=;Rj
zXz(}8_nl(p%qkI+9rSoWcgX(1Az8@eNsH9%67ku9l7{0d{aJzRjYd8_qTM=^#maWg
zs+6rVG3yW8jYnGx-v`tk@B(>CLxGhQYnZ;lyUeG>a(VAowL)6Xu@kc5?I?U(?yg}q
z6WV>n=)@ii8rseY4Wzt&0rpui5H=stz-EEn4fzE9O!Zgi8GW-Lm2}L*p(CRv`+^5J
zZQPdea3mtA9geA)m>2YVTBgt<s1v$9dw#0-uWg_XdRj|sYkCfOUNewViFGY8|E2Tn
xGMY`bO3hWp*5|*C&P@Zwa2#ynBh+941EbYzs$!Z+#jYrpoBuFmY(r1x{{ih2q^<w}

delta 305
zcmZqUdBPFL{F#@_^IbwnG6NJa0ci&yE>;2(DL}-?ki)<b1!OQWv;Y~53@OZD1`|js
zSc3(qEb~7Q_$7n1vO%#kkS^|;n5D-N$xy?@;1U}+ae<^mCQuU>Lly%=4KqUxkYr(y
zYz7K(Gnmz|GL$efWHG^o85zXWfp+mQm<1OaGK2$N60E_yS&>nIQ9y$kXm|<8rnLN`
z+{BW}Im}W_8f=r-GkZ_wWeuO4z#<?l0F-55;$h@r6k-wslFW?ale<~+1wdLgKn@M!
n1`)iIxmXkBK#Ge&9$^5g1e+cN;sx=52>!`^tR*ZwOq{#`HFhy3

diff --git a/PluginDirectory/websearch.zip b/PluginDirectory/websearch.zip
index a6c52a1f997d0fba49d3ab063110e11e6559ab3d..58077eb2a67c12f0eac9e62fe2b0fbb19e814a8e 100644
GIT binary patch
delta 1396
zcmb_cPj4GV6o0#RoyK(o`O_p#a5~)(X^mVvR<Wa|v``hAR*s7m2LhEMYrQ*h##!&U
zyR%qr9adE<@d4&gi36vqhe{kuFC5^2xbP)7AP)Tuhy%P?w`mI8%4px)nfGtry!pNP
zX6>h1rd~}Xr$CKo>`7*IR)5BxUY-42!@oQ;_vd)M*ZJrg`<XmW04SQ1UuUzEtlQ(h
zAffNNtd%F7fO}8v`OmfE0kwR4w}}dJfyfitx8?V5ZAUMq+xhe;4r5nzU1OCPh7qsd
z3v8eD#Km|KP_fCnl!wCH2|Zgd?wL7qC)SPjndk6+!R5B46u8S$5Nr1Hq`bVGJ3ow9
zJRC5>ZI(=xWWfo$y}*2#PcHX7p+0SW!Dzo32Gnm_ZR!b?UX9;ou4@&`g=J#0`Y!kA
zd2+e_2^r4G#|^U5TqZ8tqoiipYW-P`T<Y~)x<y-6CW_^=D}|_BDwK#>y}DUj&kv2)
zsJ+K?<WuSgc#7f*#;@@fb7`?uy7X?POd8gX<+I{B<zGH){3A=3d3!;V_o&xoUbE%%
zKBkQcZ~7rs1=vrg9lAsO&@=HW<a+kP*aN)CZ!iAJQz?K{N<PRgMZX-gHtqQCk?BYu
zAO!_v4t^TA05=Zi8r;yp(cwM{b#M~#B%#b2W)fZ4UpTJYD$EEH?gE#Qg71)_5qhFe
z8y%A1904Z<ZCPA6ar7<>bog-lmRw&r84Zqr0O)8i02n0U<UI{$_EW&nJ`Eim28ja=
zhC2q80fxcY8K^kNK_sA)1Qem$v@?dXH^6xlDgxcdq0+cnf-O8)!<@jBt_zjn8s}}7
z1{s`w+2-<xg+HP|Rb&XF!x;MCK`B(xR2u|e;p6~l(Q6^?wSgugRh)k}gUB8d|0nuP
zRnNGn!&gD1aeXu7f;M|@7{r<#?sqK_pImh#UJPPGb!043;5D@o`P->#CiZ^brZPu5
z^Rs9QdPd7=6Z$mr87+a79+^UiM}$uvMYXBGw=u4mdeUT`Y{}^K$l@F>0#$B6#~7>|
zD%p)u#U>S-mJd&hiCKMgre4+bsl<yHQNCkbQ7@ryTvNXvjVoiXK8SLBah1H<S^)DH
T^2K;~7f#8&#WSh*mz3yl{i$5d

delta 524
zcmX@;JI|dbz?+#xgaHK9m^boRNidbBZ1#|N%*fQAGFeyZw~$DDmg}k&uDdju7#KiU
zieYk}nhbAdZb5!gi9%^nPEKah=1l2G#>wAhA}61hQDKaoyj#v+NEE2=f9~PQDJ%>O
zAS?~iCu`08nU~A+T|!7Q*h(M)G?Kvqh>MkgL<$fwGUPBYL;)F03@tzgBSQ)^n87r;
zL0*)P4X6r)ok3c<CNGxP(~M-OVPbHJ4P=O6W~c=s7KU0@h8h-z8U}`JHijZYhD;`g
z6fTA=hRK2o!m6wcC5#MNOdwgH8p&ox2Jv*D9Xt$X!G(ql;XoGzYw&K4QV?L&(O?Ez
zQUbCqEx#x?u>{P7__%}%C|X#WUy>SMkW*T$!8ZAYlJ{gM<#b^IpacUG4<iqw5R({?
zWM&kfd_*~40A!X1$g@G*AcA-D8I`EXb5+>oKpKjH0mQ%nR1LN=2*eBG0TKL@kE@gj
z@i1}n26!_vi7>-rYO=4Y8!)COPgV5<MbraTH$K#enrxzGrGOa+AZs9CNn^b%Fh+FQ
JWIzGW0089=YySWM