Merge branch 'master' into wx

[m_librarian.git] / m_librarian / web / app.py

diff --git a/m_librarian/web/app.py b/m_librarian/web/app.py
index 283ddb715b8b819fb0039c57bf375337eff84a1e..7885d4608d58cd15366430c3becb094ce7dec8a0 100644 (file)
--- a/m_librarian/web/app.py
+++ b/m_librarian/web/app.py
@@ -65,16 +65,21 @@ def download_books():
             for bid in form.getall(k):
                 books_ids.append(bid)
     if books_ids:
-        download_path = get_config().getpath('download', 'path')
-        for bid in books_ids:
-            book = Book.get(int(bid))
-            download(book, download_path)
-        return {
-            'message': u'Книги сохранены.',
-        }
+        try:
+            for bid in books_ids:
+                book = Book.get(int(bid))
+                download(book)
+        except Exception as e:
+            return {
+                'error': str(e),
+            }
+        else:
+            return {
+                'message': u'Книги сохранены.',
+            }
     else:
         return {
-            'message': u'Не выбрано книг для сохранения.',
+            'error': u'Не выбрано книг для сохранения.',
         }