From e57cf0f878215eae23b63aa8238223c7c8a5addf Mon Sep 17 00:00:00 2001 From: Maximilien Rigaut Date: Sun, 7 May 2017 14:29:00 +0200 Subject: [PATCH] Fixed the error on the config, took me way too long --- generator/model.py | 4 ++++ generator/models/dual.py | 4 ++-- generator/tree_parser.py | 4 +++- minitest | 2 +- sites/example_website/Poetry/_config.txt | 3 +++ test.py | 24 ++++++++++++++++++++++-- 6 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 sites/example_website/Poetry/_config.txt diff --git a/generator/model.py b/generator/model.py index 9c97a44..0965234 100644 --- a/generator/model.py +++ b/generator/model.py @@ -22,6 +22,10 @@ def getDataType(name): return typename return "other" +def makeHTMLName(node): + "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) + 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") diff --git a/generator/models/dual.py b/generator/models/dual.py index 5924434..6e626b9 100644 --- a/generator/models/dual.py +++ b/generator/models/dual.py @@ -103,11 +103,11 @@ def menuitem(text,link,datatype): #print (datatype) return """
  • {text}
  • """.format(text=text,link=link,datatype=geticon(datatype)) -def makeSubNodelist(subnode,lang,getdatatype): +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),node.path,getdatatype(node.path))) + items.append(menuitem(node.get_title(lang),makeHTMLName(node),getdatatype(node.path))) for node in subnode.get_next_subtree(): #print(node,node.name) if node.name[0]!="_": diff --git a/generator/tree_parser.py b/generator/tree_parser.py index 0b1a256..4a5e903 100644 --- a/generator/tree_parser.py +++ b/generator/tree_parser.py @@ -88,8 +88,10 @@ class WebSubTree(WebTree): def get_config(self): "Try to init a config, if not just use an empty variable set" try: - super.get_config(self) + WebTree.get_config(self) + #self.get_config() # It does make more sense to have your own no ? except: + #print("Can't find config") self.variables={} def make_tree(self): diff --git a/minitest b/minitest index c2d9f23..99f460e 160000 --- a/minitest +++ b/minitest @@ -1 +1 @@ -Subproject commit c2d9f232728d0c92f894761f2dcb4e5e05acced2 +Subproject commit 99f460e23e16e9fbb093a23928eca264159807e4 diff --git a/sites/example_website/Poetry/_config.txt b/sites/example_website/Poetry/_config.txt new file mode 100644 index 0000000..3bfbfd7 --- /dev/null +++ b/sites/example_website/Poetry/_config.txt @@ -0,0 +1,3 @@ +title_en: Poetry +title_fr: Poesie +---- diff --git a/test.py b/test.py index 93f0c55..e3a6080 100644 --- a/test.py +++ b/test.py @@ -214,6 +214,24 @@ class testModel(simple): break if status: self.addSuccess() + + self.currentTest("model:htmlpath") + class falseNode(object): + def __init__(self,name): + self.name=name + + res=[model.makeHTMLName(falseNode("/bla/foo.bar")),model.makeHTMLName(falseNode("goo.foo.bar"))] + expected=["/bla/foo.html","goo.foo.html"] + success=True + for i in range(len(res)): + if res[i]!=expected[i]: + self.addFailure("malformed HTML names expected {} (got {})".format(expected[i],res[i])) + success=False + break + + if success: + self.addSuccess() + # # menu=model.makeContainer(dual,site,current_node,previous_node,lang) # data=model.makeData(dual,current_node,lang) @@ -253,15 +271,17 @@ class testDual(simple): self.addSuccess() status=True - linkList=dual.makeSubNodelist(site.tree,"en",model.getDataType) + linkList=dual.makeSubNodelist(site.tree,"en",model.getDataType,model.makeHTMLName) + # print(site.tree.subtree["Poetry"]["*"].config_file) nominalLinkList=['
  • Transaltionus
  • ', '
  • First article
  • ', '
  • Poetry
  • '] for i in range(len(nominalLinkList)): if linkList[i] not in nominalLinkList: self.addFailure("link {} malformed (expected {})".format(i,nominalLinkList[i]),nonDestructive=True) + self.addFailure(" (got {})".format(linkList[i]),nonDestructive=True) status=False - + if status: self.addSuccess()