From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Mon, 4 May 2026 15:05:04 +0000 (+0300) Subject: Autocommit in repo: ros.vados.ru, generated by owner: root, in 18:05:03 04.05.2026. X-Git-Url: https://git.vados.ru/gitweb.cgi?a=commitdiff_plain;h=3de1f6c0dc6c8dabd19f71a7abe6207062f86545;p=Mikrotiks%2Fros.vados.ru.git Autocommit in repo: ros.vados.ru, generated by owner: root, in 18:05:03 04.05.2026. --- diff --git a/html/AM-FwAddrLists.rsc b/html/AM-FwAddrLists.rsc index 74f02bb85..bcdf6946a 100644 --- a/html/AM-FwAddrLists.rsc +++ b/html/AM-FwAddrLists.rsc @@ -22,7 +22,7 @@ :global CertificateAvailable; :global EitherOr; - :global FetchLargeFiles; + :global FetchHugeFiles; :global HumanReadableNum; :global IfThenElse; :global LogPrint; @@ -55,7 +55,7 @@ :for I from=1 to=5 do={ :if ($tmpIndex = false) do={ - :set tmpIndex [ :tolf [ $FetchLargeFiles $ScriptName $FwAddrListsUrl $Index $CheckCerts ] ]; + :set tmpIndex [ :tolf [ $FetchHugeFiles $ScriptName $FwAddrListsUrl $Index $CheckCerts ] ]; :if ($tmpIndex = false && $I < 5) do={ :log warning ($ScriptName . " Failed downloading address-list index, " . $I . ". try from: " . $FwAddrListsUrl . $Index); :delay (($I * $I) . "s"); @@ -90,7 +90,7 @@ :for I from=1 to=5 do={ :if ($Data = false) do={ - :set Data [ :tolf [ $FetchLargeFiles $ScriptName $FwAddrListsUrl $FwListName $CheckCerts ] ]; + :set Data [ :tolf [ $FetchHugeFiles $ScriptName $FwAddrListsUrl $FwListName $CheckCerts ] ]; :if ($Data = false && $I < 5) do={ :log warning ($ScriptName . " Failed downloading for list '" . $FwListName . "', " . $I . ". try from: " . $FwAddrListsUrl . $FwListName); :delay (($I * $I) . "s"); diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index 8dd35ba8f..fab2a46ee 100644 --- a/html/AM-GlobalFunc.rsc +++ b/html/AM-GlobalFunc.rsc @@ -17,9 +17,9 @@ :global GlobalFuncReady false; # Git commit id & info, expected configuration version -:global CommitId "main/579/0878acaa"; +:global CommitId "main/580/082ed3d4"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 18:00:03 04.05.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 18:05:03 04.05.2026."; # The variables are received right here. :global GlobalConfVersion 140; @@ -135,7 +135,7 @@ :global ExitError; :global ExitOnError; :global FetchLargeFiles; -:global FetchHuge; +:global FetchHugeFiles; :global FetchUserAgentStr; :global CertificateAvailable; :global CertificateDownload; @@ -684,8 +684,7 @@ :return $Return; } -# fetch huge data to file, read in chunks -:set FetchHuge do={ +:set FetchHugeFiles do={ :local ScriptName [ :tostr $1 ]; :local Url [ :tostr $2 ]; :local CheckCert [ :tostr $3 ]; @@ -741,10 +740,8 @@ :return $Return; } - :set FetchUserAgentStr do={ :local Caller [ :tostr $1 ]; - :global GlobalScriptsUrl; :global CommitBrief; :global IfThenElse;