remove spawning

This commit is contained in:
Marcos Pinto 2007-08-08 03:15:23 +00:00
parent 17f71c916e
commit 2e1e6901da
2 changed files with 42 additions and 21 deletions

View File

@ -31,6 +31,8 @@
import os.path import os.path
import xdg.BaseDirectory import xdg.BaseDirectory
import gobject
gobject.threads_init()
PROGRAM_NAME = "Deluge" PROGRAM_NAME = "Deluge"
PROGRAM_VERSION = "0.5.4" PROGRAM_VERSION = "0.5.4"
@ -123,11 +125,11 @@ def open_url_in_browser(link):
import webbrowser import webbrowser
webbrowser.open(link) webbrowser.open(link)
else: else:
import os, sys import webbrowser
py_version = sys.version[:3] import gtk
file = os.path.join(INSTALL_PREFIX, 'lib', 'python' \ gtk.gdk.threads_enter()
+ py_version, 'site-packages', 'deluge', 'browser.py') webbrowser.open(link)
os.spawnlp(os.P_NOWAIT, 'python', 'python', file, link) gtk.gdk.threads_leave()
def is_url(url): def is_url(url):
import re import re

View File

@ -48,6 +48,7 @@ import tab_details
class DelugeGTK: class DelugeGTK:
def __init__(self): def __init__(self):
gobject.threads_init()
self.ipc_manager = ipc_manager.Manager(self) self.ipc_manager = ipc_manager.Manager(self)
#Start the Deluge Manager: #Start the Deluge Manager:
self.manager = core.Manager(common.CLIENT_CODE, common.CLIENT_VERSION, self.manager = core.Manager(common.CLIENT_CODE, common.CLIENT_VERSION,
@ -115,25 +116,43 @@ class DelugeGTK:
self.update_interface = True self.update_interface = True
def new_release_check(): def new_release_check():
import sys import urllib
py_version = sys.version[:3] new_release = urllib.urlopen("http://download.deluge-torrent.org/version").read().strip()
file = os.path.join(common.INSTALL_PREFIX, 'lib', 'python' \ if new_release > common.PROGRAM_VERSION:
+ py_version, 'site-packages', 'deluge', 'update.py') gtk.gdk.threads_enter()
os.spawnlp(os.P_NOWAIT, 'python', 'python', file, dialog = gtk.MessageDialog(parent = None,
common.PROGRAM_VERSION) flags = gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
buttons = gtk.BUTTONS_YES_NO,
message_format=_("There is a newer version of Deluge. Would you like to be taken to our download site?"),
type=gtk.MESSAGE_QUESTION)
dialog.set_title('New Release!')
result = dialog.run()
dialog.destroy()
if result == gtk.RESPONSE_YES:
common.open_url_in_browser('http://download.deluge-torrent.org')
elif result == gtk.RESPONSE_NO:
pass
gtk.gdk.threads_leave()
def send_info(): def send_info():
import time import time
def _run_script(): def _run_script():
import sys import urllib
import platform
py_version = sys.version[:3] pygtk = '%i.%i.%i' %(gtk.pygtk_version[0],gtk.pygtk_version[1],gtk.pygtk_version[2])
gtk.gdk.threads_enter()
file = os.path.join(common.INSTALL_PREFIX, 'lib', 'python' \ urllib.urlopen("http://download.deluge-torrent.org/stats.php?processor=" + \
+ py_version, 'site-packages', 'deluge', 'info.py') platform.machine() + "&python=" + platform.python_version() \
os.spawnlp(os.P_NOWAIT, 'python', 'python', file, + "&os=" + platform.system() + "&pygtk=" + pygtk)
common.PROGRAM_VERSION)
f = open(os.path.join(common.CONFIG_DIR, 'infosent'), 'w')
f.write("")
f.close
gtk.gdk.threads_leave()
info_file = os.path.join(common.CONFIG_DIR, 'infosent') info_file = os.path.join(common.CONFIG_DIR, 'infosent')