Collections, and installer patches

config.json

@@ -1 +1 @@
-{"TITLE": "pyShelf E-Book Server", "VERSION": "0.4.1", "BOOKPATH": "", "DB_HOST": "localhost", "DB_PORT": "5432", "DATABASE": "pyshelf", "USER": "pyshelf", "PASSWORD": "pyshelf", "BOOKSHELF": "data/shelf.json", "ALLOWED_HOSTS": "*", "hostname": "localhost", "webport": "8000", "wsgiport": "8001"}
+{"TITLE": "pyShelf E-Book Server", "VERSION": "0.4.1", "BOOKPATH": "/home/raelon/Books", "DB_HOST": "localhost", "DB_PORT": "5432", "DATABASE": "pyshelf", "USER": "pyshelf", "PASSWORD": "pyshelf", "BOOKSHELF": "data/shelf.json", "ALLOWED_HOSTS": "*", "hostname": "localhost", "webport": "8000", "wsgiport": "8001"}

docs/html/doxygen.css

@@ -1768,4 +1768,3 @@ tt, code, kbd, samp
 u {
 	text-decoration: underline;
 }
-

importBooks

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!python
 
 import pathlib
 import sys

installer

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!python
 import json
 import os
 import pathlib
@@ -136,6 +136,9 @@ class SystemInstaller:
             if os.path.isdir(_dirs[1]):
                 ln_string = str(_dirs[0] + outfile + " " + _dirs[1] + outfile)
                 os.system("sudo ln -s %s" % ln_string)
+
+            """ TODO check for sites-enabled, create it if it doesnt exist,
+            then symlink the config """
         except Exception as e:
             pass
         return True
@@ -152,7 +155,7 @@ class SystemInstaller:
                 wsgiport = r["answer"]
         nginx_conf_str = """
         # pyshelf_nginx.conf
-        upstream django {server unix://%s/pyshelf_wsgi.sock;}
+        upstream django {server unix:///tmp/pyshelf_wsgi.sock;}
         server {
             listen      %s;
             server_name %s;
@@ -166,7 +169,6 @@ class SystemInstaller:
             location / {uwsgi_pass django; include %s/uwsgi_params;}
         }
         """ % (
-            root,
             port,
             hostname,
             root,
@@ -194,11 +196,10 @@ class SystemInstaller:
         master=True
         pidfile=/tmp/pyShelf.pid
         vacuum=True
-        socket=%s/pyshelf_wsgi.sock
+        socket=/tmp/pyshelf_wsgi.sock
         chmod-socket=666
         """ % (
             root,
-            root
         )
         with open(_fp, "w") as write_file:
             write_file.write(wsgi_conf_str)
@@ -223,7 +224,7 @@ install_answers = TerminalDisplay().installer()
 for key in install_answers:
     config[key["name"]] = key["answer"]
 # config["USER"] = os.environ["USER"]
-config["USER"] = 'pyshelf'
+config["USER"] = "pyshelf"
 # Write configuration
 Configuration().write_file(config)
 
@@ -300,23 +301,29 @@ if RequiredServices().db_server_found(req) is False:
         )
         install_status = os.system(cmd)
         for r in install_answers:
-            if r["name"] == "PASSWORD": sql_pass = r["answer"]
+            if r["name"] == "PASSWORD":
+                sql_pass = r["answer"]
 
         # sql_user = config["USER"]
         sql_user = "pyshelf"
         db_name = "pyshelf"
-        psql_cmd = """
-        CREATE DATABASE %s;
-        CREATE USER %s WITH PASSWORD \'%s\';
-        GRANT ALL PRIVILEGES ON DATABASE %s TO %s;
-        """ % (db_name, sql_user, sql_pass, db_name, sql_user)
-        _sql_file = "create_db.sql"
+        import pudb
+
+        pudb.set_trace()
+        psql_cmd = (
+            "CREATE DATABASE %s; CREATE USER %s WITH PASSWORD '%s'; GRANT ALL PRIVILEGES ON DATABASE %s TO %s;"
+            % (db_name, sql_user, sql_pass, db_name, sql_user)
+        )
+        _sql_file = "/tmp/create_db.sql"
         with open(_sql_file, "w") as sql_file_open:
             sql_file_open.write(psql_cmd)
         sql_file_open.close()
-        os.system("sudo -u postgres initdb --locale=en_US.UTF-8 -E UTF8 -D /var/lib/postgres/data")
+        os.system(
+            "sudo -u postgres initdb --locale=en_US.UTF-8 -E UTF8 -D /var/lib/postgres/data"
+        )
         os.system("sudo systemctl start postgresql")
         os.system("sudo -u postgres psql -f %s" % _sql_file)
+        # os.system("sudo -u postgres psql -c \'%s\'"%psql_cmd)
         messages = messages + [
             "PostgreSQL installed and started",
             "To enable autostart you must run",
@@ -324,7 +331,7 @@ if RequiredServices().db_server_found(req) is False:
             "\n",
             "Database cluster initialized at /var/lib/postgres",
             "pyShelf database and user created",
-            psql_cmd
+            psql_cmd,
         ]
 
 # Post install configurations
@@ -342,11 +349,19 @@ except Exception as e:
 try:
     copy_config = sysinstall.copy_config()
     if copy_config:
-        messages = messages + ["pyShelf site config copied to sites-available, and symlinked to sites-enabled"]
+        messages = messages + [
+            "pyShelf site config copied to sites-available, and symlinked to sites-enabled"
+        ]
 except Exception as e:
-    messages = messages + ["nginx site config not copied", "A nginx config for your install has been created \"pyshelf_nginx.conf\""]
+    messages = messages + [
+        "nginx site config not copied",
+        'A nginx config for your install has been created "pyshelf_nginx.conf"',
+    ]
 sysinstall.make_wsgi_config(install_answers)
-messages = messages + ["You should now import your books by running importBooks", "You can then start the interface with uwsgi --ini uwsgi.ini"]
+messages = messages + [
+    "You should now import your books by running importBooks",
+    "You can then start the interface with uwsgi --ini uwsgi.ini",
+]
 
 # Display end screen
 sysinstall.log()

requirements.txt

@@ -12,9 +12,12 @@ pre-commit
 isort
 django
 toml
-uwsgi
+:close
+
+q
 django-debug-toolbar
 psycopg2-binary
 prompt_toolkit
 psutil
 pyfiglet
+psycopg2

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()
@@ -106,20 +100,25 @@ class Storage:
         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("'", "")
                 _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