Collections, and installer patches

src/backend/lib/storage.py

@@ -1,10 +1,5 @@
 #!/usr/bin/python
-import sqlite3
 import psycopg2
-from psycopg2 import Error
-from .config import Config
-
-# db_pointer = Config().catalogue_db
 
 
 class Storage:
@@ -29,7 +24,6 @@ class Storage:
         try:
             self.cursor.execute(_q)
         except Exception as e:
-            breakpoint()
             if e.pgcode == "42501":
                 _q = """ALTER TABLE public.books OWNER to pyshelf;"""
                 self.close()
@@ -102,24 +96,29 @@ class Storage:
         return True
 
     def make_collections(self):
-        _q =  "SELECT id,file_name FROM books"
+        _q = "SELECT id,file_name FROM books"
         self.cursor.execute(_q)
         _set = self.cursor.fetchall()
         for book in _set:
-            path = self.config.book_path+'/'
+            path = self.config.book_path + "/"
             _collections = []
-            _pathing = book[1].split(path)[1].split('/')
-            _pathing.pop(0);_pathing.pop(-1)
+            _pathing = book[1].split(path)[1].split("/")
+            _pathing.pop(0)
+            _pathing.pop(-1)
             for _p in _pathing:
-                _s = _p.replace("'","")
+                _s = _p.replace("'", "")
                 _q_x = """
                 SELECT id FROM collections where collection='%s' AND book_id_id=%s
-                """%(_s,book[0])
+                """ % (
+                    _s,
+                    book[0],
+                )
                 try:
                     self.cursor.execute(_q_x)
                     if len(self.cursor.fetchall()) < 1:
                         self.cursor.execute(
-                            """INSERT INTO collections (collection, book_id_id) VALUES ('%s',%s)"""%(_s,book[0])
+                            """INSERT INTO collections (collection, book_id_id) VALUES ('%s',%s)"""
+                            % (_s, book[0])
                         )
                 except Exception as e:
                     print(e)

src/frontend/settings.py

@@ -33,7 +33,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 SECRET_KEY = "@(9b9jslgg41u1u=mr)-2*-n2x0vef0zsy39*z@sz18&tvow18"
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = False
+DEBUG = TEMPLATE_DEBUG = True
 
 ALLOWED_HOSTS = CONFIG.allowed_hosts
 

src/frontend/urls.py

@@ -27,6 +27,11 @@ urlpatterns = [
     path("search/", views.search, name="search"),
     path("search/<query>", views.search, name="search"),
     path("search/<query>/<_set>", views.search, name="search"),
+    path(
+        "show_collection/<_collection>/<_colset>",
+        views.show_collection,
+        name="show_collection",
+    ),
 ]
 if settings.DEBUG:
     import debug_toolbar

src/interface/migrations/0004_collections.py

@@ -1,25 +1,37 @@
 # Generated by Django 3.0.2 on 2020-02-04 20:22
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('interface', '0003_auto_20200101_0447'),
+        ("interface", "0003_auto_20200101_0447"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='Collections',
+            name="Collections",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('collection', models.CharField(max_length=255)),
-                ('book_id', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='interface.Books')),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("collection", models.CharField(max_length=255)),
+                (
+                    "book_id",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to="interface.Books",
+                    ),
+                ),
             ],
-            options={
-                'db_table': 'collections',
-            },
+            options={"db_table": "collections",},
         ),
     ]

src/interface/models.py

@@ -30,12 +30,14 @@ class Books(models.Model):
     progress = models.IntegerField(null=True)
     file_name = models.CharField(max_length=255, null=False)
 
-class Collections(models.Model):
 
+class Collections(models.Model):
     class Meta:
         db_table = "collections"
+
     def __str__(self):
         return self.collection
+
     collection = models.CharField(max_length=255)
     book_id = models.ForeignKey(Books, on_delete=models.PROTECT)
 
@@ -45,9 +47,9 @@ class Collections(models.Model):
 
     def generic_search(self, query):
         try:
-            results = Books.objects.annotate(
-                search=SearchVector("author", "title", "file_name"),
-            ).filter(search=query)
+            results = Books.objects.annotate(search=SearchVector("collection"),).filter(
+                search=query
+            )
         except Exception as e:
             raise
         return results