pestctrl/newfol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify callback type checking.

Browse source 
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
This commit is contained in:
brian m. carlson 2014-03-16 21:22:43 +00:00
parent 95873edc0e
commit d4d61cf452
No known key found for this signature in database
GPG key ID: BF535D811F52F68B
2 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/newfol/exception.py
View file

@ -4,6 +4,9 @@ class NewfolError(Exception):
class LockError(NewfolError): class LockError(NewfolError):
pass pass
class ImplementationError(NewfolError):
pass
class FilemanipError(Exception): class FilemanipError(Exception):
pass pass

29
newfol
View file

@ -226,6 +226,17 @@ class View:
@staticmethod @staticmethod
def text(text, *classes): def text(text, *classes):
return urwid.AttrMap(urwid.Text(text), *classes) return urwid.AttrMap(urwid.Text(text), *classes)
@staticmethod
def is_callback_type(type_, category):
if category == "select":
return type_.startswith("select") or type_.startswith("next")
elif category == "simple-select":
return type_ in ("select", "next")
elif category in ("change", "cancel"):
return type_ == category
else:
raise newfol.exception.ImplementationError("Unknown type %s" %
type_)
class IntroView(View): class IntroView(View):
def render(self, loop): def render(self, loop):
@ -436,7 +447,7 @@ class DisplayRecordView(RecordView):
continue continue
self.cells[i+1].widget_list[1].set_edit_text(str(val)) self.cells[i+1].widget_list[1].set_edit_text(str(val))
def callback(self, type_, obj): def callback(self, type_, obj):
if type_ in ("select", "next"): if self.is_callback_type(type_, "simple-select"):
dbd = DatabaseData() dbd = DatabaseData()
newrec = self._build_record() newrec = self._build_record()
recs = [] recs = []
@ -474,7 +485,7 @@ class SearchRecordView(RecordView):
return [i.widget_list[1].get_edit_text() for i in self.cells] return [i.widget_list[1].get_edit_text() for i in self.cells]
def callback(self, type_, obj): def callback(self, type_, obj):
dbd = DatabaseData() dbd = DatabaseData()
if type_ in ("select", "next"): if self.is_callback_type(type_, "select"):
fields = self._get_fields() fields = self._get_fields()
fieldres = [] fieldres = []
for f in fields: for f in fields:
@ -521,7 +532,7 @@ class DisplayTemplateRecordView(RecordView):
def _get_fields(self): def _get_fields(self):
return [i.widget_list[1].get_state() for i in self.cells] return [i.widget_list[1].get_state() for i in self.cells]
def callback(self, type_, obj): def callback(self, type_, obj):
if type_.startswith("select") or type_.startswith("next"): if self.is_callback_type(type_, "select"):
dbd = DatabaseData() dbd = DatabaseData()
selected = self._get_fields() selected = self._get_fields()
view = SortingTemplateRecordView(self.table, self.records, view = SortingTemplateRecordView(self.table, self.records,
@ -584,7 +595,7 @@ class SortingTemplateRecordView(RecordView):
l[0] = True l[0] = True
return l return l
def callback(self, type_, obj): def callback(self, type_, obj):
if type_.startswith("select") or type_.startswith("next"): if self.is_callback_type(type_, "select"):
dbd = DatabaseData() dbd = DatabaseData()
fieldno = self._get_fields().index(True) fieldno = self._get_fields().index(True)
def lookup(x): def lookup(x):
@ -743,7 +754,7 @@ class RecordListView(ListView):
if type_ == "remove": if type_ == "remove":
self._toggle_selected_record() self._toggle_selected_record()
self._full_rerender = True self._full_rerender = True
if type_ != "select" and not type_.startswith("next"): if not self.is_callback_type(type_, "select"):
return return
cur = self._current_item() cur = self._current_item()
if cur is None: if cur is None:
@ -764,7 +775,7 @@ class TableContentsListView(RecordListView):
class TableListView(ListView): class TableListView(ListView):
def callback(self, type_, obj): def callback(self, type_, obj):
if type_ != "select" and not type_.startswith("next"): if not self.is_callback_type(type_, "select"):
return return
if obj is None: if obj is None:
text = self._current_item() text = self._current_item()
@ -825,7 +836,7 @@ class MessageBox(View):
else: else:
self.message = message self.message = message
def callback(self, type_, obj): def callback(self, type_, obj):
if type_ == "select": if self.is_callback_type(type_, "select"):
render_previous_view(self.loop) render_previous_view(self.loop)
def _render_buttons(self): def _render_buttons(self):
def callback_glue(button): def callback_glue(button):
@ -858,12 +869,12 @@ class MenuView(ListView):
("About newfol", "about") ("About newfol", "about")
]) ])
def callback(self, type_, obj): def callback(self, type_, obj):
if type_ != "select" and not type_.startswith("next"): if not self.is_callback_type(type_, "select"):
return return
text = self.listbox.get_focus()[0].original_widget.get_text()[0] text = self.listbox.get_focus()[0].original_widget.get_text()[0]
command = self.OPTIONS[text] command = self.OPTIONS[text]
if command == "browse-all": if command == "browse-all":
if type_ == "select" or type_.startswith("next"): if self.is_callback_type(type_, "select"):
ccview = CompleteContentsListView() ccview = CompleteContentsListView()
ccview.set_render_type(type_) ccview.set_render_type(type_)
ccview.render(self.loop) ccview.render(self.loop)