From 62e861e298498f7a16e4a1a4a03bcc4de6973588 Mon Sep 17 00:00:00 2001
From: felixwelter <felixwelter@gmail.com>
Date: Fri, 4 Sep 2020 18:09:21 +0200
Subject: [PATCH] Fix path building
---
app.py | 3 +--
slide_indexer/basic_indexer.py | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/app.py b/app.py
index 7873860..29e93d7 100644
--- a/app.py
+++ b/app.py
@@ -36,7 +36,6 @@ def upload():
index = Index(index_dir=INDEX_DIR)
indexer = BasicIndexer(index, IMAGE_DIR, SLIDE_DIR)
for i, file in enumerate(files):
- print(i, file)
if file.filename != '':
if file and allowed_file(file.filename):
filename = secure_filename(file.filename)
@@ -55,7 +54,7 @@ def query():
query = request.form.get("term")
context = request.form.get("context")
result = index.search(query, context)
- img_name = result["path"][len(SLIDE_DIR):] + "_" + str(result["page"]) + ".jpg"
+ img_name = result["path"].split(os.sep)[-1] + "_" + str(result["page"]) + ".jpg"
return jsonify({
"type": "image",
"path": os.getenv('EXTERNAL_HOST', '<PLEASE_SET_EXTERNAL_HOST_ENV_VAR>') + "/slide/" + img_name
diff --git a/slide_indexer/basic_indexer.py b/slide_indexer/basic_indexer.py
index b550edb..8eac188 100644
--- a/slide_indexer/basic_indexer.py
+++ b/slide_indexer/basic_indexer.py
@@ -22,6 +22,6 @@ class BasicIndexer():
text = page.extract_text()
self.index.add(str(file_path), i, text, text.split("\n")[self.title_row])
if self.process_images:
- img_name = str(file_path)[len(self.slide_dir):] + "_" + str(i) + ".jpg"
+ img_name = file_path.split(os.sep)[-1] + "_" + str(i) + ".jpg"
img_path = os.path.join(self.image_dir, img_name)
page.to_image().save(img_path)
--
GitLab