aboutsummaryrefslogtreecommitdiff
path: root/pyaggr3g470r/search.py
diff options
context:
space:
mode:
authorCédric Bonhomme <cedric@cedricbonhomme.org>2014-04-27 02:09:26 +0200
committerCédric Bonhomme <cedric@cedricbonhomme.org>2014-04-27 02:09:26 +0200
commit89cf405ab970c4e289b7b79485b27aed8edb1a41 (patch)
tree7f6330fb7b9bab82a84aeb2a639377b9c4fe1d80 /pyaggr3g470r/search.py
parentThis fixes #3. (diff)
downloadnewspipe-89cf405ab970c4e289b7b79485b27aed8edb1a41.tar.gz
newspipe-89cf405ab970c4e289b7b79485b27aed8edb1a41.tar.bz2
newspipe-89cf405ab970c4e289b7b79485b27aed8edb1a41.zip
Cleaned code.
Diffstat (limited to 'pyaggr3g470r/search.py')
-rw-r--r--pyaggr3g470r/search.py41
1 files changed, 23 insertions, 18 deletions
diff --git a/pyaggr3g470r/search.py b/pyaggr3g470r/search.py
index 6f8168db..f4e57251 100644
--- a/pyaggr3g470r/search.py
+++ b/pyaggr3g470r/search.py
@@ -37,16 +37,16 @@ from whoosh.writing import AsyncWriter
from collections import defaultdict
import utils
-import models
indexdir = "./pyaggr3g470r/var/indexdir"
-schema = Schema(title=TEXT, \
- content=TEXT, \
- article_id=NUMERIC(int, stored=True), \
- feed_id=NUMERIC(int, stored=True), \
+schema = Schema(title=TEXT,
+ content=TEXT,
+ article_id=NUMERIC(int, stored=True),
+ feed_id=NUMERIC(int, stored=True),
user_id=NUMERIC(int, stored=True))
+
def create_index(user):
"""
Creates the index.
@@ -57,13 +57,14 @@ def create_index(user):
writer = ix.writer()
for feed in user.feeds:
for article in feed.articles:
- writer.add_document(title=article.title, \
- content=utils.clear_string(article.content), \
- article_id=article.id, \
- feed_id=feed.id, \
+ writer.add_document(title=article.title,
+ content=utils.clear_string(article.content),
+ article_id=article.id,
+ feed_id=feed.id,
user_id=user.id)
writer.commit()
+
def add_to_index(user_id, articles, feed):
"""
Add a list of articles to the index.
@@ -72,32 +73,35 @@ def add_to_index(user_id, articles, feed):
"""
try:
ix = open_dir(indexdir)
- except (EmptyIndexError, OSError) as e:
+ except (EmptyIndexError, OSError):
if not os.path.exists(indexdir):
os.makedirs(indexdir)
ix = create_in(indexdir, schema)
writer = AsyncWriter(ix)
for article in articles:
- writer.add_document(title=article.title, \
- content=utils.clear_string(article.content), \
- article_id=article.id, \
- feed_id=feed.id, \
+ writer.add_document(title=article.title,
+ content=utils.clear_string(article.content),
+ article_id=article.id,
+ feed_id=feed.id,
user_id=user_id)
writer.commit()
+
def delete_article(user_id, feed_id, article_id):
"""
Delete an article from the index.
"""
try:
ix = open_dir(indexdir)
- except (EmptyIndexError, OSError) as e:
+ except (EmptyIndexError, OSError):
raise EmptyIndexError
writer = ix.writer()
- document = And([Term("user_id", user_id), Term("feed_id", feed_id), Term("article_id", article_id)])
+ document = And([Term("user_id", user_id), Term("feed_id", feed_id),
+ Term("article_id", article_id)])
writer.delete_by_query(document)
writer.commit()
+
def search(user_id, term):
"""
Search for `term` in the index.
@@ -106,7 +110,7 @@ def search(user_id, term):
result_dict = defaultdict(list)
try:
ix = open_dir(indexdir)
- except (EmptyIndexError, OSError) as e:
+ except (EmptyIndexError, OSError):
raise EmptyIndexError
with ix.searcher() as searcher:
query = QueryParser("content", ix.schema).parse(term)
@@ -115,13 +119,14 @@ def search(user_id, term):
result_dict[article["feed_id"]].append(article["article_id"])
return result_dict, len(results)
+
def nb_documents():
"""
Return the number of undeleted documents.
"""
try:
ix = open_dir(indexdir)
- except (EmptyIndexError, OSError) as e:
+ except (EmptyIndexError, OSError):
raise EmptyIndexError
return ix.doc_count()
bgstack15