More convenient calling format for autograbber

Keep backwards compatibility

diff --git a/README.md b/README.md
index f24ad29a5e1373c6fc7f1d75ac48eb203b5e4b75..3b10969a96e9f840905b1cb6d6881115303d3468 100644 (file)
--- a/README.md
+++ b/README.md
@@ -52,21 +52,21 @@ The bolded parts are what you type. Note that you can go back on any screen by t
 
 ## Cron scripted usage (autograbber.py)
 
 
 ## Cron scripted usage (autograbber.py)
 

-I have a shell script which looks something like this, I run it daily from crontab.
+You can schedule a regular download of your favourite shows.

 
 ```
 # m    h  dom mon dow   command
 
 ```
 # m    h  dom mon dow   command

-  0    1   *   *   *     ./autograbber.py /path/to/video-dir/ /path/to/patterns.txt
+  0    1   *   *   *     ./autograbber.py /videos/ABC4Kids /videos/Insight

 ```
 
 ```
 

-The patterns.txt file should contain shell-style globs, something like:
+Each of these directories should contain a `.patterns.txt` with shell-style globs:

 
 ```
 
 ```

-ABC iView/*/QI*/*
-SBS/Programs/Documentary/*/*
+ABC iView/By Channel/ABC4Kids/*/*
+SBS/Channel/SBS1/Insight*

 ```
 
 ```
 

-The above will download all episodes of QI from ABC as well as every SBS documentary. Whenever an episode is downloaded it is recorded into downloaded_auto.txt. Even if you move the files somewhere else they will not be redownloaded.
+Whenever an episode is downloaded it is recorded into `.downloaded_auto.txt`. Even if you move the files somewhere else they will not be redownloaded.

 
 
 ## Bug reports
 
 
 ## Bug reports

diff --git a/autograbber.py b/autograbber.py
index 7ef6816fb9583f4a04c6d370db2c2e4a804f30f2..f291e0b3a6826e08899c85523a97c118d30d53b9 100755 (executable)
--- a/autograbber.py
+++ b/autograbber.py
@@ -4,33 +4,37 @@ from common import load_root_node
 import fnmatch
 import logging
 import os
 import fnmatch
 import logging
 import os

+import shutil

 import sys
 
 import sys
 

-DOWNLOAD_HISTORY_FILES = [
-    ".downloaded_auto.txt",
-    "downloaded_auto.txt",
-]
+HISTORY_FILENAME = ".history.txt"
+PATTERN_FILENAME = ".patterns.txt"

 
 class DownloadList(object):
     def __init__(self):
         self.seen_list = set()
 
 class DownloadList(object):
     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]
+        self._load_history_file()
+        self.f = open(HISTORY_FILENAME, "a")
+
+    def _load_history_file(self):
+        self._move_old_file("downloaded_auto.txt")
+        self._move_old_file(".downloaded_auto.txt")
+

         try:
         try:

-            self.f = open(filename, "r")
-            for line in self.f:
-                self.seen_list.add(line.strip())
-            self.f.close()
+            with open(HISTORY_FILENAME, "r") as f:
+                for line in f:
+                    self.seen_list.add(line.strip())

         except Exception as e:
         except Exception as e:

-            logging.error("Could not open: %s -- %s", filename, e)
-        self.f = open(filename, "a")
-    
+            logging.error("Could not open history file: %s -- %s", HISTORY_FILENAME, e)
+
+    def _move_old_file(self, old_filename):
+        if os.path.isfile(old_filename) and not os.path.isfile(HISTORY_FILENAME):
+            logging.info("Migrating download history from %s to %s", old_filename, HISTORY_FILENAME)
+            shutil.move(old_filename, HISTORY_FILENAME)
+

     def has_seen(self, node):
         return node.title in self.seen_list
     def has_seen(self, node):
         return node.title in self.seen_list

-    
+

     def mark_seen(self, node):
         self.seen_list.add(node.title)
         self.f.write(node.title + "\n")
     def mark_seen(self, node):
         self.seen_list.add(node.title)
         self.f.write(node.title + "\n")


@@ -55,7 +59,7 @@ def match(download_list, node, pattern, count=0):
             match(download_list, child, pattern, count+1)
 
 
             match(download_list, child, pattern, count+1)
 
 

-def main(destdir, patternfile):
+def process_one_dir(destdir, patternfile):

     os.chdir(destdir)
     node = load_root_node()
     download_list = DownloadList()
     os.chdir(destdir)
     node = load_root_node()
     download_list = DownloadList()


@@ -64,15 +68,49 @@ def main(destdir, patternfile):
         search = line.strip().split("/")
         match(download_list, node, search)
 
         search = line.strip().split("/")
         match(download_list, node, search)
 

+def check_directories(download_dirs):
+    result = []
+    failed = False
+
+    for d in download_dirs:
+        d = os.path.abspath(d)
+        if not os.path.isdir(d):
+            print("Not a directory!", d)
+            failed = True
+
+        pattern_filename = os.path.join(d, PATTERN_FILENAME)
+        if not os.path.isfile(pattern_filename):
+            print("Missing file!", pattern_filename)
+            failed = True
+
+        result.append((d, pattern_filename))
+
+    if failed:
+        print("Exiting!")
+        sys.exit(1)
+
+    return result
+
+def process_dirs(download_dirs):
+    for download_dir, pattern_filename in check_directories(download_dirs):
+        logging.info("Processing directory: %s", download_dir)
+        process_one_dir(download_dir, pattern_filename)
+

 if __name__ == "__main__":
 if __name__ == "__main__":

-    try:
+    if len(sys.argv) <= 1:
+        print("Usage: %s download_dir [download_dir ...]" % sys.argv[0])
+        sys.exit(1)
+
+    if len(sys.argv) == 3 and os.path.isfile(sys.argv[2]):
+        # Backwards compatibility with old argument format

         destdir = os.path.abspath(sys.argv[1])
         patternfile = os.path.abspath(sys.argv[2])
         destdir = os.path.abspath(sys.argv[1])
         patternfile = os.path.abspath(sys.argv[2])

-    except IndexError:
-        print("Usage: %s destdir patternfile" % sys.argv[0])
-        sys.exit(1)
+        run = lambda: process_one_dir(destdir, patternfile)
+
+    else:
+        run = lambda: process_dirs(sys.argv[1:])
+

     try:
     try:

-        main(destdir, patternfile)
+        run()

     except (KeyboardInterrupt, EOFError):
         print("\nExiting...")
     except (KeyboardInterrupt, EOFError):
         print("\nExiting...")

-