phyks/blogit
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix RSS + Markdown support

Browse Source
This commit is contained in:
Phyks 2014-07-30 15:30:21 +02:00
parent e63bf27c2f
commit 2d1cc39d68
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pre-commit.py
View File

@ -640,13 +640,13 @@ for filename in deleted_files:
# Delete generated files # Delete generated files
try: try:
os.unlink("gen/"+filename[4:-5]+".gen") os.unlink("gen/"+filename[4:filename.rfind('.')]+".gen")
os.unlink("blog/"+filename[4:]) os.unlink("blog/"+filename[4:])
except FileNotFoundError: except FileNotFoundError:
print("[INFO] (DELETION) Article "+filename[4:]+" seems " print("[INFO] (DELETION) Article "+filename[4:]+" seems "
"to not have already been generated. " "to not have already been generated. "
"You should check manually.") "You should check manually.")
os.system("git rm gen/"+filename[4:-5]+".gen") os.system("git rm gen/"+filename[4:filename.rfind('.')]+".gen")
os.system("git rm blog/"+filename[4:]) os.system("git rm blog/"+filename[4:])
print("[INFO] (DELETION) Deleted article "+filename[4:] + print("[INFO] (DELETION) Deleted article "+filename[4:] +
@ -710,8 +710,8 @@ for filename in added_files+modified_files:
article = article.replace("@article_path", article_path) article = article.replace("@article_path", article_path)
try: try:
auto_dir("gen/"+filename[4:-5]+".gen") auto_dir("gen/"+filename[4:filename.rfind('.')]+".gen")
with open("gen/"+filename[4:-5]+".gen", 'w') as article_file: with open("gen/"+filename[4:filename.rfind('.')]+".gen", 'w') as article_file:
article_file.write("<article>\n" article_file.write("<article>\n"
"\t<aside>\n" "\t<aside>\n"
"\t\t<p class=\"day\">"+day_aside+"</p>\n" "\t\t<p class=\"day\">"+day_aside+"</p>\n"
@ -779,7 +779,7 @@ rss += ("\t<channel>"
# Generate header (except title) + index file + rss file # Generate header (except title) + index file + rss file
for i, article in enumerate(["gen/"+x[4:-5]+".gen" for x in last_articles]): for i, article in enumerate(["gen/"+x[4:x.rfind('.')]+".gen" for x in last_articles]):
content, title, tags, date, author = "", "", "", "", "" content, title, tags, date, author = "", "", "", "", ""
content_desc = "" content_desc = ""
try: try:
@ -896,7 +896,7 @@ for tag in tags_full_list:
# Sort by date # Sort by date
with open(tag, "r") as tag_gen_fh: with open(tag, "r") as tag_gen_fh:
articles_list = ["gen/"+line.replace(".html", ".gen").strip() for line articles_list = ["gen/"+line.replace(".html", ".gen").replace('.md', '.gen').strip() for line
in tag_gen_fh.readlines()] in tag_gen_fh.readlines()]
articles_list.sort(key=lambda x: (get_date(x)[4:8], get_date(x)[2:4], articles_list.sort(key=lambda x: (get_date(x)[4:8], get_date(x)[2:4],
get_date(x)[:2], get_date(x)[9:]), get_date(x)[:2], get_date(x)[9:]),
@ -920,11 +920,11 @@ for tag in tags_full_list:
# Finish generating HTML for articles (blog/ dir) # Finish generating HTML for articles (blog/ dir)
for article in added_files+modified_files: for article in added_files+modified_files:
try: try:
with open("gen/"+article[4:-5]+".gen", "r") as article_fh: with open("gen/"+article[4:article.rfind('.')]+".gen", "r") as article_fh:
content = article_fh.read() content = article_fh.read()
except IOError: except IOError:
sys.exit("[ERROR] An error occurred while opening" sys.exit("[ERROR] An error occurred while opening"
"gen/"+article[4:-5]+".gen file.") "gen/"+article[4:article.rfind('.')]+".gen file.")
for line in content.split("\n"): for line in content.split("\n"):
if "@title=" in line: if "@title=" in line:
@ -1052,7 +1052,7 @@ for i in os.listdir("blog/"):
content = content.replace("#include_header_here", content = content.replace("#include_header_here",
header.replace("@title", header.replace("@title",
(params["BLOG_TITLE"] + (params["BLOG_TITLE"] +
" - "+i[:-5].title()), " - "+i[:i.rfind('.')].title()),
1), 1),
1) 1)
fh.write(content) fh.write(content)