From 4493c14c0c0d6ad83dec21ae4f7e3dbbb9f7333e Mon Sep 17 00:00:00 2001 From: z-Fng <54583083+z-Fng@users.noreply.github.com> Date: Tue, 7 Apr 2026 10:12:16 +0000 Subject: [PATCH] (chore): Clean up redundant try-catch blocks in checkver --- bucket/goneovim-nightly.json | 13 ++++--------- bucket/ipfilter-nightly.json | 6 +++++- bucket/lapce-nightly.json | 6 +++++- bucket/orcaslicer-nightly.json | 15 +++++---------- bucket/prismlauncher-git.json | 5 +++-- bucket/qbittorrent-nightly.json | 10 +++++----- bucket/qview-nightly.json | 27 +++++++++++++-------------- bucket/rustdesk-nightly.json | 12 ++++-------- bucket/syncplay-beta.json | 9 ++++----- 9 files changed, 48 insertions(+), 55 deletions(-) diff --git a/bucket/goneovim-nightly.json b/bucket/goneovim-nightly.json index 4fb0813d3c7..755e505fca6 100644 --- a/bucket/goneovim-nightly.json +++ b/bucket/goneovim-nightly.json @@ -28,15 +28,10 @@ "checkver": { "url": "https://api.github.com/repos/akiyosi/goneovim/releases/tags/nightly", "script": [ - "try {", - " $release = $page | ConvertFrom-Json", - " $date = Get-Date $release.updated_at -Format 'yyyyMMdd'", - " $commit = $release.target_commitish", - " return \"$date-$commit\"", - "", - "}catch {", - " return ''", - "}" + "$release = $page | ConvertFrom-Json", + "$date = Get-Date $release.updated_at -Format 'yyyyMMdd'", + "$commit = $release.target_commitish", + "Write-Output \"$date-$commit\"" ], "regex": "(?^\\d{8}-[0-9a-f]{7})" }, diff --git a/bucket/ipfilter-nightly.json b/bucket/ipfilter-nightly.json index f8f713f28ae..a06967314c9 100644 --- a/bucket/ipfilter-nightly.json +++ b/bucket/ipfilter-nightly.json @@ -6,7 +6,11 @@ "url": "https://github.com/DavidMoore/ipfilter/releases/download/lists/ipfilter.zip", "hash": "a7f254e778d83ac96ef21d7bcf36b73cd77279c6e61eddb94282c90a9827dcb4", "checkver": { - "script": "try { Get-Date (Invoke-RestMethod https://api.github.com/repos/DavidMoore/ipfilter/releases/tags/lists).assets[0].updated_at -UFormat %s } catch { '' }", + "url": "https://api.github.com/repos/DavidMoore/ipfilter/releases/tags/lists", + "script": [ + "$release = $page | ConvertFrom-Json", + "Get-Date $release.assets[0].updated_at -UFormat %s" + ], "regex": "\\A(\\d+)\\Z" }, "autoupdate": { diff --git a/bucket/lapce-nightly.json b/bucket/lapce-nightly.json index a438717e237..d48f59a8918 100644 --- a/bucket/lapce-nightly.json +++ b/bucket/lapce-nightly.json @@ -23,7 +23,11 @@ ], "persist": "lapce-data", "checkver": { - "script": "try { Get-Date (Invoke-RestMethod https://api.github.com/repos/lapce/lapce/releases/tags/nightly).published_at -UFormat %s } catch { '' }", + "url": "https://api.github.com/repos/lapce/lapce/releases/tags/nightly", + "script": [ + "$release = $page | ConvertFrom-Json", + "Get-Date $release.published_at -UFormat %s" + ], "regex": "\\A(\\d+)\\Z" }, "autoupdate": { diff --git a/bucket/orcaslicer-nightly.json b/bucket/orcaslicer-nightly.json index 9774d9701e4..2220a319277 100644 --- a/bucket/orcaslicer-nightly.json +++ b/bucket/orcaslicer-nightly.json @@ -1,11 +1,11 @@ { "version": "1775509943", "description": "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.)", - "homepage": "https://github.com/SoftFever/OrcaSlicer", + "homepage": "https://github.com/OrcaSlicer/OrcaSlicer", "license": "AGPL-3.0-or-later", "architecture": { "64bit": { - "url": "https://github.com/SoftFever/OrcaSlicer/releases/download/nightly-builds/OrcaSlicer_Windows_nightly_portable.zip", + "url": "https://github.com/OrcaSlicer/OrcaSlicer/releases/download/nightly-builds/OrcaSlicer_Windows_nightly_portable.zip", "hash": "f37bd138987ada1abaeafc0784d7a09c339542d9e01768bfe68d864d460d401e" } }, @@ -17,19 +17,14 @@ ] ], "checkver": { - "url": "https://api.github.com/repos/SoftFever/OrcaSlicer/releases/tags/nightly-builds", - "script": [ - "try {", - " ($page | ConvertFrom-Json).updated_at | Get-Date -UFormat %s", - "}", - "catch { '' }" - ], + "url": "https://api.github.com/repos/OrcaSlicer/OrcaSlicer/releases/tags/nightly-builds", + "script": "($page | ConvertFrom-Json).updated_at | Get-Date -UFormat %s", "regex": "^(\\d+)$" }, "autoupdate": { "architecture": { "64bit": { - "url": "https://github.com/SoftFever/OrcaSlicer/releases/download/nightly-builds/OrcaSlicer_Windows_nightly_portable.zip" + "url": "https://github.com/OrcaSlicer/OrcaSlicer/releases/download/nightly-builds/OrcaSlicer_Windows_nightly_portable.zip" } } } diff --git a/bucket/prismlauncher-git.json b/bucket/prismlauncher-git.json index 135cbaca8ae..197eeeceab9 100644 --- a/bucket/prismlauncher-git.json +++ b/bucket/prismlauncher-git.json @@ -80,9 +80,10 @@ "if ($cmd -eq 'uninstall') { reg import \"$dir\\uninstall-associations.reg\" }" ], "checkver": { + "url": "https://api.github.com/repos/PrismLauncher/PrismLauncher/actions/workflows/build.yml/runs?branch=develop&status=success&event=push", "script": [ - "$apiUrl = 'https://api.github.com/repos/PrismLauncher/PrismLauncher/actions/workflows/build.yml/runs?branch=develop&status=success&event=push'", - "$fullSha = (Invoke-RestMethod -Uri $apiUrl).workflow_runs[0].head_sha", + "$workflows = $page | ConvertFrom-Json", + "$fullSha = $workflows.workflow_runs[0].head_sha", "$cmakeContent = Invoke-WebRequest \"https://raw.githubusercontent.com/PrismLauncher/PrismLauncher/$fullSha/CMakeLists.txt\" | Select-Object -ExpandProperty Content", "$majorVersion = [regex]::Match($cmakeContent, 'set\\(Launcher_VERSION_MAJOR (\\d+)\\)').Groups[1].Value", "$minorVersion = [regex]::Match($cmakeContent, 'set\\(Launcher_VERSION_MINOR (\\d+)\\)').Groups[1].Value", diff --git a/bucket/qbittorrent-nightly.json b/bucket/qbittorrent-nightly.json index 9c4715a9e73..a61d85744a5 100644 --- a/bucket/qbittorrent-nightly.json +++ b/bucket/qbittorrent-nightly.json @@ -65,12 +65,12 @@ "script": "if ($cmd -eq 'uninstall') { reg import \"$dir\\uninstall-associations.reg\" }" }, "checkver": { + "url": "https://api.github.com/repos/qbittorrent/qBittorrent/actions/workflows/ci_windows.yaml/runs?branch=master&status=success", "script": [ - "try {", - " (Invoke-RestMethod 'https://api.github.com/repos/qbittorrent/qBittorrent/actions/workflows/ci_windows.yaml/runs?branch=master&status=success').workflow_runs[0].id,", - " (Invoke-RestMethod https://raw.githubusercontent.com/qbittorrent/qBittorrent/master/.github/workflows/ci_windows.yaml | Select-String 'libtorrent:\\n.*version:\\s*\"(\\d+(?:\\.\\d+){2})\"').matches.groups[1].value -join ' '", - "}", - "catch { '' }" + "$ci_workflows = $page | ConvertFrom-Json", + "$ci_file = Invoke-RestMethod https://raw.githubusercontent.com/qbittorrent/qBittorrent/master/.github/workflows/ci_windows.yaml", + "$libtorrent_version = ( $ci_file | Select-String 'libtorrent:\\n.*version:\\s*\"(\\d+(?:\\.\\d+){2})\"').matches.groups[1].value", + "$ci_workflows.workflow_runs[0].id, $libtorrent_version -join ' '" ], "regex": "\\A(\\d+) (?[\\d.]+)\\Z" }, diff --git a/bucket/qview-nightly.json b/bucket/qview-nightly.json index 8513a083fc2..a8c07b83aa2 100644 --- a/bucket/qview-nightly.json +++ b/bucket/qview-nightly.json @@ -5,16 +5,16 @@ "license": "GPL-3.0-only", "architecture": { "arm64": { - "url": "https://nightly.link/jurplel/qView/workflows/build/master/qView-nightly-Windows_arm64-2025-10-11.1.zip", - "hash": "06180ecab5ce7927ddb4adb366cc97815d831bd402c364063685c89fd82b753e" + "url": "https://github.com/jurplel/qView/releases/download/nightly/qView-nightly-Windows_arm64-2025-10-11.1.zip", + "hash": "ad9887085aad19c44ba90b59e654e7e147514e4cfce424185a87e098f8deaaca" }, "64bit": { - "url": "https://nightly.link/jurplel/qView/workflows/build/master/qView-nightly-Windows_64-2025-10-11.1.zip", - "hash": "d26e2fda7b96c2c6b382fd8df3d83396c17d3778fa1ec52c1aa84f47b5a2b7b7" + "url": "https://github.com/jurplel/qView/releases/download/nightly/qView-nightly-Windows_64-2025-10-11.1.zip", + "hash": "57dfd29a9b9233df0b8d1de97ca57d4353cd2034e672327e921f6af3e591b6a7" }, "32bit": { - "url": "https://nightly.link/jurplel/qView/workflows/build/master/qView-nightly-Windows_32-2025-10-11.1.zip", - "hash": "0e957d9f578efe3b5b877d2c2565936b7e8a44997043b540013732242671c611" + "url": "https://github.com/jurplel/qView/releases/download/nightly/qView-nightly-Windows_32-2025-10-11.1.zip", + "hash": "bb74811d061c97d7e049f50c5d41456060e241fcdedd4a397334c6fce6fb461d" } }, "pre_install": [ @@ -29,25 +29,24 @@ ] ], "checkver": { + "url": "https://api.github.com/repos/jurplel/qView/actions/workflows/build.yml/runs?branch=master&status=success", "script": [ - "try {", - " $api = (Invoke-RestMethod 'https://api.github.com/repos/jurplel/qView/actions/workflows/build.yml/runs?branch=master&status=success').workflow_runs[0]", - " ($api.id, (Get-Date $api.updated_at -Format 'yyyy-MM-dd'), $api.run_attempt) -join ' '", - "}", - "catch { '' }" + "$workflows = $page | ConvertFrom-Json", + "$api = $workflows.workflow_runs[0]", + "($api.id, (Get-Date $api.updated_at -Format 'yyyy-MM-dd'), $api.run_attempt) -join ' '" ], "regex": "\\A(\\d+) (?\\d{4}(?:-\\d{2}){2}) (?\\d+)\\Z" }, "autoupdate": { "architecture": { "arm64": { - "url": "https://nightly.link/jurplel/qView/workflows/build/master/qView-nightly-Windows_arm64-$matchDate.$matchAttempt.zip" + "url": "https://github.com/jurplel/qView/releases/download/nightly/qView-nightly-Windows_arm64-$matchDate.$matchAttempt.zip" }, "64bit": { - "url": "https://nightly.link/jurplel/qView/workflows/build/master/qView-nightly-Windows_64-$matchDate.$matchAttempt.zip" + "url": "https://github.com/jurplel/qView/releases/download/nightly/qView-nightly-Windows_64-$matchDate.$matchAttempt.zip" }, "32bit": { - "url": "https://nightly.link/jurplel/qView/workflows/build/master/qView-nightly-Windows_32-$matchDate.$matchAttempt.zip" + "url": "https://github.com/jurplel/qView/releases/download/nightly/qView-nightly-Windows_32-$matchDate.$matchAttempt.zip" } } } diff --git a/bucket/rustdesk-nightly.json b/bucket/rustdesk-nightly.json index 504e386af59..e4aa2cd5b20 100644 --- a/bucket/rustdesk-nightly.json +++ b/bucket/rustdesk-nightly.json @@ -20,15 +20,11 @@ ] ], "checkver": { + "url": "https://api.github.com/repos/rustdesk/rustdesk/releases/tags/nightly", "script": [ - "try {", - " $api = Invoke-RestMethod 'https://api.github.com/repos/rustdesk/rustdesk/releases/tags/nightly'", - " foreach ($name in $api.assets.name) { if ($name -clike '*-x86_64.exe') { $asset = $name; break } }", - " (Get-Date $api.assets[0].updated_at -UFormat %s), $asset -join ' '", - "}", - "catch {", - " ''", - "}" + "$api = $page | ConvertFrom-Json", + "foreach ($name in $api.assets.name) { if ($name -clike '*-x86_64.exe') { $asset = $name; break } }", + "(Get-Date $api.assets[0].updated_at -UFormat %s), $asset -join ' '" ], "regex": "\\A(\\d+) rustdesk-(?[\\d.-]+)-x86_64.exe\\Z" }, diff --git a/bucket/syncplay-beta.json b/bucket/syncplay-beta.json index 3976c9a8837..2ccaefae456 100644 --- a/bucket/syncplay-beta.json +++ b/bucket/syncplay-beta.json @@ -17,12 +17,11 @@ ], "persist": "syncplay.ini", "checkver": { + "url": "https://api.github.com/repos/Syncplay/syncplay/releases", "script": [ - "try {", - " if (($ver = (Invoke-RestMethod https://api.github.com/repos/Syncplay/syncplay/releases)[0].tag_name)[0] -eq ($prefix = 'v')) { $ver = $ver.Substring(1) } else { $prefix = '' }", - " $prefix, $ver, $ver.Replace('-', '_') -join ' '", - "}", - "catch { '' }" + "$releases = $page | ConvertFrom-Json", + "if (($ver = $releases[0].tag_name)[0] -eq ($prefix = 'v')) { $ver = $ver.Substring(1) } else { $prefix = '' }", + "$prefix, $ver, $ver.Replace('-', '_') -join ' '" ], "regex": "\\A(?v)? (\\S+) (?\\S+)\\Z" },