magical
/
ttbp
forked from endorphant/ttbp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixing publish dir bug, again 

threw in a str cast so the program won't crash when the publish dir
settting ends up as null. I SHOULD REALLY FIGURE OUT WHY THAT KEEPS
HAPPENING but i'm so sleepy
master
endorphant 2016-06-14 22:39:03 -04:00
parent 72d0bdf208
commit e0f2f64d02
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/_ttbp.py
View File

@ -324,7 +324,7 @@ def setup():
print("\n\ttext editor:\t" +SETTINGS.get("editor")) print("\n\ttext editor:\t" +SETTINGS.get("editor"))
if core.publishing(): if core.publishing():
print("\tpublish dir:\t" +os.path.join(PUBLIC, SETTINGS.get("publish dir"))) print("\tpublish dir:\t" +os.path.join(PUBLIC, str(SETTINGS.get("publish dir"))))
print("\tpubishing:\t"+str(SETTINGS.get("publishing"))+"\n") print("\tpubishing:\t"+str(SETTINGS.get("publishing"))+"\n")
# editor selection # editor selection
@ -642,7 +642,7 @@ editor.
if core.publishing(): if core.publishing():
core.load_files() core.load_files()
core.write("index.html") core.write("index.html")
left = "posted to "+LIVE+USER+"/"+SETTINGS["publish dir"]+"/index.html\n\n>" left = "posted to "+LIVE+USER+"/"+str(SETTINGS.get("publish dir"))+"/index.html\n\n>"
redraw(left + " thanks for sharing your feels!") redraw(left + " thanks for sharing your feels!")
return return
@ -890,6 +890,8 @@ def update_publishing():
unpublish() unpublish()
SETTINGS.update({"publish dir": None}) SETTINGS.update({"publish dir": None})
core.load(SETTINGS)
def make_publish_dir(dir): def make_publish_dir(dir):
''' '''
setup helper to create publishing directory setup helper to create publishing directory
@ -1032,7 +1034,7 @@ def update_version():
# increment user versionfile # increment user versionfile
open(versionFile, "w").write(__version__) open(versionFile, "w").write(__version__)
print(""" print("""
you're all good to go, "+chatter.say("friend")+"! please contact ~endorphant if you're all good to go, """+chatter.say("friend")+"""! please contact ~endorphant if
somehing strange happened to you during this update. somehing strange happened to you during this update.
""") """)

13
bin/ttbp.py
View File

@ -62,7 +62,6 @@ p = inflect.engine()
## user globals ## user globals
USER = os.path.basename(os.path.expanduser("~")) USER = os.path.basename(os.path.expanduser("~"))
PATH = os.path.join("/home", USER, ".ttbp") PATH = os.path.join("/home", USER, ".ttbp")
PUBLIC = os.path.join("/home", USER, "public_html") PUBLIC = os.path.join("/home", USER, "public_html")
WWW = os.path.join(PATH, "www") WWW = os.path.join(PATH, "www")
@ -291,7 +290,7 @@ def setup():
print("\n\ttext editor:\t" +SETTINGS.get("editor")) print("\n\ttext editor:\t" +SETTINGS.get("editor"))
if core.publishing(): if core.publishing():
print("\tpublish dir:\t" +os.path.join(PUBLIC, SETTINGS.get("publish dir"))) print("\tpublish dir:\t" +os.path.join(PUBLIC, str(SETTINGS.get("publish dir"))))
print("\tpubishing:\t"+str(SETTINGS.get("publishing"))+"\n") print("\tpubishing:\t"+str(SETTINGS.get("publishing"))+"\n")
# editor selection # editor selection
@ -300,6 +299,7 @@ def setup():
# publishing selection # publishing selection
SETTINGS.update({"publishing":select_publishing()}) SETTINGS.update({"publishing":select_publishing()})
core.reload_ttbprc(SETTINGS)
update_publishing() update_publishing()
redraw("blog publishing: "+str(core.publishing())) redraw("blog publishing: "+str(core.publishing()))
@ -391,7 +391,6 @@ def feedback_menu():
* calls feedback writing function * calls feedback writing function
''' '''
util.print_menu(SUBJECTS, RAINBOW) util.print_menu(SUBJECTS, RAINBOW)
choice = raw_input("\npick a category for your feedback: ") choice = raw_input("\npick a category for your feedback: ")
@ -567,7 +566,7 @@ editor.
if core.publishing(): if core.publishing():
core.load_files() core.load_files()
core.write("index.html") core.write("index.html")
left = "posted to "+LIVE+USER+"/"+SETTINGS["publish dir"]+"/index.html\n\n>" left = "posted to "+LIVE+USER+"/"+str(SETTINGS.get("publish dir"))+"/index.html\n\n>"
redraw(left + " thanks for sharing your feels!") redraw(left + " thanks for sharing your feels!")
return return
@ -794,6 +793,8 @@ def update_publishing():
unpublish() unpublish()
SETTINGS.update({"publish dir": None}) SETTINGS.update({"publish dir": None})
core.load(SETTINGS)
def make_publish_dir(dir): def make_publish_dir(dir):
''' '''
setup helper to create publishing directory setup helper to create publishing directory
@ -906,7 +907,7 @@ def update_version():
publishDir = os.path.join(PUBLIC, SETTINGS.get("publish dir")) publishDir = os.path.join(PUBLIC, SETTINGS.get("publish dir"))
if os.path.exists(publishDir): if os.path.exists(publishDir):
subprocess.call(["rm", "-rf", publishDir]) subprocess.call(["rm", "-rf", publishDir])
subprocess.call(["ln", "-s", WWW, os.path.join(PUBLIC, SETTINGS.get("publish dir"))]) subprocess.call(["ln", "-s", WWW, os.path.join(PUBLIC, SETTINGS.get("publish dir"))])
# repopulate html files # repopulate html files
@ -936,7 +937,7 @@ def update_version():
# increment user versionfile # increment user versionfile
open(versionFile, "w").write(__version__) open(versionFile, "w").write(__version__)
print(""" print("""
you're all good to go, "+chatter.say("friend")+"! please contact ~endorphant if you're all good to go, """+chatter.say("friend")+"""! please contact ~endorphant if
somehing strange happened to you during this update. somehing strange happened to you during this update.
""") """)