From ef6f780028365e4da695ea28fec8bbb88da61c0b Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Thu, 28 Jul 2022 22:05:16 +1000 Subject: [PATCH] tweak(resource/version): currentVersion validation Check currentVersion is valid before performing HttpRequest, and print a message when failing. --- resource/version/server.lua | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/resource/version/server.lua b/resource/version/server.lua index 2aba3bd..969b97f 100644 --- a/resource/version/server.lua +++ b/resource/version/server.lua @@ -1,6 +1,14 @@ function lib.versionCheck(repository) local resource = GetInvokingResource() or GetCurrentResourceName() + local currentVersion = GetResourceMetadata(resource, 'version', 0) + + if currentVersion then + currentVersion = currentVersion:match('%d%.%d+%.%d+') + end + + if not currentVersion then return print(("^1Unable to determine current resource version for '%s' ^0"):format(resource)) end + SetTimeout(1000, function() PerformHttpRequest(('https://api.github.com/repos/%s/releases/latest'):format(repository), function(status, response) if status ~= 200 then return end @@ -8,9 +16,6 @@ function lib.versionCheck(repository) response = json.decode(response) if response.prerelease then return end - local currentVersion = GetResourceMetadata(resource, 'version', 0):match('%d%.%d+%.%d+') - if not currentVersion then return end - local latestVersion = response.tag_name:match('%d%.%d+%.%d+') if not latestVersion then return end