Merge lp:~mvo/archive-index/mvo into lp:archive-index

[Michael Vogt]

Minor tweaks:
- add --verbose to the commandline
- add ARCHIVE_INDEX_CACHE_DIR environment (for people like me with a small ~/ but lots of space on /space :)

Thanks,
 Michael

[lp:~mvo/archive-index/mvo]

3. By Jacob Johan Edwards on 2011-08-03

Merged cache and logging options from lp:~mvo/archive-index/mvo. Thanks!

[Jjed (jjed)]

Useful options. I've merged to the app-install branch too.

Thanks,
Jacob

review: Approve

=== modified file 'extract-app-metadata'
--- extract-app-metadata	2011-06-24 19:56:58 +0000
+++ extract-app-metadata	2011-08-02 07:56:24 +0000
@@ -17,7 +17,10 @@
     Option("-o", "--out-dir", dest="out_dir", default="output/",
            help="directory where extracted metadata will output"),
     Option("-m", "--memory", type="int", dest="memory", default=500,
-           help="how many megabytes of data to load into memory"))
+           help="how many megabytes of data to load into memory"),
+    Option("-v", "--verbose",  default=False, action="store_true",
+           help="show more output to stdout"),
+    )
 
 
 if __name__ == "__main__":
@@ -39,5 +42,12 @@
     logging.basicConfig(level=logging.DEBUG, filename=out_log, filemode="w",
                         format="%(asctime)s %(levelname)s %(message)s")
 
+    # create output on stdout
+    if opts.verbose:
+        log = logging.getLogger()
+        handler = logging.StreamHandler()
+        log.addHandler(handler)
+    del kwargs["verbose"]
+
     # extract
     extract_metadata(**kwargs)

=== modified file 'src/ArchiveCache/__init__.py'
--- src/ArchiveCache/__init__.py	2011-07-29 01:35:15 +0000
+++ src/ArchiveCache/__init__.py	2011-08-02 07:56:24 +0000
@@ -11,7 +11,7 @@
 from ..utils import md5sum, file_type
 
 # TODO: Use xdg.BaseDirectory when ready for python3
-CACHE_DIR = os.path.expandvars("$HOME/.cache/archive-cache")
+CACHE_DIR = os.environ.get("ARCHIVE_INDEX_CACHE_DIR") or os.path.expandvars("$HOME/.cache/archive-cache")
 
 
 class ArchiveCache: