rainerosion/CHERWIN_SCRIPTS
1
0
Fork 0
mirror of https://github.com/CHERWING/CHERWIN_SCRIPTS.git synced 2024-11-22 09:04:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update CHERWIN_TOOLS.py

Browse Source
This commit is contained in:
CHERWING 2024-04-08 04:41:51 +08:00 committed by GitHub
parent f216cb9b19
commit 5c894eba7e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CHERWIN_TOOLS.py
View File

@ -6,7 +6,7 @@ import sys
import requests import requests
from http import HTTPStatus from http import HTTPStatus
NOW_TOOLS_VERSION = '2024.04.06' NOW_TOOLS_VERSION = '2024.04.08'
if os.path.isfile('DEV_ENV.py'): if os.path.isfile('DEV_ENV.py'):
import DEV_ENV import DEV_ENV
# 尝试导入包 # 尝试导入包
@ -135,13 +135,13 @@ def CHECK_UPDATE(local_version, server_version_url, server_script_url, script_fi
except requests.exceptions.RequestException as e: except requests.exceptions.RequestException as e:
print(f'发生网络错误：{e}') print(f'发生网络错误：{e}')
except Exception as e: except Exception as e:
print(f'发生未知错误：{e}') print(f'发生未知错误：{e}')
return False # 返回 False 表示没有进行更新操作 return False # 返回 False 表示没有进行更新操作
def CHECK_UPDATE_NEW(local_version, server_version, server_script_url, script_filename,server_version_url=None): def CHECK_UPDATE_NEW(local_version, server_version, server_script_url, script_filename,server_version_url=None,APP_NAME=None):
""" """
检查版本并更新 检查版本并更新
@ -187,7 +187,10 @@ def CHECK_UPDATE_NEW(local_version, server_version, server_script_url, script_fi
except requests.exceptions.RequestException as e: except requests.exceptions.RequestException as e:
print(f'发生网络错误：{e}') print(f'发生网络错误：{e}')
server_base_url = f"https://py.cherwin.cn/{APP_NAME}/"
server_script_url = f"{server_base_url}{script_filename}"
CHECK_UPDATE_NEW(local_version, server_version, server_script_url, script_filename, APP_NAME=APP_NAME)
except Exception as e: except Exception as e:
print(f'发生未知错误：{e}') print(f'发生未知错误：{e}')
@ -468,13 +471,12 @@ def CHECK():
def main(APP_NAME,local_script_name,ENV_NAME,local_version): def main(APP_NAME,local_script_name,ENV_NAME,local_version):
global APP_INFO,TIPS,TIPS_HTML global APP_INFO,TIPS,TIPS_HTML
server_base_url = f"https://py.cherwin.cn/{APP_NAME}/" git_url = f'https://github.com/CHERWING/CHERWIN_SCRIPTS/raw/main/{local_script_name}'
server_script_url = f"{server_base_url}{local_script_name}"
if CHECK(): if CHECK():
APP_INFO = CHERWIN_SCRIPT_CONFIG.get("APP_CONFIG", {}).get(ENV_NAME, {}) APP_INFO = CHERWIN_SCRIPT_CONFIG.get("APP_CONFIG", {}).get(ENV_NAME, {})
# print(APP_INFO) # print(APP_INFO)
server_version = APP_INFO.get('NEW_VERSION', '') server_version = APP_INFO.get('NEW_VERSION', '')
if CHECK_UPDATE_NEW(local_version, server_version, server_script_url, local_script_name): if CHECK_UPDATE_NEW(local_version, server_version, git_url, local_script_name,APP_NAME=APP_NAME):
print('更新成功，请重新运行脚本！') print('更新成功，请重新运行脚本！')
if not APP_INFO.get('ENABLE', False): if not APP_INFO.get('ENABLE', False):