mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-12 19:28:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed input line bug lines were not wrapped correctly

Browse source
This commit is contained in:
Ido Abramovich 2008-10-04 20:02:00 +00:00
commit fafc2a4b76
2 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
deluge/ui/null2/colors.py
View file

@ -1,11 +1,13 @@
#!/usr/bin/env python #!/usr/bin/env python
import re, sys import re, sys
def color(string, fg=None, attrs=[], bg=None, keep_open=False): def color(string, fg=None, attrs=[], bg=None, keep_open=False, input=False):
if isinstance(attrs, basestring): if isinstance(attrs, basestring):
attrs = [attrs] attrs = [attrs]
attrs = map(str.lower, attrs) attrs = map(str.lower, attrs)
ansi_reset = "\x1b[0m" ansi_reset = "\x1b[0m"
if input:
ansi_reset = '\001'+ansi_reset+'\002'
if len(attrs) == 1 and 'reset' in attrs: if len(attrs) == 1 and 'reset' in attrs:
return ansi_reset return ansi_reset
colors = ['black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white'] colors = ['black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white']
@ -16,7 +18,10 @@ def color(string, fg=None, attrs=[], bg=None, keep_open=False):
color_vals = map(str, filter(lambda x: x is not None, [_fg, _bg])) color_vals = map(str, filter(lambda x: x is not None, [_fg, _bg]))
color_vals.extend(_attrs) color_vals.extend(_attrs)
reset_cmd = ansi_reset if not keep_open else '' reset_cmd = ansi_reset if not keep_open else ''
return "\x1b["+";".join(color_vals)+"m"+string+reset_cmd color_code = '\x1b['+';'.join(color_vals)+'m'
if input:
color_code = '\001'+color_code+'\002'
return color_code+string+reset_cmd
def make_style(*args, **kwargs): def make_style(*args, **kwargs):
return lambda text: color(text, *args, **kwargs) return lambda text: color(text, *args, **kwargs)
@ -53,11 +58,21 @@ class Template(str):
else: else:
return str(self) % args return str(self) % args
class InputTemplate(Template):
"""This class is similar to Template, but the escapes are wrapped in \001
and \002 so that readline can properly know the length of each line and
can wrap lines accordingly. Use this class for any colored text which
needs to be used in input prompts, such as in calls to raw_input()."""
input_codes = re.compile('(\x1b\[.*?m)')
def __new__(self, text):
regular_string = InputTemplate.regex.sub(lambda mo: InputTemplate.style[mo.group('style')](mo.group('arg')) , text)
return str.__new__(self, InputTemplate.input_codes.sub(r'\001\1\002', regular_string))
class struct(object): class struct(object):
pass pass
templates = struct() templates = struct()
templates.prompt = Template('{{bold_white(%s)}}') templates.prompt = InputTemplate('{{bold_white(%s)}}')
templates.ERROR = Template('{{bold_red( * %s)}}') templates.ERROR = Template('{{bold_red( * %s)}}')
templates.SUCCESS = Template('{{bold_green( * %s)}}') templates.SUCCESS = Template('{{bold_green( * %s)}}')
templates.help = Template(' * {{bold_blue(%-*s)}} %s') templates.help = Template(' * {{bold_blue(%-*s)}} %s')

6
deluge/ui/null2/commands/info.py
View file

@ -66,13 +66,13 @@ class Command(BaseCommand):
#self._mapping[state['name']] = torrent # update mapping #self._mapping[state['name']] = torrent # update mapping
print templates.info_general('Path', state['save_path']) print templates.info_general('Path', state['save_path'])
if not state['is_seed']: if verbose or not state['is_seed']:
print templates.info_transfers("Completed", common.fsize(state['total_done']) + "/" + common.fsize(state['total_size'])) print templates.info_transfers("Completed", common.fsize(state['total_done']) + "/" + common.fsize(state['total_size']))
print templates.info_transfers("Status", state['state']) print templates.info_transfers("Status", state['state'])
if state['state'] == 'Downloading': if verbose or state['state'] == 'Downloading':
print templates.info_transfers("Download Speed", common.fspeed(state['download_payload_rate'])) print templates.info_transfers("Download Speed", common.fspeed(state['download_payload_rate']))
if state['state'] in ('Downloading', 'Seeding'): if verbose or state['state'] in ('Downloading', 'Seeding'):
print templates.info_transfers("Upload Speed", common.fspeed(state['upload_payload_rate'])) print templates.info_transfers("Upload Speed", common.fspeed(state['upload_payload_rate']))
print templates.info_transfers("Share Ratio", "%.1f" % state['ratio']) print templates.info_transfers("Share Ratio", "%.1f" % state['ratio'])
if state['state'] == ('Downloading'): if state['state'] == ('Downloading'):