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

[Common] Only attempt dbus import on non-Win/OSX

This commit is contained in:
Calum Lind 2016-11-10 10:28:51 +00:00 committed by Calum Lind
parent 93ab2445a1
commit bde13515e6
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
deluge/common.py
View File

@ -29,13 +29,19 @@ import pkg_resources
from deluge.error import InvalidPathError from deluge.error import InvalidPathError
try: DBUS_FILEMAN = None
import dbus # gi makes dbus available on Window but don't import it as unused.
bus = dbus.SessionBus() if platform.system() not in ('Windows', 'Microsoft', 'Darwin'):
dbus_fileman = bus.get_object('org.freedesktop.FileManager1', '/org/freedesktop/FileManager1') try:
except Exception: import dbus
dbus_fileman = None except ImportError:
pass
else:
try:
bus = dbus.SessionBus()
DBUS_FILEMAN = bus.get_object('org.freedesktop.FileManager1', '/org/freedesktop/FileManager1')
except dbus.DBusException:
pass
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -249,9 +255,9 @@ def show_file(path, timestamp=None):
if timestamp is None: if timestamp is None:
timestamp = int(time.time()) timestamp = int(time.time())
startup_id = '%s_%u_%s-dbus_TIME%d' % (os.path.basename(sys.argv[0]), os.getpid(), os.uname()[1], timestamp) startup_id = '%s_%u_%s-dbus_TIME%d' % (os.path.basename(sys.argv[0]), os.getpid(), os.uname()[1], timestamp)
if dbus_fileman: if DBUS_FILEMAN:
paths = [urlparse.urljoin('file:', urllib.pathname2url(utf8_encoded(path)))] paths = [urlparse.urljoin('file:', urllib.pathname2url(utf8_encoded(path)))]
dbus_fileman.ShowItems(paths, startup_id, dbus_interface='org.freedesktop.FileManager1') DBUS_FILEMAN.ShowItems(paths, startup_id, dbus_interface='org.freedesktop.FileManager1')
else: else:
env = os.environ.copy() env = os.environ.copy()
env['DESKTOP_STARTUP_ID'] = startup_id.replace('dbus', 'xdg-open') env['DESKTOP_STARTUP_ID'] = startup_id.replace('dbus', 'xdg-open')