Merge pull request #1 from christian-intra2net/apple-zip-files

Apple zip files

Author: glensc

db/AppleDouble/AppleDouble

@@ -0,0 +1,4 @@
+AUTHOR: Intra2net <[email protected]>
+URL: Created it myself
+LICENSE: public domain
+NOTE: AppleDouble files appear in folder __MACOSX of zip files created on MacOSX systems with same name and path as the "real" zip file contents

db/AppleDouble/AppleDouble.source.txt

@@ -0,0 +1,3 @@
+AUTHOR: Intra2net <[email protected]>
+URL: Created it myself
+LICENSE: public domain

db/DS_Store/DS_Store

@@ -21,74 +21,102 @@
 import sys
 
 def review_patches(patches):
-	ret = 0
-	for patch in patches:
-		out = ""
-		f = open(patch)
+    ret = 0
+    for patch in patches:
+        out = ""
+        f = open(patch)
 
-		added_files = []
-		files_without_source = []
+        added_files = []
+        files_without_source = []
 
-		for line in f.readlines():
-			filename = ""
-			if line.startswith("+++"):
-				filename = line[4:-1]
-			elif line.startswith("diff --git"):
-				filename = line[line.rfind(" ") + 1:-1]
+        for line in f.readlines():
+            filename = ""
+            if line.startswith("+++"):
+                filename = line[4:-1]
+            elif line.startswith("diff --git"):
+                filename = line[line.rfind(" ") + 1:-1]
 
-			if filename != "" and not filename in added_files:
-				added_files.append(filename)
-				if not filename.endswith(".source.txt"):
-					files_without_source.append(filename)
-		f.close()
+            if filename != "" and not filename in added_files:
+                added_files.append(filename)
+                if not filename.endswith(".source.txt"):
+                    files_without_source.append(filename)
+        f.close()
 
 
-		local_error = False
+        local_error = False
 
-		added_files.sort()
-		for f in added_files:
-			dir_id = f.rfind("/") + 1
-			ext_id = dir_id + f[dir_id:].find(".")
-			if ext_id != -1:
-				ext = f[ext_id + 1:]
-				if ext.endswith("source.txt"):
-					real_db_file = f[:-len(".source.txt")]
-					try:
-						files_without_source.remove(real_db_file)
-					except:
-						out += "\t" + f + ": .source.txt found for non-existing file, expecting " + real_db_file + " in patch\n"
-						ret = 1
-						local_error = True
-				else:
-					db_dir = os.path.basename(os.path.dirname(f))
-					if db_dir != ext:
-						out += "\t" + f + ": File is not in proper directory according to extension\n"
-						ret = 1
-						local_error = True
+        added_files.sort()
+        for f in added_files:
+            dir_id = f.rfind("/") + 1    # f[dir_id:] is name.type[.source.txt]
+            if dir_id == 0:
+                out += "\tMalformed patch: " + f + " should be of the form 'b/db/type/name.type[.source.txt]'\n"
+                ret = 1
+                local_error = True
+                continue
+            if not "/db/" in f:
+                continue     # file is not in db subdir
 
-		for f in files_without_source:
-			out += "\t" + f + ": Does not have matching .source.txt file with license\n"
-			ret = 1
-			local_error = True
+            ext_id = dir_id + f[dir_id:].find(".")
+            if ext_id == dir_id-1:    # check if f is .../db/type/type or .../db/misc/type
+                dir_id2 = f.rfind("/", 0, dir_id-1)+1   # f[dir_id2:dir_id] is subdir within db/
+                if f[dir_id2:dir_id-1] == f[dir_id:]:
+                    pass  #    ok, is .../db/type/type
+                    if f[dir_id2] in ('.', '_'):
+                        out += "\t" + f + ": Subdir names may not start with . or _\n"
+                        ret = 1
+                        local_error = True
+                elif f[dir_id2:dir_id-1] == 'misc':
+                    pass  #    ok, is .../db/msic/type
+                else:
+                    out += "\t" + f + ": File is not in proper directory according to extension\n"
+                    ret = 1
+                    local_error = True
+            else:
+                ext = f[ext_id + 1:]     # ext is type[.source.txt]
+                if ext.endswith("source.txt"):
+                    real_db_file = f[:-len(".source.txt")]
+                    try:
+                        files_without_source.remove(real_db_file)
+                    except:
+                        out += "\t" + f + ": .source.txt found for non-existing file, expecting " + real_db_file + " in patch\n"
+                        ret = 1
+                        local_error = True
+                else:
+                    db_dir = os.path.basename(os.path.dirname(f))
+                    if db_dir != ext:
+                        out += "\t" + f + ": File is not in proper directory according to extension\n"
+                        ret = 1
+                        local_error = True
 
-		if local_error:
-			print "Patch", patch + ":"
-			print out
+        for f in files_without_source:
+            out += "\t" + f + ": Does not have matching .source.txt file with license\n"
+            ret = 1
+            local_error = True
 
-	return ret
+        if local_error:
+            print "Patch", patch + ":"
+            print out
+
+    return ret
 
 if __name__ == '__main__':
-	if len(sys.argv) == 1:
-		print "Reviews patches for file-tests database."
-		print """There are following rules currently:
+    if len(sys.argv) == 1:
+        print "Reviews patches for file-tests database."
+        print """There are following rules currently:
  - Every file 'F' in file-tests database has to have matching 'F.source.txt'
    file with the license information. Note that case sensitivity is important
    and must be respected.
  - Every file with extension '.X' has to be in directory 'db/X' according to
    its extension. Note that case sensitivity is important and must be
    respected.
+ - If a file has no (typical) extension (e.g. AppleDouble), then it has to go
+   to folder db/misc or must be given a descriptive short name and no extension
+   and appear in a directory of the same name (e.g. db/AppleDouble/AppleDouble).
+   The corresponding .source.txt needs to explain this in a line starting with
+   'NOTE: ' (see e.g. db/AppleDouble/AppleDouble.source.txt). No leading . or _
+   (e.g. .DS_Store --> DS_Store)
 """
-		print "Usage: " + sys.argv[0] + " [[patch1], [patch2], ...]"
-		print "Usage: " + sys.argv[0] + " *.patch"
-		sys.exit(0)
-	sys.exit(review_patches(sys.argv[1:]))
+        print "Usage: " + sys.argv[0] + " [[patch1], [patch2], ...]"
+        print "Usage: " + sys.argv[0] + " *.patch"
+        sys.exit(0)
+    sys.exit(review_patches(sys.argv[1:]))