Fixing the def main function, properly calling it from treecutter.

[treecutter.git] / treecutter / main.py

diff --git a/treecutter/main.py b/treecutter/main.py
old mode 100755 (executable)
new mode 100644 (file)
index 3c30824..b53a92f
--- a/treecutter/main.py
+++ b/treecutter/main.py
@@ -1,59 +1,45 @@
 #!/usr/bin/python
 import os
-import fnmatch
-import subprocess
-import amara
-import re
-import tempfile
-import errno
 import time
 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
-
-parser = argparse.ArgumentParser(description='Process docbook article tree.')
-parser.add_argument('--style', nargs='?',
-                    default=os.path.dirname(os.getcwd())+'/style/default/')
-parser.add_argument('--output', nargs='?',
-                    default=os.path.dirname(os.getcwd())+'/htdocs/')
-args = parser.parse_args()
-
-style_xslt = args.style+"docbook.xsl"
-outputdir = args.output
-
-tmptarget = tempfile.mkdtemp()+'/'
-
-MAXLEVEL = 10000
-
-ts = time.time()
-dir_ = Directory()
-sitemap = Sitemap()
-
-dir_.scan()
-sitemap.read_map()
-
-missing = dir_.set() - sitemap.set()
-removed = sitemap.set() - dir_.set()
-for page in removed:
-    print page+' pages missing!!'
-for page in missing:
-    print 'adding missing 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))
-print "Total    [%5.2f s]" % (round(t2-ts,2))
+from treecutter.directory import Directory
+from treecutter.sitemap import Sitemap
+
+def main():
+    parser = argparse.ArgumentParser(description='Process docbook article tree.')
+    parser.add_argument('--style', nargs='?',
+                        default=os.path.dirname(os.getcwd())+'/style/default/')
+    parser.add_argument('--output', nargs='?',
+                        default=os.path.dirname(os.getcwd())+'/htdocs/')
+    args = parser.parse_args()
+
+    ts = time.time()
+    dir_ = Directory()
+    sitemap = Sitemap()
+
+    dir_.scan()
+    sitemap.read_map()
+
+    missing = dir_.set() - sitemap.set()
+    removed = sitemap.set() - dir_.set()
+    for page in removed:
+        print page+' pages missing!!'
+    for page in missing:
+        print 'adding missing 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(args.style)
+
+    t1 = time.time()
+    sitemap.publish(args.output,args.style)
+    t2 = time.time()
+    print "Publish  [%5.2f s]" % (round(t2-t1,2))
+    print "Total    [%5.2f s]" % (round(t2-ts,2))
+    return 0
+
+if __name__ == "__main__":
+    sys.exit(main())