X-Git-Url: https://source.tree.se/git?p=treecutter.git;a=blobdiff_plain;f=src%2Ftree-cutter.py;h=bc4ae7e0db92400f8f33019e7d0f09e33d0b1a19;hp=b764af41c7822e3fe016c8537206fb0bbca963b0;hb=9da51ba1b5901376d69406559002238877941fca;hpb=d63b79210e3bf7f77606176b5acea9361a38e801 diff --git a/src/tree-cutter.py b/src/tree-cutter.py index b764af4..bc4ae7e 100755 --- a/src/tree-cutter.py +++ b/src/tree-cutter.py @@ -11,6 +11,8 @@ import argparse import shutil import pygraphviz as pgv import glob +import gettext +import shutil from amara import bindery from amara.xslt import transform from Cheetah.Template import Template @@ -23,7 +25,6 @@ parser.add_argument('--output', nargs='?', args = parser.parse_args() style_xslt = args.style+"docbook.xsl" -style_tmpl = args.style+"index.en.html.tmpl" outputdir = args.output tmptarget = tempfile.mkdtemp()+'/' @@ -74,7 +75,8 @@ class Directory(): class Page(): """Class representing a version of a webpage""" - def __init__(self,page): + def __init__(self,link,page): + self._link = link self._file = page[1] self._lang = page[0] self._doc = None @@ -86,6 +88,9 @@ class Page(): def language(self): return self._lang + def resources(self): + return set(self._resources) + def menu(self): return self._menu @@ -105,7 +110,7 @@ class Page(): for c in code: (p, ext) = os.path.splitext(c.href) if ext in valid_scripts: - exe = os.path.join(os.path.abspath(dirname+c.href)) + exe = os.path.join(os.path.abspath(dirname)+'/'+c.href) xml = subprocess.Popen([exe],stdout=subprocess.PIPE) xstr = bindery.parse(str(xml.stdout.read())) idp = c.xml_index_on_parent @@ -146,15 +151,16 @@ class Page(): os.chdir(cwd) def template(self,sitemap): - htmlmenu = sitemap.gen_menu(self._lang,None) - levelmenu = sitemap.gen_menu(self._lang,self) - template = Template(file=style_tmpl, + htmlmenu = sitemap.gen_menu(self._lang,None,"menu") + levelmenu = sitemap.gen_menu(self._lang,self,"tree") + langmenu = sitemap.lang_menu(self._lang,self._link) + template = Template(file=args.style+'index.'+self._lang+'.html.tmpl', searchList=[{'title':self._title}, {'menu':htmlmenu}, {'article':self._rendered_article}, {'levelmenu':levelmenu}, - {'levelname':levelname}]) - outfile = tmptarget+self._file+'.'+self._lang+'.html' + {'langmenu':langmenu}]) + outfile = tmptarget+'html'.join(self._file.rsplit('xml',1)) mkdir_p(os.path.dirname(outfile)) out = open(outfile, 'w') out.write(str(template)) @@ -172,7 +178,10 @@ class Link(): path = path+'index' lang = self._scan_languages(path) for l in lang: - self._pages.append(Page(l)) + self._pages.append(Page(self,l)) + + def add_page(self,l): + self._pages.append(Page(self,l)) def _scan_languages(self,path): lang = [] @@ -185,6 +194,37 @@ 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 + return None + + def resources(self): + res = set() + for page in self._pages: + res = res.union(page.resources()) + return res + + class Node(): def __init__(self,token,value): self._token = token @@ -210,8 +250,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 @@ -244,16 +284,48 @@ class Trie(): # G.draw('g.png') # print G.string() + def _menu(self, trie, lang, page, css): + html = "\n" % css + for l in trie: + sel = '' + p = l.value().page(lang) + if p == page: + sel = ' class="selected"' + if p != None: + html += '%s\n' \ + % (sel,l.value().link(),p.menu()) + else: + html += '%s*\n' \ + % (sel,l.value().link(), l.value().page('en').menu()) + if l.children(): + html += self._menu(l.children(), lang, page, "") + html += "\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): self._file = 'sitemap.txt' self._tree = Trie() + self._sitelang = set() + self._isocode = bindery.parse('/usr/share/xml/iso-codes/iso_639_3.xml') + self._tranlang = {} def add_link(self, link): - tokens = filter(None,re.split(r'(^/\w*/|\w*/)',link)) + 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) @@ -267,11 +339,72 @@ 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)) + for link in self._tree: + self._sitelang = self._sitelang.union(set(link.languages())) + for tran in self._sitelang: + if tran != 'en': + self._tranlang[tran] = gettext.translation('iso_639_3', + languages=[tran]) + 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)) + t6 = time.time() + res = set() + cwd = os.getcwd() + for link in self._tree: + res = res.union(link.resources()) + for f in res: + outfile = tmptarget+f + mkdir_p(os.path.dirname(outfile)) + shutil.copyfile(f,outfile) + print "Resources[%5.2f s]" % (round(t6-t5,2)) + sitmaplink = Link('/sitemap') + for l in self._sitelang: + sitmaplink.add_page((l,'/sitemap.'+l+'.xml')) + for l in self._sitelang: + sitmaplink.page(l).set_article(self.gen_menu(l,None,"tree sitemap")) + sitmaplink.page(l).template(self) + t7 = time.time() + print "Sitemap [%5.2f s]" % (round(t7-t6,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 lang_menu(self,lang,link): + html = "
    " + for l in link.languages(): + isoxml = u"//iso_639_3_entry[@*='"+l+"']" + ln = self._isocode.xml_select(isoxml)[0].name + if lang != 'en': + ln = self._tranlang[lang].gettext(ln) + p = link.link() + if p[-1] == '/': + p = p +'index' + p = p+'.'+l + html += '
  • %s
    • ' % (p, l, ln) + html += "
" + return html + + def publish(self): + publish(tmptarget, args.output) + publish(args.style+"css", args.output) + publish(args.style+"images",args.output) def generateSitemap(): sitemap = [] @@ -464,17 +597,25 @@ sitemap.read_map() missing = dir_.set() - sitemap.set() removed = sitemap.set() - dir_.set() for page in removed: - print removed+' pages missing!!' - + print page+' pages missing!!' for page in missing: print 'adding missing page '+page - sitemap.add_page(page) - + sitemap.add_link(page) +if len(missing)+len(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()+'/' +tot = 0 for page in sitemap: t1 = time.time() print "Page : %-30s %30s" % (page['link'], @@ -484,7 +625,9 @@ for page in sitemap: writeToTemplate(page,pubdoc,sitemap) t2 = time.time() print "[%5.2f s]" % (round(t2-t1,2)) + tot = tot + (t2-t1) +print "Total time\t\t\t\t\t\t\t [%5.2f s]" % (round(tot,2)) createSitemap(sitemap) publish(tmptarget, args.output) publish(args.style+"css", args.output)