diff --git a/generator/model.py b/generator/model.py index adbd882..c7be69a 100644 --- a/generator/model.py +++ b/generator/model.py @@ -4,8 +4,9 @@ from tree_parser import * from model import dual import re,traceback -def DataType(ext): +def getDataType(name): "Return some kind of general types depending on the extention" + ext=os.path.splitext(name)[-1] data={"image":[".jpg",".png",".svg",".tiff",".jpeg"], "audio":[".ogg",".aiff",".mp3"], "text":[".txt",".md"], @@ -13,33 +14,31 @@ def DataType(ext): for typename,extension in data.iteritems(): if ext in extension: return typename - return None + return "other" -def makeContainer(node): - c=DualContainer(node.name,node) - #print node.variables - #print node.config_file - c.load("generator/model/dual_menu.html") - c.replace("fr") - return c +def makeContainer(module,site,current_node,previous_node,lang): + article_list=module.makeSubNodelist(site.tree,lang,getDataType) + previous=module.menuitem(site.get_variable("previous",lang),previous_node.path,"previous") + menu=module.menu(previous=previous,menulist="\n".join(article_list),articles=site.get_variable("articles",lang)) + return menu -def makeData(node): - c=DualData(node.name,node) - c.load("generator/model/dual_page.html") - c.replace("fr") - return c +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(node,cont,data): - c=DualContainer(node.name,node) - c.load("generator/model/dual_container.html") - c.replace('fr') - cont_t=cont.export() - data_t=data.export() - print c.export().replace("##PAGE##",data_t).replace("##MENU##",cont_t) +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) if __name__ == '__main__': site=makeWebsite("sites/example_website") - print dual.menuitem('da',"ma","text") - #cont=makeContainer(site) - #data=makeData(site.tree.get_node("index","fr")) - #makePage(site,cont,data) + + lang="fr" + current_node=site.tree.get_node("index",lang) + previous_node=site.tree.get_node("index",lang) + + menu=makeContainer(dual,site,current_node,previous_node,lang) + data=makeData(dual,current_node,lang) + + page=makePage(dual,site,lang,menu,data) + with open("site_base/dual/test.html","w+") as f: + f.write(page) + print page diff --git a/generator/model/dual.py b/generator/model/dual.py index da36a1b..6af1d46 100644 --- a/generator/model/dual.py +++ b/generator/model/dual.py @@ -1,4 +1,4 @@ -def container(pagetitle="#_pagetitle_#",websitename="#_websitename_#",menu="##MENU##",page="##PAGE##"): +def container(pagetitle="#_pagetitle_#",websitename="#_websitename_#",menu="\{menu\}",page="\{page\}"): "Return the global appearance of the website" return """ @@ -62,25 +62,35 @@ def container(pagetitle="#_pagetitle_#",websitename="#_websitename_#",menu="##ME """.format(MENU=menu,PAGE=page,websitename=websitename,pagetitle=pagetitle) -def menu(previous="#_previous_#",menulist="\{menulist\}",articles="#_articles_#",preferences="#_preferences_#",about='#_about_#'): +def menu(previous="",menulist="\{menulist\}",articles="#_articles_#"): "Return the menu list" return """
  • -
  • {previous}
  • + {previous}
  • {articles} -
  • {preferences}
  • -
  • {about}
  • - """.format(previous=previous,menulist=menulist,articles=articles,preferences=preferences,about=about) + """.format(previous=previous,menulist=menulist,articles=articles) + +def content(content="\{content\}",title="\{title\}"): + return """
    +
    +
    +

    {title}

    + {content} +
    +
    +
    +
    """.format(content=content,title=title) # Inner functions -icons={"image":"picture-o","audio":"music","text":"book","video":"film","folder":"folder","other":"file"} #"gear":"gear","edit":"edit" +icons={"image":"picture-o","audio":"music","text":"book","video":"film","folder":"folder","other":"file","previous":"arrow-left"} #"gear":"gear","edit":"edit" def geticon(datatype): + "Get an Icon for the given datatype" try: return icons[datatype] except: @@ -88,4 +98,16 @@ def geticon(datatype): def menuitem(text,link,datatype): "Generate a menu link" + print datatype return """
  • {text}
  • """.format(text=text,link=link,datatype=geticon(datatype)) + +def makeSubNodelist(subnode,lang,getdatatype): + items=[] + for node in subnode.get_next_nodes(): + if node.name[0]!="_": + items.append(menuitem(node.get_title(lang),node.path,getdatatype(node.path))) + for node in subnode.get_next_subtree(): + #print node,node.name + if node.name[0]!="_": + items.append(menuitem(node.get_title(lang),node.path,"folder")) + return items diff --git a/generator/tree_parser.py b/generator/tree_parser.py index 21c61be..d9b8c98 100644 --- a/generator/tree_parser.py +++ b/generator/tree_parser.py @@ -12,6 +12,21 @@ class WebTree(object): self.get_config() self.make_tree() + def get_title(self,filter_lang): + "Try to give the human-readable title of the node, default to the name" + try: + return self.get_variable("title",filter_lang) + except: + return self.name + + def get_one(self,array_of_variables,filter_lang="",default=None): + "Try to get one of the equivalent variables" + for var in array_of_variables: + try: + return self.get_variable(var,filter_lang) + except: + pass + return default def make_tree(self): "Walk the directory and subdirectories and make the tree from it, note that the WebTree only have one Subtree, containing other subtrees" @@ -23,6 +38,7 @@ class WebTree(object): self.config_path=os.path.join(self.website_path,self.path,"_config.txt") self.config_file=file_parser.parse_file(self.config_path) self.variables=self.config_file.variables + self.name=self.config_file.name def get_variable(self,varname,filter_lang="*"): "Get the corresponding variable" @@ -53,6 +69,7 @@ class WebSubTree(WebTree): self.subtree={} self.nodes={} WebTree.__init__(self,website_path,path) + self.name=os.path.split(path)[-1] def get_variable(self,varname,filter_lang): "Get the variable, either in it's config or one of the above" @@ -91,9 +108,10 @@ class WebSubTree(WebTree): #print self, self.subtree #print self.nodes - def get_all_nodes(self,filter_lang="*"): + def get_next_nodes(self,filter_lang="*"): "Get all nodes in the following language" - pass + for node in self.nodes: + yield self.get_node(node,filter_lang) def get_node(self,name,filter_lang=""): "Get a node with a specific name" @@ -105,6 +123,21 @@ class WebSubTree(WebTree): return self.nodes[name]["*"] # specific language unavailable, all languages returned, better luck here raise IndexError("The node "+name+" doesn't exist") + def get_next_subtree(self,filter_lang="*"): + "Get all subtrees" + for tree in self.subtree: + yield self.get_subtree(tree,filter_lang) + + def get_subtree(self,name,filter_lang="*"): + "Get a tree with a specific name" + if name in self.subtree: + if filter_lang=="": #No specific lang, so all langs are returned, should disapear soon I think + return self.subtree[name] + if filter_lang in self.subtree[name]: + return self.subtree[name][filter_lang] + return self.subtree[name]["*"] # specific language unavailable, all languages returned, better luck here + raise IndexError("The tree "+subtree+" doesn't exist") + def get_content(self,name,filter_lang=""): "Get the content of the node in the specified language" return self.get_node(name,filter_lang).get_content(filter_lang) @@ -169,3 +202,4 @@ if __name__ == '__main__': # Do all the nominal tests s=makeWebsite("sites/example_website") s.print_webtree(" > ") + container(pagetitle="#_pagetitle_#",websitename="#_websitename_#",menu="##MENU##",page="##PAGE##") diff --git a/site_base/bs-twopage/assets/css/bootstrap.css b/site_base/dual/assets/css/bootstrap.css similarity index 100% rename from site_base/bs-twopage/assets/css/bootstrap.css rename to site_base/dual/assets/css/bootstrap.css diff --git a/site_base/bs-twopage/assets/css/custom.css b/site_base/dual/assets/css/custom.css similarity index 100% rename from site_base/bs-twopage/assets/css/custom.css rename to site_base/dual/assets/css/custom.css diff --git a/site_base/bs-twopage/assets/css/font-awesome.css b/site_base/dual/assets/css/font-awesome.css similarity index 100% rename from site_base/bs-twopage/assets/css/font-awesome.css rename to site_base/dual/assets/css/font-awesome.css diff --git a/site_base/bs-twopage/assets/font-awesome/fonts/fontawesome-webfontba72.eot b/site_base/dual/assets/font-awesome/fonts/fontawesome-webfontba72.eot similarity index 100% rename from site_base/bs-twopage/assets/font-awesome/fonts/fontawesome-webfontba72.eot rename to site_base/dual/assets/font-awesome/fonts/fontawesome-webfontba72.eot diff --git a/site_base/bs-twopage/assets/font-awesome/fonts/fontawesome-webfontba72.svg b/site_base/dual/assets/font-awesome/fonts/fontawesome-webfontba72.svg similarity index 100% rename from site_base/bs-twopage/assets/font-awesome/fonts/fontawesome-webfontba72.svg rename to site_base/dual/assets/font-awesome/fonts/fontawesome-webfontba72.svg diff --git a/site_base/bs-twopage/assets/font-awesome/fonts/fontawesome-webfontba72.ttf b/site_base/dual/assets/font-awesome/fonts/fontawesome-webfontba72.ttf similarity index 100% rename from site_base/bs-twopage/assets/font-awesome/fonts/fontawesome-webfontba72.ttf rename to site_base/dual/assets/font-awesome/fonts/fontawesome-webfontba72.ttf diff --git a/site_base/bs-twopage/assets/font-awesome/fonts/fontawesome-webfontba72.woff b/site_base/dual/assets/font-awesome/fonts/fontawesome-webfontba72.woff similarity index 100% rename from site_base/bs-twopage/assets/font-awesome/fonts/fontawesome-webfontba72.woff rename to site_base/dual/assets/font-awesome/fonts/fontawesome-webfontba72.woff diff --git a/site_base/bs-twopage/assets/font-awesome/fonts/fontawesome-webfontd41d.eot b/site_base/dual/assets/font-awesome/fonts/fontawesome-webfontd41d.eot similarity index 100% rename from site_base/bs-twopage/assets/font-awesome/fonts/fontawesome-webfontd41d.eot rename to site_base/dual/assets/font-awesome/fonts/fontawesome-webfontd41d.eot diff --git a/site_base/bs-twopage/assets/fonts/glyphicons-halflings-regular.eot b/site_base/dual/assets/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from site_base/bs-twopage/assets/fonts/glyphicons-halflings-regular.eot rename to site_base/dual/assets/fonts/glyphicons-halflings-regular.eot diff --git a/site_base/bs-twopage/assets/fonts/glyphicons-halflings-regular.svg b/site_base/dual/assets/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from site_base/bs-twopage/assets/fonts/glyphicons-halflings-regular.svg rename to site_base/dual/assets/fonts/glyphicons-halflings-regular.svg diff --git a/site_base/bs-twopage/assets/fonts/glyphicons-halflings-regular.ttf b/site_base/dual/assets/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from site_base/bs-twopage/assets/fonts/glyphicons-halflings-regular.ttf rename to site_base/dual/assets/fonts/glyphicons-halflings-regular.ttf diff --git a/site_base/bs-twopage/assets/fonts/glyphicons-halflings-regular.woff b/site_base/dual/assets/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from site_base/bs-twopage/assets/fonts/glyphicons-halflings-regular.woff rename to site_base/dual/assets/fonts/glyphicons-halflings-regular.woff diff --git a/site_base/bs-twopage/assets/fonts/glyphicons-halflings-regulard41d.eot b/site_base/dual/assets/fonts/glyphicons-halflings-regulard41d.eot similarity index 100% rename from site_base/bs-twopage/assets/fonts/glyphicons-halflings-regulard41d.eot rename to site_base/dual/assets/fonts/glyphicons-halflings-regulard41d.eot diff --git a/site_base/bs-twopage/assets/img/find_user.png b/site_base/dual/assets/img/find_user.png similarity index 100% rename from site_base/bs-twopage/assets/img/find_user.png rename to site_base/dual/assets/img/find_user.png diff --git a/site_base/bs-twopage/assets/img/logo.png b/site_base/dual/assets/img/logo.png similarity index 100% rename from site_base/bs-twopage/assets/img/logo.png rename to site_base/dual/assets/img/logo.png diff --git a/site_base/bs-twopage/assets/js/bootstrap.min.js b/site_base/dual/assets/js/bootstrap.min.js similarity index 100% rename from site_base/bs-twopage/assets/js/bootstrap.min.js rename to site_base/dual/assets/js/bootstrap.min.js diff --git a/site_base/bs-twopage/assets/js/custom.js b/site_base/dual/assets/js/custom.js similarity index 100% rename from site_base/bs-twopage/assets/js/custom.js rename to site_base/dual/assets/js/custom.js diff --git a/site_base/bs-twopage/assets/js/jquery-1.10.2.js b/site_base/dual/assets/js/jquery-1.10.2.js similarity index 100% rename from site_base/bs-twopage/assets/js/jquery-1.10.2.js rename to site_base/dual/assets/js/jquery-1.10.2.js diff --git a/site_base/bs-twopage/assets/js/jquery.metisMenu.js b/site_base/dual/assets/js/jquery.metisMenu.js similarity index 100% rename from site_base/bs-twopage/assets/js/jquery.metisMenu.js rename to site_base/dual/assets/js/jquery.metisMenu.js diff --git a/site_base/bs-twopage/assets/js/jquery.session.js b/site_base/dual/assets/js/jquery.session.js similarity index 100% rename from site_base/bs-twopage/assets/js/jquery.session.js rename to site_base/dual/assets/js/jquery.session.js diff --git a/site_base/bs-twopage/blank.html b/site_base/dual/blank.html similarity index 100% rename from site_base/bs-twopage/blank.html rename to site_base/dual/blank.html diff --git a/site_base/bs-twopage/index.html b/site_base/dual/index.html similarity index 100% rename from site_base/bs-twopage/index.html rename to site_base/dual/index.html diff --git a/site_base/bs-twopage/model.html b/site_base/dual/model.html similarity index 100% rename from site_base/bs-twopage/model.html rename to site_base/dual/model.html diff --git a/site_base/dual/test.html b/site_base/dual/test.html new file mode 100644 index 0000000..d53ae1c --- /dev/null +++ b/site_base/dual/test.html @@ -0,0 +1,82 @@ + + + + + + Mouaulande + + + + + + + + + + +
    + + + + +
    +
    +
    +
    +

    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/sites/example_website/_config.txt b/sites/example_website/_config.txt index b3fef6c..6fb3e11 100644 --- a/sites/example_website/_config.txt +++ b/sites/example_website/_config.txt @@ -12,7 +12,7 @@ previous_fr: Articles précédents preferences_en: Preferences preferences_fr: Préférences websitename_*: Tradiction -pagetitle_*: Mouaulande +title_*: Mouaulande about_en: About me about_fr: A propos ---- diff --git a/test.html b/test.html new file mode 100644 index 0000000..8aefd67 --- /dev/null +++ b/test.html @@ -0,0 +1,82 @@ + + + + + + _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