punky
/
botany
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge pull request #15 from Ensiss/garden-controls 

Add controls for the garden screen
pull/16/head
Jake Funke 2018-06-06 10:48:38 -07:00 committed by GitHub
parent d2be5e385a 454cccec26
commit 5b839650fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 103 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
menu_screen.py
View File

@ -8,6 +8,8 @@ import random
import getpass import getpass
import json import json
import sqlite3 import sqlite3
import string
import re
class CursedMenu(object): class CursedMenu(object):
#TODO: name your plant #TODO: name your plant
@ -276,23 +278,37 @@ class CursedMenu(object):
def format_garden_data(self,this_garden): def format_garden_data(self,this_garden):
# Returns list of lists (pages) of garden entries # Returns list of lists (pages) of garden entries
plant_table = "" plant_table = []
for plant_id in this_garden: for plant_id in this_garden:
if this_garden[plant_id]: if this_garden[plant_id]:
if not this_garden[plant_id]["dead"]: if not this_garden[plant_id]["dead"]:
this_plant = this_garden[plant_id] this_plant = this_garden[plant_id]
entry = "{:14} - {:>16} - {:>8}p - {}\n".format( plant_table.append((this_plant["owner"],
this_plant["owner"], this_plant["age"],
this_plant["age"], int(this_plant["score"]),
this_plant["score"], this_plant["description"]))
this_plant["description"] return plant_table
)
plant_table += entry def format_garden_entry(self, entry):
# build list of n entries per page return "{:14} - {:>16} - {:>8}p - {}".format(*entry)
entries_per_page = self.maxy - 16
garden_list = plant_table.splitlines() def sort_garden_table(self, table, column, ascending):
paginated_list = [garden_list[i:i+entries_per_page] for i in range(0,len(garden_list),entries_per_page)] """ Sort table in place by a specified column """
return paginated_list return table.sort(key=lambda x: x[column], reverse=not ascending)
def filter_garden_table(self, table, pattern):
""" Filter table using a pattern, and return the new table """
def filterfunc(entry):
if len(pattern) == 0:
return True
entry_txt = self.format_garden_entry(entry)
try:
result = bool(re.search(pattern, entry_txt))
except Exception as e:
# In case of invalid regex, don't match anything
result = False
return result
return list(filter(filterfunc, table))
def draw_garden(self): def draw_garden(self):
# draws community garden # draws community garden
@ -300,30 +316,80 @@ class CursedMenu(object):
this_garden = self.user_data.retrieve_garden_from_db() this_garden = self.user_data.retrieve_garden_from_db()
# format data # format data
self.clear_info_pane() self.clear_info_pane()
plant_table_pages = []
if self.infotoggle != 2: if self.infotoggle == 2:
# if infotoggle isn't 2, the screen currently displays other stuff
plant_table_pages = self.format_garden_data(this_garden)
self.infotoggle = 2
else:
# the screen IS currently showing the garden (1 page), make the # the screen IS currently showing the garden (1 page), make the
# text a bunch of blanks to clear it out # text a bunch of blanks to clear it out
self.infotoggle = 0 self.infotoggle = 0
return
# if infotoggle isn't 2, the screen currently displays other stuff
plant_table_orig = self.format_garden_data(this_garden)
self.infotoggle = 2
# print garden information OR clear it # print garden information OR clear it
# TODO: pagination control with hjkl/arrow keys/esc-or-x to close # TODO: pagination control with hjkl/arrow keys/esc-or-x to close
for page_num, page in enumerate(plant_table_pages, 1): index = 0
# Print page text sort_column, sort_ascending = 0, True
sort_keys = ["n", "a", "s", "d"] # Name, Age, Score, Description
plant_table = plant_table_orig
self.sort_garden_table(plant_table, sort_column, sort_ascending)
while True:
entries_per_page = self.maxy - 16
index_max = min(len(plant_table), index + entries_per_page)
plants = plant_table[index:index_max]
page = [self.format_garden_entry(entry) for entry in plants]
self.draw_info_text(page) self.draw_info_text(page)
if len(plant_table_pages) > 1: # Multiple pages, paginate and require keypress
# Multiple pages, paginate and require keypress page_text = "(%d-%d/%d) --- press q to quit ---" % (index, index_max, len(plant_table))
page_text = "(%d/%d) --- press any key ---" % (page_num, len(plant_table_pages)) self.screen.addstr(self.maxy-2, 2, page_text)
self.screen.addstr(self.maxy-2, 2, page_text) self.screen.refresh()
self.screen.getch() c = self.screen.getch()
self.screen.refresh() self.infotoggle = 0
# Clear page before drawing next
self.clear_info_pane() # Quit
self.infotoggle = 0 if c == ord("q") or c == ord("x") or c == 27:
break
# Next page
elif c in [curses.KEY_ENTER, curses.KEY_NPAGE, ord(" "), ord("\n")]:
index += entries_per_page
if index >= len(plant_table):
break
# Previous page
elif c == curses.KEY_BACKSPACE or c == curses.KEY_PPAGE:
index = max(index - entries_per_page, 0)
# Next line
elif c == ord("j") or c == curses.KEY_DOWN:
index = max(min(index + 1, len(plant_table) - 1), 0)
# Previous line
elif c == ord("k") or c == curses.KEY_UP:
index = max(index - 1, 0)
# Sort entries
elif c == ord("s"):
c = self.screen.getch()
column = -1
if c < 255 and chr(c) in sort_keys:
column = sort_keys.index(chr(c))
elif ord("1") <= c <= ord("4"):
column = c - ord("1")
if column != -1:
if sort_column == column:
sort_ascending = not sort_ascending
else:
sort_column = column
sort_ascending = True
self.sort_garden_table(plant_table, sort_column, sort_ascending)
# Filter entries
elif c == ord("/") or c == ord("f"):
self.screen.addstr(self.maxy-2, 2, "Filter: " + " " * (len(page_text)-8))
pattern = self.get_user_string(10, self.maxy-2, lambda x: x in string.printable)
plant_table = self.filter_garden_table(plant_table_orig, pattern)
self.sort_garden_table(plant_table, sort_column, sort_ascending)
index = 0
# Clear page before drawing next
self.clear_info_pane()
self.clear_info_pane()
def get_plant_description(self, this_plant): def get_plant_description(self, this_plant):
output_text = "" output_text = ""
@ -505,6 +571,8 @@ class CursedMenu(object):
info_text = info_text.splitlines() info_text = info_text.splitlines()
for y, line in enumerate(info_text, 2): for y, line in enumerate(info_text, 2):
this_y = y+12 + y_offset this_y = y+12 + y_offset
if len(line) > self.maxx - 3:
line = line[:self.maxx-3]
if this_y < self.maxy: if this_y < self.maxy:
self.screen.addstr(this_y, 2, line, curses.A_NORMAL) self.screen.addstr(this_y, 2, line, curses.A_NORMAL)
self.screen.refresh() self.screen.refresh()
@ -576,8 +644,8 @@ class CursedMenu(object):
visitor_block = 'nobody :(' visitor_block = 'nobody :('
return visitor_block return visitor_block
def get_user_string(self, xpos=3, ypos=15): def get_user_string(self, xpos=3, ypos=15, filterfunc=str.isalnum):
# doesn't allow non-alphanumeric text # filter allowed characters using filterfunc, alphanumeric by default
user_string = "" user_string = ""
user_input = 0 user_input = 0
while user_input != 10: while user_input != 10:
@ -586,9 +654,9 @@ class CursedMenu(object):
if user_input == 127 or user_input == 263: if user_input == 127 or user_input == 263:
if len(user_string) > 0: if len(user_string) > 0:
user_string = user_string[:-1] user_string = user_string[:-1]
self.screen.addstr(15, 3, " " * (self.maxx-2) ) self.screen.addstr(ypos, xpos, " " * (self.maxx-xpos-1))
if user_input in range(256): if user_input < 256 and user_input != 10:
if chr(user_input).isalnum(): if filterfunc(chr(user_input)):
user_string += chr(user_input) user_string += chr(user_input)
self.screen.addstr(ypos, xpos, str(user_string)) self.screen.addstr(ypos, xpos, str(user_string))
self.screen.refresh() self.screen.refresh()