mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-02 22:48:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tweaks to console info code

Browse source
This commit is contained in:
Calum Lind 2012-10-13 02:20:58 +01:00
commit 1c865ebeb9
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
deluge/ui/console/commands/info.py
View file

@ -47,7 +47,7 @@ strwidth = format_utils.strwidth
from os.path import sep as dirsep from os.path import sep as dirsep
status_keys = ["state", STATUS_KEYS = ["state",
"save_path", "save_path",
"tracker", "tracker",
"next_announce", "next_announce",
@ -74,8 +74,8 @@ status_keys = ["state",
"is_finished" "is_finished"
] ]
states = ["Active", "Downloading", "Seeding", "Paused", "Checking", "Error", "Queued"] # Add filter specific state to torrent states
STATES = ["Active"] + common.TORRENT_STATE
def format_progressbar(progress, width): def format_progressbar(progress, width):
""" """
@ -95,7 +95,6 @@ def format_progressbar(progress, width):
s += "]" s += "]"
return s return s
class Command(BaseCommand): class Command(BaseCommand):
"""Show information about the torrents""" """Show information about the torrents"""
@ -106,8 +105,8 @@ class Command(BaseCommand):
help='shows detailed information about files and peers. ' help='shows detailed information about files and peers. '
"Implies -v"), "Implies -v"),
make_option('-s', '--state', action='store', dest='state', make_option('-s', '--state', action='store', dest='state',
help="Only retrieve torrents in state STATE. " help="show torrents with state STATE. "
"Allowable values are: %s "%(", ".join(states))), "Possible values are: %s"%(", ".join(STATES))),
) )
usage = "Usage: info [-v | -d | -s <state>] [<torrent-id> [<torrent-id> ...]]\n"\ usage = "Usage: info [-v | -d | -s <state>] [<torrent-id> [<torrent-id> ...]]\n"\
@ -140,14 +139,15 @@ class Command(BaseCommand):
status_dict = {"id": torrent_ids} status_dict = {"id": torrent_ids}
if options["state"]: if options["state"]:
if options["state"] not in states: options["state"] = options["state"].capitalize()
self.console.write("Invalid state: %s"%options["state"]) if options["state"] in STATES:
self.console.write("Allowble values are: %s."%(", ".join(states)))
return
else:
status_dict["state"] = options["state"] status_dict["state"] = options["state"]
else:
self.console.write("Invalid state: %s"%options["state"])
self.console.write("Possible values are: %s."%(", ".join(STATES)))
return
d = client.core.get_torrents_status(status_dict, status_keys) d = client.core.get_torrents_status(status_dict, STATUS_KEYS)
d.addCallback(on_torrents_status) d.addCallback(on_torrents_status)
d.addErrback(on_torrents_status_fail) d.addErrback(on_torrents_status_fail)
return d return d