X-Git-Url: https://oss.titaniummirror.com/gitweb?a=blobdiff_plain;f=webber.py;h=c90cdb97b3805c35b03a1983ef6d51124b2e09c7;hb=beefd7886d61f941afdd0041c109219327894119;hp=542df6da3172ac4eba2090b38d854ca28a54b1a1;hpb=cf49785b65e0307b8813df07a69c3c6e38fd24b1;p=webber.git

diff --git a/webber.py b/webber.py
index 542df6d..c90cdb9 100644
--- a/webber.py
+++ b/webber.py
@@ -116,7 +116,7 @@ class File(Holder):
 
 		# Warn about long titles / long linktitles
 		if len(self.linktitle) > 20:
-			log('%s: define a shorter "linktitle: xxx"')
+			log('%s: define a shorter linktitle' % self.rel_path)
 
 		self.contents = "".join(txt)
 
@@ -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
@@ -337,13 +337,11 @@ hooks = {}
 def load_plugins():
 	"""Loads all plugins in the plugins directory."""
 	sys.path.append(os.path.join(get_program_directory(), "plugins"))
+	if cfg.has_key("plugin_dirs"):
+		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)
 
 
 def set_hook(name, last=False):
@@ -545,7 +543,7 @@ def walk_tree(dirpath):
 					)
 					file.inheritFrom(direc)
 					read_file(direc, file)
-						
+
 	walk(dirpath)
 
 
@@ -602,7 +600,7 @@ def run_macros(file, contents):
 	s = reMacro.sub(do_macro, contents)
 	#print s
 	return s
-	
+
 
 def scan_files():
 	info("Scanning files ...")
@@ -619,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)
@@ -664,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
@@ -742,7 +741,7 @@ def addoptions(params):
 
 	return parser
 
-	
+
 @set_hook("checkconfig", last=True)
 def checkconfig(params):
 	# Ensure absolute paths that end in '/'.