From f1d142433017d824e083595e197c21f6bf7cd03b Mon Sep 17 00:00:00 2001 From: wcbing Date: Tue, 3 Sep 2024 16:56:47 +0800 Subject: [PATCH] remove invalid no-redirect code --- get/clash-verge.py | 10 ++++------ get/flclash.py | 8 +++----- get/hugo.py | 11 ++++------- get/mihomo.py | 11 ++++------- get/obsidian.py | 10 ++++------ get/rustdesk.py | 10 ++++------ 6 files changed, 23 insertions(+), 37 deletions(-) diff --git a/get/clash-verge.py b/get/clash-verge.py index e0632ac..98020fe 100644 --- a/get/clash-verge.py +++ b/get/clash-verge.py @@ -1,18 +1,16 @@ import requests from module.check import deb -name = "clash-verge" - release_url = "https://github.com/clash-verge-rev/clash-verge-rev/releases" -res = requests.head(release_url + "/latest", allow_redirects=False) -vversion = requests.Session().get_redirect_target(res).split("/")[-1] # v1.1.1 +latest_req = requests.head(release_url + "/latest") +vversion = latest_req.headers["Location"].split("/")[-1] # v1.1.1 version = vversion[1:] # 1.1.1 # print(vversion, version) # /v1.7.5/clash-verge_1.7.5_amd64.deb x64_deb_url = ( - release_url + "/download/" + vversion + "/" + name + "_" + version + "_amd64.deb" + release_url + "/download/" + vversion + "/clash-verge_" + version + "_amd64.deb" ) -deb(name, version, x64_deb_url) +deb("clash-verge", version, x64_deb_url) diff --git a/get/flclash.py b/get/flclash.py index 12ab8b2..bb1b351 100644 --- a/get/flclash.py +++ b/get/flclash.py @@ -1,12 +1,10 @@ import requests from module.check import deb -name = "flclash" - release_url = "https://github.com/chen08209/FlClash/releases" -res = requests.head(release_url + "/latest", allow_redirects=False) -vversion = requests.Session().get_redirect_target(res).split("/")[-1] # v1.1.1 +latest_req = requests.head(release_url + "/latest") +vversion = latest_req.headers["Location"].split("/")[-1] # v1.1.1 version = vversion[1:] # 1.1.1 # print(vversion, version) @@ -15,4 +13,4 @@ x64_deb_url = ( release_url + "/download/" + vversion + "/FlClash-" + version + "-linux-amd64.deb" ) -deb(name, version, x64_deb_url) +deb("flclash", version, x64_deb_url) diff --git a/get/hugo.py b/get/hugo.py index 62a2fd7..30aa6a1 100644 --- a/get/hugo.py +++ b/get/hugo.py @@ -1,19 +1,16 @@ import requests from module.check import deb -name = "hugo" - release_url = "https://github.com/gohugoio/hugo/releases" -res = requests.head(release_url + "/latest", allow_redirects=False) -vversion = requests.Session().get_redirect_target(res).split("/")[-1] # v1.1.1 +latest_req = requests.head(release_url + "/latest") +vversion = latest_req.headers["Location"].split("/")[-1] # v1.1.1 version = vversion[1:] # 1.1.1 # print(vversion, version) # /v0.129.0/hugo_0.129.0_linux-amd64.deb x64_deb_url = ( - release_url + "/download/" + vversion + "/" - + name + "_" + version + "_linux-amd64.deb" + release_url + "/download/" + vversion + "/hugo_" + version + "_linux-amd64.deb" ) -deb(name, version, x64_deb_url) +deb("hugo", version, x64_deb_url) diff --git a/get/mihomo.py b/get/mihomo.py index dadcfef..4a9a41a 100644 --- a/get/mihomo.py +++ b/get/mihomo.py @@ -1,19 +1,16 @@ import requests from module.check import deb -name = "mihomo" - release_url = "https://github.com/MetaCubeX/mihomo/releases" -res = requests.head(release_url + "/latest", allow_redirects=False) -vversion = requests.Session().get_redirect_target(res).split("/")[-1] # v1.1.1 +latest_req = requests.head(release_url + "/latest") +vversion = latest_req.headers["Location"].split("/")[-1] # v1.1.1 version = vversion[1:] # 1.1.1 # print(vversion, version) # /v1.18.6/mihomo-linux-amd64-compatible-v1.18.6.deb x64_deb_url = ( - release_url + "/download/" + vversion + "/" - + name + "-linux-amd64-compatible-" + vversion + ".deb" + release_url + "/download/" + vversion + "/mihomo-linux-amd64-compatible-" + vversion + ".deb" ) -deb(name, version, x64_deb_url) +deb("mihomo", version, x64_deb_url) diff --git a/get/obsidian.py b/get/obsidian.py index c3f0e19..5f5e3e7 100644 --- a/get/obsidian.py +++ b/get/obsidian.py @@ -1,18 +1,16 @@ import requests from module.check import deb -name = "obsidian" - release_url = "https://github.com/obsidianmd/obsidian-releases/releases" -res = requests.head(release_url + "/latest", allow_redirects=False) -vversion = requests.Session().get_redirect_target(res).split("/")[-1] # v1.1.1 +latest_req = requests.head(release_url + "/latest") +vversion = latest_req.headers["Location"].split("/")[-1] # v1.1.1 version = vversion[1:] # 1.1.1 # print(vversion, version) # /v1.6.7/obsidian_1.6.7_amd64.deb x64_deb_url = ( - release_url + "/download/" + vversion + "/" + name + "_" + version + "_amd64.deb" + release_url + "/download/" + vversion + "/obsidian_" + version + "_amd64.deb" ) -deb(name, version, x64_deb_url) +deb("obsidian", version, x64_deb_url) diff --git a/get/rustdesk.py b/get/rustdesk.py index 2ba48a4..39f0dfe 100644 --- a/get/rustdesk.py +++ b/get/rustdesk.py @@ -1,17 +1,15 @@ import requests from module.check import deb -name = "rustdesk" - release_url = "https://github.com/rustdesk/rustdesk/releases" -res = requests.head(release_url + "/latest", allow_redirects=False) -version = requests.Session().get_redirect_target(res).split("/")[-1] # 1.1.1 +latest_req = requests.head(release_url + "/latest") +version = latest_req.headers["Location"].split("/")[-1] # 1.1.1 # print(version) # /1.2.7/rustdesk-1.2.7-x86_64.deb x64_deb_url = ( - release_url + "/download/" + version + "/" + name + "-" + version + "-x86_64.deb" + release_url + "/download/" + version + "/rustdesk-" + version + "-x86_64.deb" ) -deb(name, version, x64_deb_url) +deb("rustdesk", version, x64_deb_url)