mcvsoftware/twblue
1
0
Fork 0
mirror of https://github.com/MCV-Software/TWBlue.git synced 2024-11-26 12:53:12 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed some platform unused code

Browse Source
This commit is contained in:
Manuel Cortez 2022-11-03 11:34:21 -06:00
parent e00ec84df3
commit 4dc4f46b84
No known key found for this signature in database
GPG Key ID: 9E0735CA15EFE790
1 changed files with 38 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
src/main.py
View File

@ -1,22 +1,16 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import platform
from win32com.client import GetObject from win32com.client import GetObject
import sys
""" there are lots of things not implemented for Gtk+ yet. import os
We've started this effort 1 Apr 2015 so it isn't fully functional. We will remove the ifs statements when are no needed""" import platform
#redirect the original stdout and stderr
system = platform.system() stdout=sys.stdout
if system == "Windows": stderr=sys.stderr
import sys sys.stdout = open(os.path.join(os.getenv("temp"), "stdout.log"), "w")
import os sys.stderr = open(os.path.join(os.getenv("temp"), "stderr.log"), "w")
#redirect the original stdout and stderr
stdout=sys.stdout
stderr=sys.stderr
sys.stdout = open(os.path.join(os.getenv("temp"), "stdout.log"), "w")
sys.stderr = open(os.path.join(os.getenv("temp"), "stderr.log"), "w")
import languageHandler import languageHandler
import paths import paths
#check if TWBlue is installed (Windows only) #check if TWBlue is installed
# ToDo: Remove this soon as this is done already when importing the paths module. # ToDo: Remove this soon as this is done already when importing the paths module.
if os.path.exists(os.path.join(paths.app_path(), "Uninstall.exe")): if os.path.exists(os.path.join(paths.app_path(), "Uninstall.exe")):
paths.mode="installed" paths.mode="installed"
@ -31,34 +25,30 @@ import fixes
import widgetUtils import widgetUtils
import webbrowser import webbrowser
from wxUI import commonMessageDialogs from wxUI import commonMessageDialogs
if system == "Windows": from logger import logger
from logger import logger from update import updater
from update import updater stdout_temp=sys.stdout
stdout_temp=sys.stdout stderr_temp=sys.stderr
stderr_temp=sys.stderr
#if it's a binary version #if it's a binary version
if hasattr(sys, 'frozen'): if hasattr(sys, 'frozen'):
sys.stderr = open(os.path.join(paths.logs_path(), "stderr.log"), 'w') sys.stderr = open(os.path.join(paths.logs_path(), "stderr.log"), 'w')
sys.stdout = open(os.path.join(paths.logs_path(), "stdout.log"), 'w') sys.stdout = open(os.path.join(paths.logs_path(), "stdout.log"), 'w')
else: else:
sys.stdout=stdout sys.stdout=stdout
sys.stderr=stderr sys.stderr=stderr
# We are running from source, let's prepare vlc module for that situation # We are running from source, let's prepare vlc module for that situation
if system=="Windows": arch="x86"
arch="x86" if platform.architecture()[0][:2] == "64":
if platform.architecture()[0][:2] == "64": arch="x64"
arch="x64" os.environ['PYTHON_VLC_MODULE_PATH']=os.path.abspath(os.path.join(paths.app_path(), "..", "windows-dependencies", arch))
os.environ['PYTHON_VLC_MODULE_PATH']=os.path.abspath(os.path.join(paths.app_path(), "..", "windows-dependencies", arch)) os.environ['PYTHON_VLC_LIB_PATH']=os.path.abspath(os.path.join(paths.app_path(), "..", "windows-dependencies", arch, "libvlc.dll"))
os.environ['PYTHON_VLC_LIB_PATH']=os.path.abspath(os.path.join(paths.app_path(), "..", "windows-dependencies", arch, "libvlc.dll")) #the final log files have been opened succesfully, let's close the temporary files
#the final log files have been opened succesfully, let's close the temporary files stdout_temp.close()
stdout_temp.close() stderr_temp.close()
stderr_temp.close() #finally, remove the temporary files. TW Blue doesn't need them anymore, and we will get more free space on the harddrive
#finally, remove the temporary files. TW Blue doesn't need them anymore, and we will get more free space on the harddrive os.remove(stdout_temp.name)
os.remove(stdout_temp.name) os.remove(stderr_temp.name)
os.remove(stderr_temp.name)
import sound import sound
if system == "Linux":
from gi.repository import Gdk, GObject, GLib
log = logging.getLogger("main") log = logging.getLogger("main")
@ -79,14 +69,14 @@ def setup():
from sessionmanager import sessionManager from sessionmanager import sessionManager
app = widgetUtils.mainLoopObject() app = widgetUtils.mainLoopObject()
check_pid() check_pid()
if system == "Windows": if config.app["app-settings"]["donation_dialog_displayed"] == False:
if config.app["app-settings"]["donation_dialog_displayed"] == False: donation()
donation() if config.app['app-settings']['check_for_updates']:
if config.app['app-settings']['check_for_updates']: updater.do_update()
updater.do_update()
sm = sessionManager.sessionManagerController() sm = sessionManager.sessionManagerController()
sm.fill_list() sm.fill_list()
if len(sm.sessions) == 0: sm.show() if len(sm.sessions) == 0:
sm.show()
else: else:
sm.do_ok() sm.do_ok()
if hasattr(sm.view, "destroy"): if hasattr(sm.view, "destroy"):
@ -96,10 +86,7 @@ def setup():
r.view.show() r.view.show()
r.do_work() r.do_work()
r.check_invisible_at_startup() r.check_invisible_at_startup()
if system == "Windows": call_threaded(r.start)
call_threaded(r.start)
elif system == "Linux":
GLib.idle_add(r.start)
app.run() app.run()
def proxy_setup(): def proxy_setup():