fix(kosync): add namespace to koreader plugin modules to avoid collision (#4153)

apps/readest.koplugin/_meta.lua

@@ -1,4 +1,4 @@
-local _ = require("i18n")
+local _ = require("readest_i18n")
 return {
     name = "readest",
     fullname = _("Readest"),

apps/readest.koplugin/library/libraryviewmenu.lua

@@ -9,7 +9,7 @@
 local ButtonDialog = require("ui/widget/buttondialog")
 local PathChooser  = require("ui/widget/pathchooser")
 local UIManager    = require("ui/uimanager")
-local _            = require("i18n")
+local _            = require("readest_i18n")
 
 local M = {}
 

apps/readest.koplugin/library/librarywidget.lua

@@ -18,7 +18,7 @@ local TitleBar     = require("ui/widget/titlebar")
 local Trapper      = require("ui/trapper")
 local UIManager    = require("ui/uimanager")
 local logger       = require("logger")
-local _            = require("i18n")
+local _            = require("readest_i18n")
 
 local LibraryStore   = require("library.librarystore")
 local libraryitem    = require("library.libraryitem")

apps/readest.koplugin/main.lua

@@ -7,12 +7,12 @@ local UIManager = require("ui/uimanager")
 local logger = require("logger")
 local sha2 = require("ffi/sha2")
 local T = require("ffi/util").template
-local _ = require("i18n")
+local _ = require("readest_i18n")
 
-local SyncAuth = require("syncauth")
-local SyncConfig = require("syncconfig")
-local SyncAnnotations = require("syncannotations")
-local SelfUpdate = require("selfupdate")
+local SyncAuth = require("readest_syncauth")
+local SyncConfig = require("readest_syncconfig")
+local SyncAnnotations = require("readest_syncannotations")
+local SelfUpdate = require("readest_selfupdate")
 
 local ReadestSync = WidgetContainer:new{
     name = "readest",

apps/readest.koplugin/readest_selfupdate.lua

@@ -4,7 +4,7 @@ local NetworkMgr = require("ui/network/manager")
 local UIManager = require("ui/uimanager")
 local logger = require("logger")
 local T = require("ffi/util").template
-local _ = require("i18n")
+local _ = require("readest_i18n")
 
 local SelfUpdate = {}
 

apps/readest.koplugin/readest_syncannotations.lua

@@ -5,7 +5,7 @@ local UIManager = require("ui/uimanager")
 local logger = require("logger")
 local sha2 = require("ffi/sha2")
 local T = require("ffi/util").template
-local _ = require("i18n")
+local _ = require("readest_i18n")
 
 local SyncAnnotations = {}
 

apps/readest.koplugin/readest_syncauth.lua

@@ -6,7 +6,7 @@ local UIManager = require("ui/uimanager")
 local logger = require("logger")
 local util = require("util")
 local T = require("ffi/util").template
-local _ = require("i18n")
+local _ = require("readest_i18n")
 
 local SyncAuth = {}
 
@@ -76,7 +76,7 @@ function SyncAuth:getSupabaseAuthClient(settings, path)
         return nil
     end
 
-    local SupabaseAuthClient = require("supabaseauth")
+    local SupabaseAuthClient = require("readest_supabaseauth")
     return SupabaseAuthClient:new{
         service_spec = path .. "/supabase-auth-api.json",
         custom_url = settings.supabase_url .. "/auth/v1/",
@@ -89,7 +89,7 @@ function SyncAuth:getReadestSyncClient(settings, path)
         return nil
     end
 
-    local ReadestSyncClient = require("readestsync")
+    local ReadestSyncClient = require("readest_syncclient")
     return ReadestSyncClient:new{
         service_spec = path .. "/readest-sync-api.json",
         access_token = settings.access_token,

apps/readest.koplugin/readest_syncconfig.lua

@@ -4,7 +4,7 @@ local UIManager = require("ui/uimanager")
 local logger = require("logger")
 local util = require("util")
 local sha2 = require("ffi/sha2")
-local _ = require("i18n")
+local _ = require("readest_i18n")
 
 local SyncConfig = {}