Add fixme and small changes to code

GeekMasher · web-flow · commit c6a8190a1eb1 · 2021-10-07T10:58:14.000Z
diff --git a/Pipfile b/Pipfile
@@ -5,6 +5,7 @@ name = "pypi"
 
 [packages]
 flask = "*"
+python-dotenv = "*"
 
 [dev-packages]
 
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/fixme b/fixme
@@ -0,0 +1,30 @@
+
+from flask import request, render_template, make_response
+
+from server.webapp import flaskapp, cursor
+from server.models import Book
+
+
+@flaskapp.route('/')
+def index():
+    name = request.args.get('name')
+    author = request.args.get('author')
+    read = bool(request.args.get('read'))
+
+    if name:
+        cursor.execute(
+            "SELECT * FROM books WHERE name LIKE :name", {'name': f"%{name}%"}
+        )
+        books = [Book(*row) for row in cursor]
+
+    elif author:
+        cursor.execute(
+            "SELECT * FROM books WHERE author LIKE :author", {'author': f"%{author}%"}
+        )
+        books = [Book(*row) for row in cursor]
+
+    else:
+        cursor.execute("SELECT name, author, read FROM books")
+        books = [Book(*row) for row in cursor]
+
+    return render_template('books.html', books=books)
diff --git a/server/__main__.py b/server/__main__.py
@@ -1,3 +1,4 @@
+import os
 import sys
 sys.path.append('.')
 
@@ -29,7 +30,7 @@
         except Exception as err:
             print(f'[!] Error Occurred: {err}')
 
-    flaskapp.run('0.0.0.0', debug=True)
+    flaskapp.run('0.0.0.0', debug=bool(os.environ.get('DEBUG', False)))
     
     cursor.close()
     database.close()
diff --git a/server/routes.py b/server/routes.py
@@ -16,16 +16,12 @@ def index():
             "SELECT * FROM books WHERE name LIKE '%" + name + "%'"
         )
         books = [Book(*row) for row in cursor]
-        if len(books) == 0:
-            return make_response(f"Search Result not found: {name}", 404)
 
     elif author:
         cursor.execute(
             "SELECT * FROM books WHERE author LIKE '%" + author + "%'"
         )
         books = [Book(*row) for row in cursor]
-        if len(books) == 0:
-            return make_response(f"Search Result not found: {author}", 404)
 
     else:
         cursor.execute("SELECT name, author, read FROM books")
