neighbor view sorts by most recently updated blog

added input capture from feels recording page, so if user starts typing before opening text editor, progress is saved.
working on improving exits and ^c/^d catching
master
endorphant 2016-05-08 22:59:48 -04:00
parent 3491cc7843
commit cfd6a42683
3 changed files with 86 additions and 31 deletions

View File

@ -1,5 +1,5 @@
============== ==============
| TILDE TOWN | | TILDE TOWN |
| BLOGGING | ver 0.5 (fairly unstable) | BLOGGING | ver 0.6 (fairly unstable)
| PLATFORM | ~endorphant/projects/ttbp/changelog.txt | PLATFORM | ~endorphant/projects/ttbp/changelog.txt
============== ==============

View File

@ -36,6 +36,9 @@ BANNER = open(os.path.join(SOURCE, "config", "banner.txt")).read()
SPACER = "\n\n\n" SPACER = "\n\n\n"
INVALID = "please pick a number from the list of options!\n\n" INVALID = "please pick a number from the list of options!\n\n"
DUST = "sorry about the dust, but this part is still under construction. check back later!\n\n" DUST = "sorry about the dust, but this part is still under construction. check back later!\n\n"
QUITS = ['exit', 'quit', 'q', 'x']
BACKS = ['back', 'b']
EJECT = "eject button fired! going home now."
## ref ## ref
@ -57,19 +60,21 @@ def start():
#print("(remember, you can always press ctrl-c to come home)\n") #print("(remember, you can always press ctrl-c to come home)\n")
print("if you don't want to be here at any point, press <ctrl-d> and it'll all go away.\njust keep in mind that you might lose anything you've started here.\n") print("if you don't want to be here at any point, press <ctrl-d> and it'll all go away.\njust keep in mind that you might lose anything you've started here.\n")
print(check_init()) print(check_init())
redraw()
try: try:
redraw()
print(main_menu())
except ValueError or SyntaxError:
redraw("oh no i didn't understand that. let's go home and start over.")
print(main_menu()) print(main_menu())
#except ValueError or SyntaxError:
# redraw("oh no i didn't understand that. let's go home and start over.")
# print(main_menu())
except EOFError:
print(stop())
except KeyboardInterrupt: except KeyboardInterrupt:
redraw("eject button fired! going home now.") redraw(EJECT)
print(main_menu()) print(main_menu())
def stop(): def stop():
return "\n\t"+chatter.say("bye") return "\n\n\t"+chatter.say("bye")+"\n\n"
def check_init(): def check_init():
global SETTINGS global SETTINGS
@ -221,10 +226,15 @@ def main_menu():
print_menu(menuOptions) print_menu(menuOptions)
#print("how are you feeling today? ") #print("how are you feeling today? ")
#try:
# choice = raw_input("\ntell me about your feels (or 'quit' to exit): ")
#except KeyboardInterrupt:
# redraw(EJECT)
# return main_menu()
try: try:
choice = raw_input("\ntell me about your feels (enter 'none' to quit): ") choice = raw_input("\ntell me about your feels (or 'quit' to exit): ")
except KeyboardInterrupt: except KeyboardInterrupt:
redraw("eject button fired! going home now.") redraw(EJECT)
return main_menu() return main_menu()
if choice == '0': if choice == '0':
@ -236,7 +246,7 @@ def main_menu():
view_own() view_own()
elif choice == '2': elif choice == '2':
users = find_ttbps() users = find_ttbps()
redraw("the following "+p.no("user", len(users))+" "+p.plural("is", len(users))+" recording feels on ttbp:\n\n") redraw("the following "+p.no("user", len(users))+" "+p.plural("is", len(users))+" recording feels on ttbp, listed by most recently updated first:\n\n")
view_neighbors(users) view_neighbors(users)
elif choice == '3': elif choice == '3':
redraw("now viewing most recent entries\n\n") redraw("now viewing most recent entries\n\n")
@ -249,7 +259,7 @@ def main_menu():
try: try:
setup() setup()
except KeyboardInterrupt(): except KeyboardInterrupt():
redraw("eject button fired! going home now.") redraw(EJECT)
raw_input("\nyou're all good to go, "+chatter.say("friend")+"! hit <enter> to continue.\n\n") raw_input("\nyou're all good to go, "+chatter.say("friend")+"! hit <enter> to continue.\n\n")
redraw() redraw()
elif choice == '5': elif choice == '5':
@ -257,7 +267,7 @@ def main_menu():
feedback_menu() feedback_menu()
elif choice == '6': elif choice == '6':
redraw(DUST) redraw(DUST)
elif choice == "none": elif choice in QUITS:
return stop() return stop()
else: else:
redraw(INVALID) redraw(INVALID)
@ -285,7 +295,11 @@ def feedback_menu():
def write_entry(entry=os.path.join(DATA, "test.txt")): def write_entry(entry=os.path.join(DATA, "test.txt")):
raw_input("\nfeels will be recorded for today, "+time.strftime("%d %B %Y")+".\n\nif you've already started recording feels for this day, you \ncan pick up where you left off.\n\npress <enter> to begin recording your feels.\n\n") entered = raw_input("\nfeels will be recorded for today, "+time.strftime("%d %B %Y")+".\n\nif you've already started recording feels for this day, you \ncan pick up where you left off.\n\npress <enter> to begin recording your feels.\n\n")
if entered:
entryFile = open(entry, "a")
entryFile.write("\n"+entered+"\n")
entryFile.close()
subprocess.call([SETTINGS["editor"], entry]) subprocess.call([SETTINGS["editor"], entry])
core.load_files() core.load_files()
core.write("index.html") core.write("index.html")
@ -317,19 +331,40 @@ def view_neighbors(users):
userRC = json.load(open(os.path.join("/home", user, ".ttbp", "config", "ttbprc"))) userRC = json.load(open(os.path.join("/home", user, ".ttbp", "config", "ttbprc")))
url = LIVE+user+"/"+userRC["publish dir"] url = LIVE+user+"/"+userRC["publish dir"]
count = 0 count = 0
for filename in os.listdir(os.path.join("/home", user, ".ttbp", "entries")): lastfile = ""
files = os.listdir(os.path.join("/home", user, ".ttbp", "entries"))
files.sort()
#for filename in os.listdir(os.path.join("/home", user, ".ttbp", "entries")).sort():
for filename in files:
if os.path.splitext(filename)[1] == ".txt" and len(os.path.splitext(filename)[0]) == 8: if os.path.splitext(filename)[1] == ".txt" and len(os.path.splitext(filename)[0]) == 8:
count += 1 count += 1
lastfile = os.path.join("/home", user, ".ttbp", "entries", filename)
date = ""
if lastfile:
last = os.path.getctime(lastfile)
date = time.strftime("%Y%m%d %H%M", time.localtime(last))
else:
last = 0
pad = "" pad = ""
if len(user) < 8: if len(user) < 8:
pad = "\t" pad = "\t"
user = "~"+user user = "~"+user
if len(user) < 8: if len(user) < 8:
user += "\t" user += "\t"
userList.append("\t"+user+"\t"+url+pad+"\t("+p.no("feel", count)+")")
userList.sort() userList.append(["\t"+user+"\t"+url+pad+"\t("+p.no("feel", count)+")", last])
print_menu(userList) #userList.append(["\t"+user+"\t"+url+pad+"\t("+p.no("feel", count)+") "+date, last])
# sort user by most recent entry
userList.sort(key = lambda userdata:userdata[1])
userList.reverse()
sortedUsers = []
for user in userList:
sortedUsers.append(user[0])
print_menu(sortedUsers)
raw_input("\n\npress <enter> to go back home.\n\n") raw_input("\n\npress <enter> to go back home.\n\n")
redraw() redraw()
@ -349,16 +384,17 @@ def view_own():
#print(entry) #print(entry)
entries.append(""+entry[4]+" ("+p.no("word", entry[2])+") ") entries.append(""+entry[4]+" ("+p.no("word", entry[2])+") ")
view_entries(metas, entries, "here are your recorded feels, listed by date: \n\n")
redraw()
return #view_entries(metas, entries, "here are your recorded feels, listed by date: \n\n")
return view_entries(metas, entries, "here are your recorded feels, listed by date: \n\n")
def view_entries(metas, entries, prompt): def view_entries(metas, entries, prompt):
print_menu(entries) print_menu(entries)
choice = list_select(entries, "pick an entry from the list, or <ctrl-c> to go home: ") choice = list_select(entries, "pick an entry from the list, or type 'back' to go home: ")
if choice is not False:
redraw("now reading ~"+metas[choice][5]+"'s feels on "+metas[choice][4]+"\n> press <q> to return to feels list.\n\n") redraw("now reading ~"+metas[choice][5]+"'s feels on "+metas[choice][4]+"\n> press <q> to return to feels list.\n\n")
@ -368,6 +404,10 @@ def view_entries(metas, entries, prompt):
return view_entries(metas, entries, prompt) return view_entries(metas, entries, prompt)
else:
redraw()
return
def show_entry(filename): def show_entry(filename):
subprocess.call(["less", filename]) subprocess.call(["less", filename])
@ -424,10 +464,15 @@ def list_select(options, prompt):
invalid = True invalid = True
while invalid: while invalid:
try: #try:
# choice = raw_input("\n\n"+prompt)
#except KeyboardInterrupt:
# redraw()
# main_menu()
choice = raw_input("\n\n"+prompt) choice = raw_input("\n\n"+prompt)
except KeyboardInterrupt: if choice in BACKS:
list_select(options, prompt) return False
try: try:
ans = int(choice) ans = int(choice)

View File

@ -9,16 +9,26 @@ TO-DO:
-show most recent global entries on html -show most recent global entries on html
-make a nicer entry view wrapper -make a nicer entry view wrapper
-maybe with a box? and a nicer feed view? -maybe with a box? and a nicer feed view?
-make commenting actually use mail instead of dumping
to a file?
-command line flags
(goals for phase two) (goals for phase two)
-stylesheet selector -stylesheet selector
-and make a couple more custom stylesheets -and make a couple more custom stylesheets
-replying to entries??
-direct mail to author
------ ------
CHANGELOG: CHANGELOG:
ver 0.6
-improving exit handling
-sort neighbor view by most recently updated
-capture input from recording feels screen
ver 0.5 ver 0.5
-added reading own entries -added reading own entries
-added reading 10 most recent global entries -added reading 10 most recent global entries