Fix #577 adding torrents by drag n' drop in windows

This commit is contained in:
Andrew Resch 2008-11-02 23:22:55 +00:00
commit b3cda61961
2 changed files with 33 additions and 32 deletions

View file

@ -88,6 +88,8 @@ def process_args(args):
return return
config = ConfigManager("gtkui.conf") config = ConfigManager("gtkui.conf")
for arg in args: for arg in args:
if not arg:
continue
log.debug("arg: %s", arg) log.debug("arg: %s", arg)
if deluge.common.is_url(arg): if deluge.common.is_url(arg):
log.debug("Attempting to add %s from external source..", log.debug("Attempting to add %s from external source..",
@ -113,4 +115,3 @@ def process_args(args):
component.get("AddTorrentDialog").show(config["focus_add_dialog"]) component.get("AddTorrentDialog").show(config["focus_add_dialog"])
else: else:
client.add_torrent_file([os.path.abspath(arg)]) client.add_torrent_file([os.path.abspath(arg)])

View file

@ -196,8 +196,8 @@ class MainWindow(component.Component):
args = [] args = []
for uri in selection_data.data.split(): for uri in selection_data.data.split():
if deluge.common.windows_check(): if deluge.common.windows_check():
uri = uri[7:] args.append(urllib.url2pathname(uri[7:]))
uri = urllib.url2pathname(uri).strip("\r\n\x00") else:
args.append(urllib.unquote(urlparse(uri).path)) args.append(urllib.unquote(urlparse(uri).path))
process_args(args) process_args(args)
drag_context.finish(True, True) drag_context.finish(True, True)