rss_feed.py: sort items by modification time

[webber.git] / webber.py

diff --git a/webber.py b/webber.py
index 9b3d0728baa2af88b79360fc1a0fddb0d8b16990..c90cdb97b3805c35b03a1983ef6d51124b2e09c7 100644 (file)
--- a/webber.py
+++ b/webber.py
@@ -125,7 +125,7 @@ _get_file_for_cache = {}
 def get_file_for(name):
        """webber.files is an hash of File objects, but keyed on the real file name.
        This function returns a File object for a specific linktitle."""
-       
+
        try:
                return _get_file_for_cache[name]
        except:
@@ -313,7 +313,7 @@ def info(s):
 # At startup:
 #      addoptions           allow plugins to add command-line options
 #      checkconfig          check configuration
-#      start                
+#      start
 # While reading files:
 #      read                 ask any reader (plugins!) to read the file
 #      filter               ask anybody to filter the contents
@@ -341,12 +341,7 @@ def load_plugins():
                for s in cfg.plugin_dirs:
                        sys.path.append(s)
        for s in cfg.plugins:
-               #print "import:", s
-               try:
-                       exec "import %s" % s
-               except:
-                       print "Could not import plugin '%s'" % s
-                       sys.exit(1)
+               exec "import %s" % s
 
 
 def set_hook(name, last=False):
@@ -548,7 +543,7 @@ def walk_tree(dirpath):
                                        )
                                        file.inheritFrom(direc)
                                        read_file(direc, file)
-                                               
+
        walk(dirpath)
 
 
@@ -605,7 +600,7 @@ def run_macros(file, contents):
        s = reMacro.sub(do_macro, contents)
        #print s
        return s
-       
+
 
 def scan_files():
        info("Scanning files ...")
@@ -622,6 +617,10 @@ def scan_files():
 
                direc = directories[file.direc]
 
+               # Output-Filename "berechnen"
+               if file.render and file.render == "html":
+                       file.out_path = os.path.splitext(s)[0] + ".html"
+
                run_hooks("scan",
                        direc=direc,
                        file=file)
@@ -667,9 +666,6 @@ def render_files():
                        continue
                file.contents = contents
 
-               # Output-Filename "berechnen"
-               file.out_path = os.path.splitext(fname_in)[0] + ".html"
-
        for fname_in in files:
                file = files[fname_in]
                current_file = file
@@ -745,7 +741,7 @@ def addoptions(params):
 
        return parser
 
-       
+
 @set_hook("checkconfig", last=True)
 def checkconfig(params):
        # Ensure absolute paths that end in '/'.