codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix windows launching of daemon

This commit is contained in:
Marcos Pinto 2008-07-10 04:19:22 +00:00
parent 19a2ae45e9
commit 5a8662ae03
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deluge/main.py
View File

@ -124,14 +124,6 @@ def start_daemon():
else: else:
os._exit(0) os._exit(0)
if deluge.common.windows_check() and not options.donot:
port = 58846
if options.port:
port = options.port
import subprocess
subprocess.Popen(["deluged", "-p %s" % port])
os._exit(0)
from deluge.core.daemon import Daemon from deluge.core.daemon import Daemon
Daemon(options, args) Daemon(options, args)

22
deluge/ui/gtkui/connectionmanager.py
View File

@ -36,7 +36,6 @@ import pkg_resources
import gobject import gobject
import socket import socket
import os import os
import subprocess
import time import time
import threading import threading
@ -60,6 +59,10 @@ HOSTLIST_STATUS = [
"Online", "Online",
"Connected" "Connected"
] ]
if deluge.common.windows_check():
import win32api
class ConnectionManager(component.Component): class ConnectionManager(component.Component):
def __init__(self): def __init__(self):
component.Component.__init__(self, "ConnectionManager") component.Component.__init__(self, "ConnectionManager")
@ -121,7 +124,10 @@ class ConnectionManager(component.Component):
# If classic mode is set, we just start up a localhost daemon and connect to it # If classic mode is set, we just start up a localhost daemon and connect to it
if self.gtkui_config["classic_mode"]: if self.gtkui_config["classic_mode"]:
uri = "http://localhost:58846" uri = "http://localhost:58846"
subprocess.Popen(["deluged", "-p 58846"]) if deluge.common.windows_check():
win32api.WinExec("deluged -p 58846")
else:
os.popen("deluged -p 58846")
time.sleep(0.1) time.sleep(0.1)
# We need to wait for the host to start before connecting # We need to wait for the host to start before connecting
while not self.test_online_status(uri): while not self.test_online_status(uri):
@ -153,7 +159,10 @@ class ConnectionManager(component.Component):
port = uri[7:].split(":")[1] port = uri[7:].split(":")[1]
# First add it to the list # First add it to the list
self.add_host("localhost", port) self.add_host("localhost", port)
subprocess.Popen(["deluged", "-p %s" % port]) if deluge.common.windows_check():
win32api.WinExec("deluged -p %s" % port)
else:
os.popen("deluged -p %s" % port)
# We need to wait for the host to start before connecting # We need to wait for the host to start before connecting
while not self.test_online_status(uri): while not self.test_online_status(uri):
time.sleep(0.01) time.sleep(0.01)
@ -425,8 +434,11 @@ class ConnectionManager(component.Component):
port = str(port) port = str(port)
log.info("Starting localhost:%s daemon..", port) log.info("Starting localhost:%s daemon..", port)
# Spawn a local daemon # Spawn a local daemon
subprocess.Popen(["deluged", "-p %s" % port]) if deluge.common.windows_check():
win32api.WinExec("deluged -p %s" % port)
else:
os.popen("deluged -p %s" % port)
def on_button_close_clicked(self, widget): def on_button_close_clicked(self, widget):
log.debug("on_button_close_clicked") log.debug("on_button_close_clicked")
self.hide() self.hide()