Process CD Covers seperatly

Author: sdaqo

library_db/library.db

@@ -53,14 +53,14 @@ def ret_error(error: str):
     return redirect(request.args.get("next", "/"))
 
 
-@auth_bluep.route("/signin", methods=["GET", "POST"])
-def signin():
+@auth_bluep.route("/signup", methods=["GET", "POST"])
+def signup():
     template_vars = get_template_vars(session)
     if request.method == "GET":
-        return render_template("auth/signin.html", **template_vars)
+        return render_template("auth/signup.html", **template_vars)
 
     def ret_error(error: str):
-        return render_template("auth/signin.html", error=error, **template_vars)
+        return render_template("auth/signup.html", error=error, **template_vars)
 
     try:
         email = request.form["email"]

library_db/routes/auth/auth.py

@@ -58,6 +58,7 @@
       value="Submit"
       class="form-control"
     />
+    <span class="mt-1">No Account? Signup <a href="{{url_for('auth_bluep.signup')}}">here</a></span>
   </form>
 </div>
 {% endblock %}

library_db/routes/auth/templates/auth/login.html

@@ -1,4 +1,4 @@
-{% extends "base.html"%} {% block title %} Signin {% endblock %} {% block head
+{% extends "base.html"%} {% block title %} SignUp {% endblock %} {% block head
 %} {{ super() }}
 <style>
   {% if darkmode %}
@@ -29,7 +29,7 @@
   class="position-absolute top-50 start-50 translate-middle sign-in-container"
 >
   <form
-    action="/signin"
+    action="{{url_for('auth_bluep.signup')}}"
     method="post"
     id="form"
     class="rounded bg-light p-3 d-flex flex-column {%if darkmode%} bg-dark text-white {% else %} shadow-lg border {% endif%}"

…b/routes/auth/templates/auth/signin.html …b/routes/auth/templates/auth/signup.htmllibrary_db/routes/auth/templates/auth/signin.html renamed to library_db/routes/auth/templates/auth/signup.html library_db/routes/auth/templates/auth/signin.html renamed to library_db/routes/auth/templates/auth/signup.html

@@ -73,7 +73,7 @@
       <div class="d-flex flex-column">
         <div class="d-flex flex-column align-self-center">
           <span class="display-4"
-            ><img src="/static/images/books.png" alt="books emoticon" /> SQL
+            ><img src="{{url_for('static', filename='images/books.png')}}" alt="books emoticon" /> SQL
             Library</span
           >
           <span class="text-muted sub-title"
@@ -88,7 +88,7 @@
           >
           <button
             class="btn btn-primary mt-3"
-            onclick="window.location.pathname = '/medialist'"
+            onclick="window.location.pathname = '{{url_for('media_bluep.show_medialist')}}'"
           >
             Medialist
           </button>
@@ -118,15 +118,15 @@
             {%else%}
               <button
                 class="btn btn-outline-primary mt-3"
-                onclick="window.location.pathname = '/login'"
+                onclick="window.location.pathname = '{{url_for('auth_bluep.login')}}'"
               >
                 Login
               </button>
               <button
                 class="btn btn-outline-primary mt-3"
-                onclick="window.location.pathname = '/signin'"
+                onclick="window.location.pathname = '{{url_for('auth_bluep.signup')}}'"
               >
-                Signin
+                SignUp
               </button>
             {%endif%}
           </div>
@@ -138,7 +138,7 @@
           <img
             id="header-image"
             class="rounded img-fluid shadow-lg"
-            src="/static/images/library.webp"
+            src="{{url_for('static', filename='images/library.webp')}}"
             alt="picture of library"
           />
         </div>

library_db/routes/general/templates/general/index.html

@@ -131,7 +131,7 @@ <h5 for="mediaSearch" class="{%if darkmode %} text-white {%endif%}">
               >
                 Create new Admin/Staff Account
               </h5>
-              <a href="{{url_for('auth_bluep.signin')}}">
+              <a href="{{url_for('auth_bluep.signup')}}">
                 <div class="d-flex flex-column">
                   <button class="btn btn-primary">Create</button>
                 </div></a

library_db/routes/panel/admin/templates/admin/user_mng.html

@@ -17,6 +17,7 @@
     is_admin,
     is_staff,
     process_cover_image,
+    process_cd_cover,
     download_image
 )
 from library_db.utils.db_utils import (
@@ -38,7 +39,7 @@
 
 
 
-ALLOWED_EXTENSIONS = {'.png', '.jpg', '.jpeg'}
+ALLOWED_EXTENSIONS = {'.png', '.jpg', '.jpeg', '.webp'}
 
 def allowed_file(filename):
     return Path(filename).suffix in ALLOWED_EXTENSIONS
@@ -115,17 +116,17 @@ def ret_error(error: str):
         return ret_error("Bad Form Data")
 
     media = get_media(id)
-
+    
     if not media:
         return ret_error("Bad Form Data")
-
+    
     if not media.title == title:
         media_title_id = get_media_id(title)
         if media_title_id:
             return ret_error("Media With this Title already exsists")
-
-    if not age_limit:
-        return ret_error("Bad Form Data")
+    
+    if age_limit is None:
+        age_limit = 0
 
     if not media_type in get_media_types():
         return ret_error("Media Type doesnt exsist")
@@ -226,26 +227,6 @@ def ret_error(error: str):
     except KeyError:
         return ret_error("Bad Form Data")
 
-    filename = None
-    if "image" in request.files or "url" in request.form:
-        file = request.files["image"]
-        url = request.form["url"]
-        filename = uuid.uuid1().hex + ".jpg"
-        save_path = Path(current_app.config['UPLOAD_FOLDER']).joinpath(filename).__str__()
-
-        if file.filename != '' and url != '':
-            return ret_error("Can't upload Image and use Scraper Image")
-        elif not file.filename == '' and allowed_file(file.filename):
-            file.save(save_path)
-            process_cover_image(save_path)
-        elif not url == '':
-            if download_image(url, save_path) != 1:
-                filename = None
-            else:
-                process_cover_image(save_path)
-        else:
-            filename = None
-
     if isbn:
         try:
             isbn = int(isbn)
@@ -261,18 +242,44 @@ def ret_error(error: str):
     if not media_type in get_media_types():
         return ret_error("Media Type doesnt exsist")
 
-    media_type = get_media_type_id(media_type)
+    media_type_id = get_media_type_id(media_type)
 
     if not author_exsists(author):
         return ret_error("Author does not exsist")
 
-    author = get_author_id(author)
+    author_id = get_author_id(author)
+
+    filename = None
+    if "image" in request.files or "url" in request.form:
+        file = request.files["image"]
+        url = request.form["url"]
+        filename = uuid.uuid1().hex + ".jpg"
+        save_path = Path(current_app.config['UPLOAD_FOLDER']).joinpath(filename).__str__()
+
+        if file.filename != '' and url != '':
+            return ret_error("Can't upload Image and use Scraper Image")
+        elif not file.filename == '' and allowed_file(file.filename):
+            file.save(save_path)
+            if media_type == "CD":
+                process_cd_cover(save_path)
+            else:
+                process_cover_image(save_path)
+        elif not url == '':
+            if download_image(url, save_path) != 1:
+                filename = None
+            else:
+                if media_type == "CD":
+                    process_cd_cover(save_path)
+                else:
+                    process_cover_image(save_path)
+        else:
+            filename = None
 
     new_id = add_media_item(
         title=title,
-        author_id=author,
+        author_id=author_id,
         age_limit=age_limit,
-        media_type_id=media_type,
+        media_type_id=media_type_id,
         isbn=isbn,
         image=filename
     )

library_db/routes/panel/staff/staff.py

@@ -155,7 +155,7 @@ <h5 class="underlined {%if darkmode %} text-white {%endif%}">
                 id="mediaAuthorSearch"
                 autocomplete="off"
                 name="author"
-                value="{{media_item.author if media_item.author}}"
+                value="{{media_item.author}}"
               />
               <ul
                 class="list-group d-none"
@@ -176,7 +176,7 @@ <h5 class="underlined {%if darkmode %} text-white {%endif%}">
                     name="age_limit"
                     placeholder="0"
                     autocomplete="off"
-                    value="{{media_item.age_limit if media_item.age_limit}}"
+                    value="{{media_item.age_limit}}"
                   />
                 </div>
                 <div class="d-flex flex-column flex-fill ms-1">
@@ -204,7 +204,7 @@ <h5 class="underlined {%if darkmode %} text-white {%endif%}">
                 name="isbn"
                 placeholder="Optional"
                 autocomplete="off"
-                value="{{media_item.isbn if media_item.isbn}}"
+                value="{{media_item.isbn}}"
               />
               <div class="d-flex flex-fill">
                 <div>