New grid layout, fixes, images and other stuff

Author: sdaqo

db_create.sql

@@ -34,8 +34,9 @@ CREATE TABLE "media" (
         "title" TEXT,
         "media_type_id" INTEGER,
         "isbn"  INTEGER,
-        "age_limit"     INTEGER,
+        "age_limit" INTEGER,
         "author_id" INTEGER,
+        "image" TEXT,
         FOREIGN KEY("media_type_id") REFERENCES "media_types"("id"),
         FOREIGN KEY("author_id") REFERENCES "authors"("id"),
         PRIMARY KEY("id" AUTOINCREMENT)
@@ -66,4 +67,4 @@ VALUES("Student", 28),
       ("Default", 14);
 
 CREATE INDEX ix_author_name ON authors (name COLLATE NOCASE);
-CREATE INDEX ix_media_title ON media (title COLLATE NOCASE);
+CREATE INDEX ix_media_title ON media (title COLLATE NOCASE);

library_db/app.py

@@ -1,3 +1,4 @@
+import os
 import logging
 from flask import Flask
 from flask_cors import CORS
@@ -17,6 +18,7 @@ def create_app():
     app = Flask(__name__)
     CORS(app, resources={r"/api/*": {"origins": "*"}})
     app.config["CORS_HEADER"] = "Content-Type"
+    app.config["UPLOAD_FOLDER"] = os.path.join(app.static_folder, "images/media/")
 
     app.secret_key = "c4c4f1e8c78c2a52ee46"
 

library_db/library.db

@@ -1,5 +1,6 @@
-from flask import Blueprint, session, request
+from pathlib import Path
 from file_read_backwards import FileReadBackwards
+from flask import Blueprint, session, request, current_app, send_file
 
 from library_db.utils.db_utils import (
     get_media,
@@ -10,7 +11,7 @@
     user_query_mini,
     get_borrower,
 )
-from library_db.utils.utils import is_admin
+from library_db.utils.utils import is_admin, goodreads_search, scrape_goodreads_cover, imdb_search
 from library_db.logger import (
     get_info_logfile,
     get_error_logfile,
@@ -21,7 +22,11 @@
 
 @other_bluep.route("/media/<int:media_id>", methods=["GET"])
 def media(media_id):
-    media_info = get_media(media_id).__dict__
+    media_info = get_media(media_id)
+    if not media_info:
+        return {"error": "No media with this ID found"}
+
+    media_info = media_info.__dict__
     if is_media_borrowed(media_id):
         media_info.update({"is_borrowed": True})
         media_info.update(
@@ -33,10 +38,22 @@ def media(media_id):
 
     return media_info
 
+@other_bluep.route("/media/image/<int:media_id>", methods=["GET"])
+def media_image(media_id):
+    media_info = get_media(media_id)
+    if not media_info:
+        return {"error": "No media with this ID found"}
+
+    if media_info.image:
+        path = Path(current_app.config["UPLOAD_FOLDER"]).joinpath(media_info.image)
+        if path.exists():
+            return send_file(path, mimetype="image/jpeg")
+
+    return {"error": "Image does not exsist for this media."}
 
 @other_bluep.route("/mini_search/author", methods=["POST"])
 def query_authors():
-    if not request.is_json and "query" in request.get_json():
+    if not (request.is_json and "query" in request.get_json()):
         return {"error": "Unprocessable data"}, 400
 
     query = request.get_json()["query"]
@@ -47,7 +64,7 @@ def query_authors():
 
 @other_bluep.route("/mini_search/media", methods=["POST"])
 def query_media():
-    if not request.is_json and "query" in request.get_json():
+    if not (request.is_json and "query" in request.get_json()):
         return {"error": "Unprocessable data"}, 400
 
     query = request.get_json()["query"]
@@ -99,3 +116,37 @@ def get_log():
         response.update({"log_lines": lines})
 
     return response
+
+
+@other_bluep.route("/scraper/search_covers", methods=["POST"])
+def search_covers():
+    if not (request.is_json and "query" in request.get_json() and "media_type" in request.get_json()):
+        return {"error": "Unprocessable data"}, 400
+    
+    if request.get_json().get("media_type") == "Book":
+        try:
+            urls = goodreads_search(request.get_json().get("query"))
+        except:
+            return {"error": "Search failed"}
+
+        with_images = False
+    elif request.get_json().get("media_type") == "Blu-Ray" or request.get_json().get("media_type") == "DVD":
+        urls = imdb_search(request.get_json().get("query"))
+        with_images = True
+    elif request.get_json().get("media_type") == "CD":
+        return {"error": "CD-Cover Scraper not Implementet"}
+    else:
+        return {"error": "Invalid media type"}
+
+    return {"with_images": with_images, "urls": urls} 
+    
+@other_bluep.route("/scraper/book/scrape_cover", methods=["POST"])
+def scrape_coverurl():
+    if not (request.is_json and "url" in request.get_json()):
+        return {"error": "Unprocessable data"}, 400
+    
+    url = scrape_goodreads_cover(request.get_json().get("url"))
+    if not url:
+        return {"error": "Could not scrape image url"}
+
+    return {"image_url": url}

library_db/routes/api/other/other.py

@@ -45,32 +45,25 @@ def show_medialist():
             query_params.update({name: value})
 
     table_data_prams = deepcopy(query_params)
-    try:
-        table_data_prams.pop("status")
-    except KeyError:
-        pass
 
     author_query_match = re.match(AUTHOR_REGEX, query_params.get("query", ""))
     if author_query_match:
         table_data_prams.update({"author_query": author_query_match.group(1)})
         table_data_prams["query"] = re.sub(AUTHOR_REGEX, "", table_data_prams["query"])
         table_data_prams["query"] = table_data_prams["query"].strip()
 
-    query_count = get_media_query_count(
-        table_data_prams.get("query", ""),
-        table_data_prams.get("author_query", ""),
-        table_data_prams.get("media_type", ""),
-    )
 
     table_data, sort_field, sort_dir = get_media_list(
         PAGE_SIZE, PAGE_SIZE * page, **table_data_prams
     )
-
-    borrow_status_filter = query_params.get("status", "all")
-    if borrow_status_filter == "availabel":
-        table_data = [i for i in table_data if not is_media_borrowed(i.id)]
-    elif borrow_status_filter == "borrowed":
-        table_data = [i for i in table_data if is_media_borrowed(i.id)]
+    
+    
+    query_count = get_media_query_count(
+        table_data_prams.get("query", ""),
+        table_data_prams.get("author_query", ""),
+        table_data_prams.get("status", "all"),
+        table_data_prams.get("media_type", None)
+    )
 
     template_vars = get_template_vars(session)
     template_vars["table_data"] = table_data
@@ -84,8 +77,11 @@ def show_medialist():
     template_vars["page_size"] = PAGE_SIZE
     template_vars["url"] = request.url
     template_vars["update_query_params"] = update_query_params
-    template_vars["borrow_status_filter"] = borrow_status_filter
-    return render_template("media/medialist.html", **template_vars)
+    template_vars["borrow_status_filter"] = query_params.get("status", "all")
+    if session.get("grid", True):
+        return render_template("media/medialist_grid.html", **template_vars)
+    else:
+        return render_template("media/medialist_table.html", **template_vars)
 
 
 @media_bluep.route("/media/return", methods=["POST"])