Archives
/
koreader
mirror of https://github.com/koreader/koreader
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix a few Goodreads-related typos

Browse Source
pull/2362/head
Frans de Jonge 8 years ago committed by Qingping Hou
parent fc5ba9b862
commit 2bc7b01d78
4 changed files with 72 additions and 72 deletions
Show Stats Download Patch File Download Diff File

14
plugins/goodreads.koplugin/doublekeyvaluepage.lua
Unescape Escape View File

@ -16,7 +16,7 @@ local Geom = require("ui/geometry")
local Font = require("ui/font") local Font = require("ui/font")
local Device = require("device") local Device = require("device")
local Screen = Device.screen local Screen = Device.screen
local GoodReadersApi = require("goodreadsapi") local GoodreadsApi = require("goodreadsapi")
local LuaSettings = require("luasettings") local LuaSettings = require("luasettings")
local DataStorage = require("datastorage") local DataStorage = require("datastorage")
local _ = require("gettext") local _ = require("gettext")
@ -176,7 +176,7 @@ local DoubleKeyValuePage = InputContainer:new{
show_page = 1, show_page = 1,
text_input = "", text_input = "",
pages = 1, pages = 1,
goodreadersKey = "", goodreads_key = "",
} }
function DoubleKeyValuePage:readGRSettings() function DoubleKeyValuePage:readGRSettings()
@ -195,11 +195,11 @@ function DoubleKeyValuePage:init()
self.screen_height = Screen:getSize().h self.screen_height = Screen:getSize().h
local gr_sett = self:readGRSettings().data local gr_sett = self:readGRSettings().data
if gr_sett.goodreads then if gr_sett.goodreads then
self.goodreadersKey = gr_sett.goodreads.key self.goodreads_key = gr_sett.goodreads.key
self.goodreadersSecret = gr_sett.goodreads.secret self.goodreads_secret = gr_sett.goodreads.secret
end end
self.kv_pairs = GoodReadersApi:showData(self.text_input, self.search_type, 1, self.goodreadersKey) self.kv_pairs = GoodReadsApi:showData(self.text_input, self.search_type, 1, self.goodreads_key)
self.total_res = GoodReadersApi:getTotalResults() self.total_res = GoodReadsApi:getTotalResults()
if self.total_res == nil then if self.total_res == nil then
self.total_res = 0 self.total_res = 0
end end
@ -257,7 +257,7 @@ function DoubleKeyValuePage:nextPage()
and #self.kv_pairs < self.total_res then and #self.kv_pairs < self.total_res then
local api_page = math.floor(new_page * self.items_per_page / 20 ) + 1 local api_page = math.floor(new_page * self.items_per_page / 20 ) + 1
-- load new portion of data -- load new portion of data
local new_pair = GoodReadersApi:showData(self.text_input, self.search_type, api_page, self.goodreadersKey ) local new_pair = GoodReadsApi:showData(self.text_input, self.search_type, api_page, self.goodreads_key )
if new_pair == nil then return end if new_pair == nil then return end
for _, v in pairs(new_pair) do for _, v in pairs(new_pair) do
table.insert(self.kv_pairs, v) table.insert(self.kv_pairs, v)

30
plugins/goodreads.koplugin/goodreadsapi.lua
Unescape Escape View File

@ -1,5 +1,5 @@
local InputContainer = require("ui/widget/container/inputcontainer") local InputContainer = require("ui/widget/container/inputcontainer")
local GoodReaderBook = require("goodreaderbook") local GoodreadsBook = require("goodreadsbook")
local InfoMessage = require("ui/widget/infomessage") local InfoMessage = require("ui/widget/infomessage")
local UIManager = require("ui/uimanager") local UIManager = require("ui/uimanager")
local url = require('socket.url') local url = require('socket.url')
@ -9,13 +9,13 @@ local https = require('ssl.https')
local ltn12 = require('ltn12') local ltn12 = require('ltn12')
local _ = require("gettext") local _ = require("gettext")
local GoodReadsApi = InputContainer:new { local GoodreadsApi = InputContainer:new {
goodreaders_key = "", goodreads_key = "",
goodreaders_secret = "", goodreads_secret = "",
total_result = 0, total_result = 0,
} }
function GoodReadsApi:init() function GoodreadsApi:init()
end end
local function genSearchURL(text_search, userApi, search_type, npage) local function genSearchURL(text_search, userApi, search_type, npage)
@ -42,7 +42,7 @@ local function genIdUrl(id, userApi)
)) ))
end end
function GoodReadsApi:fetchXml(s_url) function GoodreadsApi:fetchXml(s_url)
local request, sink = {}, {} local request, sink = {}, {}
local parsed = url.parse(s_url) local parsed = url.parse(s_url)
request['url'] = s_url request['url'] = s_url
@ -61,7 +61,7 @@ function GoodReadsApi:fetchXml(s_url)
end end
end end
function GoodReadsApi:showSearchTable(data) function GoodreadsApi:showSearchTable(data)
local books = {} local books = {}
if data == nil then if data == nil then
UIManager:show(InfoMessage:new{text =_("Network problem.\nCheck connection.")}) UIManager:show(InfoMessage:new{text =_("Network problem.\nCheck connection.")})
@ -86,7 +86,7 @@ function GoodReadsApi:showSearchTable(data)
return books return books
end end
function GoodReadsApi:getTotalResults() function GoodreadsApi:getTotalResults()
return self.total_result return self.total_result
end end
@ -175,9 +175,9 @@ end
-- search_type = all - search all -- search_type = all - search all
-- search_type = author - serch book by author -- search_type = author - serch book by author
-- search_type = title - search book by title -- search_type = title - search book by title
function GoodReadsApi:showData(search_text, search_type, page, goodreaders_key) function GoodreadsApi:showData(search_text, search_type, page, goodreads_key)
local stats = {} local stats = {}
local gen_url = genSearchURL(search_text, goodreaders_key, search_type, page) local gen_url = genSearchURL(search_text, goodreads_key, search_type, page)
local gen_xml = self:fetchXml(gen_url) local gen_xml = self:fetchXml(gen_url)
local tbl = self:showSearchTable(gen_xml) local tbl = self:showSearchTable(gen_xml)
if #tbl == 0 then if #tbl == 0 then
@ -190,9 +190,9 @@ function GoodReadsApi:showData(search_text, search_type, page, goodreaders_key)
table.insert(stats, { author, table.insert(stats, { author,
title, title,
callback = function() callback = function()
local dates = self:showIdData(id, goodreaders_key) local dates = self:showIdData(id, goodreads_key)
if dates.id ~= nil then if dates.id ~= nil then
UIManager:show(GoodReaderBook:new{ UIManager:show(GoodreadsBook:new{
dates = dates, dates = dates,
}) })
end end
@ -202,11 +202,11 @@ function GoodReadsApi:showData(search_text, search_type, page, goodreaders_key)
return stats return stats
end end
function GoodReadsApi:showIdData(id, goodreaders_key) function GoodreadsApi:showIdData(id, goodreads_key)
local gen_url = genIdUrl(id, goodreaders_key) local gen_url = genIdUrl(id, goodreads_key)
local gen_xml = self:fetchXml(gen_url) local gen_xml = self:fetchXml(gen_url)
local tbl = showIdTable(gen_xml) local tbl = showIdTable(gen_xml)
return tbl return tbl
end end
return GoodReadsApi return GoodreadsApi

18
plugins/goodreads.koplugin/goodreaderbook.lua → plugins/goodreads.koplugin/goodreadsbook.lua
Unescape Escape View File

@ -22,11 +22,11 @@ local _ = require("gettext")
local T = require("ffi/util").template local T = require("ffi/util").template
local Pic = require("ffi/pic") local Pic = require("ffi/pic")
local GoodReaderBook = InputContainer:new{ local GoodreadsBook = InputContainer:new{
padding = Screen:scaleBySize(15), padding = Screen:scaleBySize(15),
} }
function GoodReaderBook:init() function GoodreadsBook:init()
self.small_font_face = Font:getFace("ffont", 16) self.small_font_face = Font:getFace("ffont", 16)
self.medium_font_face = Font:getFace("ffont", 18) self.medium_font_face = Font:getFace("ffont", 18)
self.large_font_face = Font:getFace("ffont", 22) self.large_font_face = Font:getFace("ffont", 22)
@ -45,7 +45,7 @@ function GoodReaderBook:init()
} }
end end
function GoodReaderBook:getStatusContent(width) function GoodreadsBook:getStatusContent(width)
return VerticalGroup:new{ return VerticalGroup:new{
align = "left", align = "left",
OverlapGroup:new{ OverlapGroup:new{
@ -59,7 +59,7 @@ function GoodReaderBook:getStatusContent(width)
} }
end end
function GoodReaderBook:genHeader(title) function GoodreadsBook:genHeader(title)
local header_title = TextWidget:new{ local header_title = TextWidget:new{
text = title, text = title,
face = self.medium_font_face, face = self.medium_font_face,
@ -94,7 +94,7 @@ function GoodReaderBook:genHeader(title)
} }
end end
function GoodReaderBook:genBookInfoGroup() function GoodreadsBook:genBookInfoGroup()
local split_span_width = self.screen_width * 0.05 local split_span_width = self.screen_width * 0.05
local img_width, img_height local img_width, img_height
if Screen:getScreenMode() == "landscape" then if Screen:getScreenMode() == "landscape" then
@ -226,7 +226,7 @@ function GoodReaderBook:genBookInfoGroup()
} }
end end
function GoodReaderBook:bookReview() function GoodreadsBook:bookReview()
local book_meta_info_group = VerticalGroup:new{ local book_meta_info_group = VerticalGroup:new{
align = "center", align = "center",
padding = 0, padding = 0,
@ -246,14 +246,14 @@ function GoodReaderBook:bookReview()
} }
end end
function GoodReaderBook:onAnyKeyPressed() function GoodreadsBook:onAnyKeyPressed()
return self:onClose() return self:onClose()
end end
function GoodReaderBook:onClose() function GoodreadsBook:onClose()
UIManager:setDirty("all") UIManager:setDirty("all")
UIManager:close(self) UIManager:close(self)
return true return true
end end
return GoodReaderBook return GoodreadsBook

82
plugins/goodreads.koplugin/main.lua
Unescape Escape View File

@ -7,61 +7,61 @@ local UIManager = require("ui/uimanager")
local Screen = require("device").screen local Screen = require("device").screen
local _ = require("gettext") local _ = require("gettext")
local GoodReads = InputContainer:new { local Goodreads = InputContainer:new {
goodreaders_key = "", goodreads_key = "",
goodreaders_secret = "", goodreads_secret = "",
} }
function GoodReads:init() function Goodreads:init()
local gr_sett = DoubleKeyValuePage:readGRSettings().data local gr_sett = DoubleKeyValuePage:readGRSettings().data
if gr_sett.goodreads then if gr_sett.goodreads then
self.goodreaders_key = gr_sett.goodreads.key self.goodreads_key = gr_sett.goodreads.key
self.goodreaders_secret = gr_sett.goodreads.secret self.goodreads_secret = gr_sett.goodreads.secret
end end
self.ui.menu:registerToMainMenu(self) self.ui.menu:registerToMainMenu(self)
end end
function GoodReads:addToMainMenu(tab_item_table) function Goodreads:addToMainMenu(tab_item_table)
table.insert(tab_item_table.plugins, { table.insert(tab_item_table.plugins, {
text = _("GoodReads"), text = _("Goodreads"),
sub_item_table = { sub_item_table = {
{ {
text = _("Settings"), text = _("Settings"),
callback = function() self:updateSettings() end, callback = function() self:updateSettings() end,
}, },
{ {
text = _("Search book all"), text = _("Search all books"),
callback = function() callback = function()
if self.goodreaders_key ~= "" then if self.goodreads_key ~= "" then
self:search("all") self:search("all")
else else
UIManager:show(InfoMessage:new{ UIManager:show(InfoMessage:new{
text = _("Please set up GoodReads key in settings"), text = _("Please set up your Goodreads key in the settings dialog"),
}) })
end end
end, end,
}, },
{ {
text = _("Search book by title"), text = _("Search for book by title"),
callback = function() callback = function()
if self.goodreaders_key ~= "" then if self.goodreads_key ~= "" then
self:search("title") self:search("title")
else else
UIManager:show(InfoMessage:new{ UIManager:show(InfoMessage:new{
text = _("Please set up GoodReads key in settings"), text = _("Please set up your Goodreads key in the settings dialog"),
}) })
end end
end, end,
}, },
{ {
text = _("Search book by author"), text = _("Search for book by author"),
callback = function() callback = function()
if self.goodreaders_key ~= "" then if self.goodreads_key ~= "" then
self:search("author") self:search("author")
else else
UIManager:show(InfoMessage:new{ UIManager:show(InfoMessage:new{
text = _("Please set up GoodReads key in settings"), text = _("Please set up your Goodreads key in the settings dialog"),
}) })
end end
end, end,
@ -70,33 +70,33 @@ function GoodReads:addToMainMenu(tab_item_table)
}) })
end end
function GoodReads:updateSettings() function Goodreads:updateSettings()
local hint_top local hint_top
local text_top local text_top
local hint_bottom local hint_bottom
local text_bottom local text_bottom
local text_info = "How to generate key and secret key:\n".. local text_info = "How to generate a key and a secret key:\n"..
"1. Go to https://www.goodreads.com/user/sign_up and create account\n" .. "1. Go to https://www.goodreads.com/user/sign_up and create an account\n" ..
"2. Register development key on page: https://www.goodreads.com/user/sign_in?rd=true\n" .. "2. Register for a development key on the following page: https://www.goodreads.com/user/sign_in?rd=true\n" ..
"3. Your key and secret key are on https://www.goodreads.com/api/keys\n" .. "3. Your key and secret key will now be available on https://www.goodreads.com/api/keys\n" ..
"4. Enter your generated key and secret key in settings (Login to GoodReads window)" "4. Enter your generated key and your secret key in the settings dialog (Login to Goodreads window)"
if self.goodreaders_key == "" then if self.goodreads_key == "" then
hint_top = _("GoodReaders Key Not Set") hint_top = _("Goodreads Key Not Set")
text_top = "" text_top = ""
else else
hint_top = "" hint_top = ""
text_top = self.goodreaders_key text_top = self.goodreads_key
end end
if self.goodreaders_secret == "" then if self.goodreads_secret == "" then
hint_bottom = _("GoodReaders Secret Key Not Set (optional)") hint_bottom = _("Goodreads Secret Key Not Set (optional)")
text_bottom = "" text_bottom = ""
else else
hint_bottom = "" hint_bottom = ""
text_bottom = self.goodreaders_key text_bottom = self.goodreads_key
end end
self.settings_dialog = MultiInputDialog:new { self.settings_dialog = MultiInputDialog:new {
title = _("Login to GoodReads"), title = _("Login to Goodreads"),
fields = { fields = {
{ {
text = text_top, text = text_top,
@ -142,14 +142,14 @@ function GoodReads:updateSettings()
UIManager:show(self.settings_dialog) UIManager:show(self.settings_dialog)
end end
function GoodReads:saveSettings(fields) function Goodreads:saveSettings(fields)
if fields then if fields then
self.goodreaders_key = fields[1] self.goodreads_key = fields[1]
self.goodreaders_secret = fields[2] self.goodreads_secret = fields[2]
end end
local settings = { local settings = {
key = self.goodreaders_key, key = self.goodreads_key,
secret = self.goodreaders_secret, secret = self.goodreads_secret,
} }
DoubleKeyValuePage:saveGRSettings(settings) DoubleKeyValuePage:saveGRSettings(settings)
end end
@ -157,7 +157,7 @@ end
-- search_type = all - search all -- search_type = all - search all
-- search_type = author - serch book by author -- search_type = author - serch book by author
-- search_type = title - search book by title -- search_type = title - search book by title
function GoodReads:search(search_type) function Goodreads:search(search_type)
local title_header local title_header
local hint local hint
local search_input local search_input
@ -165,13 +165,13 @@ function GoodReads:search(search_type)
local info local info
local result local result
if search_type == "all" then if search_type == "all" then
title_header = _("Search book all in GoodReads") title_header = _("Search all books in Goodreads")
hint = _("Title, author or ISBN") hint = _("Title, author or ISBN")
elseif search_type == "author" then elseif search_type == "author" then
title_header = _("Search book by author in GoodReads") title_header = _("Search for book by author in Goodreads")
hint = _("Author") hint = _("Author")
elseif search_type == "title" then elseif search_type == "title" then
title_header = _("Search book by title in GoodReads") title_header = _("Search for book by title in Goodreads")
hint = _("Title") hint = _("Title")
end end
@ -209,7 +209,7 @@ function GoodReads:search(search_type)
UIManager:close(search_input) UIManager:close(search_input)
else else
UIManager:show(InfoMessage:new{ UIManager:show(InfoMessage:new{
text =_("Please input text"), text =_("Please enter text"),
}) })
end end
end, end,
@ -221,4 +221,4 @@ function GoodReads:search(search_type)
UIManager:show(search_input) UIManager:show(search_input)
end end
return GoodReads return Goodreads

Write Preview
Loading…
Cancel
Save