fix: normalize require path to reuse import result

frontend/apps/cloudstorage/cloudstorage.lua

@@ -2,15 +2,15 @@ local ButtonDialog = require("ui/widget/buttondialog")
 local ButtonDialogTitle = require("ui/widget/buttondialogtitle")
 local ConfirmBox = require("ui/widget/confirmbox")
 local DataStorage = require("datastorage")
-local DropBox = require("frontend/apps/cloudstorage/dropbox")
+local DropBox = require("apps/cloudstorage/dropbox")
 local InfoMessage = require("ui/widget/infomessage")
-local Ftp = require("frontend/apps/cloudstorage/ftp")
+local Ftp = require("apps/cloudstorage/ftp")
 local Menu = require("ui/widget/menu")
 local LuaSettings = require("luasettings")
 local Screen = require("device").screen
 local UIManager = require("ui/uimanager")
-local _ = require("gettext")
 local lfs = require("libs/libkoreader-lfs")
+local _ = require("gettext")
 
 local CloudStorage = Menu:extend{
     cloud_servers = {

frontend/apps/cloudstorage/dropbox.lua

@@ -1,15 +1,14 @@
-local DropBoxApi = require("frontend/apps/cloudstorage/dropboxapi")
+local DropBoxApi = require("apps/cloudstorage/dropboxapi")
 local ConfirmBox = require("ui/widget/confirmbox")
 local InfoMessage = require("ui/widget/infomessage")
 local MultiInputDialog = require("ui/widget/multiinputdialog")
 local UIManager = require("ui/uimanager")
-local _ = require("gettext")
-local T = require("ffi/util").template
 local ReaderUI = require("apps/reader/readerui")
 local Screen = require("device").screen
+local T = require("ffi/util").template
+local _ = require("gettext")
 
-local DropBox = {
+local DropBox = {}
-}
 
 function DropBox:run(url, password)
     return DropBoxApi:listFolder(url, password)

frontend/apps/filemanager/filemanagermenu.lua

@@ -282,7 +282,7 @@ function FileManagerMenu:setUpdateItemTable()
 
     local order = require("ui/elements/filemanager_menu_order")
 
-    local MenuSorter = require("frontend/ui/menusorter")
+    local MenuSorter = require("ui/menusorter")
     self.tab_item_table = MenuSorter:mergeAndSort("filemanager", self.menu_items, order)
 end
 

frontend/apps/reader/modules/readergoto.lua

@@ -2,8 +2,8 @@ local InputContainer = require("ui/widget/container/inputcontainer")
 local InputDialog = require("ui/widget/inputdialog")
 local UIManager = require("ui/uimanager")
 local Event = require("ui/event")
+local SkimToWidget = require("apps/reader/skimtowidget")
 local _ = require("gettext")
-local SkimToWidget = require("frontend/apps/reader/skimtowidget")
 
 local ReaderGoto = InputContainer:new{
     goto_menu_title = _("Go to"),

frontend/apps/reader/modules/readermenu.lua

@@ -178,9 +178,9 @@ function ReaderMenu:setUpdateItemTable()
         end,
     }
 
-    local order = require("frontend/ui/elements/reader_menu_order")
+    local order = require("ui/elements/reader_menu_order")
 
-    local MenuSorter = require("frontend/ui/menusorter")
+    local MenuSorter = require("ui/menusorter")
     self.tab_item_table = MenuSorter:mergeAndSort("reader", self.menu_items, order)
 end
 

frontend/ui/widget/opdsbrowser.lua

@@ -492,14 +492,13 @@ end
 function OPDSBrowser:downloadFile(item, format, remote_url)
     -- download to user selected directory or last opened dir
     local download_dir = self.getCurrentDownloadDir()
-    local utl = require("frontend/util")
+    local file_system = util.getFilesystemType(download_dir)
-    local file_system = utl.getFilesystemType(download_dir)
     if file_system == "vfat" or file_system == "fuse.fsp" then
-        item.author = utl.replaceInvalidChars(item.author)
+        item.author = util.replaceInvalidChars(item.author)
-        item.title = utl.replaceInvalidChars(item.title)
+        item.title = util.replaceInvalidChars(item.title)
     else
-        item.author = utl.replaceSlashChar(item.author)
+        item.author = util.replaceSlashChar(item.author)
-        item.title = utl.replaceSlashChar(item.title)
+        item.title = util.replaceSlashChar(item.title)
     end
     local local_path = download_dir .. "/" .. item.author .. ' - ' .. item.title .. "." .. string.lower(format)
     logger.dbg("downloading file", local_path, "from", remote_url)