Skip to content

Commit ddd7c9e

Browse files
BadTudouBadTudou
committed
fix
1.去除多余参数remote_ip
1 parent f47472e commit ddd7c9e

File tree

2 files changed

+79
-87
lines changed

2 files changed

+79
-87
lines changed

‎Jiumo-search.alfredworkflow

-45 Bytes
Binary file not shown.

‎src/info.plist

+79-87
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
<dict>
55
<key>bundleid</key>
66
<string>com.badtudou.jiumo-search</string>
7-
<key>category</key>
8-
<string>Internet</string>
97
<key>connections</key>
108
<dict>
119
<key>1AEE333F-4073-4E76-A286-91F869C65BE1</key>
@@ -64,6 +62,23 @@
6462
<key>version</key>
6563
<integer>1</integer>
6664
</dict>
65+
<dict>
66+
<key>config</key>
67+
<dict>
68+
<key>autopaste</key>
69+
<false/>
70+
<key>clipboardtext</key>
71+
<string>{query}</string>
72+
<key>transient</key>
73+
<false/>
74+
</dict>
75+
<key>type</key>
76+
<string>alfred.workflow.output.clipboard</string>
77+
<key>uid</key>
78+
<string>1AEE333F-4073-4E76-A286-91F869C65BE1</string>
79+
<key>version</key>
80+
<integer>2</integer>
81+
</dict>
6782
<dict>
6883
<key>config</key>
6984
<dict>
@@ -84,7 +99,7 @@
8499
<key>queuedelayimmediatelyinitially</key>
85100
<false/>
86101
<key>queuedelaymode</key>
87-
<integer>0</integer>
102+
<integer>1</integer>
88103
<key>queuemode</key>
89104
<integer>1</integer>
90105
<key>runningsubtext</key>
@@ -100,27 +115,27 @@ HOST_FREEGEOIP = 'https://freegeoip.net'
100115
HOST_JIUMO = 'https://www.jiumodiary.com'
101116
102117
HEADERS = {
103-
'Content-Type' =&gt;'application/x-www-form-urlencoded',
104-
'X-Requested-With' =&gt; 'XMLHttpRequest'
118+
'Content-Type' =&gt;'application/x-www-form-urlencoded',
119+
'X-Requested-With' =&gt; 'XMLHttpRequest'
105120
}
106121
107122
ICONS = {
108-
'vdisk.weibo.com' =&gt; 'weipan.icns',
109-
'ishare.iask.com' =&gt; 'aiwen.icns',
110-
'local' =&gt; 'icon.png',
111-
'yun.baidu.com' =&gt; 'baiduwangpan.icns',
112-
'pan.baidu.com' =&gt; 'baiduwangpan.icns',
113-
'喜马拉雅 (ximalaya.com)' =&gt; 'ximalaya.icns',
114-
'gitbook.com' =&gt; 'gitbook.icns',
115-
'error' =&gt; 'error.icns'
123+
'vdisk.weibo.com' =&gt; 'weipan.icns',
124+
'ishare.iask.com' =&gt; 'aiwen.icns',
125+
'local' =&gt; 'icon.png',
126+
'yun.baidu.com' =&gt; 'baiduwangpan.icns',
127+
'pan.baidu.com' =&gt; 'baiduwangpan.icns',
128+
'喜马拉雅 (ximalaya.com)' =&gt; 'ximalaya.icns',
129+
'gitbook.com' =&gt; 'gitbook.icns',
130+
'error' =&gt; 'error.icns'
116131
}
117132
118133
ERRORS = {
119-
'tooshort' =&gt; '您查询的图书标题长度过短, 请重试',
120-
'exceed' =&gt; '您的查询已达到今日的最高次数',
121-
'none' =&gt; '没有找到相关的文档',
122-
'network' =&gt; '网络错误，请保持网络畅通',
123-
'default' =&gt; '未知错误'
134+
'tooshort' =&gt; '您查询的图书标题长度过短, 请重试',
135+
'exceed' =&gt; '您的查询已达到今日的最高次数',
136+
'none' =&gt; '没有找到相关的文档',
137+
'network' =&gt; '网络错误，请保持网络畅通',
138+
'default' =&gt; '未知错误'
124139
}
125140
126141
RESPONSE_SUCCEED = 'succeed'
@@ -129,70 +144,62 @@ NETWORK_ERROR = 'network'
129144
130145
keywords = ARGV[0]
131146
132-
def get_remote_ip
133-
uri = URI("#{HOST_FREEGEOIP}/json/")
134-
res = JSON.parse(Net::HTTP.get(uri))
135-
res['ip']
136-
end
137-
138-
139147
def serch_books(keywords)
140-
remote_ip = get_remote_ip()
141-
url_str = &lt;&lt;EOF
142-
#{HOST_JIUMO}/init_hubs.php?q=#{URI::encode(keywords)}&amp;remote_ip=#{remote_ip}&amp;time_int=#{Time.now.to_i}
148+
url_str = &lt;&lt;EOF
149+
#{HOST_JIUMO}/init_hubs.php?q=#{URI::encode(keywords)}&amp;time_int=#{Time.now.to_i}
143150
EOF
144-
uri = URI(url_str)
145-
res = Net::HTTP.post_form(uri, HEADERS)
146-
if res.is_a?(Net::HTTPSuccess)
147-
res = JSON.parse(res.body)
148-
raise res['status'] if res['status'] != RESPONSE_SUCCEED
149-
res['id']
150-
end
151+
uri = URI(url_str)
152+
res = Net::HTTP.post_form(uri, HEADERS)
153+
if res.is_a?(Net::HTTPSuccess)
154+
res = JSON.parse(res.body)
155+
raise res['status'] if res['status'] != RESPONSE_SUCCEED
156+
res['id']
157+
end
151158
end
152159
153160
def fetch_result(id, set=0)
154-
url_str = &lt;&lt;EOF
161+
url_str = &lt;&lt;EOF
155162
#{HOST_JIUMO}/ajax_fetch_hubs.php?id=#{id}&amp;set=#{set}
156163
EOF
157-
uri = URI(url_str)
158-
res = Net::HTTP.post_form(uri, HEADERS)
159-
if res.is_a?(Net::HTTPSuccess)
160-
res = JSON.parse(res.body)
161-
end
164+
uri = URI(url_str)
165+
res = Net::HTTP.post_form(uri, HEADERS)
166+
if res.is_a?(Net::HTTPSuccess)
167+
res = JSON.parse(res.body)
168+
end
162169
end
163170
164171
def parse_result(result)
165-
raise RESULT_NONE if result['sources'].empty?
166-
xml = REXML::Document.new
167-
book_index = 0
168-
element = xml.add_element ('items')
169-
result['sources'].each do |item|
170-
item['details']['data'].each do |book|
171-
book_index += 1
172-
item_xml = element.add_element('item')
173-
item_xml.add_element('title').add_text("#{book_index} . #{book['title']}")
174-
item_xml.add_element('subtitle').add_text("#{book['host']} - #{book['des']}")
175-
item_xml.add_element('arg').add_text(book['link'])
176-
item_xml.add_element('autocomplete').add_text(book['title'])
177-
item_xml.add_element('match').add_text(book['title'])
178-
item_xml.add_element('icon').add_text("#{Dir.pwd}/#{ICONS[book['host']]}")
179-
end
180-
end
181-
xml.write
172+
raise RESULT_NONE if result['sources'].empty?
173+
xml = REXML::Document.new
174+
book_index = 0
175+
element = xml.add_element ('items')
176+
result['sources'].each do |item|
177+
item['details']['data'].each do |book|
178+
book_index += 1
179+
item_xml = element.add_element('item')
180+
item_xml.add_element('title').add_text("#{book_index} . #{book['title']}")
181+
item_xml.add_element('subtitle').add_text("#{book['host']} - #{book['des']}")
182+
item_xml.add_element('arg').add_text(book['link'])
183+
item_xml.add_element('autocomplete').add_text(book['title'])
184+
item_xml.add_element('match').add_text(book['title'])
185+
item_xml.add_element('icon').add_text("#{Dir.pwd}/#{ICONS[book['host']]}")
186+
end
187+
end
188+
xml.write
182189
end
183190
184191
begin
185-
result = fetch_result( serch_books(keywords))
186-
parse_result(result)
192+
result = fetch_result( serch_books(keywords))
193+
parse_result(result)
187194
rescue =&gt; exception
188-
message = exception.message
189-
message = NETWORK_ERROR if exception.instance_of? SocketError
190-
xml = REXML::Document.new
191-
element = xml.add_element ('items')
192-
item_xml = element.add_element('item')
193-
item_xml.add_element('title').add_text("错误： #{!ERRORS[message].nil? ? ERRORS[message]:ERRORS['default']}")
194-
item_xml.add_element('icon').add_text("#{Dir.pwd}/#{ICONS['error']}")
195-
xml.write
195+
message = exception.message
196+
message = NETWORK_ERROR if exception.instance_of? SocketError
197+
xml = REXML::Document.new
198+
element = xml.add_element ('items')
199+
item_xml = element.add_element('item')
200+
item_xml.add_element('title').add_text("错误： #{!ERRORS[message].nil? ? ERRORS[message]:ERRORS['default']}")
201+
item_xml.add_element('icon').add_text("#{Dir.pwd}/#{ICONS['error']}")
202+
xml.write
196203
end
197204
198205
</string>
@@ -216,26 +223,11 @@ end
216223
<key>version</key>
217224
<integer>2</integer>
218225
</dict>
219-
<dict>
220-
<key>config</key>
221-
<dict>
222-
<key>autopaste</key>
223-
<false/>
224-
<key>clipboardtext</key>
225-
<string>{query}</string>
226-
<key>transient</key>
227-
<false/>
228-
</dict>
229-
<key>type</key>
230-
<string>alfred.workflow.output.clipboard</string>
231-
<key>uid</key>
232-
<string>1AEE333F-4073-4E76-A286-91F869C65BE1</string>
233-
<key>version</key>
234-
<integer>2</integer>
235-
</dict>
236226
</array>
237227
<key>readme</key>
238-
<string>Alfred workflow for Jiumo E-Book Search(鸠摩电子书搜索)</string>
228+
<string>Alfred workflow for Jiumo E-Book Search(鸠摩电子书搜索)
229+
230+
https://github.com/duxiaodou/Alfred-workflow-Jiumo</string>
239231
<key>uidata</key>
240232
<dict>
241233
<key>1AEE333F-4073-4E76-A286-91F869C65BE1</key>
@@ -261,7 +253,7 @@ end
261253
</dict>
262254
</dict>
263255
<key>version</key>
264-
<string>1.0</string>
256+
<string>1.1</string>
265257
<key>webaddress</key>
266258
<string>https://github.com/BadTudou/alfred-workflow-jiumo</string>
267259
</dict>

0 commit comments

Comments
 (0)