fixed #4

Author: zqzten

README.md

@@ -23,27 +23,27 @@ Alfred search suggest workflow for various popular websites. Inspired by the off
 
 ### Google
 
-Support basic suggestions. Proxy settings are available in the workflow environment variables.
+Support basic suggestions. [Proxy setting](#proxy-setting) is available in the workflow environment variables.
 
 ![google](screenshots/google.png)
 
 ### Wikipedia
 
-Support direct term suggestions and preview, language can be specified with [ISO 639-1](https://en.wikipedia.org/wiki/ISO_639-1) code in the first arg. Proxy settings are available in the workflow environment variables.
+Support direct term suggestions and preview, language can be specified with [ISO 639-1](https://en.wikipedia.org/wiki/ISO_639-1) code in the first arg. [Proxy setting](#proxy-setting) is available in the workflow environment variables.
 
 ![wikipedia-en](screenshots/wikipedia-en.png)
 
 ![wikipedia-zh](screenshots/wikipedia-zh.png)
 
 ### Wolfram|Alpha
 
-Support direct term suggestions. Proxy settings are available in the workflow environment variables.
+Support direct term suggestions. [Proxy setting](#proxy-setting) is available in the workflow environment variables.
 
 ![wolframalpha](screenshots/wolframalpha.png)
 
 ### Pixiv
 
-Support basic suggestions. Proxy settings are available in the workflow environment variables.
+Support basic suggestions. [Proxy setting](#proxy-setting) is available in the workflow environment variables.
 
 ![pixiv](screenshots/pixiv.png)
 
@@ -87,7 +87,7 @@ Support basic suggestions.
 
 Support direct term suggestions and preview, type can be specified in the first arg.
 
-注：共支持 6 种条目类型的搜索，分别为全部（all）、动画（anime）、书籍（book）、音乐（music）、游戏（game）、三次元（real）；对于每一条搜索结果，副标题默认显示该条目的类型（如果当前搜索类型为全部）和中文名称（若有），按 ⌘ 可显示其简介（若有），按 ⌃ 可显示其排名与评分（若有）。
+注：共支持 6 种条目类型的搜索，分别为全部（all）、动画（anime）、书籍（book）、音乐（music）、游戏（game）、三次元（real）；对于每一条搜索结果，副标题默认显示该条目的类型（如果当前搜索类型为全部）和中文名称（若有），按 **⌘** 可显示其简介（若有），按 **⌃** 可显示其排名与评分（若有）。
 
 ![bangumi-all](screenshots/bangumi-all.png)
 
@@ -118,12 +118,11 @@ If you want an alternative to search exactly what you typed, you can add custom
 * Bangumi: `http://bangumi.tv/subject_search/{query}`
 * Moegirlpedia: `https://zh.moegirl.org/?search={query}`
 
-### Proxy Settings
+### Proxy Setting
 
-Proxy settings are avaliable in the workflow environment variables, here's an example setting:
+Proxy setting is avaliable in the workflow environment variables as `proxy`, here's some example settings:
 
-```text
-proxy_address: 127.0.0.1
-proxy_port: 1087
-proxy_type: CURLPROXY_HTTP // or CURLPROXY_SOCKS5 if you use a Socks5 proxy
-```
+* If you use an HTTP proxy at `127.0.0.1:1087` without credentials, set `proxy` to `http://127.0.0.1:1087`
+* If you use a SOCKS5 proxy at `127.0.0.1:1086` with username `user` and password `pass`, set `proxy` to `socks5://user:pass@127.0.0.1:1086`
+
+For more details, check the [libcurl doc](https://curl.haxx.se/libcurl/c/CURLOPT_PROXY.html).

src/info.plist

@@ -202,11 +202,7 @@
 				<string>Retrieving search suggestions ...</string>
 				<key>script</key>
 				<string>$query = "{query}";
-$opt = array(
-	CURLOPT_PROXYTYPE =&gt; getenv('proxy_type'),
-	CURLOPT_PROXY =&gt; getenv('proxy_address'),
-	CURLOPT_PROXYPORT =&gt; getenv('proxy_port')
-);
+$opt[CURLOPT_PROXY] = getenv('proxy');
 
 require_once('google.php');</string>
 				<key>scriptargtype</key>
@@ -290,11 +286,7 @@ require_once('google.php');</string>
 				<string>Retrieving search suggestions ...</string>
 				<key>script</key>
 				<string>$query = "{query}";
-$opt = array(
-	CURLOPT_PROXYTYPE =&gt; getenv('proxy_type'),
-	CURLOPT_PROXY =&gt; getenv('proxy_address'),
-	CURLOPT_PROXYPORT =&gt; getenv('proxy_port')
-);
+$opt[CURLOPT_PROXY] = getenv('proxy');
 
 require_once('wikipedia.php');</string>
 				<key>scriptargtype</key>
@@ -344,11 +336,7 @@ require_once('wikipedia.php');</string>
 				<string>Retrieving asking suggestions ...</string>
 				<key>script</key>
 				<string>$query = "{query}";
-$opt = array(
-	CURLOPT_PROXYTYPE =&gt; getenv('proxy_type'),
-	CURLOPT_PROXY =&gt; getenv('proxy_address'),
-	CURLOPT_PROXYPORT =&gt; getenv('proxy_port')
-);
+$opt[CURLOPT_PROXY] = getenv('proxy');
 
 require_once('wolframalpha.php');</string>
 				<key>scriptargtype</key>
@@ -432,11 +420,7 @@ require_once('wolframalpha.php');</string>
 				<string>Retrieving search suggestions ...</string>
 				<key>script</key>
 				<string>$query = "{query}";
-$opt = array(
-	CURLOPT_PROXYTYPE =&gt; getenv('proxy_type'),
-	CURLOPT_PROXY =&gt; getenv('proxy_address'),
-	CURLOPT_PROXYPORT =&gt; getenv('proxy_port')
-);
+$opt[CURLOPT_PROXY] = getenv('proxy');
 
 require_once('pixiv.php');</string>
 				<key>scriptargtype</key>
@@ -1179,21 +1163,15 @@ require_once('moegirlpedia.php');</string>
 	</dict>
 	<key>variables</key>
 	<dict>
-		<key>proxy_address</key>
-		<string>127.0.0.1</string>
-		<key>proxy_port</key>
-		<string>1087</string>
-		<key>proxy_type</key>
-		<string>CURLPROXY_HTTP</string>
+		<key>proxy</key>
+		<string></string>
 	</dict>
 	<key>variablesdontexport</key>
 	<array>
-		<string>proxy_port</string>
-		<string>proxy_type</string>
-		<string>proxy_address</string>
+		<string>proxy</string>
 	</array>
 	<key>version</key>
-	<string>1.7</string>
+	<string>1.8</string>
 	<key>webaddress</key>
 	<string>https://github.com/AkikoZ/alfred-web-search-suggest</string>
 </dict>