From 916730667f9b7c85e1b0738c83038ab8635be130 Mon Sep 17 00:00:00 2001 From: Maximilien Rigaut Date: Fri, 5 May 2017 19:34:11 +0200 Subject: [PATCH] Finnaly foun't the bug in the parsing, working on a patch --- generator/file_parser.py | 1 - generator/tree_parser.py | 47 ++++++++++++++++++---------- sites/example_website/_config.txt | 3 +- test.py | 52 ++++++++++++++++++++++++++++--- 4 files changed, 80 insertions(+), 23 deletions(-) diff --git a/generator/file_parser.py b/generator/file_parser.py index 8db5ad3..954d2be 100644 --- a/generator/file_parser.py +++ b/generator/file_parser.py @@ -72,7 +72,6 @@ class WebPage(object): #print "Getting",varname,filter_lang,"in",self.variables #if varname in self.reserved: # return getattr(self,varname) - if varname in self.variables: if filter_lang in self.variables[varname]: return self.variables[varname][filter_lang] diff --git a/generator/tree_parser.py b/generator/tree_parser.py index e061c2c..ebee14c 100644 --- a/generator/tree_parser.py +++ b/generator/tree_parser.py @@ -39,7 +39,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 + self.name=self.config_file.name #Unsure it's actually useful def get_variable(self,varname,filter_lang="*"): "Get the corresponding variable" @@ -48,10 +48,10 @@ class WebTree(object): def convert_local(self,files): pass - def print_webtree(self,prefix=""): + def print_webtree(self,lang="en",prefix=""): "Print a representation of the Tree" print self - self.tree.print_webtree(prefix) + self.tree.print_webtree(lang,prefix) def __repr__(self): return "{} @ {}".format(self.__class__.__name__,self.full_path) @@ -143,18 +143,30 @@ class WebSubTree(WebTree): "Get the content of the node in the specified language" return self.get_node(name,filter_lang).get_content(filter_lang) - def print_webtree(self,prefix=""): - "Print the tree and recuse" - for item,langs in self.nodes.iteritems(): - for lang,node in langs.iteritems(): - print "{} [{}] {}".format(prefix,lang,node) - print prefix+" +-----------" - print "{} | {}".format(prefix,node.get_content("en")) - - for item,langs in self.subtree.iteritems(): - for lang,node in langs.iteritems(): - print "{} [{}] {}".format(prefix,lang,node) - node.print_webtree(prefix+" ") + def print_webtree(self,lang="en",prefix=""): + "Print the tree and recurse" + #print self.get_next_subtree(lang) + # for item,langs in self.nodes.iteritems(): + # for lang,node in langs.iteritems(): # There is a proper way do this, it ain't this one + # #print node + # #print self.get_content(node,lang) + # print "{} [{}] {}".format(prefix,lang,node) + # print prefix+" +-----------" + # print "{} | {}".format(prefix,node.get_content(lang)) + # + # for item,langs in self.subtree.iteritems(): + # for lang,node in langs.iteritems(): + # print "{} [{}] {}".format(prefix,lang,node) + # node.print_webtree(lang,prefix+" ") + #print self + for node in self.get_next_nodes(lang): + print "{} [{}] {}".format(prefix,lang,node) + print prefix+" +-----------" + newL="\n{} [{}] | ".format(prefix,lang) + print "{} [{}] | {}".format(prefix,lang,node.get_content(lang).replace('\n',newL)) + for tree in self.get_next_subtree(lang): + print "{} [{}] {}".format(prefix,lang,node) + tree.print_webtree(lang,prefix+" ") class WebNode(WebSubTree): "A webfile, as seen from the tree, contains a link to a WebPage/Webfile in every langague" @@ -167,6 +179,9 @@ class WebNode(WebSubTree): if self.type==".txt": self.open_node() + def print_webtree(self,lang,prefix): + raise AttributeError("WebNode doesn't have an attribute print_webtree") + def get_variable(self,varname,filter_lang): "Get the corresponding variable, first in the Webnode, then the config and repeating up until the Root" try: @@ -202,5 +217,5 @@ def makeWebsite(website): if __name__ == '__main__': # Do all the nominal tests s=makeWebsite("sites/example_website") - s.print_webtree(" > ") + s.print_webtree("en"," > ") dual.container(pagetitle="#_pagetitle_#",websitename="#_websitename_#",menu="##MENU##",page="##PAGE##") diff --git a/sites/example_website/_config.txt b/sites/example_website/_config.txt index 0fc613f..d229f74 100644 --- a/sites/example_website/_config.txt +++ b/sites/example_website/_config.txt @@ -12,7 +12,8 @@ previous_fr: Articles précédents preferences_en: Preferences preferences_fr: Préférences websitename_*: Tradiction -title_*: Mouaulande +title_en: Mulloland +title_fr: Mulehollande about_en: About me about_fr: A propos ---- diff --git a/test.py b/test.py index 43d9bbf..fb5f27e 100644 --- a/test.py +++ b/test.py @@ -126,17 +126,58 @@ class testTree(simple): else: self.addFailure("Repr incorrect") - status=True + self.currentTest="tree:get_title" + if webt.get_title("en")!="Mulloland": + self.addFailure("lang incorrect [en]") + elif webt.get_title("fr")!="Mulehollande": + self.addFailure("lang incorrect [fr]") + else: + self.addSucess() + + self.currentTest="tree:config" + if type(webt.config_file)!=file_parser.WebPage: + self.addFailure("config malformed"+srt(type(webt.config_file))) + else: + self.addSucess() + + + self.currentTest="tree:name" + if webt.name!="_config.txt": + self.addFailure("malformed name"+webt.name) + else: + self.addSucess() + + #webt.print_webtree("fr",'[fr] ') + self.currentTest="tree:Poetry" + poetry=webt.tree.get_subtree("Poetry","fr") + if type(poetry)!=tree_parser.WebSubTree: + self.addFailure("can't acess the Poetry subtree") + else: + self.addSucess() + + self.currentTest="tree:Poetry:loading" + poem1=poetry.get_node("poetry1","fr") + if type(poem1)!=tree_parser.WebNode: + self.addFailure("can't acess the node") + else: + self.addSucess() + + self.currentTest="tree:Poetry:config" + status=True for l in list_of_lang: - if webt.get_title(l)!="Mouaulande": - self.addFailure("lang incorrect {}".format(l)) + if poem1.get_variable("title",l)!="Rose": status=False + self.addFailure("title incorrect for {}".format(l)) if status: self.addSucess() - print webt.get_config() - webt.print_webtree() + self.currentTest="tree:Poetry:content" + + if poem1.get_content("fr")=="Une rose qui passe\nQuelle est bien belle\nMais pourquoi donc\nEsceque tu est jolie": + self.addSucess() + else: + self.addFailure("can't load content") testVky=group(name="vkyWeb_all",terminal=term,verbose=1,align=42) #testConfig=group(name="config",terminal=term,prefix="| ") @@ -153,5 +194,6 @@ testVky=group(name="vkyWeb_all",terminal=term,verbose=1,align=42) testParser("file_parser").test() testVky.addTest(testParser("file_parser")) testVky.addTest(testTree("tree_parser")) +#testVky.addTest(testConfig("testConfig",config)) test a config file testVky.test()