diff --git a/ttbp/config/__init__.py b/ttbp/config/__init__.py index 5f0a731..061ee07 100644 --- a/ttbp/config/__init__.py +++ b/ttbp/config/__init__.py @@ -1,6 +1,7 @@ from __future__ import absolute_import import os import sys +import time from .. import util @@ -82,10 +83,44 @@ ___________________________________________________________ | ____ ____ ____ _ ____ ____ _ _ ____ _ _ _ ____ | | |___ |___ |___ | [__ |___ |\ | | __ | |\ | |___ | | | |___ |___ |___ ___] |___ | \| |__] | | \| |___ | -| ver 0.11.2 (rainbows) | +| ver 0.11.3 (rainbows) | |__________________________________________________________| '''.lstrip() +## page texts + +credits = """ +ttbp was written for tilde.town by ~endorphant in python. the codebase is +publicly available on github at https://github.com/modgethanc/ttbp + +other contributors: + ~vilmibm, packaging help and gopher support + ~sanqui, the bug swatter + ~sinacutie, for css updates + +if you have ideas for ttbp, you are welcome to contact me to discuss them; +please send me tildemail or open a github issue. i am not a very experienced +developer, and ttbp is one of my first public-facing projects, so i appreciate +your patience while i learn how to be a better developer! + +i'd love to hear about your ideas and brainstorm about new features! + +thanks to everyone who reads, listens, writes, and feels.""" + +recording = """ +feels will be recorded for today, {today}. + +if you've already started recording feels for this day, you +can pick up where you left off. + +you can write your feels in plaintext, markdown, html, or a mixture of +these. + +press to begin recording your feels in your chosen text +editor. + +""".format(today=time.strftime("%d %B %Y")) + ## update announcements UPDATES = { diff --git a/ttbp/ttbp.py b/ttbp/ttbp.py index b819003..9b963f0 100644 --- a/ttbp/ttbp.py +++ b/ttbp/ttbp.py @@ -754,25 +754,7 @@ def show_credits(): prints author acknowledgements and commentary ''' - print(""" -ttbp was written for tilde.town by ~endorphant in python. the codebase is -publicly available on github at https://github.com/modgethanc/ttbp - -other contributors: - ~vilmibm, packaging help and gopher support - ~sanqui, the bug swatter - ~sinacutie, for css updates - -if you have ideas for ttbp, you are welcome to contact me to discuss them; -please send me tildemail or open a github issue. i am not a very experienced -developer, and ttbp is one of my first public-facing projects, so i appreciate -your patience while i learn how to be a better developer! - -i'd love to hear about your ideas and brainstorm about new features! - -thanks to everyone who reads, listens, writes, and feels.\ - """) - + print(config.credits) input("\n\npress to go back home.\n\n") redraw() @@ -785,19 +767,7 @@ def write_entry(entry=os.path.join(config.USER_DATA, "test.txt")): main feels-recording handler ''' - entered = input(""" -feels will be recorded for today, {today}. - -if you've already started recording feels for this day, you -can pick up where you left off. - -you can write your feels in plaintext, markdown, html, or a mixture of -these. - -press to begin recording your feels in your chosen text -editor. - -""".format(today=time.strftime("%d %B %Y"))) + entered = input(config.recording) if entered: entryFile = open(entry, "a") @@ -807,6 +777,8 @@ editor. left = "" + core.load_files() + if SETTINGS.get("post as nopub"): core.toggle_nopub(os.path.basename(entry)) else: @@ -821,7 +793,7 @@ editor. gopher.publish_gopher('feels', core.get_files()) left += " also posted to your ~/public_gopher!\n" - core.load_files() + #core.load_files() redraw(left + " thanks for sharing your feels!") return @@ -1108,14 +1080,14 @@ def select_publish_dir(): publishDir = os.path.join(config.PUBLIC, choice) while os.path.exists(publishDir): - second = input("\n"+publishDir+"""\ - already exists! + second = input(""" +{pDir} already exists! setting this as your publishing directory means this program may delete or overwrite file there! if you're sure you want to use it, hit to confirm. -otherwise, pick another location: """) +otherwise, pick another location: """.format(pDir=publishDir) if second == "": break