summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar KingZero <kingzero@pyload.org> 2009-05-31 17:22:21 +0200
committerGravatar KingZero <kingzero@pyload.org> 2009-05-31 17:22:21 +0200
commit6c9e99989890c6102f577dd97d15c399c8306c1d (patch)
treec6aaf064b856dd1ac60729805bac3839d79c94b0
parentfixed server mode (diff)
downloadpyload-6c9e99989890c6102f577dd97d15c399c8306c1d.tar.xz
pyload server starts when gui starts
-rwxr-xr-xpyMainGui.py20
1 files changed, 16 insertions, 4 deletions
diff --git a/pyMainGui.py b/pyMainGui.py
index 0353213dc..10903433c 100755
--- a/pyMainGui.py
+++ b/pyMainGui.py
@@ -25,6 +25,10 @@ from os.path import dirname
import wx
import wx.lib.sized_controls as sized_control
from module.remote.ClientSocket import ClientSocket
+from Core import Core
+#from module.Py_Load_File import PyLoadFile
+from module.remote.SocketServer import ServerThread
+#from module.thread_list import Thread_List
class _Download_Dialog(sized_control.SizedDialog):
def __init__(self, parent, id):
@@ -70,6 +74,13 @@ class Pyload_Main_Gui(wx.Frame):
wx.Frame.__init__(self, parent, id, title, size=(910, 500))
app_path = dirname(abspath(__file__)) + sep
+ # Core
+ testLoader = Core()
+ if testLoader.config['remote_activated']:
+ print _("Server Mode")
+ server = ServerThread(testLoader)
+ server.start()
+
# socket
self.socket = ClientSocket(self)
self.socket.connect(('localhost', 7272))
@@ -116,7 +127,8 @@ class Pyload_Main_Gui(wx.Frame):
adddownload = _Download_Dialog(None, -1)
result = adddownload.ShowModal()
adddownload.Destroy()
-
-app = wx.App()
-Pyload_Main_Gui(None,-1)
-app.MainLoop()
+
+if __name__ == "__main__":
+ app = wx.App()
+ Pyload_Main_Gui(None,-1)
+ app.MainLoop()