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

[Coverimage, plugin] Clean up, typo (#8565)

Browse Source 
SizeSpinner: "Set" is disabled if the value has not changed, so no need to check this in the callback function.

Corrected typo.

Optimized code.
This commit is contained in:
zwim
2021-12-25 11:29:57 +01:00
committed by GitHub
parent 3cf3c97e87
commit befc0d9c83
1 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
plugins/coverimage.koplugin/main.lua
View File

@@ -231,7 +231,6 @@ function CoverImage:emptyCache()
end
function CoverImage:getCacheFiles(cache_path, cache_prefix)
local cache_count = 0
local cache_size = 0
local files = {}
for entry in lfs.dir(self.cover_image_cache_path) do
@@ -239,19 +238,20 @@ function CoverImage:getCacheFiles(cache_path, cache_prefix)
local file = cache_path .. entry
if entry:sub(1, self.cover_image_cache_prefix:len()) == cache_prefix
and lfs.attributes(file, "mode") == "file" then
cache_count = cache_count + 1
local blocksize = lfs.attributes(file).blksize or 4096
files[cache_count] = {
local size = math.floor(((lfs.attributes(file).size) + blocksize - 1) / blocksize) * blocksize
table.insert(files, {
name = file,
size = math.floor(((lfs.attributes(file).size) + blocksize - 1)/ blocksize) * blocksize,
size = size,
mod = lfs.attributes(file).modification,
}
cache_size = cache_size + files[cache_count].size
})
cache_size = cache_size + size
end
end
end
logger.dbg("CoverImage: start - cache size: ".. cache_size .. " Bytes, cached files: " .. cache_count)
return cache_count, cache_size, files
logger.dbg("CoverImage: start - cache size: ".. util.getFriendlySize(cache_size) ..
", cached files: " .. #files)
return #files, cache_size, files
end
function CoverImage:cleanCache()
@@ -273,7 +273,8 @@ function CoverImage:cleanCache()
cache_size = cache_size - files[index].size
index = index + 1
end
logger.dbg("CoverImage: clean - cache size: ".. cache_size .. " Bytes, cached files: " .. cache_count)
logger.dbg("CoverImage: clean - cache size: ".. util.getFriendlySize(cache_size) ..
", cached files: " .. cache_count)
end
function CoverImage:isCacheEnabled(path)
@@ -399,21 +400,18 @@ Update a specific G_reader_setting's value via a Spinner
]]
function CoverImage:sizeSpinner(touchmenu_instance, setting, title, min, max, default, callback)
local SpinWidget = require("ui/widget/spinwidget")
local old_val = self[setting]
UIManager:show(SpinWidget:new{
value = old_val,
value = self[setting],
value_min = min,
value_max = max,
default_value = default,
title_text = title,
ok_text = _("Set"),
callback = function(spin)
if spin.value ~= old_val then
self[setting] = spin.value
G_reader_settings:saveSetting(setting, self[setting])
if callback then
callback(self)
end
self[setting] = spin.value
G_reader_settings:saveSetting(setting, self[setting])
if callback then
callback(self)
end
if touchmenu_instance then touchmenu_instance:updateItems() end
end
@@ -622,13 +620,13 @@ function CoverImage:menuEntrySBF()
end,
keep_menu_open = true,
help_text_func = function()
return T(_("If the image and the screen have a similar aspect ratio (±%1%), stretch the image instead of keeping its aspect ratio."), self.cover_image_stretch_limit )
return T(_("If the image and the screen have a similar aspect ratio (±%1%), stretch the image instead of keeping its aspect ratio."), self.cover_image_stretch_limit)
end,
callback = function(touchmenu_instance)
local function createCover()
self:createCoverImage(self.ui.doc_settings)
end
self:sizeSpinner(touchmenu_instance, "cover_image_stretch_limit", _("Set strech threshold"), 0, 20, 8, createCover)
self:sizeSpinner(touchmenu_instance, "cover_image_stretch_limit", _("Set stretch threshold"), 0, 20, 8, createCover)
end,
},
self:menuEntryBackground("black", _("black")),