Feat(config): Warp config to provide default value

[m_librarian.git] / m_librarian / download.py

diff --git a/m_librarian/download.py b/m_librarian/download.py
index db09f12f08e263b786abef9fbb804a2ae7de7ed6..7e27561be25f413e8b054d34239c36c2740962bd 100755 (executable)
--- a/m_librarian/download.py
+++ b/m_librarian/download.py
@@ -19,9 +19,8 @@ def _compile_format():
     global format, compile_format, compiled_format
     if compile_format:
         compile_format = False
-        try:
-            format = get_config().get('download', 'format')
-        except:
+        format = get_config().get('download', 'format')
+        if not format:
             return
     got_percent = False
     compiled = []
@@ -64,12 +63,12 @@ def _compile_format():
 _library_path = None
 
 
-def download(book, path=None, a_format=None):
-    if path is None:
+def download(book, dest_path=None, lib_path=None, a_format=None):
+    if lib_path is None:
         global _library_path
         if _library_path is None:
-            _library_path = get_config().get('library', 'path')
-        path = _library_path
+            _library_path = get_config().get('library', 'path') or '.'
+        lib_path = _library_path
 
     global format, compile_format, compiled_format
     if a_format:
@@ -92,19 +91,20 @@ def download(book, path=None, a_format=None):
     if '%(extension)s' not in compiled_format:
         compiled_format += '.%(extension)s'
     filename = compiled_format % bdict
+    full_path = os.path.join(dest_path, filename)
     try:
-        os.makedirs(os.path.dirname(filename))
+        os.makedirs(os.path.dirname(full_path))
     except OSError:
         pass  # Already exists
-    zf = ZipFile(os.path.join(path, book.archive),  'r')
+    zf = ZipFile(os.path.join(lib_path, book.archive),  'r')
     infile = zf.open('%s.%s' % (book.file, book.extension.name))
-    outfile = open(filename, 'wb')
+    outfile = open(full_path, 'wb')
     copyfileobj(infile, outfile)
     outfile.close()
     infile.close()
     zf.close()
     dt = mktime(book.date.timetuple())
-    os.utime(filename, (dt, dt))
+    os.utime(full_path, (dt, dt))
 
 
 def test():