TildeClub/ttbp
1
0
Fork 0
mirror of https://github.com/tildeclub/ttbp.git synced 2026-01-24 10:50:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

there was a major bug that caused users who opted not to publish to

Browse Source 
crash during version checking. the version checker was trying to update
files associated with published blogs, and crashing due to trying to
read null paths.

this fix checks to see if the user has opted to publish *before* running
those updates.
This commit is contained in:
endorphant
2016-09-07 22:05:38 -04:00
parent 9e372b4160
commit 56419f2f43
3 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/core.py
View File

@@ -382,7 +382,9 @@ def www_neighbors():
userRC = json.load(open(os.path.join("/home", user, ".ttbp", "config", "ttbprc")))
url = LIVE+user+"/"+userRC["publish dir"]
url = ""
if userRC["publish dir"]:
url = LIVE+user+"/"+userRC["publish dir"]
lastfile = ""
files = os.listdir(os.path.join("/home", user, ".ttbp", "entries"))

31
bin/ttbp.py
View File

@@ -893,26 +893,27 @@ def update_version():
# from 0.8.5 to 0.8.6:
# change style.css location
if os.path.isfile(os.path.join(WWW, "style.css")):
subprocess.call(["mv", os.path.join(WWW, "style.css"), CONFIG])
if core.publishing():
if os.path.isfile(os.path.join(WWW, "style.css")):
subprocess.call(["mv", os.path.join(WWW, "style.css"), CONFIG])
# change www symlink
if os.path.exists(WWW):
subprocess.call(["rm", WWW])
subprocess.call(["mkdir", WWW])
# change www symlink
if os.path.exists(WWW):
subprocess.call(["rm", WWW])
subprocess.call(["mkdir", WWW])
subprocess.call(["ln", "-s", os.path.join(CONFIG, "style.css"), os.path.join(WWW, "style.css")])
subprocess.call(["ln", "-s", os.path.join(CONFIG, "style.css"), os.path.join(WWW, "style.css")])
publishDir = os.path.join(PUBLIC, SETTINGS.get("publish dir"))
if os.path.exists(publishDir):
subprocess.call(["rm", "-rf", publishDir])
publishDir = os.path.join(PUBLIC, SETTINGS.get("publish dir"))
if os.path.exists(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
core.load_files()
core.write("index.html")
# repopulate html files
core.load_files()
core.write("index.html")
# add publishing setting
print("\nnew feature!\n")