X-Git-Url: https://oss.titaniummirror.com/gitweb?a=blobdiff_plain;f=webber.py;h=f3e0f63fec5c57e0d50dc37870d4630869e4c02d;hb=70cfc96535147a69cc81326165e070775756e155;hp=194ce5cf3e93e4667f7f79245842948a19d2d6e4;hpb=5b24964cda642526f6331573980b2cd6f254780b;p=webber.git

diff --git a/webber.py b/webber.py
index 194ce5c..f3e0f63 100644
--- a/webber.py
+++ b/webber.py
@@ -107,6 +107,16 @@ class File(Holder):
 				continue
 			#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: xxx"')
+
 		self.contents = "".join(txt)
 
 
@@ -439,6 +449,13 @@ def get_time():
 def get_current_file():
 	return current_file
 
+@set_function("get_path_to_root")
+def get_path_to_root():
+	rel_path = relpath(directories[current_file.direc].abs_path, directories[''].abs_path)
+	rel_path = os.path.join(rel_path, os.path.split("")[1])
+	if rel_path[-1] == "/":
+		rel_path = rel_path[:-1]
+	return rel_path
 
 
 
@@ -496,7 +513,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)
@@ -519,6 +536,13 @@ def walk_tree(dirpath):
 				if ok:
 					#print "FILE", s
 					rel_path = relpath(cfg.in_dir, full_path)
+					# Allow paths to be specified in exclude_files:
+					for e in cfg.exclude_files:
+						if fnmatch.fnmatch(rel_path, e):
+							log("ignoring file %s" % rel_path, level=7)
+							ok = False
+							break
+				if ok:
 					log("reading file %s" % rel_path, level=5)
 					file = File(
 						path = full_path,