goodbye old friend
This commit is contained in:
parent
0bdd74b4fe
commit
e7f18eecd2
2 changed files with 13 additions and 7 deletions
|
@ -13,8 +13,9 @@ YELLOW = f"{ANSI}33m"
|
||||||
PURPLE = f"{ANSI}35m"
|
PURPLE = f"{ANSI}35m"
|
||||||
DEBUG = f"{ANSI}1;30m"
|
DEBUG = f"{ANSI}1;30m"
|
||||||
RESET = f"{ANSI}0m"
|
RESET = f"{ANSI}0m"
|
||||||
VERSION_URL = "https://goober.expect.ovh"
|
VERSION_URL = "https://raw.githubusercontent.com/gooberinc/version/main"
|
||||||
UPDATE_URL = VERSION_URL+"/latest_version.json"
|
UPDATE_URL = VERSION_URL+"/latest_version.json"
|
||||||
|
print(UPDATE_URL)
|
||||||
LOCAL_VERSION_FILE = "current_version.txt"
|
LOCAL_VERSION_FILE = "current_version.txt"
|
||||||
TOKEN = os.getenv("DISCORDBOTTOKEN", "0")
|
TOKEN = os.getenv("DISCORDBOTTOKEN", "0")
|
||||||
PREFIX = os.getenv("BOTPREFIX", "g.")
|
PREFIX = os.getenv("BOTPREFIX", "g.")
|
||||||
|
@ -38,7 +39,7 @@ arch = platform.machine()
|
||||||
slash_commands_enabled = True # 100% broken, its a newer enough version so its probably enabled by default.... fix this at somepoint or hard code it in goober central code
|
slash_commands_enabled = True # 100% broken, its a newer enough version so its probably enabled by default.... fix this at somepoint or hard code it in goober central code
|
||||||
launched = False
|
launched = False
|
||||||
latest_version = "0.0.0"
|
latest_version = "0.0.0"
|
||||||
local_version = "2.2.0"
|
local_version = "2.3.0"
|
||||||
os.environ['gooberlocal_version'] = local_version
|
os.environ['gooberlocal_version'] = local_version
|
||||||
REACT = os.getenv("REACT")
|
REACT = os.getenv("REACT")
|
||||||
beta = True # this makes goober think its a beta version, so it will not update to the latest stable version or run any version checks
|
beta = True # this makes goober think its a beta version, so it will not update to the latest stable version or run any version checks
|
||||||
|
|
|
@ -4,6 +4,7 @@ import requests
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
import logging
|
import logging
|
||||||
|
import json
|
||||||
logger = logging.getLogger("goober")
|
logger = logging.getLogger("goober")
|
||||||
launched = False
|
launched = False
|
||||||
|
|
||||||
|
@ -34,12 +35,16 @@ def auto_update(branch='main', remote='origin'):
|
||||||
else:
|
else:
|
||||||
logger.info(_( "local_ahead").format(remote=remote, branch=branch))
|
logger.info(_( "local_ahead").format(remote=remote, branch=branch))
|
||||||
|
|
||||||
# Fetch the latest version info from the update server
|
|
||||||
def get_latest_version_info():
|
def get_latest_version_info():
|
||||||
try:
|
try:
|
||||||
response = requests.get(UPDATE_URL, timeout=5)
|
response = requests.get(UPDATE_URL, timeout=5)
|
||||||
if response.status_code == 200:
|
if response.status_code == 200:
|
||||||
|
# Try parsing JSON manually, so i dont have to maintain goober central anymore
|
||||||
|
try:
|
||||||
return response.json()
|
return response.json()
|
||||||
|
except json.JSONDecodeError:
|
||||||
|
logger.error(f"{RED}{_('version_error')} JSON decode failed{RESET}")
|
||||||
|
return None
|
||||||
else:
|
else:
|
||||||
logger.error(f"{RED}{_('version_error')} {response.status_code}{RESET}")
|
logger.error(f"{RED}{_('version_error')} {response.status_code}{RESET}")
|
||||||
return None
|
return None
|
||||||
|
@ -63,7 +68,7 @@ def check_for_update():
|
||||||
download_url = latest_version_info.get("download_url")
|
download_url = latest_version_info.get("download_url")
|
||||||
|
|
||||||
if not latest_version or not download_url:
|
if not latest_version or not download_url:
|
||||||
logger.error(f"{RED}{_(LOCALE, 'invalid_server')}{RESET}")
|
logger.error(f"{RED}{_('invalid_server')}{RESET}")
|
||||||
return None, None
|
return None, None
|
||||||
|
|
||||||
# Check if local_version is valid
|
# Check if local_version is valid
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue