]> code.delx.au - webdl/commitdiff
autograbber: look first for .downloaded_auto.txt
authorJames Bunton <jamesbunton@delx.net.au>
Sun, 9 Feb 2014 09:12:35 +0000 (20:12 +1100)
committerJames Bunton <jamesbunton@delx.net.au>
Sun, 9 Feb 2014 09:12:35 +0000 (20:12 +1100)
autograbber.py

index 7bebec819c21b2d2faac5b6ba2dcd6a478071670..62e6f27d77d3785f96a4e1478f15725d26887537 100755 (executable)
@@ -6,9 +6,19 @@ import fnmatch
 import os
 import sys
 
+DOWNLOAD_HISTORY_FILES = [
+       ".downloaded_auto.txt",
+       "downloaded_auto.txt",
+]
+
 class DownloadList(object):
-       def __init__(self, filename):
+       def __init__(self):
                self.seen_list = set()
+               for filename in DOWNLOAD_HISTORY_FILES:
+                       if os.path.isfile(filename):
+                               break
+               else:
+                       filename = DOWNLOAD_HISTORY_FILES[0]
                try:
                        self.f = open(filename, "r")
                        for line in self.f:
@@ -48,7 +58,7 @@ def match(download_list, node, pattern, count=0):
 def main(destdir, patternfile):
        os.chdir(destdir)
        node = load_root_node()
-       download_list = DownloadList("downloaded_auto.txt")
+       download_list = DownloadList()
 
        for line in open(patternfile):
                search = line.strip().split("/")