rewritten auto update module

easy-cruise.lua

@@ -1,15 +1,14 @@
 script_name("easy-cruise")
 script_author("rubin")
-script_version("22.10.26.1")
+script_version("23.10.26.1")
 
+inicfg              = require "inicfg"
+dlstatus            = require("moonloader").download_status
+vkeys               = require "vkeys"
 encoding            = require "encoding"
 encoding.default    = "CP1251"
 u8                  = encoding.UTF8
 
-dlstatus = require("moonloader").download_status
-
-vkeys = require("vkeys")
-
 main_key_start =        { "VK_LSHIFT" }
 additional_key_start =  { "VK_W", "VK_S", "VK_SPACE" }
 cruise =                false
@@ -17,8 +16,7 @@ cruise = false
 function main()
     repeat wait(0) until isSampAvailable()
 
-    lua_thread.create(update_check) -->> Удалить чтобы скрипт не проверял обновления
+    lua_thread.create(script_update.main) -->> Удалить чтобы скрипт не проверял обновления
-
     while true do
         wait(0)
         doCruise()
@@ -66,77 +64,72 @@ function check_press_key(table)
     return result, result_key_text
 end
 
-function download(url, fpath)
+script_update = {
-    local final_download = false
+    check_update = false,
-    downloadUrlToFile(url, fpath, function(id, status, p1, p2)
+    check_update_url = "https://git.deadpoo.net/rubin/easy-cruise/raw/branch/master/version",
-        if status == dlstatus.STATUS_ENDDOWNLOADDATA then
+    auto_update = false,
-            final_download = true
+    auto_update_url = "https://git.deadpoo.net/rubin/easy-cruise/raw/branch/master/easy-cruise.lua",
-        end
+    address_ini = "rubin-scripts-updates.ini",
-    end)
+    main = function()
-
+        local name = thisScript().name
-    repeat 
+        local ini = inicfg.load({
-        wait(1000) 
+            [name] = {
-    until final_download
+                check_update = true,
-end
+                auto_update = true
-
+            }
-function read(fpath)
+        }, script_update.address_ini)
-    local text = ""
+        script_update.check_update = ini[name].check_update
-    local f = io.open(fpath, "r")
+        script_update.auto_update = ini[name].auto_update
-    if f then
+        inicfg.save(ini, script_update.address_ini)
-        text = f:read("*a")
+        if script_update.check_update then
-        io.close(f)
-    end 
-    os.remove(fpath)
-    return text
-end
-
-function update_check()
             local fpath = os.tmpname()
-    download("https://git.deadpoo.net/rubin/easy-cruise/raw/branch/master/version", fpath)
+            local text = openURL(script_update.check_update_url, fpath)
-    local text = read(fpath)
             if text ~= "" and not string.find(text, thisScript().version) then
                 addChatMessage( string.format("Вышла новая версия '%s'. Текущая: '%s'", text, thisScript().version) )
                 local command = thisScript().name:gsub(" ", "").."_update"
                 addChatMessage( string.format("Чтобы обновиться введите /%s'", command) )
-        sampRegisterChatCommand(command, cmd)
+                sampRegisterChatCommand(command, script_update.command)
             end
         end
-
+    end,
-function update()
+    command = function()
+        lua_thread.create(function()
             local fpath = os.tmpname()
+            local text = openURL(script_update.auto_update_url, fpath)
+            if text ~= "" and text:find(thisScript().name:gsub("%-", "%%-")) then
+                local file, error = io.open(thisScript().path, "w")
+                if file ~= nil then
+                    file:write(text)
+                    file:flush()
+                    io.close(file)
+                    addChatMessage("Обновление завершено, скрипт перезагружен!")
+                    lua_thread.create(function() wait(500) thisScript():reload() end)
+                end
+            end
+        end)
+    end
+}
+
+function openURL(url, fpath)
     local final_download = false
-    downloadUrlToFile("https://git.deadpoo.net/rubin/easy-cruise/raw/branch/master/easy-cruise.lua", fpath,
+    downloadUrlToFile(url, fpath, function(id, status, p1, p2)
-        function(id, status, p13, p23)
-            addChatMessage(status)
         if status == dlstatus.STATUS_ENDDOWNLOADDATA then
             final_download = true
         end
-        end
+    end)
-    )
 
     repeat 
-        wait(0) 
-    until final_download
         wait(1000) 
+    until final_download
 
+    local text = ""
     local f = io.open(fpath, "r")
     if f then
-        local data = f:read("*a")
+        text = f:read("*a")
-        local file, error = io.open(thisScript().path, "w")
-        if file ~= nil then
-            file:write(data)
-            file:flush()
-            io.close(file)
-            addChatMessage("Обновление завершено, скрипт перезагружен!")
-            lua_thread.create(function() wait(500) thisScript():reload() end)
-        end
         io.close(f)
     end 
     os.remove(fpath)
-end
+    return text
-
-function cmd()
-    lua_thread.create(update)
 end
 
 function addChatMessage(text)