geminispace.info

commit 5e86473dc862db309c737f7b53f220fa500f9871
parent 14aa70b3c65c25224721478364331ad468e10f39
Author: Natalie Pendragon <natpen@natpen.net>
Date:   Sun,  1 Mar 2020 12:12:16 -0500

Index and serve mime types

Diffstat:
M
gus/crawl.py
 | 
2
++
M
gus/serve.py
 | 
4
++--

2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/gus/crawl.py b/gus/crawl.py
@@ -34,6 +34,7 @@ def create_index(index_dir):
     pathlib.Path(index_dir).mkdir(parents=True, exist_ok=True)
     schema = Schema(
         url=TEXT(stored=True),
+        content_type=TEXT(stored=True),
         content=TEXT(stored=True),
     )
     index = create_in("index", schema)
@@ -76,6 +77,7 @@ def index_content(response):
     print("INDEXING...")
     index_writer.add_document(
         url=response.url,
+        content_type=response.content_type,
         content=response.url + " " + response.content,
     )
 
diff --git a/gus/serve.py b/gus/serve.py
@@ -69,7 +69,7 @@ def _search_index(query):
     results = searcher.search(query)
     return (
         len(results),
-        [(result.score, result["url"]) for result in results]
+        [(result.score, result["url"], result["content_type"]) for result in results]
     )
 
 
@@ -78,8 +78,8 @@ def _render_results(results):
     for i, result in enumerate(results):
         if i > 0:
             data.append("")
-        data.append("              (score: {:.2f})".format(result[0]))
         data.append("=> {}".format(result[1]))
+        data.append("{} (score: {:.2f})".format(result[2], result[0]))
     return data