incrementing to 0.8.7

fixed bug in patching utility that caused publishing setting to not be
saved.
master
endorphant 2016-05-20 11:06:42 -04:00
parent 82172e4a29
commit 22676344c9
3 changed files with 50 additions and 18 deletions

View File

@ -19,7 +19,7 @@ LIVE = "http://tilde.town/~"
FEEDBACK = os.path.join("/home", "endorphant", "ttbp-mail") FEEDBACK = os.path.join("/home", "endorphant", "ttbp-mail")
FEEDBOX = "endorphant@tilde.town" FEEDBOX = "endorphant@tilde.town"
USERFILE = os.path.join("/home", "endorphant", "projects", "ttbp", "users.txt") USERFILE = os.path.join("/home", "endorphant", "projects", "ttbp", "users.txt")
VERSION = "0.8.6" VERSION = "0.8.7"
p = inflect.engine() p = inflect.engine()
@ -304,6 +304,8 @@ def view_neighbors(users):
for user in users: for user in 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="\t\t\t\t"
if userRC.get("publish dir"):
url = LIVE+user+"/"+userRC.get("publish dir") url = LIVE+user+"/"+userRC.get("publish dir")
count = 0 count = 0
lastfile = "" lastfile = ""
@ -409,7 +411,7 @@ press <enter> to begin recording your feels.
if publishing(): if 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" left = "posted to "+LIVE+USER+"/"+SETTINGS["publish dir"]+"/index.html\n\n>"
redraw(left + " thanks for sharing your feels!") redraw(left + " thanks for sharing your feels!")
return return
@ -733,14 +735,15 @@ def update_version():
print("ttbp had some updates!") print("ttbp had some updates!")
# from 0.8.5 to 0.8.6: print("\ngive me a second to update you to version "+VERSION+"...\n")
if not os.path.isfile(versionFile):
print("\ngive me a second to update you from version 0.8.5 to "+VERSION+"...\n")
time.sleep(1) time.sleep(1)
print("...") print("...")
time.sleep(2) time.sleep(2)
if not os.path.isfile(versionFile):
# from 0.8.5 to 0.8.6:
# change style.css location # change style.css location
if os.path.isfile(os.path.join(WWW, "style.css")): if os.path.isfile(os.path.join(WWW, "style.css")):
subprocess.call(["mv", os.path.join(WWW, "style.css"), CONFIG]) subprocess.call(["mv", os.path.join(WWW, "style.css"), CONFIG])
@ -765,6 +768,19 @@ def update_version():
print("\nnew feature!\n") print("\nnew feature!\n")
SETTINGS.update({"publishing":select_publishing()}) SETTINGS.update({"publishing":select_publishing()})
update_publishing() update_publishing()
ttbprc = open(TTBPRC, "w")
ttbprc.write(json.dumps(SETTINGS, sort_keys=True, indent=2, separators=(',',':')))
ttbprc.close()
else: # version at least 0.8.6
# from 0.8.6 to 0.8.7
if open(versionFile, 'r').read() == "0.8.6":
print("\nresetting your publishing settings...\n")
SETTINGS.update({"publishing":select_publishing()})
update_publishing()
ttbprc = open(TTBPRC, "w")
ttbprc.write(json.dumps(SETTINGS, sort_keys=True, indent=2, separators=(',',':')))
ttbprc.close()
# increment user versionfile # increment user versionfile

View File

@ -5,5 +5,5 @@
| |___ |___ |___ | [__ |___ |\ | | __ | |\ | |___ | | |___ |___ |___ | [__ |___ |\ | | __ | |\ | |___ |
| | |___ |___ |___ ___] |___ | \| |__] | | \| |___ | | | |___ |___ |___ ___] |___ | \| |__] | | \| |___ |
| | | |
| ver 0.8.6 (almost stable) | | ver 0.8.7 (almost stable) |
|__________________________________________________________| |__________________________________________________________|

View File

@ -19,7 +19,7 @@ LIVE = "http://tilde.town/~"
FEEDBACK = os.path.join("/home", "endorphant", "ttbp-mail") FEEDBACK = os.path.join("/home", "endorphant", "ttbp-mail")
FEEDBOX = "endorphant@tilde.town" FEEDBOX = "endorphant@tilde.town"
USERFILE = os.path.join("/home", "endorphant", "projects", "ttbp", "users.txt") USERFILE = os.path.join("/home", "endorphant", "projects", "ttbp", "users.txt")
VERSION = "0.8.6" VERSION = "0.8.7"
p = inflect.engine() p = inflect.engine()
@ -302,6 +302,8 @@ def view_neighbors(users):
for user in users: for user in 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="\t\t\t\t"
if userRC.get("publish dir"):
url = LIVE+user+"/"+userRC.get("publish dir") url = LIVE+user+"/"+userRC.get("publish dir")
count = 0 count = 0
lastfile = "" lastfile = ""
@ -731,14 +733,15 @@ def update_version():
print("ttbp had some updates!") print("ttbp had some updates!")
# from 0.8.5 to 0.8.6: print("\ngive me a second to update you to version "+VERSION+"...\n")
if not os.path.isfile(versionFile):
print("\ngive me a second to update you from version 0.8.5 to "+VERSION+"...\n")
time.sleep(1) time.sleep(1)
print("...") print("...")
time.sleep(2) time.sleep(2)
if not os.path.isfile(versionFile):
# from 0.8.5 to 0.8.6:
# change style.css location # change style.css location
if os.path.isfile(os.path.join(WWW, "style.css")): if os.path.isfile(os.path.join(WWW, "style.css")):
subprocess.call(["mv", os.path.join(WWW, "style.css"), CONFIG]) subprocess.call(["mv", os.path.join(WWW, "style.css"), CONFIG])
@ -763,6 +766,19 @@ def update_version():
print("\nnew feature!\n") print("\nnew feature!\n")
SETTINGS.update({"publishing":select_publishing()}) SETTINGS.update({"publishing":select_publishing()})
update_publishing() update_publishing()
ttbprc = open(TTBPRC, "w")
ttbprc.write(json.dumps(SETTINGS, sort_keys=True, indent=2, separators=(',',':')))
ttbprc.close()
else: # version at least 0.8.6
# from 0.8.6 to 0.8.7
if open(versionFile, 'r').read() == "0.8.6":
print("\nresetting your publishing settings...\n")
SETTINGS.update({"publishing":select_publishing()})
update_publishing()
ttbprc = open(TTBPRC, "w")
ttbprc.write(json.dumps(SETTINGS, sort_keys=True, indent=2, separators=(',',':')))
ttbprc.close()
# increment user versionfile # increment user versionfile