X-Git-Url: https://source.tree.se/git?p=treecutter.git;a=blobdiff_plain;f=src%2Ftree-cutter.py;h=37b893a0961529fcdb66b230f5bb9d68f0e83e31;hp=e1e80ee9157673fb87378c1158f9808616fa7fba;hb=9efe89fdf3454731169d3f51ce357cf16a04bd76;hpb=ccff20494cb682f214c8394d5d87837defcbf351

diff --git a/src/tree-cutter.py b/src/tree-cutter.py
index e1e80ee..37b893a 100755
--- a/src/tree-cutter.py
+++ b/src/tree-cutter.py
@@ -83,6 +83,15 @@ class Page():
         self._menu = None
         self._rendered_article = None
 
+    def language(self):
+        return self._lang
+
+    def menu(self):
+        return self._menu
+
+    def set_article(self,art):
+        self._rendered_article = art
+
     def prepare(self):
         self._doc = bindery.parse(self._file, prefixes=PREFIXES)
         if self._doc.xml_select(u'/db:article/db:info/db:title'):
@@ -137,15 +146,15 @@ class Page():
         os.chdir(cwd)
 
     def template(self,sitemap):
-        htmlmenu =  sitemap.gen_menu(self._lang,None)
-        levelmenu = sitemap.gen_menu(self._lang,self)
+        htmlmenu =  sitemap.gen_menu(self._lang,None,None)
+        levelmenu = sitemap.gen_menu(self._lang,self,"tree")
         template = Template(file=style_tmpl,
                             searchList=[{'title':self._title},
                                         {'menu':htmlmenu},
                                         {'article':self._rendered_article},
                                         {'levelmenu':levelmenu},
-                                        {'levelname':levelname}])
-        outfile = tmptarget+self._file+'.'+self._lang+'.html'
+                                        {'levelname':'Menu'}])
+        outfile = tmptarget+'html'.join(self._file.rsplit('xml',1))
         mkdir_p(os.path.dirname(outfile))
         out = open(outfile, 'w')
         out.write(str(template))
@@ -176,6 +185,29 @@ class Link():
     def link(self):
         return self._link
 
+    def prepare(self):
+        for page in self._pages:
+            page.prepare()
+
+    def languages(self):
+        p = []
+        for page in self._pages:
+            p.append(page.language())
+        return p
+
+    def render(self):
+        for page in self._pages:
+            page.render()
+
+    def template(self,sitemap):
+        for page in self._pages:
+            page.template(sitemap)
+
+    def page(self,lang):
+        for page in self._pages:
+            if page.language()==lang:
+                return page
+
 class Node():
     def __init__(self,token,value):
         self._token = token
@@ -201,8 +233,8 @@ class Trie():
     def inorder(self,t):
         for l in t:
             yield l.value()
-            for ch in l.children():
-                self.inorder(ch)
+            for x in self.inorder(l.children()):
+                yield x
 
     def _add(self,trie, key, content):
         # is the key a leaf
@@ -235,6 +267,24 @@ class Trie():
 #        G.draw('g.png')
 #        print G.string()
 
+    def _menu(self, trie, lang, page, css):
+        html = "<ul%s>\n" % css
+        for l in trie:
+            sel = ''
+            if l.value().page(lang) == page:
+                sel = ' class="selected"'
+            html += '<li%s><a href="%s">%s</a>\n' \
+            % (sel,l.value().link(),l.value().page(lang).menu())
+            html += self._menu(l.children(), lang, page, "")
+        html += "</ul>\n"
+        return html
+
+    def menu(self,lang,page,cssclass):
+        css = ''
+        if cssclass:
+            css = ' class="'+cssclass+'"'
+        return self._menu(self._root, lang, page, css)
+
 class Sitemap():
     """Class keeping the internal site structure"""
     def __init__(self):
@@ -245,6 +295,11 @@ class Sitemap():
         tokens = filter(None,re.split(r'(^/\w*/|\w*/)',link))
         self._tree.add(tokens,Link(link))
 
+    def write_map(self):
+        f = open(self._file,'w')
+        f.write('\n'.join(link.link() for link in self._tree))
+        f.close()
+
     def read_map(self):
         try:
             f = open(self._file)
@@ -258,11 +313,43 @@ class Sitemap():
     def set(self):
         return set(link.link() for link in self._tree)
 
+    def process(self):
+        t1 = time.time()
+        for link in self._tree:
+            link.prepare()
+        t2 = time.time()
+        print "Prepare  [%5.2f s]" % (round(t2-t1,2))
+        sitelang = set()
+        for link in self._tree:
+            sitelang = lang.union(set(link.languages()))
+        t3 = time.time()
+        print "Language [%5.2f s]" % (round(t3-t2,2))
+        for link in self._tree:
+            link.render()
+        t4 = time.time()
+        print "Render   [%5.2f s]" % (round(t4-t3,2))
+        for link in self._tree:
+            link.template(self)
+        t5 = time.time()
+        print "Template [%5.2f s]" % (round(t5-t4,2))
+        sm = {}
+        for l in sitelang:
+            sm[l] = Page((l,'/sitemap'))
+            sm[l].set_article(self.gen_menu(l,None,"tree sitemap"))
+            sm[l].template(self)
+        t6 = time.time()
+        print "Sitemap [%5.2f s]" % (round(t6-t5,2))
+
     def graph(self):
         self._tree.graph()
 
-    def gen_menu(self,lang,page):
-        return 'Generate menu from sitemap - To be implemented'
+    def gen_menu(self,lang,page,cssclass):
+        return self._tree.menu(lang,page,cssclass)
+
+    def publish(self):
+        publish(tmptarget, args.output)
+        publish(args.style+"css", args.output)
+        publish(args.style+"images",args.output)
 
 def generateSitemap():
     sitemap = []
@@ -456,13 +543,20 @@ missing = dir_.set() - sitemap.set()
 removed = sitemap.set() - dir_.set()
 for page in removed:
     print removed+' pages missing!!'
-
 for page in missing:
     print 'adding missing page '+page
-    sitemap.add_page(page)
-
+    sitemap.add_link(page)
+if len(missing & removed) != 0:
+    print 'writing new sitemap - please adjust if needed'
+    sitemap.write_map()
 sitemap.graph()
 
+sitemap.process()
+
+t1 = time.time()
+sitemap.publish()
+t2 = time.time()
+print "Publish  [%5.2f s]" % (round(t2-t1,2))
 
 sitemap = generateSitemap()
 tmptarget = tempfile.mkdtemp()+'/'