Fixed the error on the config, took me way too long

This commit is contained in:
Maximilien Rigaut 2017-05-07 14:29:00 +02:00
parent c2aa51905e
commit e57cf0f878
6 changed files with 35 additions and 6 deletions

View File

@ -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")

View File

@ -103,11 +103,11 @@ def menuitem(text,link,datatype):
#print (datatype)
return """<li><a href="{link}"><i class="fa fa-{datatype} "></i>{text}</a></li>""".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]!="_":

View File

@ -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):

@ -1 +1 @@
Subproject commit c2d9f232728d0c92f894761f2dcb4e5e05acced2
Subproject commit 99f460e23e16e9fbb093a23928eca264159807e4

View File

@ -0,0 +1,3 @@
title_en: Poetry
title_fr: Poesie
----

24
test.py
View File

@ -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=['<li><a href="index.html"><i class="fa fa-book "></i>Transaltionus</a></li>',
'<li><a href="article1.html"><i class="fa fa-book "></i>First article</a></li>',
'<li><a href="Poetry"><i class="fa fa-folder "></i>Poetry</a></li>']
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()