[scripts] download.pl: cope with potential two-digit linux versions

[openwrt.git] / scripts / dl_cleanup.py

diff --git a/scripts/dl_cleanup.py b/scripts/dl_cleanup.py
index 48f587d..81c69f7 100755 (executable)
--- a/scripts/dl_cleanup.py
+++ b/scripts/dl_cleanup.py
@@ -15,7 +15,7 @@ import getopt
 opt_dryrun = False
 
 
 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) |\
        progname = match.group(1)
        progversion = (int(match.group(2)) << 64) |\
                      (int(match.group(3)) << 48) |\


@@ -23,7 +23,7 @@ def parseVer_1234(match):
                      (int(match.group(5)) << 16)
        return (progname, progversion)
 
                      (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)
        progname = match.group(1)
        try:
                patchlevel = match.group(5)


@@ -39,7 +39,7 @@ def parseVer_123(match):
                      patchlevel
        return (progname, progversion)
 
                      patchlevel
        return (progname, progversion)
 

-def parseVer_12(match):
+def parseVer_12(match, filepath):

        progname = match.group(1)
        try:
                patchlevel = match.group(4)
        progname = match.group(1)
        try:
                patchlevel = match.group(4)


@@ -54,18 +54,24 @@ def parseVer_12(match):
                      patchlevel
        return (progname, progversion)
 
                      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)
 
        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)
 
        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",
 extensions = (
        ".tar.gz",
        ".tar.bz2",


@@ -77,6 +83,7 @@ extensions = (
 )
 
 versionRegex = (
 )
 
 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+)\.(\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


@@ -102,10 +109,12 @@ class Entry:
                self.directory = directory
                self.filename = filename
                self.progname = ""
                self.directory = directory
                self.filename = filename
                self.progname = ""

+               self.fileext = ""

 
                for ext in extensions:
                        if filename.endswith(ext):
                                filename = filename[0:0-len(ext)]
 
                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"
                                break
                else:
                        print self.filename, "has an unknown file-extension"


@@ -113,7 +122,8 @@ class Entry:
                for (regex, parseVersion) in versionRegex:
                        match = regex.match(filename)
                        if match:
                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"
                                break
                else:
                        print self.filename, "has an unknown version pattern"


@@ -147,7 +157,8 @@ def main(argv):
                        "hdBw:",
                        [ "help", "dry-run", "show-blacklist", "whitelist=", ])
                if len(args) != 1:
                        "hdBw:",
                        [ "help", "dry-run", "show-blacklist", "whitelist=", ])
                if len(args) != 1:

-                       raise getopt.GetoptError()
+                       usage()
+                       return 1

        except getopt.GetoptError:
                usage()
                return 1
        except getopt.GetoptError:
                usage()
                return 1