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

More sorting orders in file manager (#2535)

Browse Source
This commit is contained in:
Hzj_jie
2017-02-11 18:55:31 -08:00
committed by Qingping Hou
parent faaca028e7
commit 726b15ad01
3 changed files with 87 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/apps/filemanager/filemanager.lua
View File

@@ -475,8 +475,12 @@ end
function FileManager:getSortingMenuTable()
local fm = self
local collates = {
strcoll = {_("by title"), _("Sort by title")},
access = {_("by date"), _("Sort by date")},
strcoll = {_("title"), _("Sort by title")},
access = {_("date read"), _("Sort by date of last read")},
change = {_("date added"), _("Sort by date of adding")},
modification = {_("date modified"), _("Sort by date of modification")},
size = {_("size"), _("Sort by size")},
type = {_("type"), _("Sort by type")},
}
local set_collate_table = function(collate)
return {
@@ -490,13 +494,17 @@ function FileManager:getSortingMenuTable()
return {
text_func = function()
return util.template(
_("Sort order: %1"),
_("Sort by %1"),
collates[fm.file_chooser.collate][1]
)
end,
sub_item_table = {
set_collate_table("strcoll"),
set_collate_table("access"),
set_collate_table("change"),
set_collate_table("modification"),
set_collate_table("size"),
set_collate_table("type"),
}
}
end

88
frontend/ui/widget/filechooser.lua
View File

@@ -7,6 +7,7 @@ local DocSettings = require("docsettings")
local util = require("ffi/util")
local _ = require("gettext")
local ffi = require("ffi")
local getFileNameSuffix = require("util").getFileNameSuffix
ffi.cdef[[
int strcoll (const char *str1, const char *str2);
]]
@@ -16,13 +17,16 @@ local function strcoll(str1, str2)
return ffi.C.strcoll(str1, str2) < 0
end
local function kobostrcoll(str1, str2)
return str1 < str2
end
local FileChooser = Menu:extend{
no_title = true,
path = lfs.currentdir(),
parent = nil,
show_hidden = nil,
exclude_dirs = {"%.sdr$"},
strcoll = strcoll,
collate = "strcoll", -- or collate = "access",
reverse_collate = false,
path_items = {}, -- store last browsed location(item index) for each path
@@ -48,11 +52,17 @@ function FileChooser:init()
if attributes ~= nil then
if attributes.mode == "directory" and f ~= "." and f~=".." then
if self.dir_filter(filename) then
table.insert(dirs, {name = f, attr = attributes})
table.insert(dirs, {name = f,
suffix = getFileNameSuffix(f),
fullpath = filename,
attr = attributes})
end
elseif attributes.mode == "file" then
if self.file_filter == nil or self.file_filter(filename) then
table.insert(files, {name = f, attr = attributes})
table.insert(files, {name = f,
suffix = getFileNameSuffix(f),
fullpath = filename,
attr = attributes})
end
end
end
@@ -61,9 +71,23 @@ function FileChooser:init()
end
end
local strcoll_func = strcoll
-- circumvent string collating in Kobo devices. See issue koreader/koreader#686
if Device:isKobo() then
self.strcoll = function(a, b) return a < b end
strcoll_func = kobostrcoll
end
self.strcoll = function(a, b)
if a == nil and b == nil then
return false
elseif a == nil then
return true
elseif b == nil then
return false
elseif DALPHA_SORT_CASE_INSENSITIVE then
return strcoll_func(string.lower(a), string.lower(b))
else
return strcoll_func(a, b)
end
end
self.item_table = self:genItemTableFromPath(self.path)
Menu.init(self) -- call parent's init()
@@ -75,26 +99,56 @@ function FileChooser:genItemTableFromPath(path)
self.list(path, dirs, files)
local sorting = nil
local reverse = self.reverse_collate
local sorting
if self.collate == "strcoll" then
if DALPHA_SORT_CASE_INSENSITIVE then
sorting = function(a, b)
return self.strcoll(string.lower(a.name), string.lower(b.name)) == not reverse
end
else
sorting = function(a, b)
return self.strcoll(a.name, b.name) == not reverse
end
sorting = function(a, b)
return self.strcoll(a.name, b.name)
end
elseif self.collate == "access" then
sorting = function(a, b)
if reverse then
return a.attr.access < b.attr.access
if DocSettings:hasSidecarFile(a.fullpath) and not DocSettings:hasSidecarFile(b.fullpath) then
return true
end
if not DocSettings:hasSidecarFile(a.fullpath) and DocSettings:hasSidecarFile(b.fullpath) then
return false
end
return a.attr.access > b.attr.access
end
elseif self.collate == "modification" then
sorting = function(a, b)
return a.attr.modification > b.attr.modification
end
elseif self.collate == "change" then
sorting = function(a, b)
if DocSettings:hasSidecarFile(a.fullpath) and not DocSettings:hasSidecarFile(b.fullpath) then
return false
end
if not DocSettings:hasSidecarFile(a.fullpath) and DocSettings:hasSidecarFile(b.fullpath) then
return true
end
return a.attr.change > b.attr.change
end
elseif self.collate == "size" then
sorting = function(a, b)
return a.attr.size < b.attr.size
end
elseif self.collate == "type" then
sorting = function(a, b)
if a.suffix == nil and b.suffix == nil then
return self.strcoll(a.name, b.name)
else
return a.attr.access > b.attr.access
return self.strcoll(a.suffix, b.suffix)
end
end
else
sorting = function(a, b)
return a.name < b.name
end
end
if self.reverse_collate then
local sorting_unreversed = sorting
sorting = function(a, b) return sorting_unreversed(b, a) end
end
table.sort(dirs, sorting)

5
frontend/util.lua
View File

@@ -266,6 +266,11 @@ function util.splitFileNameSuffix(file)
return string.gsub(file, "(.*)%.(.*)", "%1"), string.gsub(file, ".*%.", "")
end
function util.getFileNameSuffix(file)
local _, suffix = util.splitFileNameSuffix(file)
return suffix
end
function util.getMenuText(item)
local text
if item.text_func then