Pass config object to terminal.

This commit is contained in:
Michael Lazar
2016-07-08 20:48:42 -07:00
parent e30d53c49e
commit cd9617b0d8
4 changed files with 56 additions and 56 deletions

View File

@@ -93,7 +93,7 @@ def main():
if not config['monochrome']:
Color.init()
term = Terminal(stdscr, config['ascii'])
term = Terminal(stdscr, config)
with term.loader('Initializing', catch_exception=False):
reddit = praw.Reddit(user_agent=user_agent,
decode_html_entities=False,

View File

@@ -42,28 +42,28 @@ class Terminal(object):
RETURN = 10
SPACE = 32
def __init__(self, stdscr, ascii=False):
def __init__(self, stdscr, config):
self.stdscr = stdscr
self.ascii = ascii
self.config = config
self.loader = LoadScreen(self)
self._display = None
@property
def up_arrow(self):
symbol = '^' if self.ascii else ''
symbol = '^' if self.config['ascii'] else ''
attr = curses.A_BOLD | Color.GREEN
return symbol, attr
@property
def down_arrow(self):
symbol = 'v' if self.ascii else ''
symbol = 'v' if self.config['ascii'] else ''
attr = curses.A_BOLD | Color.RED
return symbol, attr
@property
def neutral_arrow(self):
symbol = 'o' if self.ascii else ''
symbol = 'o' if self.config['ascii'] else ''
attr = curses.A_BOLD
return symbol, attr
@@ -75,7 +75,7 @@ class Terminal(object):
@property
def guilded(self):
symbol = '*' if self.ascii else ''
symbol = '*' if self.config['ascii'] else ''
attr = curses.A_BOLD | Color.YELLOW
return symbol, attr
@@ -215,7 +215,7 @@ class Terminal(object):
if isinstance(string, six.text_type):
string = unescape(string)
if self.ascii:
if self.config['ascii']:
if isinstance(string, six.binary_type):
string = string.decode('utf-8')
string = string.encode('ascii', 'replace')