X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=gen-sitemap.py;h=797801099e67bae50b940a0b67f2e837b122dfa9;hb=HEAD;hp=088f83819e4c8d491fa0ac69e4eb8ab632c3cb06;hpb=faa336e3b58a3a51edcfd5da191dc0dcdac3b2be;p=phdru.name%2Fphdru.name.git

diff --git a/gen-sitemap.py b/gen-sitemap.py
index 088f838..7978010 100755
--- a/gen-sitemap.py
+++ b/gen-sitemap.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 import argparse
 from fnmatch import fnmatch
@@ -12,10 +12,11 @@ parser.add_argument('root_dir', help='Root dicrectory')
 args = parser.parse_args()
 
 exclude = []
-for pat in args.exclude:
-    exclude.append(pat)
-    if not pat.endswith('/*'):
-        exclude.append(pat + '/*')
+if args.exclude:
+    for pat in args.exclude:
+        exclude.append(pat)
+        if not pat.endswith('/*'):
+            exclude.append(pat + '/*')
 
 os.chdir(args.root_dir)
 fullpath = os.getcwd()
@@ -42,30 +43,37 @@ for dirpath, dirs, files in sorted(os.walk(fullpath)):
         elif level > save_level:
             assert level - save_level == 1
             current_subtree = current_subtree[-1][1]
-        #else: # level == save_level:
+        # else: # level == save_level:
         current_subtree.append((parts[-1], []))
         save_level = level
     except StopIteration:
         pass
 
-def _tree2html(tree, level=0):
-    indent = "  " * level
-    strings = []
-    strings.append(indent + "<ul>")
-
-    level += 1
-    indent2 = "  " * level
 
+def _tree2html(tree, path='', level=0):
+    subparts = []
+    indent = "  " * (level + 1)
     for title, subtree in tree:
+        subpath = "%s/%s" % (path, title)
+        if subpath.startswith('/'):
+            subpath = subpath[1:]
+        href = '<a href="%s/">%s</a>' % (subpath, title)
         if subtree:
-            strings.append(indent2 + "<li>%s" % title)
-            strings.append(_tree2html(subtree, level+1))
-            strings.append(indent2 + "</li>")
+            subparts.append(indent + "<li>%s" % href)
+            subparts.append(_tree2html(subtree, subpath, level+2))
+            subparts.append(indent + "</li>")
         else:
-            strings.append(indent2 + "<li>%s</li>" % title)
+            subparts.append(indent + "<li>%s</li>" % href)
+    s = "\n".join(subparts)
+
+    parts = []
+    indent = "  " * level
+    parts.append(indent + "<ul>")
+    parts.append(s)
+    parts.append(indent + "</ul>")
+
+    return "\n".join(parts)
 
-    strings.append(indent + "</ul>")
-    return '\n'.join(strings)
 
 sitemap_tmpl = ["""\
 #extends phd_site