Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions google/lib/google_suggest.rb
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,12 @@ def suggest_for(keyword)
:q => URI.encode(keyword)}
res = http_get('/complete/search', query)

doc = REXML::Document.new(res.body.to_s)
result_body = if res['content-type'] =~ /iso-8859-1/i
res.body.to_s.force_encoding("ISO-8859-1").encode("UTF-8")
else
res.body.to_s
end
doc = REXML::Document.new(result_body)

suggestions = []
doc.elements.each("toplevel/CompleteSuggestion/suggestion") { |elem |
Expand All @@ -61,15 +66,15 @@ def suggest_for(keyword)

def http
if @proxy
proxy_url = URI.parse(@proxy)
proxy_url = URI.parse(@proxy)
http_class = Net::HTTP.Proxy(proxy_url.host, proxy_url.port)
else
http_class = Net::HTTP
end
http_class.new(GOOGLE_HOST)
end

def http_get(path, query)
def http_get(path, query)
path = path + '?' + query.map{|k,v| "#{k}=#{v}"}.join('&')
req = Net::HTTP::Get.new(path)
http.request(req)
Expand Down
11 changes: 11 additions & 0 deletions google/suggest.rb
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,17 @@ def generate_feedback(alfred, query)

end

if feedback.items.length == 0
feedback.add_item({
:title => query ,
:subtitle => "Search Google for #{query}" ,
:arg => query ,
:autocomplete => query ,
:icon => icon ,
})
end


puts feedback.to_xml
end

Expand Down