diff options
Diffstat (limited to 'pomu/search.py')
| -rw-r--r-- | pomu/search.py | 58 |
1 files changed, 34 insertions, 24 deletions
diff --git a/pomu/search.py b/pomu/search.py index e77ed1a..db8625c 100644 --- a/pomu/search.py +++ b/pomu/search.py @@ -1,7 +1,8 @@ from enum import Enum from pydoc import pager -from curtsies import FullscreenWindow, width, invert, fmtstr +from curtsies import FullscreenWindow, fmtstr, fsarray +from curtsies.fmtfuncs import invert from pomu.util.iquery import Prompt, clamp @@ -12,7 +13,7 @@ class Entry: self.item = item self.children = children - def toggle(self, idx): + def toggle(self, idx=0): if idx == 0: self.expanded = not self.expanded else: @@ -28,7 +29,9 @@ class Entry: return len(self.children) + 1 if self.expanded else 1 def selected(self): - return [child[1] for child in self.children if child[0]] + if self.children: + return [child[1] for child in self.children if child[0]] + return [] class PromptState(Enum): TOP_PREV=0 @@ -44,14 +47,14 @@ class PSPrompt(Prompt): self.state = PromptState.LIST self.set_page(1) - def results(): + def results(self): # (cp, v, overlay, data) res = [] - for k, v in self. itemitems(): + for k, v in self.pages.items(): for entry in v: cp = entry.item[0] for child in entry.selected(): - cid, v, overlay = *child + cid, v, overlay = child data = self.data.get_item(cid) res.append((cp, v, overlay, data)) return res @@ -67,7 +70,7 @@ class PSPrompt(Prompt): self.pages[page] = self.entries def render(self): - title = str(self.page) + title = str(self.page) + '//' + str(self.state.value) if self.page > 1: title = ('[ ' + (invert('Prev') if self.state == 0 else ('Prev')) + @@ -76,28 +79,33 @@ class PSPrompt(Prompt): title = (title + ' [ ' + (invert('Next') if self.state == 1 else ('Next')) + ' ]') - title = center(title) - bottom = ('[ ' + invert('OK') if self.idx == len(self) else 'OK' + ' ]') - bottom = center(bottom) - items = [render_entry(e, idx) for idx, e in enumerate(self.lens())] + title = self.center(title) + bottom = '[ ' + (invert('OK') if self.idx == len(self) else 'OK') + ' ]' + bottom = self.center(bottom) + items = [self.render_entry(e, idx) for idx, e in enumerate(self.lens())] output = fsarray([title] + items + [bottom]) self.window.render_to_terminal(output) + def _refresh(self): + w, h = self.window.width, self.window.height + output = fsarray([' ' * w] * h) + self.window.render_to_terminal(output) + def render_entry(self, entry, idx): winw = self.window.width if entry[1]: - hld, data = *entry[1] + hld, data = entry[1] stt = '*' if hld else ' ' - text = ' [' + invert(stt) if idx == 0 else stt + '] ' + text = ' [' + (invert(stt) if idx == 0 else stt) + '] ' text += '{}::{}'.format(data[1], data[2]) elif entry[0]: - data = entry[0] - exp = 'v' if entry.expanded else '>' - text = '[' + invert(exp) if idx == 0 else exp + '] ' + data = entry[0].item + exp = 'v' if entry[0].expanded else '>' + text = '[' + (invert(exp) if idx == 0 else exp) + '] ' text += data[0] + ' ' strw = fmtstr(text).width insw = fmtstr(data[1]).width - text += data[1][:winw - strw - 2] + '..' if insw + strw > winw else data[1] + text += data[1][:winw - strw - 2] + ('..' if insw + strw > winw else data[1]) else: text = '' return text @@ -107,9 +115,9 @@ class PSPrompt(Prompt): if res: return res elif event == '<TAB>': - self.state = (self.state + 1) % 2 + self.state = PromptState((self.state.value + 1) % 2) elif event in {'<Ctrl-j>', '<Ctrl-m>'}: - if self.state < 2: + if self.state.value < 2: return -1 else: return False @@ -117,7 +125,7 @@ class PSPrompt(Prompt): def __len__(self): - return sum(lun(y) for y in self.entries) + return sum(len(y) for y in self.entries) def center(self, stri): tw = fmtstr(stri).width @@ -129,13 +137,15 @@ class PSPrompt(Prompt): def toggle(self): item, idx = self.get_idx(self.idx) - item.toggle(idx) + item[0].toggle(idx) def preview(self): target = self.get_target() if target[1]: - data = self.data.get_item(target[1][0]) + data = self.data.get_item(target[1][1][0]) pager(data) + self._refresh() + self.render() def lens(self): h = self.window.height - 2 @@ -144,10 +154,10 @@ class PSPrompt(Prompt): return lst def get_target(self): - return get_idx(self.idx)[0] + return self.get_idx(self.idx)[0] def get_idx(self, idx): - for entry in self.entries(): + for entry in self.entries: if len(entry) > idx: break idx -= len(entry) |