aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bonhomme <cedric@cedricbonhomme.org>2014-04-12 19:10:38 +0200
committerCédric Bonhomme <cedric@cedricbonhomme.org>2014-04-12 19:10:38 +0200
commit882581abe066f16f14b7cc54776bb7985f2b34c6 (patch)
tree314d2c1420428d2153c33f64d5b3bba631816f58
parentTrying the export to HTML option on Heroku (2). (diff)
downloadnewspipe-882581abe066f16f14b7cc54776bb7985f2b34c6.tar.gz
newspipe-882581abe066f16f14b7cc54776bb7985f2b34c6.tar.bz2
newspipe-882581abe066f16f14b7cc54776bb7985f2b34c6.zip
Trying the export to HTML option on Heroku (3).
-rw-r--r--conf.py4
-rw-r--r--pyaggr3g470r/export.py7
-rw-r--r--pyaggr3g470r/views.py3
3 files changed, 10 insertions, 4 deletions
diff --git a/conf.py b/conf.py
index ecc85d11..01483f10 100644
--- a/conf.py
+++ b/conf.py
@@ -44,6 +44,8 @@ if not ON_HEROKU:
basedir = os.path.abspath(os.path.dirname(__file__))
PATH = os.path.abspath(".")
+
+ WEBZINE_ROOT = PATH + "/pyaggr3g470r/var/export/webzine/"
else:
HTTP_PROXY = ""
@@ -57,6 +59,8 @@ else:
MAIL_ENABLED = False
SQLALCHEMY_DATABASE_URI = os.environ['DATABASE_URL']
+
+ WEBZINE_ROOT = "/tmp/"
CSRF_ENABLED = True
# slow database query threshold (in seconds)
diff --git a/pyaggr3g470r/export.py b/pyaggr3g470r/export.py
index da63774e..530c08fd 100644
--- a/pyaggr3g470r/export.py
+++ b/pyaggr3g470r/export.py
@@ -136,7 +136,7 @@ def export_html(user):
"""
Export all articles of 'user' in Web pages.
"""
- webzine_root = conf.PATH + "/pyaggr3g470r/var/export/webzine/"
+ webzine_root = conf.WEBZINE_ROOT
nb_articles = format(len(models.Article.query.filter(models.Article.user_id == user.id).all()), ",d")
index = HTML_HEADER("News archive")
index += "<h1>List of feeds</h1>\n"
@@ -177,8 +177,9 @@ def export_html(user):
f.write(a_post.encode("utf-8"))
posts += HTML_FOOTER
- with open(feed_index, "w") as f:
- f.write(posts.encode("utf-8"))
+ if len(feed.articles.all()) != 0:
+ with open(feed_index, "w") as f:
+ f.write(posts.encode("utf-8"))
index += "</ul>\n"
index += "<p>" + time.strftime("Generated on %d %b %Y at %H:%M.") + "</p>\n"
diff --git a/pyaggr3g470r/views.py b/pyaggr3g470r/views.py
index 3cd8afc5..9ce597e6 100644
--- a/pyaggr3g470r/views.py
+++ b/pyaggr3g470r/views.py
@@ -394,8 +394,9 @@ def export_articles():
Export all articles.
"""
user = User.query.filter(User.id == g.user.id).first()
+ archive_file, archive_file_name = export.export_html(user)
try:
- archive_file, archive_file_name = export.export_html(user.feeds)
+ archive_file, archive_file_name = export.export_html(user)
except:
flash("Error when exporting articles.", 'danger')
return redirect(url_for('management'))
bgstack15