mirror of
https://github.com/koreader/koreader
synced 2024-11-10 01:10:34 +00:00
d53ee056cc
My volumize PR introduced too many issues. Revert to previous version of NewsDownloader until they can be resolved. Fixes #8867 Reintroduces #8799, #6234
201 lines
5.2 KiB
Lua
201 lines
5.2 KiB
Lua
local logger = require("logger")
|
|
local _ = require("gettext")
|
|
|
|
local FeedView = {
|
|
URL = "url",
|
|
LIMIT = "limit",
|
|
DOWNLOAD_FULL_ARTICLE = "download_full_article",
|
|
INCLUDE_IMAGES = "include_images",
|
|
ENABLE_FILTER = "enable_filter",
|
|
FILTER_ELEMENT = "filter_element"
|
|
}
|
|
|
|
function FeedView:getList(feed_config, callback, edit_feed_attribute_callback, delete_feed_callback)
|
|
local view_content = {}
|
|
-- Loop through the feed.
|
|
for idx, feed in ipairs(feed_config) do
|
|
local feed_item_content = {}
|
|
|
|
local vc_feed_item = FeedView:getItem(
|
|
idx,
|
|
feed,
|
|
edit_feed_attribute_callback,
|
|
delete_feed_callback
|
|
)
|
|
|
|
if not vc_feed_item then
|
|
logger.warn('NewsDownloader: invalid feed config entry', feed)
|
|
else
|
|
feed_item_content = FeedView:flattenArray(feed_item_content, vc_feed_item)
|
|
local url = feed[1]
|
|
table.insert(
|
|
view_content,
|
|
{
|
|
url,
|
|
"",
|
|
callback = function()
|
|
-- Here is where we trigger the single feed item display
|
|
callback(feed_item_content)
|
|
end
|
|
}
|
|
)
|
|
-- Insert a divider.
|
|
table.insert(
|
|
view_content,
|
|
"---"
|
|
)
|
|
end
|
|
end
|
|
return view_content
|
|
end
|
|
|
|
function FeedView:getItem(id, feed, edit_feed_callback, delete_feed_callback)
|
|
|
|
logger.dbg("NewsDownloader:", feed)
|
|
|
|
local url = feed[1]
|
|
local limit = feed.limit
|
|
|
|
-- If there's no URL or limit we don't care about this
|
|
-- because we can't use it.
|
|
if not url and limit then
|
|
return nil
|
|
end
|
|
|
|
-- Collect this stuff for later, with the single view.
|
|
local download_full_article = feed.download_full_article ~= false
|
|
local include_images = feed.include_images ~= false
|
|
local enable_filter = feed.enable_filter ~= false
|
|
local filter_element = feed.filter_element
|
|
|
|
local vc = {
|
|
{
|
|
_("URL"),
|
|
url,
|
|
callback = function()
|
|
edit_feed_callback(
|
|
id,
|
|
FeedView.URL,
|
|
url
|
|
)
|
|
end
|
|
},
|
|
{
|
|
_("Limit"),
|
|
limit,
|
|
callback = function()
|
|
edit_feed_callback(
|
|
id,
|
|
FeedView.LIMIT,
|
|
limit
|
|
)
|
|
end
|
|
},
|
|
{
|
|
_("Download full article"),
|
|
download_full_article,
|
|
callback = function()
|
|
edit_feed_callback(
|
|
id,
|
|
FeedView.DOWNLOAD_FULL_ARTICLE,
|
|
download_full_article
|
|
)
|
|
end
|
|
},
|
|
{
|
|
_("Include images"),
|
|
include_images,
|
|
callback = function()
|
|
edit_feed_callback(
|
|
id,
|
|
FeedView.INCLUDE_IMAGES,
|
|
include_images
|
|
)
|
|
end
|
|
},
|
|
{
|
|
_("Enable filter"),
|
|
enable_filter,
|
|
callback = function()
|
|
edit_feed_callback(
|
|
id,
|
|
FeedView.ENABLE_FILTER,
|
|
enable_filter
|
|
)
|
|
end
|
|
|
|
},
|
|
{
|
|
_("Filter element"),
|
|
filter_element,
|
|
callback = function()
|
|
edit_feed_callback(
|
|
id,
|
|
FeedView.FILTER_ELEMENT,
|
|
filter_element
|
|
)
|
|
end
|
|
},
|
|
}
|
|
|
|
-- We don't always display this. For instance: if a feed
|
|
-- is being created, this button is not necessary.
|
|
if delete_feed_callback then
|
|
table.insert(
|
|
vc,
|
|
"---"
|
|
)
|
|
table.insert(
|
|
vc,
|
|
{
|
|
_("Delete feed"),
|
|
"",
|
|
callback = function()
|
|
delete_feed_callback(
|
|
id
|
|
)
|
|
end
|
|
}
|
|
)
|
|
end
|
|
|
|
return vc
|
|
end
|
|
|
|
--
|
|
-- KeyValuePage doesn't like to get a table with sub tables.
|
|
-- This function flattens an array, moving all nested tables
|
|
-- up the food chain, so to speak
|
|
--
|
|
function FeedView:flattenArray(base_array, source_array)
|
|
for key, value in pairs(source_array) do
|
|
if value[2] == nil then
|
|
-- If the value is empty, then it's probably supposed to be a line
|
|
table.insert(
|
|
base_array,
|
|
"---"
|
|
)
|
|
else
|
|
if value["callback"] then
|
|
table.insert(
|
|
base_array,
|
|
{
|
|
value[1], value[2], callback = value["callback"]
|
|
}
|
|
)
|
|
else
|
|
table.insert(
|
|
base_array,
|
|
{
|
|
value[1], value[2]
|
|
}
|
|
)
|
|
end
|
|
end
|
|
end
|
|
return base_array
|
|
end
|
|
|
|
|
|
return FeedView
|