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

[plugin] Fix wallabag's "Prefer original non-HTML document" setting (#13333)
Some checks are pending
macos / macOS 13 x86-64 🔨15.2 🎯10.15 (push) Waiting to run
Details
macos / macOS 14 ARM64 🔨15.4 🎯11.0 (push) Waiting to run
Details

Browse Source 
Fixes #13279.
This commit is contained in:
hrm
2025-03-10 09:50:31 +01:00
committed by GitHub
parent 5cf57dce22
commit cf1fb70c38
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
plugins/wallabag.koplugin/main.lua
View File

@@ -102,7 +102,7 @@ function Wallabag:init()
self.remove_read_from_history = self.wb_settings.data.wallabag.remove_read_from_history or false
self.remove_abandoned_from_history = self.wb_settings.data.wallabag.remove_abandoned_from_history or false
self.download_original_document = self.wb_settings.data.wallabag.download_original_document or false
self.offline_queue = self.wb_settings.data.wallabag.offline_queue or {}
self.offline_queue = self.wb_settings.data.wallabag.offline_queue or {}
self.use_local_archive = self.wb_settings.data.wallabag.use_local_archive or false
-- archive_directory only has a default if directory is set
@@ -667,22 +667,32 @@ function Wallabag:downloadArticle(article)
-- The mimetype is actually an HTTP Content-Type, so it can include a semicolon with stuff after it.
-- Just in case we also trim it, though that shouldn't be necessary.
-- A function represents `null` in our JSON.decode, because `nil` would just disappear.
-- We can simplify that to not a string.
local mimetype = type(article.mimetype) == string and util.trim(article.mimetype:match("^[^;]*")) or nil
-- We can simplify that to 'not a string'.
local mimetype = type(article.mimetype) == "string" and util.trim(article.mimetype:match("^[^;]*")) or nil
-- If the article links to a supported file type, we will download it directly.
-- All webpages are HTML. Ignore them since we want the Wallabag EPUB instead!
if self.download_original_document then
if mimetype ~= "text/html" and DocumentRegistry:hasProvider(nil, mimetype) then
if mimetype == "text/html" then
logger.dbg("Wallabag:downloadArticle: not ignoring EPUB, because", article.url, "is HTML")
elseif mimetype == nil then -- base ourselves on the file extension
if util.getFileNameSuffix(article.url):lower():find("^html?$") then
logger.dbg("Wallabag:downloadArticle: not ignoring EPUB, because", article.url, "appears to be HTML")
elseif DocumentRegistry:hasProvider(article.url) then
logger.dbg("Wallabag:downloadArticle: ignoring EPUB in favor of original", article.url)
file_ext = "." .. util.getFileNameSuffix(article.url)
item_url = article.url
-- If an article does not have a title in its metadata (e.g. txt files),
-- its filename (including extension) is used instead. This would cause it to be
-- saved with a duplicate extension. So we remove the extension from the title
title = util.trim(title:gsub("%" .. file_ext .. "$", ""))
else
logger.dbg("Wallabag:downloadArticle: not ignoring EPUB, because there is no provider for", article.url)
end
elseif DocumentRegistry:hasProvider(nil, mimetype) then
logger.dbg("Wallabag:downloadArticle: ignoring EPUB in favor of mimetype", mimetype)
file_ext = "."..DocumentRegistry:mimeToExt(article.mimetype)
item_url = article.url
elseif mimetype == nil and DocumentRegistry:hasProvider(article.url) then
logger.dbg("Wallabag:downloadArticle: ignoring EPUB in favor of original", article.url)
file_ext = "."..util.getFileNameSuffix(article.url)
file_ext = "." .. DocumentRegistry:mimeToExt(article.mimetype)
item_url = article.url
else
logger.dbg("Wallabag:downloadArticle: not ignoring EPUB, because", article.url, "is HTML")
logger.dbg("Wallabag:downloadArticle: not ignoring EPUB, because there is no provider for", mimetype)
end
end