aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bonhomme <cedric@cedricbonhomme.org>2014-11-30 10:40:38 +0100
committerCédric Bonhomme <cedric@cedricbonhomme.org>2014-11-30 10:40:38 +0100
commit0af83751908aac66029848d7464c332008f47b72 (patch)
treea362437d6b4a62fdb97fd964975d61263f7edbf3
parentDatabase is now indexed in background. (diff)
downloadnewspipe-0af83751908aac66029848d7464c332008f47b72.tar.gz
newspipe-0af83751908aac66029848d7464c332008f47b72.tar.bz2
newspipe-0af83751908aac66029848d7464c332008f47b72.zip
Minor changes (comment and logging).
-rw-r--r--pyaggr3g470r/decorators.py3
-rw-r--r--pyaggr3g470r/search.py4
-rw-r--r--pyaggr3g470r/views.py3
3 files changed, 4 insertions, 6 deletions
diff --git a/pyaggr3g470r/decorators.py b/pyaggr3g470r/decorators.py
index 5cacb09f..3e808793 100644
--- a/pyaggr3g470r/decorators.py
+++ b/pyaggr3g470r/decorators.py
@@ -11,7 +11,8 @@ from pyaggr3g470r.models import Feed
def async(f):
"""
- This decorator enables to send email in a new thread.
+ This decorator enables to launch a task (for examle sending an email or
+ indexing the database) in background.
This prevent the server to freeze.
"""
def wrapper(*args, **kwargs):
diff --git a/pyaggr3g470r/search.py b/pyaggr3g470r/search.py
index b9e0ade7..2c065fb3 100644
--- a/pyaggr3g470r/search.py
+++ b/pyaggr3g470r/search.py
@@ -62,10 +62,8 @@ def create_index(user_id):
os.makedirs(indexdir)
ix = create_in(indexdir, schema)
writer = ix.writer()
- logger.info("Starting now.")
- logger.info("Test: "+ user.nickname)
for feed in user.feeds:
- logger.info("Indexing " +feed.title)
+ logger.info("Indexing " + feed.title)
for article in feed.articles:
writer.add_document(title=article.title,
content=utils.clear_string(article.content),
diff --git a/pyaggr3g470r/views.py b/pyaggr3g470r/views.py
index bec9f5ba..12f73791 100644
--- a/pyaggr3g470r/views.py
+++ b/pyaggr3g470r/views.py
@@ -494,9 +494,8 @@ def index_database():
Index all the database.
"""
if not conf.ON_HEROKU:
- user = User.query.filter(User.id == g.user.id).first()
try:
- fastsearch.create_index(user.id)
+ fastsearch.create_index(g.user.id)
flash(gettext('Indexing database...'), 'success')
except Exception as e:
flash(gettext('An error occured') + ' (%s).' % e, 'danger')
bgstack15