1
0
Fork 0
mirror of synced 2024-06-27 02:30:31 +12:00

Add some sys infos to debug option and print code name with --version

This commit is contained in:
Dummerle 2021-12-11 23:41:55 +01:00
parent 1aa5c7f5df
commit c5aeded9ad
No known key found for this signature in database
GPG key ID: AB68CC59CA39F2F1
3 changed files with 11 additions and 7 deletions

View file

@ -1,6 +1,7 @@
import os
__version__ = "1.7.0"
code_name = "Finch Quail"
import platform

View file

@ -36,9 +36,6 @@ def main():
args = parser.parse_args()
if args.debug:
print(sys.path)
if args.desktop_shortcut:
from rare.utils import utils
utils.create_rare_desktop_link("desktop")
@ -50,8 +47,8 @@ def main():
print("link created")
if args.version:
from rare import __version__
print(__version__)
from rare import __version__, code_name
print(f"Rare {__version__} Codename: {code_name}")
return
from rare.utils import singleton
try:

View file

@ -1,6 +1,7 @@
import configparser
import logging
import os
import platform
import sys
import time
import traceback
@ -10,6 +11,7 @@ from PyQt5.QtGui import QIcon
from PyQt5.QtWidgets import QApplication, QSystemTrayIcon, QMessageBox
from requests import HTTPError
import legendary
# noinspection PyUnresolvedReferences
import rare.resources.resources
import rare.shared as shared
@ -20,7 +22,7 @@ from rare.components.tray_icon import TrayIcon
from rare.utils.utils import set_color_pallete, set_style_sheet
start_time = time.strftime('%y-%m-%d--%H-%M') # year-month-day-hour-minute
file_name = os.path.join(cache_dir, f"logs/Rare_{start_time}.log")
file_name = os.path.join(cache_dir, "logs", f"Rare_{start_time}.log")
if not os.path.exists(os.path.dirname(file_name)):
os.makedirs(os.path.dirname(file_name))
@ -50,6 +52,7 @@ class App(QApplication):
def __init__(self):
super(App, self).__init__(sys.argv)
self.args = shared.args # add some options
# init Legendary
try:
self.core = shared.init_legendary()
@ -139,7 +142,6 @@ class App(QApplication):
self.launch_dialog.login()
def start_app(self):
self.mainwindow = MainWindow()
self.launch_dialog.close()
@ -209,6 +211,10 @@ def start(args):
logging.getLogger('requests').setLevel(logging.WARNING)
logging.getLogger('urllib3').setLevel(logging.WARNING)
logging.getLogger("asyncio").setLevel(logging.WARNING)
logger.info(f"Launching Rare version {rare.__version__} Codename: {rare.code_name}\n"
f"Using Legendary {legendary.__version__} Codename: {legendary.__codename__} as backend\n"
f"Operating System: {platform.system()}, Python version: {platform.python_version()}\n"
f"Running {sys.executable} {' '.join(sys.argv)}")
else:
logging.basicConfig(
format='[%(name)s] %(levelname)s: %(message)s',