homer77
/
picoblogger
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Working on archive. Articles should be moved to archive folder.

This commit is contained in:
maste9 2015-03-09 21:15:43 +01:00 committed by Homer S
parent 6aa2f3af4f
commit 62e460dc98
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
picoblogger/main.py
View File

@ -82,6 +82,9 @@ draftDir = os.path.join(blog_dir,"drafts")
# path to articles # path to articles
articleDir = os.path.join(blog_dir,"articles") articleDir = os.path.join(blog_dir,"articles")
# path to archive
archiveDir = os.path.join(blog_dir,"archive")
# paths to configs # paths to configs
pbconfpath = os.path.join("/","etc","picoblogger","pb.conf") # global config pbconfpath = os.path.join("/","etc","picoblogger","pb.conf") # global config
blogconfpath = os.path.join(blog_dir,"pb.conf") # local config blogconfpath = os.path.join(blog_dir,"pb.conf") # local config
@ -129,6 +132,7 @@ try:
dateFormat = blogconf['BLOG_DATE_FORMAT'] dateFormat = blogconf['BLOG_DATE_FORMAT']
timeFormat = blogconf['BLOG_TIME_FORMAT'] timeFormat = blogconf['BLOG_TIME_FORMAT']
amountRecent = int(blogconf['RECENT_AMOUNT']) amountRecent = int(blogconf['RECENT_AMOUNT'])
notToArchive = blogconf['BLOG_CURRENT_ARTICLES']
except: except:
print("Couldn't parse blog's local configuration (%s)."%blogconfpath) print("Couldn't parse blog's local configuration (%s)."%blogconfpath)
@ -254,6 +258,11 @@ def recent_articles(amount):
return joined_html return joined_html
def archive_articles(notToArchive):
articles= [item for os.listdir(artDir) if not "\~" in item]
for i in range(notToArchive,):
os.replace(draft, article)
def update_blog(subsection): def update_blog(subsection):
# Joins config defined variables into templates # Joins config defined variables into templates
@ -261,8 +270,6 @@ def update_blog(subsection):
tplIndex = os.path.join(tplDir,"index.htm") tplIndex = os.path.join(tplDir,"index.htm")
blogIndex = os.path.join(blog_dir,"index.html") blogIndex = os.path.join(blog_dir,"index.html")
blogArchive = os.path.join(blog_dir,"archive.html")
tpl = Template(open(tplIndex,'r').read()) tpl = Template(open(tplIndex,'r').read())
sNAV = open(os.path.join(tplDir,"nav.htm")).read() sNAV = open(os.path.join(tplDir,"nav.htm")).read()
@ -270,7 +277,6 @@ def update_blog(subsection):
# sMAIN = open(os.path.join(tplDir,"main.htm")).read() # sMAIN = open(os.path.join(tplDir,"main.htm")).read()
# sMAIN = Template(sMAIN).safe_substitute(join_articles()) # sMAIN = Template(sMAIN).safe_substitute(join_articles())
sMAIN = join_articles() sMAIN = join_articles()
sARCHIVE = join_articles()
sASIDE = open(os.path.join(tplDir,"aside.htm")).read() sASIDE = open(os.path.join(tplDir,"aside.htm")).read()
sRECENT = open(os.path.join(tplDir,"recent.htm")).read() sRECENT = open(os.path.join(tplDir,"recent.htm")).read()
@ -311,16 +317,6 @@ def update_blog(subsection):
with open(blogIndex,"w", encoding=l10nconf['BLOG_CHARSET']) as f: with open(blogIndex,"w", encoding=l10nconf['BLOG_CHARSET']) as f:
print(tmpIndex, file=f) print(tmpIndex, file=f)
tplSub['TEMPLATE_MAIN'] = sARCHIVE
tmpIndex = Template(tmpIndex).safe_substitute(tplSub)
with open(blogArchive,"w", encoding=l10nconf['BLOG_CHARSET']) as f:
print(tmpIndex, file=f)
# def article_to_html(name): # def article_to_html(name):
# article = os.path.join(blog_dir,"articles",name + ".txt") # article = os.path.join(blog_dir,"articles",name + ".txt")