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

No need to initialize oldname = self:FullFileName() twice when renaming a file --- one initialization is enough.

Browse Source 
(and, while at it, replaced references to a non-existent word "extention" with the proper English "extension")
This commit is contained in:
Tigran Aivazian
2012-09-10 18:17:50 +01:00
parent bfc369062e
commit 253a0829ff
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crereader.lua
View File

@@ -45,7 +45,7 @@ function CREReader:ZipContentExt(fname)
if i == 4 then s = lines break else i = i + 1 end
end
end
if s then -- return the extention
if s then -- return the extension
return string.lower(string.match(s, ".+%.([^.]+)") or "")
else
return nil

2
extentions.lua
View File

@@ -1,4 +1,4 @@
-- List of acceptable extentions
-- List of acceptable extensions
ext = {
djvuRead = ";djvu;",

17
filechooser.lua
View File

@@ -35,8 +35,8 @@ FileChooser = {
-- for users with various purposes & skills
filemanager_expert_mode, -- default value is defined in reader.lua
-- the definitions
BEGINNERS_MODE = 1, -- the filemanager content is restricted by files with reader-related extentions; safe renaming (no extention)
ADVANCED_MODE = 2, -- no extention-based filtering; renaming with extentions; appreciable danger to crash crengine by improper docs
BEGINNERS_MODE = 1, -- the filemanager content is restricted by files with reader-related extensions; safe renaming (no extension)
ADVANCED_MODE = 2, -- no extension-based filtering; renaming with extensions; appreciable danger to crash crengine by improper docs
ROOT_MODE = 3, -- TODO: all functions (including non-stable and dangerous)
}
@@ -394,16 +394,15 @@ function FileChooser:addAllCommands()
self.pagedirty = true
end -- function
)
-- make renaming flexible: it either keeps old extention (BEGINNERS_MODE) or
-- allows to rename the whole filename including the extention
-- make renaming flexible: it either keeps old extension (BEGINNERS_MODE) or
-- allows to rename the whole filename including the extension
self.commands:add(KEY_R, MOD_SHIFT, "R",
"rename file",
function(self)
local oldname = self:FullFileName()
if oldname then
-- NuPogodi, 04.09.2012: safe mode (keep old extentions)
-- NuPogodi, 04.09.2012: safe mode (keep old extensions)
-- Tigran, 18/08/12: corrected the rename operation to include extension.)
local oldname = self:FullFileName()
local name_we = self.files[self.perpage*(self.page-1)+self.current-#self.dirs]
local ext = ""
if self.filemanager_expert_mode <= self.BEGINNERS_MODE then
@@ -592,11 +591,11 @@ function FileChooser:changeFileChooserMode()
--[[ TODO: to allow multiline-rendering for info messages & to include detailed description of the selected mode
local msg = "Press 'Y' to accept new mode..."
if m==self.BEGINNERS_MODE then
msg = "You have selected safe mode for beginners: the filemanager shows only files with the reader-related extentions (*.pdf, *.djvu, etc.); "..
"safe renaming (no extentions); unstable or dangerous functions are NOT included. "..msg
msg = "You have selected safe mode for beginners: the filemanager shows only files with the reader-related extensions (*.pdf, *.djvu, etc.); "..
"safe renaming (no extensions); unstable or dangerous functions are NOT included. "..msg
elseif m==self.ADVANCED_MODE then
msg = "You have selected advanced mode for experienced users: the filemanager shows all files; "..
"you may rename not only their names, but also the extentions; the files with unknown extentions would be sent to CREReader "..
"you may rename not only their names, but also the extensions; the files with unknown extensions would be sent to CREReader "..
"and could crash the reader. Please, use it in your own risk. "..msg
else -- ROOT_MODE
msg = "You have selected the most advanced and dangerous mode. I hope You know what you are doing. God bless You. "..msg