Rearrange almost all of the code.
This commit is contained in:
Sadrul Habib Chowdhury
parent
5f40e030b1
commit
3d26049aeb
|
|
@ -53,169 +53,232 @@ status_keys = ["state",
|
||||||
"file_progress",
|
"file_progress",
|
||||||
]
|
]
|
||||||
|
|
||||||
def add_torrent(cmd):
|
class Command:
|
||||||
"""Add a torrent."""
|
def __init__(self):
|
||||||
def show_usage():
|
pass
|
||||||
|
|
||||||
|
def execute(self, cmd):
|
||||||
|
pass
|
||||||
|
|
||||||
|
def usage(self):
|
||||||
|
print ""
|
||||||
|
|
||||||
|
def help(self):
|
||||||
|
pass
|
||||||
|
|
||||||
|
class CommandAdd(Command):
|
||||||
|
"""Command to add a torrent."""
|
||||||
|
def execute(self, cmd):
|
||||||
|
if len(cmd) < 2:
|
||||||
|
self.usage()
|
||||||
|
return
|
||||||
|
|
||||||
|
save_path = None
|
||||||
|
readpath = False
|
||||||
|
if cmd[1] == '-p':
|
||||||
|
if len(cmd) < 4:
|
||||||
|
self.usage()
|
||||||
|
return
|
||||||
|
del cmd[1]
|
||||||
|
readpath = True
|
||||||
|
else:
|
||||||
|
def _got_config(configs):
|
||||||
|
global save_path
|
||||||
|
save_path = configs['download_location']
|
||||||
|
client.get_config(_got_config)
|
||||||
|
client.force_call()
|
||||||
|
|
||||||
|
command = " ".join(cmd[1:])
|
||||||
|
paths = command.split(';')
|
||||||
|
if readpath:
|
||||||
|
save_path = paths[0].strip() # Perhaps verify that the path exists?
|
||||||
|
client.set_config({'download_location': save_path})
|
||||||
|
del paths[0]
|
||||||
|
|
||||||
|
if not save_path:
|
||||||
|
print "There's no save-path specified. You must specify a path to save the downloaded files.\n"
|
||||||
|
return
|
||||||
|
|
||||||
|
for iter in range(0, len(paths)):
|
||||||
|
paths[iter] = paths[iter].strip()
|
||||||
|
if len(paths[iter]) == 0:
|
||||||
|
del paths[iter]
|
||||||
|
|
||||||
|
try:
|
||||||
|
client.add_torrent_file(paths)
|
||||||
|
except Exception, msg:
|
||||||
|
print "*** Error:", str(msg), "\n"
|
||||||
|
|
||||||
|
def usage(self):
|
||||||
print "Usage: add [-p <save-location>;] <torrent-file>; [<torrent-file>; ...]"
|
print "Usage: add [-p <save-location>;] <torrent-file>; [<torrent-file>; ...]"
|
||||||
print " (Note that a ';' must follow a path)"
|
print " (Note that a ';' must follow a path)"
|
||||||
print ""
|
print ""
|
||||||
|
|
||||||
if len(cmd) < 2:
|
def help(self):
|
||||||
show_usage()
|
print "Add a torrent"
|
||||||
return
|
|
||||||
|
|
||||||
save_path = None
|
class CommandConfig(Command):
|
||||||
readpath = False
|
def execute(self, cmd):
|
||||||
if cmd[1] == '-p':
|
del cmd[0]
|
||||||
if len(cmd) < 4:
|
def _on_get_config(config):
|
||||||
show_usage()
|
for key in config:
|
||||||
return
|
if cmd and key not in cmd: continue
|
||||||
del cmd[1]
|
print "%s: %s" % (key, config[key])
|
||||||
readpath = True
|
print ""
|
||||||
else:
|
client.get_config(_on_get_config)
|
||||||
def _got_config(configs):
|
|
||||||
global save_path
|
|
||||||
save_path = configs['download_location']
|
|
||||||
client.get_config(_got_config)
|
|
||||||
client.force_call()
|
|
||||||
|
|
||||||
command = " ".join(cmd[1:])
|
def usage(self):
|
||||||
paths = command.split(';')
|
print "Usage: config [key1 [key2 ...]]"
|
||||||
if readpath:
|
|
||||||
save_path = paths[0].strip() # Perhaps verify that the path exists?
|
|
||||||
client.set_config({'download_location': save_path})
|
|
||||||
del paths[0]
|
|
||||||
|
|
||||||
if not save_path:
|
|
||||||
print "There's no save-path specified. You must specify a path to save the downloaded files.\n"
|
|
||||||
return
|
|
||||||
|
|
||||||
for iter in range(0, len(paths)):
|
|
||||||
paths[iter] = paths[iter].strip()
|
|
||||||
if len(paths[iter]) == 0:
|
|
||||||
del paths[iter]
|
|
||||||
|
|
||||||
try:
|
|
||||||
client.add_torrent_file(paths)
|
|
||||||
client.force_call()
|
|
||||||
except Exception, msg:
|
|
||||||
print "*** Error:", str(msg), "\n"
|
|
||||||
|
|
||||||
|
|
||||||
def show_configs(cmd):
|
|
||||||
del cmd[0]
|
|
||||||
def _on_get_config(config):
|
|
||||||
for key in config:
|
|
||||||
if cmd and key not in cmd: continue
|
|
||||||
print "%s: %s" % (key, config[key])
|
|
||||||
print ""
|
print ""
|
||||||
client.get_config(_on_get_config)
|
|
||||||
client.force_call()
|
|
||||||
|
|
||||||
def show_state(state):
|
def help(self):
|
||||||
ts = common.TORRENT_STATE
|
print "Show configuration values"
|
||||||
return ts.keys()[ts.values().index(state)]
|
|
||||||
|
|
||||||
def show_info(torrent, brief):
|
class CommandExit(Command):
|
||||||
"""Show information about a torrent."""
|
def execute(self, cmd):
|
||||||
def _got_torrent_status(state):
|
print "Thanks"
|
||||||
print "*** ID:", torrent
|
sys.exit(0)
|
||||||
print "*** Name:", state['name']
|
|
||||||
print "*** Path:", state['save_path']
|
|
||||||
print "*** Completed:", common.fsize(state['total_done']) + "/" + common.fsize(state['total_size'])
|
|
||||||
print "*** Status:", show_state(state['state'])
|
|
||||||
if state['state'] in [3, 4, 5, 6]:
|
|
||||||
print "*** Download Speed:", common.fspeed(state['download_payload_rate'])
|
|
||||||
print "*** Upload Speed:", common.fspeed(state['upload_payload_rate'])
|
|
||||||
if state['state'] in [3, 4]:
|
|
||||||
print "*** ETA:", "%s" % common.ftime(state['eta'])
|
|
||||||
|
|
||||||
if brief == False:
|
def help(self):
|
||||||
print "*** Seeders:", "%s (%s)" % (state['num_seeds'], state['total_seeds'])
|
print "Exit from the client."
|
||||||
print "*** Peers:", "%s (%s)" % (state['num_peers'], state['total_peers'])
|
|
||||||
print "*** Share Ratio:", "%.1f" % state['ratio']
|
|
||||||
print "*** Availability:", "%.1f" % state['distributed_copies']
|
|
||||||
print "*** Files:"
|
|
||||||
for i, file in enumerate(state['files']):
|
|
||||||
print "\t*", file['path'], "(%s)" % common.fsize(file['size']), "-", "%.1f%% completed" % (state['file_progress'][i] * 100)
|
|
||||||
print ""
|
|
||||||
pr = state['file_priorities']
|
|
||||||
print pr
|
|
||||||
if len(pr) == 0:
|
|
||||||
pr = [1] * len(state['files'])
|
|
||||||
pr[0] = 2
|
|
||||||
print "b", pr
|
|
||||||
client.set_torrent_file_priorities(torrent, pr)
|
|
||||||
client.get_torrent_status(_got_torrent_status, torrent, status_keys)
|
|
||||||
|
|
||||||
def info_torrents(cmd):
|
class CommandHelp(Command):
|
||||||
"""Show information about the torrents."""
|
def execute(self, cmd):
|
||||||
torrents = []
|
|
||||||
def _got_session_state(tors):
|
|
||||||
for tor in tors:
|
|
||||||
torrents.append(tor)
|
|
||||||
client.get_session_state(_got_session_state)
|
|
||||||
client.force_call()
|
|
||||||
for tor in torrents:
|
|
||||||
if len(cmd) < 2:
|
if len(cmd) < 2:
|
||||||
show_info(tor, True)
|
print "Available commands:"
|
||||||
elif cmd[1] == tor[0:len(cmd[1])]:
|
for cmd in sorted(commands.keys()):
|
||||||
show_info(tor, False)
|
print "\t*", "%s:" % cmd,
|
||||||
client.force_call()
|
command = commands[cmd]
|
||||||
|
command.help()
|
||||||
|
else:
|
||||||
|
for c in cmd[1:]:
|
||||||
|
if c not in commands:
|
||||||
|
print "Unknown command:", c
|
||||||
|
else:
|
||||||
|
print "*", "%s:" % c,
|
||||||
|
command = commands[c]
|
||||||
|
command.help()
|
||||||
|
command.usage()
|
||||||
|
|
||||||
def exit(cmd):
|
def usage(self):
|
||||||
"""Terminate."""
|
print "Usage: help [cmd1 [cmd2 ...]]"
|
||||||
print "Thanks."
|
|
||||||
sys.exit(0)
|
|
||||||
|
|
||||||
def show_help(cmd):
|
|
||||||
"""Show help."""
|
|
||||||
print "Available commands:"
|
|
||||||
for cmd, action, help in commands:
|
|
||||||
print "\t" + cmd + ": " + help
|
|
||||||
|
|
||||||
def pause_torrent(cmd):
|
|
||||||
"""Pause a torrent"""
|
|
||||||
if len(cmd) < 2:
|
|
||||||
print "Usage: pause <torrent-id> [<torrent-id> ...]"
|
|
||||||
return
|
|
||||||
try:
|
|
||||||
client.pause_torrent(cmd[1:])
|
|
||||||
except Exception, msg:
|
|
||||||
print "Error:", str(msg), "\n"
|
|
||||||
|
|
||||||
def resume_torrent(cmd):
|
|
||||||
"""Resume a torrent."""
|
|
||||||
if len(cmd) < 2:
|
|
||||||
print "Usage: resume <torrent-id> [<torrent-id> ...]"
|
|
||||||
return
|
|
||||||
try:
|
|
||||||
client.resume_torrent(cmd[1:])
|
|
||||||
except Exception, msg:
|
|
||||||
print "Error:", str(msg), "\n"
|
|
||||||
|
|
||||||
def remove_torrent(cmd):
|
|
||||||
"""Remove a torrent."""
|
|
||||||
if len(cmd) < 2:
|
|
||||||
print "Usage: rm <torrent-id> [<torrent-id> ...]"
|
|
||||||
print " Use 'list' to see the list of torrents."
|
|
||||||
print ""
|
print ""
|
||||||
return
|
|
||||||
try:
|
|
||||||
client.remove_torrent(cmd[1:])
|
|
||||||
except Exception, msg:
|
|
||||||
print "*** Error:", str(msg), "\n"
|
|
||||||
|
|
||||||
commands = (('add', add_torrent, 'Add a torrent'),
|
def help(self):
|
||||||
('configs', show_configs, 'Show configurations'),
|
print "Show help"
|
||||||
('exit', exit, 'Terminate'),
|
|
||||||
('help', show_help, 'Show help about a command, or generic help'),
|
class CommandInfo(Command):
|
||||||
('info', info_torrents, 'Show information about the torrents'),
|
def execute(self, cmd):
|
||||||
('pause', pause_torrent, 'Pause a torrent.'),
|
torrents = []
|
||||||
('quit', exit, 'Terminate'),
|
def _got_session_state(tors):
|
||||||
('resume', resume_torrent, 'Resume a torrent.'),
|
for tor in tors:
|
||||||
('rm', remove_torrent, 'Remove a torrent'),
|
torrents.append(tor)
|
||||||
)
|
client.get_session_state(_got_session_state)
|
||||||
|
client.force_call()
|
||||||
|
for tor in torrents:
|
||||||
|
if len(cmd) < 2:
|
||||||
|
self.show_info(tor, True)
|
||||||
|
elif cmd[1] == tor[0:len(cmd[1])]:
|
||||||
|
self.show_info(tor, False)
|
||||||
|
|
||||||
|
def usage(self):
|
||||||
|
print "Usage: info [<torrent-id> [<torrent-id> ...]]"
|
||||||
|
print " You can give the first few characters of a torrent-id to identify the torrent."
|
||||||
|
print ""
|
||||||
|
|
||||||
|
def help(self):
|
||||||
|
print "Show information about the torrents"
|
||||||
|
|
||||||
|
def show_info(self, torrent, brief):
|
||||||
|
def show_state(state):
|
||||||
|
ts = common.TORRENT_STATE
|
||||||
|
return ts.keys()[ts.values().index(state)]
|
||||||
|
def _got_torrent_status(state):
|
||||||
|
print "*** ID:", torrent
|
||||||
|
print "*** Name:", state['name']
|
||||||
|
print "*** Path:", state['save_path']
|
||||||
|
print "*** Completed:", common.fsize(state['total_done']) + "/" + common.fsize(state['total_size'])
|
||||||
|
print "*** Status:", show_state(state['state'])
|
||||||
|
if state['state'] in [3, 4, 5, 6]:
|
||||||
|
print "*** Download Speed:", common.fspeed(state['download_payload_rate'])
|
||||||
|
print "*** Upload Speed:", common.fspeed(state['upload_payload_rate'])
|
||||||
|
if state['state'] in [3, 4]:
|
||||||
|
print "*** ETA:", "%s" % common.ftime(state['eta'])
|
||||||
|
|
||||||
|
if brief == False:
|
||||||
|
print "*** Seeders:", "%s (%s)" % (state['num_seeds'], state['total_seeds'])
|
||||||
|
print "*** Peers:", "%s (%s)" % (state['num_peers'], state['total_peers'])
|
||||||
|
print "*** Share Ratio:", "%.1f" % state['ratio']
|
||||||
|
print "*** Availability:", "%.1f" % state['distributed_copies']
|
||||||
|
print "*** Files:"
|
||||||
|
for i, file in enumerate(state['files']):
|
||||||
|
print "\t*", file['path'], "(%s)" % common.fsize(file['size']), "-", "%.1f%% completed" % (state['file_progress'][i] * 100)
|
||||||
|
print ""
|
||||||
|
client.get_torrent_status(_got_torrent_status, torrent, status_keys)
|
||||||
|
|
||||||
|
class CommandPause(Command):
|
||||||
|
def execute(self, cmd):
|
||||||
|
if len(cmd) < 2:
|
||||||
|
self.usage()
|
||||||
|
return
|
||||||
|
try:
|
||||||
|
client.pause_torrent(cmd[1:])
|
||||||
|
except Exception, msg:
|
||||||
|
print "Error:", str(msg), "\n"
|
||||||
|
|
||||||
|
def usage(self):
|
||||||
|
print "Usage: pause <torrent-id> [<torrent-id> ...]"
|
||||||
|
print ""
|
||||||
|
|
||||||
|
def help(self):
|
||||||
|
print "Pause a torrent"
|
||||||
|
|
||||||
|
class CommandResume(Command):
|
||||||
|
def execute(self, cmd):
|
||||||
|
if len(cmd) < 2:
|
||||||
|
self.usage()
|
||||||
|
return
|
||||||
|
try:
|
||||||
|
client.resume_torrent(cmd[1:])
|
||||||
|
except Exception, msg:
|
||||||
|
print "Error:", str(msg), "\n"
|
||||||
|
|
||||||
|
def usage(self):
|
||||||
|
print "Usage: resume <torrent-id> [<torrent-id> ...]"
|
||||||
|
print ""
|
||||||
|
|
||||||
|
def help(self):
|
||||||
|
print "Resume a torrent"
|
||||||
|
|
||||||
|
class CommandRemove(Command):
|
||||||
|
def execute(self, cmd):
|
||||||
|
if len(cmd) < 2:
|
||||||
|
self.usage()
|
||||||
|
return
|
||||||
|
try:
|
||||||
|
client.remove_torrent(cmd[1:])
|
||||||
|
except Exception, msg:
|
||||||
|
print "*** Error:", str(msg), "\n"
|
||||||
|
|
||||||
|
def usage(self):
|
||||||
|
print "Usage: rm <torrent-id> [<torrent-id> ...]"
|
||||||
|
print ""
|
||||||
|
|
||||||
|
def help(self):
|
||||||
|
print "Remove a torrent"
|
||||||
|
|
||||||
|
commands = {
|
||||||
|
'add' : CommandAdd(),
|
||||||
|
'configs' : CommandConfig(),
|
||||||
|
'exit' : CommandExit(),
|
||||||
|
'help' : CommandHelp(),
|
||||||
|
'info' : CommandInfo(),
|
||||||
|
'pause' : CommandPause(),
|
||||||
|
'quit' : CommandExit(),
|
||||||
|
'resume' : CommandResume(),
|
||||||
|
'rm' : CommandRemove(),
|
||||||
|
'del' : CommandRemove(),
|
||||||
|
}
|
||||||
|
|
||||||
client.set_core_uri("http://localhost:58846")
|
client.set_core_uri("http://localhost:58846")
|
||||||
|
|
||||||
|
|
@ -224,6 +287,7 @@ class NullUI:
|
||||||
print "Welcome to deluge-shell. Type 'help' to see a list of available commands."
|
print "Welcome to deluge-shell. Type 'help' to see a list of available commands."
|
||||||
|
|
||||||
readline.read_init_file()
|
readline.read_init_file()
|
||||||
|
|
||||||
while True:
|
while True:
|
||||||
inp = raw_input("> ")
|
inp = raw_input("> ")
|
||||||
if len(inp) == 0: break
|
if len(inp) == 0: break
|
||||||
|
|
@ -232,14 +296,12 @@ class NullUI:
|
||||||
print ""
|
print ""
|
||||||
cmd = inp[0]
|
cmd = inp[0]
|
||||||
found = False
|
found = False
|
||||||
for command, action, help in commands:
|
if cmd not in commands:
|
||||||
if command != cmd:
|
|
||||||
continue
|
|
||||||
action(inp)
|
|
||||||
found = True
|
|
||||||
break
|
|
||||||
if not found:
|
|
||||||
print "Invalid command!"
|
print "Invalid command!"
|
||||||
show_help([])
|
commands['help'].execute([])
|
||||||
|
else:
|
||||||
|
command = commands[cmd]
|
||||||
|
command.execute(inp)
|
||||||
|
client.force_call()
|
||||||
|
|
||||||
print "Thanks."
|
print "Thanks."
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue