From 61090e54e1cf146f13d7bff2099ba1f3d5812699 Mon Sep 17 00:00:00 2001 From: Maximilien Rigaut Date: Sat, 26 Aug 2017 19:17:39 +0200 Subject: [PATCH] Finished patching, functionnal mostly and lacking features --- generator/file_parser.py | 5 ++--- generator/model.py | 7 ++++--- generator/models/dual.py | 2 ++ generator/tree_parser.py | 2 ++ sites/example_website/index.txt | 2 +- test.py | 1 + vkyweb.py | 5 +++-- 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/generator/file_parser.py b/generator/file_parser.py index 00df5a6..339a34e 100644 --- a/generator/file_parser.py +++ b/generator/file_parser.py @@ -1,8 +1,7 @@ # Copyleft (c) 2016 Cocobug All Rights Reserved. -# coding=utf-8 +# -*- coding: utf_8 -*- - -import os,sys +import os,sys,codecs import re import traceback diff --git a/generator/model.py b/generator/model.py index 795c4e1..aab8714 100644 --- a/generator/model.py +++ b/generator/model.py @@ -1,7 +1,7 @@ # Copyleft (c) 2016 Cocobug All Rights Reserved. -# coding=utf-8 +# -*- coding: utf_8 -*- -import re,traceback,os +import re,traceback,os,markdown try: from tree_parser import * @@ -43,7 +43,8 @@ def makeiFrame(module,list_of_nodes): return module.iframe(list_of_nodes) def makeData(module,current_node,lang): - return module.content(content=current_node.get_content(lang),title=current_node.get_one(["article_title",'title',"article_name","name"],lang)) + content=markdown.markdown(unicode(current_node.get_content(lang).decode("utf-8"))) + return module.content(content=content.encode('utf-8'),title=current_node.get_one(["article_title",'title',"article_name","name"],lang)) def makePage(module,site,lang,menu,data,depth,langswitch): return module.container(pagetitle=site.get_title(lang),websitename=site.get_one(['websitename',"webtitle","name","title"],lang),menu=menu,page=data,depth=depth,langswitch=langswitch) diff --git a/generator/models/dual.py b/generator/models/dual.py index 136f1d3..da1afa3 100644 --- a/generator/models/dual.py +++ b/generator/models/dual.py @@ -1,3 +1,5 @@ +# -*- coding: utf_8 -*- + import os def container(pagetitle="#_pagetitle_#",websitename="#_websitename_#",menu="\{menu\}",page="\{page\}",langswitch="\{langswitch\}",depth=""): diff --git a/generator/tree_parser.py b/generator/tree_parser.py index 8041771..bff8e35 100644 --- a/generator/tree_parser.py +++ b/generator/tree_parser.py @@ -1,4 +1,6 @@ # Copyleft (c) 2016 Cocobug All Rights Reserved. +# -*- coding: utf_8 -*- + import os,sys try: diff --git a/sites/example_website/index.txt b/sites/example_website/index.txt index 9b13d72..5e03563 100644 --- a/sites/example_website/index.txt +++ b/sites/example_website/index.txt @@ -22,7 +22,7 @@ Loreme ipsume dolore site amete, consecteture adipisicinge elite, sede doe eiusm __/fr__ __*__ -![Alt text](/path/to/img.jpg) +![Alt text](./assets/img/logo.png) __/*__ __hidden__ diff --git a/test.py b/test.py index 603f226..93d3e47 100644 --- a/test.py +++ b/test.py @@ -1,4 +1,5 @@ # Copyleft (c) 2016 Cocobug All Rights Reserved. +# -*- coding: utf_8 -*- from minitest import minitest diff --git a/vkyweb.py b/vkyweb.py index 0154f61..89d35da 100644 --- a/vkyweb.py +++ b/vkyweb.py @@ -1,8 +1,9 @@ #!/usr/bin/env python +# -*- coding: utf_8 -*- # Copyleft (c) 2016 Cocobug All Rights Reserved. -import argparse,os,sys,shutil +import argparse,os,sys,shutil,markdown from generator import * choosen_model=models.dual @@ -67,7 +68,7 @@ def gen_all_nodes_content(tree,lang): if (os.path.basename(current_node.name)[0]!="_"): #Likely add a visible: true/false tag in the future file_name=htmlContentNamer(current_node.name) if args.verbose: - print "Generating [{}]: content".format(file_name) + print("Generating [{}]: content".format(file_name)) save=savePath(file_name) content=model.makeData(choosen_model,current_node,lang)