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

util: Simplify splitFile* util functions

Browse Source 
* Use a single match call instead of two gsubs
This commit is contained in:
NiLuJe
2020-12-10 20:51:21 +01:00
parent d80d6dc562
commit c1496e943b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/util.lua
View File

@@ -810,11 +810,11 @@ end
--- If the given path has a trailing /, returns the entire path as the directory
--- path and "" as the file name.
---- @string file
---- @treturn string path, filename
---- @treturn string directory, filename
function util.splitFilePathName(file)
if file == nil or file == "" then return "", "" end
if string.find(file, "/") == nil then return "", file end
return string.gsub(file, "(.*/)(.*)", "%1"), string.gsub(file, ".*/", "")
return file:match'(.*/)(.*)'
end
--- Splits a file name into its pure file name and suffix
@@ -823,7 +823,7 @@ end
function util.splitFileNameSuffix(file)
if file == nil or file == "" then return "", "" end
if string.find(file, "%.") == nil then return file, "" end
return string.gsub(file, "(.*)%.(.*)", "%1"), string.gsub(file, ".*%.", "")
return file:match'(.*)%.(.*)'
end
--- Gets file extension
@@ -835,7 +835,7 @@ function util.getFileNameSuffix(file)
end
--- Companion helper function that returns the script's language,
--- based on the filme extension.
--- based on the file extension.
---- @string filename
---- @treturn string (lowercase) (or nil if not Device:canExecuteScript(file))
function util.getScriptType(file)