diff --git a/picoblogger/main.py b/picoblogger/main.py index a6a5624..467086c 100755 --- a/picoblogger/main.py +++ b/picoblogger/main.py @@ -269,7 +269,6 @@ def recent_articles(amount): for i in range(0,amount): if i < len(dates_of_creation): joined_html += recent_to_html(articles_dict[str(time.strftime(str(dates_of_creation[i])))]) - return joined_html def archive_articles(): @@ -309,6 +308,7 @@ def archive_articles(): except: print("Failed archiving %s."%aName) raise + def list_of_months(): dArchives = {} @@ -321,22 +321,28 @@ def list_of_months(): monthDir = os.path.join(yearDir,month) tMonth = time.strptime(month+"/"+year,"%m/%Y") sMonth = time.strftime("%B",tMonth) - dArchives[year].append(month)#sMonth) + dArchives[year].append(month) return dArchives + def list_articles(folder): - artDir = folder - joined_html = "" articles_dict = {} - for name in [os.path.splitext(item)[0] for item in os.listdir(artDir) if not "~" in item]: - article = (parse_article(os.path.join(artDir, name + ".txt"))) + for name in [os.path.splitext(item)[0] for item in os.listdir(folder) if not "~" in item]: + article = (parse_article(os.path.join(folder, name + ".txt"))) # Bring articles into chronological order t = time.mktime(time.strptime(article['DATE'] + " " + article['TIME'], "%m/%d/%y %H:%M:%S")) articles_dict[str(t)] = article + + return articles_dict + + +def list_articles_to_html(folder): + artDir = folder + joined_html = "" + articles_dict = list_articles(folder) dates_of_creation = [float(value) for value in articles_dict.keys()] dates_of_creation.sort(key=None,reverse=True) for i in range(0, len(dates_of_creation)): - joined_html += recent_to_html(articles_dict[str(time.strftime(str(dates_of_creation[i])))]) return joined_html @@ -346,10 +352,10 @@ def list_articles(folder): def months_to_html(archived_months): html = "