From 4a6706c867582b44f0fa8f6a8ea0223bf9376342 Mon Sep 17 00:00:00 2001
From: cedricbonhomme <devnull@localhost>
Date: Tue, 25 Oct 2011 00:05:21 +0200
Subject: It is now possible to export all the database in the ePub format.

---
 pyAggr3g470r.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'pyAggr3g470r.py')

diff --git a/pyAggr3g470r.py b/pyAggr3g470r.py
index de8485a1..7ecae80b 100755
--- a/pyAggr3g470r.py
+++ b/pyAggr3g470r.py
@@ -281,7 +281,8 @@ class Root:
         html += "<h1>Export articles</h1>\n\n"
         html += """<form method=get action="/export/"><select name="export_method">\n"""
         html += """\t<option value="export_webzine" selected='selected'>Simple Webzine</option>\n"""
-        html += """\t<option value="export_html" selected='selected'>HTML</option>\n"""
+        html += """\t<option value="export_html">HTML</option>\n"""
+        html += """\t<option value="export_epub">ePub</option>\n"""
         html += """\t<option value="export_txt">Text</option>\n"""
         html += """</select>\n\t<input type="submit" value="Export">\n</form>\n"""
         html += "<hr />\n\n"
@@ -1207,7 +1208,10 @@ class Root:
         Export articles currently loaded from the SQLite database with
         the appropriate function of the 'export' module.
         """
-        getattr(export, export_method)(self.feeds)
+        try:
+            getattr(export, export_method)(self.feeds)
+        except Exception, e:
+            return self.error_page(e)
         return self.management()
 
     export.exposed = True
-- 
cgit