fix: ui cleanup again and changed updater again (Sudashiii#54)

Author: Sudashiii

koreaderPlugins/sake.koplugin/_meta.lua

@@ -4,5 +4,5 @@ return {
     fullname = _("Sake"),
     description = _([[Svelte and Koreader Ecosystem - Syncs your books and progress.]]),
     author = "Sascha Lorenz",
-    version = "0.9.2",
+    version = "0.9.5",
 }

koreaderPlugins/sake.koplugin/main.lua

@@ -54,6 +54,52 @@ local function loadUpdaterModule()
     return true, mod_or_err, sake_dir, plugins_root
 end
 
+local function readUpdaterVersion(plugins_root)
+    if not plugins_root then
+        return nil, "Cannot determine plugins root"
+    end
+
+    local meta_path = plugins_root .. "/sakeUpdater.koplugin/_meta.lua"
+    local ok, meta_or_err = pcall(dofile, meta_path)
+    if not ok or type(meta_or_err) ~= "table" then
+        return nil, "Failed to read Sake Updater _meta.lua"
+    end
+    if not meta_or_err.version then
+        return nil, "Sake Updater _meta.lua has no version"
+    end
+
+    return tostring(meta_or_err.version)
+end
+
+local function parseVersion(version)
+    local parts = {}
+    for n in tostring(version or ""):gmatch("(%d+)") do
+        table.insert(parts, tonumber(n))
+    end
+    if #parts == 0 then
+        return nil
+    end
+    return parts
+end
+
+local function isVersionAtLeast(version, minimum)
+    local a = parseVersion(version)
+    local b = parseVersion(minimum)
+    if not a or not b then
+        return false
+    end
+
+    local max_len = math.max(#a, #b)
+    for i = 1, max_len do
+        local av = a[i] or 0
+        local bv = b[i] or 0
+        if av > bv then return true end
+        if av < bv then return false end
+    end
+
+    return true
+end
+
 function Sake:startDeferredProgressWatcher()
     if self.progress_watcher_active then
         return
@@ -374,47 +420,50 @@ function Sake:openPluginVersionPicker()
         return
     end
 
-    UIManager:show(InfoMessage:new{
-        text = _("Loading plugin versions..."),
-        timeout = 1
-    })
-
-    UIManager:scheduleIn(0.1, function()
-        local ok, result_or_err = self.updater:listReleases()
-        if not ok then
-            logger.warn("[Sake] Plugin release list failed: " .. tostring(result_or_err))
-            UIManager:show(InfoMessage:new{
-                text = _("Could not load plugin versions: ") .. tostring(result_or_err),
-                timeout = 6
-            })
-            return
-        end
+    local updater_version, updater_version_err = readUpdaterVersion(self.plugins_root)
+    if not updater_version or not isVersionAtLeast(updater_version, "1.1.0") then
+        logger.warn("[Sake] Specific version install blocked. Updater version: " .. tostring(updater_version or updater_version_err))
+        UIManager:show(InfoMessage:new{
+            text = _("Install Specific Plugin Version requires Sake Updater 1.1.0 or newer."),
+            timeout = 6
+        })
+        return
+    end
 
-        local result = result_or_err
-        if not result.releases or #result.releases == 0 then
-            UIManager:show(InfoMessage:new{
-                text = _("No plugin versions available."),
-                timeout = 4
-            })
-            return
-        end
+    local ok, result_or_err = self.updater:listReleases()
+    if not ok then
+        logger.warn("[Sake] Plugin release list failed: " .. tostring(result_or_err))
+        UIManager:show(InfoMessage:new{
+            text = _("Could not load plugin versions: ") .. tostring(result_or_err),
+            timeout = 6
+        })
+        return
+    end
 
-        Dialogs.showPluginVersionPicker(self.ctx, {
-            current_version = result.current_version,
-            releases = result.releases,
-            on_select = function(release)
-                if release and tostring(release.version or "") == tostring(result.current_version or "") then
-                    UIManager:show(InfoMessage:new{
-                        text = _("That plugin version is already installed."),
-                        timeout = 4
-                    })
-                    return
-                end
-
-                self:performPluginUpdateWithRelease(release)
-            end,
+    local result = result_or_err
+    if not result.releases or #result.releases == 0 then
+        UIManager:show(InfoMessage:new{
+            text = _("No plugin versions available."),
+            timeout = 4
         })
-    end)
+        return
+    end
+
+    Dialogs.showPluginVersionPicker(self.ctx, {
+        current_version = result.current_version,
+        releases = result.releases,
+        on_select = function(release)
+            if release and tostring(release.version or "") == tostring(result.current_version or "") then
+                UIManager:show(InfoMessage:new{
+                    text = _("That plugin version is already installed."),
+                    timeout = 4
+                })
+                return
+            end
+
+            self:performPluginUpdateWithRelease(release)
+        end,
+    })
 end
 
 function Sake:onDispatcherRegisterActions()
@@ -443,6 +492,7 @@ function Sake:init()
     self.bg_error_messages = {}
     self.progress_watcher_active = false
     self.updater = nil
+    self.plugins_root = nil
     local device_name = tostring(self.settings.device_name or "Not Set")
     local api_url = (self.settings.api_url ~= "" and self.settings.api_url or "Not Set")
     logger.info("[Sake] Initialized. Device: " .. device_name .. " | URL: " .. api_url)
@@ -464,6 +514,7 @@ function Sake:init()
             sake_plugin_dir = sake_plugin_dir,
             plugins_root = plugins_root,
         })
+        self.plugins_root = plugins_root
         logger.info("[Sake] Updater module loaded.")
     else
         logger.warn("[Sake] Updater module not loaded: " .. tostring(updater_mod_or_err))

koreaderPlugins/sake.koplugin/ui/dialogs.lua

@@ -9,7 +9,6 @@ local _ = require("gettext")
 local Settings = require("core/settings")
 
 local Dialogs = {}
-local RELEASES_PER_PAGE = 6
 
 local function trim(value)
     return tostring(value or ""):gsub("^%s+", ""):gsub("%s+$", "")
@@ -137,85 +136,41 @@ local function buildReleaseLabel(release)
 end
 
 function Dialogs.showPluginVersionPicker(ctx, opts)
-    local releases = opts.releases or {}
-    local total_pages = math.max(1, math.ceil(#releases / RELEASES_PER_PAGE))
-
-    local function showPage(page_number)
-        local dialog
-        local buttons = {}
-        local start_index = ((page_number - 1) * RELEASES_PER_PAGE) + 1
-        local end_index = math.min(#releases, page_number * RELEASES_PER_PAGE)
-
-        for index = start_index, end_index do
-            local release = releases[index]
-            table.insert(buttons, {
-                {
-                    text = buildReleaseLabel(release),
-                    enabled = release.is_current ~= true,
-                    callback = function()
-                        UIManager:close(dialog)
-                        if opts.on_select then
-                            opts.on_select(release)
-                        end
-                    end,
-                },
-            })
-        end
-
-        if total_pages > 1 then
-            table.insert(buttons, {
-                {
-                    text = _("Previous"),
-                    enabled = page_number > 1,
-                    callback = function()
-                        UIManager:close(dialog)
-                        showPage(page_number - 1)
-                    end,
-                },
-                {
-                    text = _("Next"),
-                    enabled = page_number < total_pages,
-                    callback = function()
-                        UIManager:close(dialog)
-                        showPage(page_number + 1)
-                    end,
-                },
-            })
-        end
+    local dialog
+    local buttons = {}
 
+    for _, release in ipairs(opts.releases or {}) do
+        local selected_release = release
         table.insert(buttons, {
             {
-                text = _("Close"),
+                text = buildReleaseLabel(selected_release),
+                enabled = selected_release.is_current ~= true,
                 callback = function()
                     UIManager:close(dialog)
+                    if opts.on_select then
+                        opts.on_select(selected_release)
+                    end
                 end,
             },
         })
-
-        local title = _("Select a Sake plugin version to install.")
-            .. "\n"
-            .. _("Installed: ")
-            .. tostring(opts.current_version or "?")
-
-        if total_pages > 1 then
-            title = title
-                .. "\n"
-                .. _("Page ")
-                .. tostring(page_number)
-                .. "/"
-                .. tostring(total_pages)
-        end
-
-        dialog = ButtonDialog:new{
-            title = title,
-            buttons = buttons,
-            shrink_unneeded_width = true,
-        }
-
-        UIManager:show(dialog)
     end
 
-    showPage(1)
+    table.insert(buttons, {
+        {
+            text = _("Close"),
+            callback = function()
+                UIManager:close(dialog)
+            end,
+        },
+    })
+
+    dialog = ButtonDialog:new{
+        title = (_("Select a Sake plugin version to install.") .. "\n" .. _("Installed: ") .. tostring(opts.current_version or "?")),
+        buttons = buttons,
+        rows_per_page = { 7, 6, 5, 4 },
+    }
+
+    UIManager:show(dialog)
 end
 
 return Dialogs

koreaderPlugins/sakeUpdater.koplugin/_meta.lua

@@ -5,5 +5,5 @@ return {
     fullname = _("Sake Updater"),
     description = _([[Provides update checks and installer support for Sake plugin.]]),
     author = "Sascha Lorenz",
-    version = "1.0",
+    version = "1.1.0",
 }