Change API to rof.tools mirrors
This commit is contained in:
parent
3cd9fcef46
commit
7dfed6af6c
1 changed files with 9 additions and 13 deletions
|
@ -11,6 +11,7 @@ from app.utils import get_app_data_folder, keep_latest_versions
|
||||||
CACHE_FILE = get_app_data_folder() + '/cache.json'
|
CACHE_FILE = get_app_data_folder() + '/cache.json'
|
||||||
CACHE_DURATION = timedelta(minutes=30)
|
CACHE_DURATION = timedelta(minutes=30)
|
||||||
|
|
||||||
|
LATEST_RELEASE_ENDPOINT = "https://git.rof.tools/api/v1/repos/mirrors/btclock_v3/tags"
|
||||||
|
|
||||||
class ReleaseChecker:
|
class ReleaseChecker:
|
||||||
'''Release Checker for firmware updates'''
|
'''Release Checker for firmware updates'''
|
||||||
|
@ -34,7 +35,7 @@ class ReleaseChecker:
|
||||||
|
|
||||||
def fetch_latest_release(self):
|
def fetch_latest_release(self):
|
||||||
'''Fetch latest firmware release from GitHub'''
|
'''Fetch latest firmware release from GitHub'''
|
||||||
repo = "btclock/btclock_v3"
|
repo = "mirrors/btclock_v3"
|
||||||
cache = self.load_cache()
|
cache = self.load_cache()
|
||||||
now = datetime.now()
|
now = datetime.now()
|
||||||
|
|
||||||
|
@ -42,7 +43,8 @@ class ReleaseChecker:
|
||||||
if 'latest_release' in cache and (now - datetime.fromisoformat(cache['latest_release']['timestamp'])) < CACHE_DURATION:
|
if 'latest_release' in cache and (now - datetime.fromisoformat(cache['latest_release']['timestamp'])) < CACHE_DURATION:
|
||||||
latest_release = cache['latest_release']['data']
|
latest_release = cache['latest_release']['data']
|
||||||
else:
|
else:
|
||||||
url = f"https://api.github.com/repos/{repo}/releases/latest"
|
# url = f"https://api.github.com/repos/{repo}/releases/latest"
|
||||||
|
url = f"https://git.rof.tools/api/v1/repos/{repo}/releases/latest"
|
||||||
try:
|
try:
|
||||||
response = requests.get(url)
|
response = requests.get(url)
|
||||||
response.raise_for_status()
|
response.raise_for_status()
|
||||||
|
@ -72,8 +74,9 @@ class ReleaseChecker:
|
||||||
for asset_url in asset_urls:
|
for asset_url in asset_urls:
|
||||||
self.download_file(asset_url, release_name)
|
self.download_file(asset_url, release_name)
|
||||||
|
|
||||||
ref_url = f"https://api.github.com/repos/{
|
ref_url = f"https://git.rof.tools/api/v1/repos/{repo}/tags/{release_name}"
|
||||||
repo}/git/ref/tags/{release_name}"
|
#ref_url = f"https://api.github.com/repos/{
|
||||||
|
# repo}/git/ref/tags/{release_name}"
|
||||||
if ref_url in cache and (now - datetime.fromisoformat(cache[ref_url]['timestamp'])) < CACHE_DURATION:
|
if ref_url in cache and (now - datetime.fromisoformat(cache[ref_url]['timestamp'])) < CACHE_DURATION:
|
||||||
commit_hash = cache[ref_url]['data']
|
commit_hash = cache[ref_url]['data']
|
||||||
|
|
||||||
|
@ -81,15 +84,8 @@ class ReleaseChecker:
|
||||||
response = requests.get(ref_url)
|
response = requests.get(ref_url)
|
||||||
response.raise_for_status()
|
response.raise_for_status()
|
||||||
ref_info = response.json()
|
ref_info = response.json()
|
||||||
if ref_info["object"]["type"] == "commit":
|
commit_hash = ref_info["commit"]["sha"]
|
||||||
commit_hash = ref_info["object"]["sha"]
|
|
||||||
else:
|
|
||||||
tag_url = f"https://api.github.com/repos/{
|
|
||||||
repo}/git/tags/{ref_info['object']['sha']}"
|
|
||||||
response = requests.get(tag_url)
|
|
||||||
response.raise_for_status()
|
|
||||||
tag_info = response.json()
|
|
||||||
commit_hash = tag_info["object"]["sha"]
|
|
||||||
cache[ref_url] = {
|
cache[ref_url] = {
|
||||||
'data': commit_hash,
|
'data': commit_hash,
|
||||||
'timestamp': now.isoformat()
|
'timestamp': now.isoformat()
|
||||||
|
|
Loading…
Reference in a new issue