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

support urls from add dialog

This commit is contained in:
Nick Lanham 2011-02-23 16:12:49 +01:00
parent 60d96c6f20
commit 62f6683730
2 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
deluge/ui/console/modes/add_util.py
View File

@ -40,6 +40,7 @@ from twisted.internet import defer
from deluge.ui.client import client from deluge.ui.client import client
import deluge.component as component import deluge.component as component
import deluge.common
from optparse import make_option from optparse import make_option
import os,base64,glob import os,base64,glob
@ -57,7 +58,12 @@ def add_torrent(t_file, options, success_cb, fail_cb, ress):
t_options["download_location"] = os.path.expanduser(options["path"]) t_options["download_location"] = os.path.expanduser(options["path"])
t_options["add_paused"] = options["add_paused"] t_options["add_paused"] = options["add_paused"]
files = glob.glob(t_file) is_url = (not (options["path_type"]==1)) and (deluge.common.is_url(t_file) or options["path_type"]==2)
if is_url:
files = [t_file]
else:
files = glob.glob(t_file)
num_files = len(files) num_files = len(files)
ress["total"] = num_files ress["total"] = num_files
@ -65,21 +71,24 @@ def add_torrent(t_file, options, success_cb, fail_cb, ress):
fail_cb("Doesn't exist",t_file,ress) fail_cb("Doesn't exist",t_file,ress)
for f in files: for f in files:
if not os.path.exists(f): if is_url:
fail_cb("Doesn't exist",f,ress) client.core.add_torrent_url(f, t_options).addCallback(success_cb,f,ress).addErrback(fail_cb,f,ress)
continue else:
if not os.path.isfile(f): if not os.path.exists(f):
fail_cb("Is a directory",f,ress) fail_cb("Doesn't exist",f,ress)
continue continue
if not os.path.isfile(f):
fail_cb("Is a directory",f,ress)
continue
try: try:
add_get_info(f) add_get_info(f)
except Exception as e: except Exception as e:
fail_cb(e.message,f,ress) fail_cb(e.message,f,ress)
continue continue
filename = os.path.split(f)[-1] filename = os.path.split(f)[-1]
filedump = base64.encodestring(open(f).read()) filedump = base64.encodestring(open(f).read())
client.core.add_torrent_file(filename, filedump, t_options).addCallback(success_cb,f,ress).addErrback(fail_cb,f,ress) client.core.add_torrent_file(filename, filedump, t_options).addCallback(success_cb,f,ress).addErrback(fail_cb,f,ress)

2
deluge/ui/console/modes/alltorrents.py
View File

@ -463,6 +463,8 @@ class AllTorrents(BaseMode):
self.popup.add_text_input("Enter path to torrent file:","file") self.popup.add_text_input("Enter path to torrent file:","file")
self.popup.add_text_input("Enter save path:","path",dl) self.popup.add_text_input("Enter save path:","path",dl)
self.popup.add_select_input("Add Paused:","add_paused",["Yes","No"],[True,False],ap) self.popup.add_select_input("Add Paused:","add_paused",["Yes","No"],[True,False],ap)
self.popup.add_spaces(1)
self.popup.add_select_input("Path is:","path_type",["Auto","File","URL"],[0,1,2],0)
def report_message(self,title,message): def report_message(self,title,message):
self.messages.append((title,message)) self.messages.append((title,message))