mirror of https://github.com/Malphaet/vkyweb.git
Some issues fixed, still a long way to go before alpha
This commit is contained in:
parent
75de3babaf
commit
c92cd8220f
|
|
@ -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")
|
||||
|
|
|
|||
|
|
@ -94,6 +94,9 @@ def iframe(list_of_pages):
|
|||
iframes+="<iframe src={} width='50%' height='500px'>Iframes not supported</iframe>".format(page)
|
||||
return iframes
|
||||
|
||||
def assets():
|
||||
return "site_base/dual/assets"
|
||||
|
||||
def mix_data(list_of_data):
|
||||
return "<table><tr><td>"+"</td><td>".join(list_of_data)+"</td></tr></table>"
|
||||
|
||||
|
|
@ -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]!="_":
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<li class="text-center user-image-back">
|
||||
<img src="../assets/img/logo.png" class="img-responsive" />
|
||||
</li>
|
||||
<li><a href="Poetry"><i class="fa fa-arrow-left "></i>Previous articles</a></li>
|
||||
<li><a href="../index_en.html"><i class="fa fa-arrow-left "></i>Previous articles</a></li>
|
||||
<li class="active">
|
||||
<a href="#"><i class="fa fa-folder"></i>Articles<span class="fa arrow"></span></a>
|
||||
<ul class="nav nav-second-level">
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<li class="text-center user-image-back">
|
||||
<img src="../assets/img/logo.png" class="img-responsive" />
|
||||
</li>
|
||||
<li><a href="Poetry"><i class="fa fa-arrow-left "></i>Articles précédents</a></li>
|
||||
<li><a href="../index_fr.html"><i class="fa fa-arrow-left "></i>Articles précédents</a></li>
|
||||
<li class="active">
|
||||
<a href="#"><i class="fa fa-folder"></i>Articles<span class="fa arrow"></span></a>
|
||||
<ul class="nav nav-second-level">
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<li class="text-center user-image-back">
|
||||
<img src="../assets/img/logo.png" class="img-responsive" />
|
||||
</li>
|
||||
<li><a href="Poetry"><i class="fa fa-arrow-left "></i>Previous articles</a></li>
|
||||
<li><a href="../index_en.html"><i class="fa fa-arrow-left "></i>Previous articles</a></li>
|
||||
<li class="active">
|
||||
<a href="#"><i class="fa fa-folder"></i>Articles<span class="fa arrow"></span></a>
|
||||
<ul class="nav nav-second-level">
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<li class="text-center user-image-back">
|
||||
<img src="../assets/img/logo.png" class="img-responsive" />
|
||||
</li>
|
||||
<li><a href="Poetry"><i class="fa fa-arrow-left "></i>Articles précédents</a></li>
|
||||
<li><a href="../index_fr.html"><i class="fa fa-arrow-left "></i>Articles précédents</a></li>
|
||||
<li class="active">
|
||||
<a href="#"><i class="fa fa-folder"></i>Articles<span class="fa arrow"></span></a>
|
||||
<ul class="nav nav-second-level">
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<li class="text-center user-image-back">
|
||||
<img src="../../assets/img/logo.png" class="img-responsive" />
|
||||
</li>
|
||||
<li><a href="Poetry/subarticle1"><i class="fa fa-arrow-left "></i>Previous articles</a></li>
|
||||
<li><a href="../index_en.html"><i class="fa fa-arrow-left "></i>Previous articles</a></li>
|
||||
<li class="active">
|
||||
<a href="#"><i class="fa fa-folder"></i>Articles<span class="fa arrow"></span></a>
|
||||
<ul class="nav nav-second-level">
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<li class="text-center user-image-back">
|
||||
<img src="../../assets/img/logo.png" class="img-responsive" />
|
||||
</li>
|
||||
<li><a href="Poetry/subarticle1"><i class="fa fa-arrow-left "></i>Articles précédents</a></li>
|
||||
<li><a href="../index_fr.html"><i class="fa fa-arrow-left "></i>Articles précédents</a></li>
|
||||
<li class="active">
|
||||
<a href="#"><i class="fa fa-folder"></i>Articles<span class="fa arrow"></span></a>
|
||||
<ul class="nav nav-second-level">
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<li class="text-center user-image-back">
|
||||
<img src="../../assets/img/logo.png" class="img-responsive" />
|
||||
</li>
|
||||
<li><a href="Poetry/subarticle2_en"><i class="fa fa-arrow-left "></i>Previous articles</a></li>
|
||||
<li><a href="../index_en.html"><i class="fa fa-arrow-left "></i>Previous articles</a></li>
|
||||
<li class="active">
|
||||
<a href="#"><i class="fa fa-folder"></i>Articles<span class="fa arrow"></span></a>
|
||||
<ul class="nav nav-second-level">
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<li class="text-center user-image-back">
|
||||
<img src="../../assets/img/logo.png" class="img-responsive" />
|
||||
</li>
|
||||
<li><a href="Poetry/subarticle2_fr"><i class="fa fa-arrow-left "></i>Articles précédents</a></li>
|
||||
<li><a href="../index_fr.html"><i class="fa fa-arrow-left "></i>Articles précédents</a></li>
|
||||
<li class="active">
|
||||
<a href="#"><i class="fa fa-folder"></i>Articles<span class="fa arrow"></span></a>
|
||||
<ul class="nav nav-second-level">
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<li class="text-center user-image-back">
|
||||
<img src="assets/img/logo.png" class="img-responsive" />
|
||||
</li>
|
||||
<li><a href=""><i class="fa fa-arrow-left "></i>Previous articles</a></li>
|
||||
|
||||
<li class="active">
|
||||
<a href="#"><i class="fa fa-folder"></i>Articles<span class="fa arrow"></span></a>
|
||||
<ul class="nav nav-second-level">
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<li class="text-center user-image-back">
|
||||
<img src="assets/img/logo.png" class="img-responsive" />
|
||||
</li>
|
||||
<li><a href=""><i class="fa fa-arrow-left "></i>Articles précédents</a></li>
|
||||
|
||||
<li class="active">
|
||||
<a href="#"><i class="fa fa-folder"></i>Articles<span class="fa arrow"></span></a>
|
||||
<ul class="nav nav-second-level">
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<li class="text-center user-image-back">
|
||||
<img src="assets/img/logo.png" class="img-responsive" />
|
||||
</li>
|
||||
<li><a href=""><i class="fa fa-arrow-left "></i>Previous articles</a></li>
|
||||
|
||||
<li class="active">
|
||||
<a href="#"><i class="fa fa-folder"></i>Articles<span class="fa arrow"></span></a>
|
||||
<ul class="nav nav-second-level">
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<li class="text-center user-image-back">
|
||||
<img src="assets/img/logo.png" class="img-responsive" />
|
||||
</li>
|
||||
<li><a href=""><i class="fa fa-arrow-left "></i>Articles précédents</a></li>
|
||||
|
||||
<li class="active">
|
||||
<a href="#"><i class="fa fa-folder"></i>Articles<span class="fa arrow"></span></a>
|
||||
<ul class="nav nav-second-level">
|
||||
|
|
|
|||
55
vkyweb.py
55
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():
|
||||
|
|
|
|||
Loading…
Reference in New Issue