From 7cd90128add168a27fc6e9b93756fbc0a3c65f8f Mon Sep 17 00:00:00 2001 From: Jonathan McCrohan Date: Sat, 3 Aug 2013 01:23:32 +0100 Subject: Imported Upstream version 1.6.1 --- transmission-remote-cli | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) (limited to 'transmission-remote-cli') diff --git a/transmission-remote-cli b/transmission-remote-cli index bbb3ea9..1dcce92 100755 --- a/transmission-remote-cli +++ b/transmission-remote-cli @@ -16,10 +16,10 @@ # http://www.gnu.org/licenses/gpl-3.0.txt # ######################################################################## -VERSION = '1.6.0' +VERSION = '1.6.1' TRNSM_VERSION_MIN = '1.90' -TRNSM_VERSION_MAX = '2.80' +TRNSM_VERSION_MAX = '2.81' RPC_VERSION_MIN = 8 RPC_VERSION_MAX = 15 @@ -61,10 +61,11 @@ import curses.ascii from textwrap import wrap from subprocess import call, Popen import netrc -import glob import operator import urlparse +locale.setlocale(locale.LC_ALL, '') +ENCODING = locale.getpreferredencoding() or 'UTF-8' # optional features provided by non-standard modules features = {'dns':False, 'geoip':False, 'ipy':False} @@ -865,9 +866,6 @@ class Interface: self.compact_torrentlist = False # draw only one line for each torrent in compact mode self.exit_now = False - locale.setlocale(locale.LC_ALL, '') - self.encoding = locale.getpreferredencoding() or 'UTF-8' - self.keybindings = { ord('?'): self.call_list_key_bindings, curses.KEY_F1: self.call_list_key_bindings, @@ -990,7 +988,7 @@ class Interface: curses.endwin() def enc(self, text): - return text.encode(self.encoding, 'replace') + return text.encode(ENCODING, 'replace') def get_screen_size(self): time.sleep(0.1) # prevents curses.error on rapid resizing @@ -2788,6 +2786,8 @@ class Interface: win = self.window(height, width, message=message) win.keypad(True) show_cursor() + if not isinstance(input, unicode): + input = unicode(input, ENCODING) index = len(input) while True: # Cut the text into pages, each as long as the text field @@ -2798,7 +2798,7 @@ class Interface: color = (curses.color_pair(self.colors.id('dialog_important')) if self.highlight_dialog else curses.color_pair(self.colors.id('dialog'))) - win.addstr(height - 2, 2, displaytext.ljust(textwidth), color) + win.addstr(height - 2, 2, self.enc(displaytext.ljust(textwidth)), color) win.move(height - 2, displayindex + 2) c = win.getch() if c == 27 or c == curses.KEY_BREAK: @@ -2834,15 +2834,23 @@ class Interface: hide_cursor() return input elif c >= 32 and c < 127: - input = input[:index] + chr(c) + (index < len(input) and input[index:] or '') + input = input[:index] + unicode(chr(c), ENCODING) + (index < len(input) and input[index:] or '') index += 1 if on_change: on_change(input) elif c == ord('\t') and tab_complete: - possible_choices = glob.glob(tilde2homedir(input)+'*') + (dirname, filename) = os.path.split(tilde2homedir(input)) + if not dirname: + dirname = unicode(os.getcwd()) + try: + possible_choices = [ choice for choice in os.listdir(dirname) + if choice.startswith(filename) ] + except OSError: + continue; if tab_complete == 'dirs': - possible_choices = [ d for d in possible_choices if os.path.isdir(d) ] + possible_choices = [ d for d in possible_choices + if os.path.isdir(os.path.join(dirname, d)) ] if(possible_choices): - input = os.path.commonprefix(possible_choices) + input = os.path.join(dirname, os.path.commonprefix(possible_choices)) if len(possible_choices) == 1 and os.path.isdir(input) and input.endswith(os.sep) == False: input += os.sep input = homedir2tilde(input) @@ -3308,7 +3316,7 @@ def ljust_columns(text, max_width, padchar=' '): def len_columns(text): """ Returns the amount of columns that would occupy. """ if type(text) == type(str()): - text = unicode(text) + text = unicode(text, ENCODING) columns = 0 for character in text: columns += 2 if unicodedata.east_asian_width(character) in ('W', 'F') else 1 -- cgit v1.2.3 f192bd-1Jonathan McCrohan1-2/+2 2016-06-11d/control: update insecure Vcs-Git URLJonathan McCrohan2-1/+2 2016-06-11d/control: update Standards Version to 3.9.8Jonathan McCrohan2-1/+9 2016-06-11Imported Upstream version 0+git20160503.4f192bdupstream/0+git20160503.4f192bdJonathan McCrohan1307-2667/+38002 2016-01-18Release 0+git20151202.3864e0a-1debian/0+git20151202.3864e0a-1Jonathan McCrohan1-2/+3 2016-01-18Imported Upstream version 0+git20151202.3864e0aJonathan McCrohan840-4057/+18230 2016-01-18Update get-vcs-snapshot.sh to reflect gbp changesJonathan McCrohan2-1/+2 2016-01-18Imported Upstream version 0+git20151202.3864e0aupstream/0+git20151202.3864e0aJonathan McCrohan840-4057/+18230 2015-05-05d/control: various fixes found by libconfig-model-dpkg-perlJonathan McCrohan2-5/+13 2015-04-01Release 0+git20150208.f2053b3-1Jonathan McCrohan1-2/+2 2015-04-01Describe changes made in snapshotJonathan McCrohan1-0/+3 2015-04-01New Upstream Snapshot (commit f2053b3)Jonathan McCrohan1-0/+6 2015-04-01Imported Upstream version 0+git20150208.f2053b3upstream/0+git20150208.f2053b3Jonathan McCrohan32-333/+483 2014-12-28Release 0+git20141218.b46a22c-1debian/0+git20141218.b46a22c-1Jonathan McCrohan1-2/+2 2014-12-28Updated AU DVB-T files; Thanks Brian Burch! (Closes LP: #1393280)Jonathan McCrohan1-0/+1 2014-12-28New Upstream Snapshot (commit b46a22c)Jonathan McCrohan1-0/+6 2014-12-28Imported Upstream version 0+git20141218.b46a22cupstream/0+git20141218.b46a22cJonathan McCrohan535-639/+317 2014-10-20Release 0+git20141009.d26b627-1debian/0+git20141009.d26b627-1Jonathan McCrohan1-2/+2 2014-10-20Fix up packaging to account for move to DVBv5Jonathan McCrohan2-2/+6 2014-10-20delete d/dtv-scan-files.install; Upstream now supplies a MakefileJonathan McCrohan2-4/+1 2014-10-15d/control: update Standards Version to 3.9.6Jonathan McCrohan2-1/+3 2014-10-15d/control: add Build-Depends on dvb-toolsJonathan McCrohan2-1/+2 2014-10-15New Upstream Snapshot (commit d26b627)Jonathan McCrohan1-0/+10 2014-10-15Imported Upstream version 0+git20141009.d26b627upstream/0+git20141009.d26b627Jonathan McCrohan2010-11120/+159271 2014-07-23Release 0+git20140611.14bd6c7-1debian/0+git20140611.14bd6c7-1Jonathan McCrohan1-2/+2 2014-07-23New Upstream Snapshot (commit 14bd6c7)Jonathan McCrohan1-2/+3 2014-07-23Imported Upstream version 0+git20140611.14bd6c7upstream/0+git20140611.14bd6c7Jonathan McCrohan7-11/+60 2014-05-13New Upstream Snapshot (commit 1246b27)Jonathan McCrohan1-0/+6 2014-05-13Imported Upstream version 0+git20140512.1246b27upstream/0+git20140512.1246b27Jonathan McCrohan391-301/+3983 2014-04-05Release 0+git20140326.cfc2975-1debian/0+git20140326.cfc2975-1Jonathan McCrohan1-2/+2 2014-04-05d/control: update Homepage (upstream has moved from Gitweb to cgit)Jonathan McCrohan2-1/+2 2014-04-05New Upstream Snapshot (commit cfc2975)Jonathan McCrohan1-0/+6 2014-04-05Imported Upstream version 0+git20140326.cfc2975upstream/0+git20140326.cfc2975Jonathan McCrohan118-656/+877 2014-01-16Release 0+git20140107.1850cf8-1debian/0+git20140107.1850cf8-1Jonathan McCrohan1-2/+2 2014-01-16Update Standards Version to 3.9.5Jonathan McCrohan2-1/+9