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

Fix path error with torrent files prefixed with 'file://' from Firefox

This commit is contained in:
Calum Lind 2011-06-16 02:57:20 +01:00
parent 2cb77d17ce
commit 34f81634e5
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deluge/ui/gtkui/ipcinterface.py
View File

@ -90,7 +90,7 @@ class IPCInterface(component.Component):
for arg in args: for arg in args:
if arg.strip(): if arg.strip():
if not deluge.common.is_magnet(arg) and not deluge.common.is_url(arg): if not deluge.common.is_magnet(arg) and not deluge.common.is_url(arg):
arg = os.path.abspath(arg) arg = os.path.abspath(arg.replace('file://', '', 1))
_args.append(arg) _args.append(arg)
args = _args args = _args
@ -218,11 +218,9 @@ def process_args(args):
client.core.add_torrent_magnet(arg, {}) client.core.add_torrent_magnet(arg, {})
else: else:
# Just a file # Just a file
log.debug("Attempting to add %s from external source..", log.debug("Attempting to add %s from external source..", arg)
os.path.abspath(arg))
if config["interactive_add"]: if config["interactive_add"]:
component.get("AddTorrentDialog").add_from_files([os.path.abspath(arg)]) component.get("AddTorrentDialog").add_from_files([arg])
component.get("AddTorrentDialog").show(config["focus_add_dialog"]) component.get("AddTorrentDialog").show(config["focus_add_dialog"])
else: else:
path = os.path.abspath(arg) client.core.add_torrent_file(os.path.split(arg)[-1], base64.encodestring(open(arg, "rb").read()), None)
client.core.add_torrent_file(os.path.split(path)[-1], base64.encodestring(open(path, "rb").read()), None)