diff --git a/generator/model.py b/generator/model.py
index 194a0a3..0343efd 100644
--- a/generator/model.py
+++ b/generator/model.py
@@ -22,14 +22,17 @@ def getDataType(name):
return typename
return "other"
-def makeHTMLName(node):
+def makeHTMLName(text):
"Get the link assotitated with the node (name.html)"
- return os.path.splitext(node.name)[0]+".html"#splitext(node.name)[0:-1].join(os.filesep)
+ return os.path.splitext(text)[0]+".html"#splitext(node.name)[0:-1].join(os.filesep)
def makeContainer(module,site,current_node,previous_node,lang,makeHTMLName=makeHTMLName,depth=""):
article_list=module.makeSubNodelist(site.tree,lang,getDataType,makeHTMLName)
- previous=module.menuitem(site.get_variable("previous",lang),previous_node.path,"previous")
- menu=module.menu(previous="../",menulist="\n".join(article_list),articles=site.get_variable("articles",lang),depth=depth)
+ if previous_node==None:
+ previous=""
+ else:
+ previous=module.menuitem(site.get_variable("previous",lang),"../"+makeHTMLName("index"),"previous")
+ menu=module.menu(previous=previous,menulist="\n".join(article_list),articles=site.get_variable("articles",lang),depth=depth)
return menu
def makeAllData(module,list_of_data):
@@ -45,6 +48,8 @@ def makeData(module,current_node,lang):
def makePage(module,site,lang,menu,data,depth):
return module.container(pagetitle=site.get_title(lang),websitename=site.get_one(['websitename',"webtitle","name","title"],lang),menu=menu,page=data,depth=depth)
+def pathAssets(module):
+ return module.assets()
if __name__ == '__main__':
site=makeWebsite("sites/example_website")
diff --git a/generator/models/dual.py b/generator/models/dual.py
index a34e438..4b265cd 100644
--- a/generator/models/dual.py
+++ b/generator/models/dual.py
@@ -94,6 +94,9 @@ def iframe(list_of_pages):
iframes+="".format(page)
return iframes
+def assets():
+ return "site_base/dual/assets"
+
def mix_data(list_of_data):
return "
| "+" | ".join(list_of_data)+" |
"
@@ -116,7 +119,7 @@ def makeSubNodelist(subnode,lang,getdatatype,makeHTMLName):
items=[]
for node in subnode.get_next_nodes():
if node.name[0]!="_":
- items.append(menuitem(node.get_title(lang),makeHTMLName(node),getdatatype(node.path)))
+ items.append(menuitem(node.get_title(lang),makeHTMLName(node.name),getdatatype(node.path)))
for node in subnode.get_next_subtree():
#print(node,node.name)
if node.name[0]!="_":
diff --git a/sites/generated_website/Poetry/index_en.html b/sites/generated_website/Poetry/index_en.html
index 0014bda..52508f2 100644
--- a/sites/generated_website/Poetry/index_en.html
+++ b/sites/generated_website/Poetry/index_en.html
@@ -39,7 +39,7 @@
- Previous articles
+ Previous articles
Articles
diff --git a/sites/generated_website/Poetry/index_fr.html b/sites/generated_website/Poetry/index_fr.html
index dbc22f1..e085a7b 100644
--- a/sites/generated_website/Poetry/index_fr.html
+++ b/sites/generated_website/Poetry/index_fr.html
@@ -39,7 +39,7 @@
-
- - Articles précédents
+ - Articles précédents
-
Articles
diff --git a/sites/generated_website/Poetry/poetry1_en.html b/sites/generated_website/Poetry/poetry1_en.html
index 1a3fb22..3e7e8ba 100644
--- a/sites/generated_website/Poetry/poetry1_en.html
+++ b/sites/generated_website/Poetry/poetry1_en.html
@@ -39,7 +39,7 @@
-
- - Previous articles
+ - Previous articles
-
Articles
diff --git a/sites/generated_website/Poetry/poetry1_fr.html b/sites/generated_website/Poetry/poetry1_fr.html
index ead90d8..6f2dd02 100644
--- a/sites/generated_website/Poetry/poetry1_fr.html
+++ b/sites/generated_website/Poetry/poetry1_fr.html
@@ -39,7 +39,7 @@
-
- - Articles précédents
+ - Articles précédents
-
Articles
diff --git a/sites/generated_website/Poetry/subarticle1/index_en_en.html b/sites/generated_website/Poetry/subarticle1/index_en_en.html
index da300b7..accc50e 100644
--- a/sites/generated_website/Poetry/subarticle1/index_en_en.html
+++ b/sites/generated_website/Poetry/subarticle1/index_en_en.html
@@ -39,7 +39,7 @@
-
- - Previous articles
+ - Previous articles
-
Articles
diff --git a/sites/generated_website/Poetry/subarticle1/index_fr_fr.html b/sites/generated_website/Poetry/subarticle1/index_fr_fr.html
index b763057..86e70f0 100644
--- a/sites/generated_website/Poetry/subarticle1/index_fr_fr.html
+++ b/sites/generated_website/Poetry/subarticle1/index_fr_fr.html
@@ -39,7 +39,7 @@
-
- - Articles précédents
+ - Articles précédents
-
Articles
diff --git a/sites/generated_website/Poetry/subarticle2_en/index_en.html b/sites/generated_website/Poetry/subarticle2_en/index_en.html
index 2b60de8..cdcca20 100644
--- a/sites/generated_website/Poetry/subarticle2_en/index_en.html
+++ b/sites/generated_website/Poetry/subarticle2_en/index_en.html
@@ -39,7 +39,7 @@
-
- - Previous articles
+ - Previous articles
-
Articles
diff --git a/sites/generated_website/Poetry/subarticle2_fr/index_fr.html b/sites/generated_website/Poetry/subarticle2_fr/index_fr.html
index b5fef61..ee4f76b 100644
--- a/sites/generated_website/Poetry/subarticle2_fr/index_fr.html
+++ b/sites/generated_website/Poetry/subarticle2_fr/index_fr.html
@@ -39,7 +39,7 @@
-
- - Articles précédents
+ - Articles précédents
-
Articles
diff --git a/sites/generated_website/article1_en.html b/sites/generated_website/article1_en.html
index e6cfcca..f64d67d 100644
--- a/sites/generated_website/article1_en.html
+++ b/sites/generated_website/article1_en.html
@@ -39,7 +39,7 @@
-
- - Previous articles
+
-
Articles
diff --git a/sites/generated_website/article1_fr.html b/sites/generated_website/article1_fr.html
index 25daaae..b205067 100644
--- a/sites/generated_website/article1_fr.html
+++ b/sites/generated_website/article1_fr.html
@@ -39,7 +39,7 @@
-
- - Articles précédents
+
-
Articles
diff --git a/sites/generated_website/index_en.html b/sites/generated_website/index_en.html
index 4a0ba49..0a68988 100644
--- a/sites/generated_website/index_en.html
+++ b/sites/generated_website/index_en.html
@@ -39,7 +39,7 @@
-
- - Previous articles
+
-
Articles
diff --git a/sites/generated_website/index_fr.html b/sites/generated_website/index_fr.html
index 708d15d..870945a 100644
--- a/sites/generated_website/index_fr.html
+++ b/sites/generated_website/index_fr.html
@@ -39,7 +39,7 @@
-
- - Articles précédents
+
-
Articles
diff --git a/vkyweb.py b/vkyweb.py
index 7ceba18..1ce290d 100644
--- a/vkyweb.py
+++ b/vkyweb.py
@@ -2,13 +2,14 @@
# Copyleft (c) 2016 Cocobug All Rights Reserved.
-import argparse,os,sys
+import argparse,os,sys,shutil
from generator import *
choosen_model=models.dual
def saveData(path,data):
- with open(path,"w+") as f:
- f.write(data)
+ if not args.dry:
+ with open(path,"w+") as f:
+ f.write(data)
def savePath(path):
return os.path.join(save_path,path)
@@ -18,23 +19,23 @@ def saveMenus():
def HTMLNameCreator(lang,ext="html"):
ext,lang=ext,lang
- def makeHTMLName(node):
- return "{}_{}.{}".format(node.name,lang,ext)
+ def makeHTMLName(text):
+ return "{}_{}.{}".format(os.path.splitext(text)[0],lang,ext)
return makeHTMLName
def iFrameFromNode(node):
"Return the list of pages that should be in the frames"
names=[]
for l in args.l:
- names.append(os.path.basename(HTMLNameCreator("content_"+l,ext=args.extension)(node)))
+ names.append(os.path.basename(HTMLNameCreator("content_"+l,ext=args.extension)(node.name)))
return names
-def gen_all_nodes_menu(tree,lang,depth):
- previous_node=tree #maybe need to be sent via parameter, nonetheless very secondary
+def gen_all_nodes_menu(tree,lang,previous_node,depth):
+ #previous_node=tree.parent_node #maybe need to be sent via parameter, nonetheless very secondary
# TODO: look for index in all nodes, create it if needed
for current_node in tree.get_next_nodes(lang):
if (os.path.basename(current_node.name)[0]!="_"): #Likely add a visible: true/false tag in the future
- filename=htmlNamer(current_node)
+ filename=htmlNamer(current_node.name)
if args.verbose:
print "Generating {} menus".format(filename)
save=savePath(filename)
@@ -46,23 +47,26 @@ def gen_all_nodes_menu(tree,lang,depth):
saveData(save,page)
depth="../"+depth
for new in tree.get_next_subtree(lang):
+ previous_node=new
try:
if args.verbose:
- print("Creating {}".format(new.path))
- os.makedirs(savePath(new.path))
+ print("Creating folder [{}]".format(new.path))
+ if not args.dry:
+ os.makedirs(savePath(new.path))
except OSError:
pass
- gen_all_nodes_menu(new,lang,depth)
+ gen_all_nodes_menu(new,lang,previous_node,depth)
def gen_all_nodes_content(tree,lang):
for current_node in tree.get_next_nodes(lang):
- file_name=htmlContentNamer(current_node)
- if args.verbose:
- print "Generating {} content".format(file_name)
- save=savePath(file_name)
- content=model.makeData(choosen_model,current_node,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)
+ save=savePath(file_name)
+ content=model.makeData(choosen_model,current_node,lang)
- saveData(save,content)
+ saveData(save,content)
for t in tree.get_next_subtree(lang):
gen_all_nodes_content(t,lang)
@@ -96,10 +100,19 @@ save_path=args.d #Directly in the dest folder, no meta folder created !
if not args.dry:
try:
if args.verbose:
- print("Creating {}".save_path)
+ print("Creating folder [{}]".format(save_path))
os.makedirs(save_path)
except OSError:
pass
+
+# Copying the assets if needed
+if not args.dry:
+ try:
+ if args.verbose:
+ print("Copying assets folder [{}] to [{}]".format(model.pathAssets(choosen_model),os.path.join(save_path,"assets")))
+ shutil.copytree(model.pathAssets(choosen_model),os.path.join(save_path,"assets"))
+ except OSError:
+ pass
#website.print_webtree(lang="fr",prefix=" * ")
# Walk & generate
@@ -109,8 +122,8 @@ if args.verbose:
for lang in args.l: #Generate every page in .lang.html (with both contents)
htmlNamer=HTMLNameCreator(lang,args.extension)
htmlContentNamer=HTMLNameCreator("content_"+lang,args.extension)
- previous_node=website.tree.get_node("index",lang)
- gen_all_nodes_menu(website.tree,lang,depth="")
+ previous_node=None#website.tree.get_node("index",lang)
+ gen_all_nodes_menu(website.tree,lang,previous_node=None,depth="")
gen_all_nodes_content(website.tree,lang)
#for tree in website.tree.get_next_subtree():