Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Cool Fire
nanobot4
Commits
dba5a075
Commit
dba5a075
authored
Feb 19, 2018
by
Cool Fire
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated for new API
parent
dff82be8
Pipeline
#534
failed with stages
in 4 minutes and 55 seconds
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
30 deletions
+23
-30
data/googlesearch.json.example
data/googlesearch.json.example
+2
-2
plugins/search.rb
plugins/search.rb
+21
-28
No files found.
data/googlesearch.json.example
View file @
dba5a075
{
"host" : "https://www.googleapis.com",
"path" : "/customsearch/v1
element
",
"path" : "/customsearch/v1",
"key" : "Yourcustomsearchapikey",
"num" : "1",
"cx" : "some-cx:id"
...
...
plugins/search.rb
View file @
dba5a075
...
...
@@ -41,11 +41,11 @@ class Search
arguments
.
gsub!
(
/ /
,
"+"
)
# Sanitize search request
# Retreive JSON
agent
=
Mechanize
.
new
page
=
agent
.
get
(
"
#{
@googleurl
}#{
CGI
::
escape
(
arguments
)
}
"
)
json
=
page
.
body
res
=
JSON
.
parse
(
json
)
result
=
"
#{
res
[
'results'
][
0
][
'unescapedUrl'
]
}
-
#{
res
[
'results'
][
0
][
'titleNoFormatting'
]
}
"
puts
res
.
inspect
result
=
"
#{
res
[
'items'
][
0
][
'link'
]
}
-
#{
res
[
'items'
][
0
][
'title'
]
}
:
#{
res
[
'items'
][
0
][
'snippet'
]
}
"
if
(
result
.
empty?
)
result
=
"Error: No result."
...
...
@@ -137,24 +137,17 @@ class Search
# Replace string token with actual key
@isbndbapipath
.
gsub!
(
/%APIKEY%/
,
apikey
)
else
@output
.
bad
(
"Could not load API key from
#{
@config
.
datadir
}
/
#{
@isbndbapifile
}
for ISBNdb search."
)
@output
.
bad
(
"Could not load API key from
#{
@config
.
datadir
}
/
#{
@isbndbapifile
}
for ISBNdb search.
\n
"
)
end
end
# Load google custom search api config
def
loadgoogleconfig
if
File
.
exist?
(
@config
.
datadir
+
'/'
+
@googleapiconf
)
cnf
=
JSON
.
parse
File
.
read
(
"
#{
@config
.
datadir
}
/
#{
@googleapiconf
}
"
)
jsonline
=
""
File
.
open
(
@config
.
datadir
+
'/'
+
@googleapiconf
)
do
|
file
|
file
.
each
do
|
line
|
jsonline
<<
line
end
end
cnf
=
JSON
.
parse
(
jsonline
)
@googleurl
=
"
#{
cnf
[
'host'
]
}#{
cnf
[
'path'
]
}
?key=
#{
cnf
[
'key'
]
}
&num=
#{
cnf
[
'num'
]
}
&cx=
#{
cnf
[
'cx'
]
}
&q="
else
@output
.
bad
(
"Could not load API data from
#{
@config
.
datadir
}
/
#{
@googleapiconf
}
for Google custom search."
)
@output
.
bad
(
"Could not load API data from
#{
@config
.
datadir
}
/
#{
@googleapiconf
}
for Google custom search.
\n
"
)
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment