X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/948d8682662f6ecbf93a1a8a8cf28e11679bbba3..70df49d54155019d53d864cd7341e97681afbc2e:/scripts/dl_cleanup.py

diff --git a/scripts/dl_cleanup.py b/scripts/dl_cleanup.py
index ff38a158f..81c69f7aa 100755
--- a/scripts/dl_cleanup.py
+++ b/scripts/dl_cleanup.py
@@ -11,13 +11,11 @@ import os
 import re
 import getopt
 
-DEBUG = 0
-
 # Commandline options
 opt_dryrun = False
 
 
-def parseVer_1234(match):
+def parseVer_1234(match, filepath):
 	progname = match.group(1)
 	progversion = (int(match.group(2)) << 64) |\
 		      (int(match.group(3)) << 48) |\
@@ -25,9 +23,12 @@ def parseVer_1234(match):
 		      (int(match.group(5)) << 16)
 	return (progname, progversion)
 
-def parseVer_123(match):
+def parseVer_123(match, filepath):
 	progname = match.group(1)
-	patchlevel = match.group(5)
+	try:
+		patchlevel = match.group(5)
+	except (IndexError), e:
+		patchlevel = None
 	if patchlevel:
 		patchlevel = ord(patchlevel[0])
 	else:
@@ -38,9 +39,12 @@ def parseVer_123(match):
 		      patchlevel
 	return (progname, progversion)
 
-def parseVer_12(match):
+def parseVer_12(match, filepath):
 	progname = match.group(1)
-	patchlevel = match.group(4)
+	try:
+		patchlevel = match.group(4)
+	except (IndexError), e:
+		patchlevel = None
 	if patchlevel:
 		patchlevel = ord(patchlevel[0])
 	else:
@@ -50,18 +54,24 @@ def parseVer_12(match):
 		      patchlevel
 	return (progname, progversion)
 
-def parseVer_r(match):
+def parseVer_r(match, filepath):
 	progname = match.group(1)
 	progversion = (int(match.group(2)) << 64)
 	return (progname, progversion)
 
-def parseVer_ymd(match):
+def parseVer_ymd(match, filepath):
 	progname = match.group(1)
 	progversion = (int(match.group(2)) << 64) |\
 		      (int(match.group(3)) << 48) |\
 		      (int(match.group(4)) << 32)
 	return (progname, progversion)
 
+def parseVer_GIT(match, filepath):
+	progname = match.group(1)
+	st = os.stat(filepath)
+	progversion = int(st.st_mtime) << 64
+	return (progname, progversion)
+
 extensions = (
 	".tar.gz",
 	".tar.bz2",
@@ -73,9 +83,11 @@ extensions = (
 )
 
 versionRegex = (
+	(re.compile(r"(.+)[-_]([0-9a-fA-F]{40,40})"), parseVer_GIT),		# xxx-GIT_SHASUM
 	(re.compile(r"(.+)[-_](\d+)\.(\d+)\.(\d+)\.(\d+)"), parseVer_1234),	# xxx-1.2.3.4
 	(re.compile(r"(.+)[-_](\d\d\d\d)-?(\d\d)-?(\d\d)"), parseVer_ymd),	# xxx-YYYY-MM-DD
 	(re.compile(r"(.+)[-_](\d+)\.(\d+)\.(\d+)(\w?)"), parseVer_123),	# xxx-1.2.3a
+	(re.compile(r"(.+)[-_](\d+)_(\d+)_(\d+)"), parseVer_123),		# xxx-1_2_3
 	(re.compile(r"(.+)[-_](\d+)\.(\d+)(\w?)"), parseVer_12),		# xxx-1.2a
 	(re.compile(r"(.+)[-_]r?(\d+)"), parseVer_r),				# xxx-r1111
 )
@@ -83,12 +95,11 @@ versionRegex = (
 blacklist = [
 	("linux",		re.compile(r"linux-.*")),
 	("gcc",			re.compile(r"gcc-.*")),
-	("boost",		re.compile(r"boost.*")),
 	("wl_apsta",		re.compile(r"wl_apsta.*")),
 	(".fw",			re.compile(r".*\.fw")),
 	(".arm",		re.compile(r".*\.arm")),
 	(".bin",		re.compile(r".*\.bin")),
-	("rt-firmware",		re.compile(r"RT\d+_Firmware.*")),
+	("rt-firmware",		re.compile(r"RT[\d\w]+_Firmware.*")),
 ]
 
 class EntryParseError(Exception): pass
@@ -98,23 +109,24 @@ class Entry:
 		self.directory = directory
 		self.filename = filename
 		self.progname = ""
+		self.fileext = ""
 
 		for ext in extensions:
 			if filename.endswith(ext):
 				filename = filename[0:0-len(ext)]
+				self.fileext = ext
 				break
 		else:
-			if DEBUG:
-				print "Extension did not match on", filename
+			print self.filename, "has an unknown file-extension"
 			raise EntryParseError("ext")
 		for (regex, parseVersion) in versionRegex:
 			match = regex.match(filename)
 			if match:
-				(self.progname, self.version) = parseVersion(match)
+				(self.progname, self.version) = parseVersion(
+					match, directory + "/" + filename + self.fileext)
 				break
 		else:
-			if DEBUG:
-				print "Version regex did not match on", filename
+			print self.filename, "has an unknown version pattern"
 			raise EntryParseError("ver")
 
 	def deleteFile(self):
@@ -145,7 +157,8 @@ def main(argv):
 			"hdBw:",
 			[ "help", "dry-run", "show-blacklist", "whitelist=", ])
 		if len(args) != 1:
-			raise getopt.GetoptError()
+			usage()
+			return 1
 	except getopt.GetoptError:
 		usage()
 		return 1