+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/vkyweb.py b/vkyweb.py
index 2b90cf3..cf801d0 100644
--- a/vkyweb.py
+++ b/vkyweb.py
@@ -4,22 +4,39 @@
import argparse,os,sys
from generator import *
-#model=generator.model
-#models=generator.models
choosen_model=models.dual
def saveData(path,data):
with open(path,"w+") as f:
f.write(data)
+def savePath(path):
+ return os.path.join(save_path,path)
+
def saveMenus():
pass
def gen_all_nodes_menu(tree,lang):
- previous_node=tree
- for current_node in tree.get_next_nodes():
- #gen_all_nodes_menu(website,current_node,previous_node,lang)
- menu=model.makeContainer(choosen_model,website,current_node,previous_node,lang)
+ previous_node=tree #maybe need to be sent via parameter, nonetheless very secondary
+ 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="{}_{}.{}".format(current_node.name,lang,"html") # usage of args.extention conflicts with makeHTMLName
+ save=savePath(filename)
+
+ menu=model.makeContainer(choosen_model,website,current_node,previous_node,lang)
+ frames=model.makeiFrame(current_node)
+ page=model.makePage(choosen_model,website,lang,menu,frames)
+ #print page
+ saveData(save,page)
+
+ for new in tree.get_next_subtree(lang):
+ try:
+ if args.verbose:
+ print("Creating {}".format(new.path))
+ os.makedirs(savePath(new.path))
+ except OSError:
+ pass
+ gen_all_nodes_menu(new,lang)
#saveMenus(save_path,cnode,lang)
def gen_node(node,menu_lang,langs,choosen_model):
@@ -43,11 +60,11 @@ parser.add_argument('--update',action="store_true",help="Only update, don't rewr
parser.add_argument("--dry",action="store_true",help="Dry run, don't write anything")
parser.add_argument("-d",metavar="destination",type=str,default=".",help="Destination to write to")
parser.add_argument("-l",metavar="langs",type=str,nargs="+",help="List of langs to generate the site to")
+parser.add_argument('--extention',type=str,default="html", help="The extention to give to all generated files")
#parser.add_argument("--model",metavar="model",type=str,help="model to use")
#parser.add_argument("--merge",metavar="merge",type=str,help="don't use iframes, merge all content")
args=parser.parse_args()
-save_path=args.d
# Make tree
if not (os.path.exists(args.website_path)):
@@ -55,6 +72,16 @@ if not (os.path.exists(args.website_path)):
print("Path {} does not exist".format(args.website_path))
sys.exit()
website=tree_parser.makeWebsite(args.website_path)
+save_path=args.d #Directly in the dest folder, no meta folder created !
+
+# Making the directory if needed
+if not args.dry:
+ try:
+ if args.verbose:
+ print("Creating {}".save_path)
+ os.makedirs(save_path)
+ except OSError:
+ pass
#website.print_webtree(lang="fr",prefix=" * ")
# Walk & generate
@@ -64,7 +91,7 @@ if args.verbose:
for lang in args.l: #Generate every page in .lang.html (with both contents)
previous_node=website.tree.get_node("index",lang)
gen_all_nodes_menu(website.tree,lang)
- for tree in website.tree.get_next_subtree():
- previous_node=tree # For now, you can't get higher than index
+ #for tree in website.tree.get_next_subtree():
+ # previous_node=tree # For now, you can't get higher than index
#for every lang, do a mix of print_webtree and makeContainer
#container=model.makeContainer(s)