X-Git-Url: https://source.tree.se/git?p=treecutter.git;a=blobdiff_plain;f=src%2Ftree-cutter.py;h=bc4ae7e0db92400f8f33019e7d0f09e33d0b1a19;hp=519acc9e21e98120aed3807b2507cdab829a154d;hb=9da51ba1b5901376d69406559002238877941fca;hpb=8f74b1dee28da2589cf86cc5042a9cd9b422481c
diff --git a/src/tree-cutter.py b/src/tree-cutter.py
index 519acc9..bc4ae7e 100755
--- a/src/tree-cutter.py
+++ b/src/tree-cutter.py
@@ -12,6 +12,7 @@ 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
@@ -24,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()+'/'
@@ -75,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
@@ -87,6 +88,9 @@ class Page():
def language(self):
return self._lang
+ def resources(self):
+ return set(self._resources)
+
def menu(self):
return self._menu
@@ -149,8 +153,8 @@ class Page():
def template(self,sitemap):
htmlmenu = sitemap.gen_menu(self._lang,None,"menu")
levelmenu = sitemap.gen_menu(self._lang,self,"tree")
- langmenu = sitemap.lang_menu(self._lang)
- template = Template(file=style_tmpl,
+ 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},
@@ -174,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 = []
@@ -209,6 +216,14 @@ class Link():
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):
@@ -273,11 +288,17 @@ class Trie():
html = "
\n" % css
for l in trie:
sel = ''
- if l.value().page(lang) == page:
+ p = l.value().page(lang)
+ if p == page:
sel = ' class="selected"'
- html += '- %s\n' \
- % (sel,l.value().link(),l.value().page(lang).menu())
- html += self._menu(l.children(), lang, page, "")
+ 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
@@ -297,7 +318,7 @@ class Sitemap():
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):
@@ -328,7 +349,8 @@ class Sitemap():
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])
+ 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:
@@ -339,13 +361,24 @@ class Sitemap():
link.template(self)
t5 = time.time()
print "Template [%5.2f s]" % (round(t5-t4,2))
- sm = {}
- for l in self._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))
+ 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()
@@ -353,14 +386,18 @@ class Sitemap():
def gen_menu(self,lang,page,cssclass):
return self._tree.menu(lang,page,cssclass)
- def lang_menu(self,lang):
+ def lang_menu(self,lang,link):
html = ""
- for l in self._sitelang:
+ 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)
- html += '- %s
' % ('link'+'.'+l, ln)
+ p = link.link()
+ if p[-1] == '/':
+ p = p +'index'
+ p = p+'.'+l
+ html += '- %s
' % (p, l, ln)
html += "
"
return html
@@ -564,7 +601,7 @@ for page in removed:
for page in missing:
print 'adding missing page '+page
sitemap.add_link(page)
-if len(missing & removed) != 0:
+if len(missing)+len(removed) != 0:
print 'writing new sitemap - please adjust if needed'
sitemap.write_map()
sitemap.graph()