X-Git-Url: https://oss.titaniummirror.com/gitweb?a=blobdiff_plain;f=webber.py;h=73f9e73d43eea65335428d6c94fa65292a1a8690;hb=02fd3bdd57de1e994b73d5e7ea0bb1576756369b;hp=98b1106c48d4cfcc30da7cfa7abdd23df5cabf05;hpb=0de356a7eb42440f875243206ceebc1207ac6a8d;p=webber.git

diff --git a/webber.py b/webber.py
index 98b1106..73f9e73 100644
--- a/webber.py
+++ b/webber.py
@@ -63,6 +63,7 @@ class File(Holder):
 		Holder.__init__(self, **kw)
 		files[kw["rel_path"]] = self
 		self.render = None
+		self.contents = None
 		mtime = os.stat(self.path)[stat.ST_MTIME]
 		self.mtime = mtime
 		self.ctime = mtime
@@ -80,7 +81,7 @@ class File(Holder):
 			if read_keywords:
 				s = s.strip()
 				#print "kwd:", s
-				if s==terminate_line:
+				if s == terminate_line:
 					read_keywords = False
 					continue
 
@@ -108,10 +109,15 @@ class File(Holder):
 			#print "txt:", s.rstrip().encode("iso-8859-1")
 			txt.append(s)
 
+		# Warn about a bogus time entries
 		if self.mtime < self.ctime:
 			log('%s: modification time cannot be before creation time' % self.rel_path)
 			self.ctime = self.mtime
 
+		# Warn about long titles / long linktitles
+		if len(self.linktitle) > 20:
+			log('%s: define a shorter linktitle' % self.rel_path)
+
 		self.contents = "".join(txt)
 
 
@@ -256,7 +262,7 @@ def get_program_directory():
 #	5... Debug
 #
 def log(s, level=4):
-	if level>4:
+	if level > 4:
 		indent = " " * (level-4)
 	else:
 		indent = ""
@@ -333,11 +339,11 @@ def load_plugins():
 	sys.path.append(os.path.join(get_program_directory(), "plugins"))
 	for s in cfg.plugins:
 		#print "import:", s
-		#try:
-		exec "import %s" % s
-		#except:
-		#	print "Could not import plugin '%s'" % s
-		#	sys.exit(1)
+		try:
+			exec "import %s" % s
+		except:
+			print "Could not import plugin '%s'" % s
+			sys.exit(1)
 
 
 def set_hook(name, last=False):
@@ -429,7 +435,7 @@ def iso_to_time(val):
 		try:
 			t = time.strptime(val, "%Y-%m-%d")
 		except ValueError:
-			warning("%s: wrong ISO format in '%s'" % (self.rel_path, s))
+			warning("wrong ISO format in '%s'" % val)
 	return int(time.mktime(t))
 
 @set_function("format_date")
@@ -501,7 +507,7 @@ def walk_tree(dirpath):
 		direc.inheritFrom(cfg)
 
 		if not rel_path: rel_path = "."
-		log("reading directory %s" % rel_path, level=4)
+		log("reading directory %s" % rel_path, level=5)
 
 		for s in os.listdir(dirpath):
 			full_path = os.path.join(dirpath, s)
@@ -603,11 +609,13 @@ def scan_files():
 
 	for s in files:
 		file = files[s]
-		try:
-			# Just check if the file has contents
-			contents = file.contents
-		except:
+		if not file.has_key("contents"):
 			continue
+#		try:
+#			# Just check if the file has contents
+#			contents = file.contents
+#		except:
+#			continue
 
 		direc = directories[file.direc]