diff --git a/generator/model.py b/generator/model.py index 0965234..8d083d7 100644 --- a/generator/model.py +++ b/generator/model.py @@ -32,11 +32,16 @@ def makeContainer(module,site,current_node,previous_node,lang): menu=module.menu(previous=previous,menulist="\n".join(article_list),articles=site.get_variable("articles",lang)) return menu +def makeAllData(module,list_of_data): + "To be deleted iframes&post merging seems better" + return module.mix_data(list_of_data) + 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)) def makePage(module,site,lang,menu,data): - return module.container(pagetitle=site.get_title(lang),websitename=site.get_one(['websitename',"webtitle","name","title"],"fr"),menu=menu,page=data) + return module.container(pagetitle=site.get_title(lang),websitename=site.get_one(['websitename',"webtitle","name","title"],lang),menu=menu,page=data) + if __name__ == '__main__': site=makeWebsite("sites/example_website") diff --git a/generator/models/dual.py b/generator/models/dual.py index 6e626b9..f74cfc8 100644 --- a/generator/models/dual.py +++ b/generator/models/dual.py @@ -88,6 +88,9 @@ def content(content="\{content\}",title="\{title\}"):
""".format(content=content,title=title) +def mix_data(list_of_data): + return "
"+"".join(list_of_data)+"
" + # Inner functions icons={"image":"picture-o","audio":"music","text":"book","video":"film","folder":"folder","other":"file","previous":"arrow-left"} #"gear":"gear","edit":"edit" diff --git a/test.html b/test.html deleted file mode 100644 index 8aefd67..0000000 --- a/test.html +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - _config.txt - - - - - - - - - - -
- - - - -
-
-
-
-

Traductionnator

- Loreme ipsume dolore site amete, consecteture adipisicinge elite, sede doe eiusmode tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolore ine reprehenderite ine voluptate velite esse cillume dolore eu fugiatte nulla pariature. Excepteure sinte occaecate cupidatate none proidente, sunta ine culpa qui officia deserunte mollite anime ide est laborume. -![Alt text](/path/to/img.jpg) -Like this - -
-
-
-
-
- -
- - - - - - - - - - - - \ No newline at end of file diff --git a/vkyweb.py b/vkyweb.py index 157bf83..2b90cf3 100644 --- a/vkyweb.py +++ b/vkyweb.py @@ -4,11 +4,32 @@ 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 vprint(*x): - if args.verbose: - print(x) +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) + #saveMenus(save_path,cnode,lang) + +def gen_node(node,menu_lang,langs,choosen_model): + #menu=makeContainer(model,site,current_node,previous_node,menu_lang) + data=[] + for lang in langs: + data.append(model.makeData(choosen_model,current_node,lang)) + print data + #model.makeMulticontent() + #page=makePage(model,site,menu_lang,menu,data) parser = argparse.ArgumentParser(description='Website on-the-fly & static generator') @@ -22,12 +43,15 @@ 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("--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)): if args.verbose: - print "O" print("Path {} does not exist".format(args.website_path)) sys.exit() website=tree_parser.makeWebsite(args.website_path) @@ -35,7 +59,12 @@ website=tree_parser.makeWebsite(args.website_path) # Walk & generate if args.verbose: - print("Website will be generated in {}".format(args.l)) + print("Website will be generated in {} at {}".format(args.l,args.d)) +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 every lang, do a mix of print_webtree and makeContainer #container=model.makeContainer(s)