renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Migrate Goodreads to https (#3298)

Browse Source
This commit is contained in:
Robert
2017-10-04 18:31:54 +02:00
committed by Frans de Jonge
parent 5786449021
commit ceb7cf9771
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/goodreads.koplugin/goodreadsapi.lua
View File

@@ -4,7 +4,6 @@ local InfoMessage = require("ui/widget/infomessage")
local UIManager = require("ui/uimanager")
local url = require('socket.url')
local socket = require('socket')
local http = require('socket.http')
local https = require('ssl.https')
local ltn12 = require('ltn12')
local _ = require("gettext")
@@ -26,7 +25,7 @@ local function genSearchURL(text_search, userApi, search_type, npage)
text_search = string.gsub (text_search, " ", "+")
end
return (string.format(
"http://www.goodreads.com/search?q=%s&search[field]=%s&format=xml&key=%s&page=%s",
"https://www.goodreads.com/search?q=%s&search[field]=%s&format=xml&key=%s&page=%s",
text_search,
search_type,
userApi,
@@ -48,10 +47,9 @@ function GoodreadsApi:fetchXml(s_url)
request['url'] = s_url
request['method'] = 'GET'
request['sink'] = ltn12.sink.table(sink)
http.TIMEOUT = 5
https.TIMEOUT = 5
local httpRequest = parsed.scheme == 'http' and http.request or https.request
local headers = socket.skip(1, httpRequest(request))
local httpsRequest = parsed.scheme == 'https' and https.request
local headers = socket.skip(1, httpsRequest(request))
if headers == nil then
return nil
end

4
plugins/goodreads.koplugin/goodreadsbook.lua
View File

@@ -20,6 +20,7 @@ local Screen = require("device").screen
local ScrollTextWidget = require("ui/widget/scrolltextwidget")
local TextBoxWidget = require("ui/widget/textboxwidget")
local UIManager = require("ui/uimanager")
local https = require('ssl.https')
local T = require("ffi/util").template
local _ = require("gettext")
@@ -192,8 +193,7 @@ function GoodreadsBook:genBookInfoGroup()
HorizontalSpan:new{ width = split_span_width }
}
-- thumbnail
local http = require("socket.http")
local body = http.request(self.dates.image)
local body = https.request(self.dates.image)
local image = false
if body then image = Pic.openJPGDocumentFromMem(body) end
if image then