X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=scripts%2Fdl_cleanup.py;h=2d6895e460a7b1290675e7ff8f9162e301efe74e;hb=d310e34d5f3a1ce650bf872d719a9aa143889394;hp=67ccbda914eec08c1aee20f7fed9069f077fd4c4;hpb=672b7efe2ab60460e1343f46946a11149f900c54;p=openwrt.git

diff --git a/scripts/dl_cleanup.py b/scripts/dl_cleanup.py
index 67ccbda914..2d6895e460 100755
--- a/scripts/dl_cleanup.py
+++ b/scripts/dl_cleanup.py
@@ -3,7 +3,8 @@
 # OpenWRT download directory cleanup utility.
 # Delete all but the very last version of the program tarballs.
 #
-# Copyright (c) 2010 Michael Buesch <mb@bu3sch.de>
+# Copyright (C) 2010 Michael Buesch <mb@bu3sch.de>
+# Copyright (C) 2013 OpenWrt.org
 """
 
 import sys
@@ -15,7 +16,7 @@ import getopt
 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) |\
@@ -23,7 +24,7 @@ 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)
 	try:
 		patchlevel = match.group(5)
@@ -39,7 +40,7 @@ def parseVer_123(match):
 		      patchlevel
 	return (progname, progversion)
 
-def parseVer_12(match):
+def parseVer_12(match, filepath):
 	progname = match.group(1)
 	try:
 		patchlevel = match.group(4)
@@ -54,31 +55,41 @@ 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",
+	".tar.xz",
 	".orig.tar.gz",
 	".orig.tar.bz2",
+	".orig.tar.xz",
 	".zip",
 	".tgz",
 	".tbz",
+	".txz",
 )
 
 versionRegex = (
 	(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"(.+)[-_]([0-9a-fA-F]{40,40})"), parseVer_GIT),		# xxx-GIT_SHASUM
 	(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
@@ -102,10 +113,12 @@ 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:
 			print self.filename, "has an unknown file-extension"
@@ -113,7 +126,8 @@ class Entry:
 		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:
 			print self.filename, "has an unknown version pattern"