th3r00t/pyShelf
1
0
Fork 0
mirror of https://github.com/th3r00t/pyShelf.git synced 2026-04-28 01:59:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring Collections, and getting docker ready.

Browse Source
This commit is contained in:
th3r00t
2023-11-27 15:21:23 -05:00
parent 1e2998aed6
commit 44a376f172
10 changed files with 63 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
docker/Dockerfile vendored
View File

@@ -9,17 +9,30 @@
# docker login
# docker push pyshelf/pyshelf
FROM python:3
FROM ubuntu:latest
EXPOSE 8000
EXPOSE 8080
EXPOSE 1337
# RUN apt-get update -y
# RUN DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential python312 python312-dev python312-pip python312-venv python312-hatch
RUN apt-get update -y
RUN apt-get upgrade -y
RUN apt install build-essential zlib1g-dev libncurses5-dev libgdbm-dev \
libnss3-dev libssl-dev libreadline-dev libffi-dev libsqlite3-dev wget \
libbz2-dev curl -y
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash
RUN export NVM_DIR="$HOME/.nvm" ; \
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" ; nvm install 14 npm
WORKDIR /tmp
RUN wget https://www.python.org/ftp/python/3.12.0/Python-3.12.0.tgz
RUN tar -xf Python-3.12.0.tgz
WORKDIR /tmp/Python-3.12.0/
RUN ./configure --enable-optimizations
RUN make -j 4
RUN make install
COPY . /pyshelf
COPY ./docker/config.json /pyshelf/config.json
COPY ./docker/requirements.txt /pyshelf/requirements.txt
WORKDIR /pyshelf/
RUN python -m pip install --no-cache-dir -r requirements.txt
RUN python3 -m pip install --no-cache-dir -r requirements.txt
ENTRYPOINT hatch run ./pyShelf.py

2
docker/README.md vendored
View File

@@ -2,5 +2,3 @@ Use `docker build -t pyshelf/pyshelf -f ./docker/Dockerfile .` in the project ro
Make sure the following files are in sync:
* config.json
* docker/pyshelf_nginx.conf
* uwsgi.ini

6
docker/config.json vendored
View File

@@ -2,9 +2,9 @@
"TITLE": "pyShelf E-Book Server",
"VERSION": "0.8.0",
"BOOKPATH": "/books",
"DB_HOST": "localhost",
"DB_PORT": "5432",
"DB_ENGINE": "psql",
"DB_HOST": "127.0.0.1",
"DB_PORT": "5433",
"DB_ENGINE": "sqlite",
"DATABASE": "pyshelf",
"USER": "pyshelf",
"PASSWORD": "pyshelf",

34
docker/development.docker-compose.yml vendored
View File

@@ -1,34 +1,36 @@
version: "3.7"
# This file is used to test the Dockerhub image. To host pyShelf yourself for
# production, please use the official pyShelf image on
# This file is used to test the Dockerhub image. To host pyShelf yourself for
# production, please use the official pyShelf image on
# https://hub.docker.com/r/pyshelf/pyshelf
# For development, use the following command in the root folder:
#
#
# docker-compose -f ./docker/development.docker-compose.yml up --build
services:
db:
image: "postgres"
environment:
- "POSTGRES_PASSWORD=pyshelf"
- "POSTGRES_USER=pyshelf"
- "POSTGRES_DB=pyshelf"
volumes:
- "db_data:/var/lib/postgresql/data/"
# db:
# image: "postgres"
# environment:
# - "POSTGRES_PASSWORD=pyshelf"
# - "POSTGRES_USER=pyshelf"
# - "POSTGRES_DB=pyshelf"
# volumes:
# - "db_data:/var/lib/postgresql/data/"
# ports:
# - "5433:5432"
pyshelf:
build:
context: ..
dockerfile: ./docker/Dockerfile
ports:
ports:
- "8080:8000"
- "1337:1337"
volumes:
- "${LOCAL_BOOK_DIR}:/books"
depends_on:
- db
# depends_on:
# - db
volumes:
db_data:
# volumes:
# db_data:

28
docker/docker-compose.yml vendored
View File

@@ -1,15 +1,17 @@
version: "3.7"
services:
db:
image: "postgres"
restart: always
environment:
- "POSTGRES_PASSWORD=pyshelf"
- "POSTGRES_USER=pyshelf"
- "POSTGRES_DB=pyshelf"
volumes:
- "db_data:/var/lib/postgresql/data/"
# db:
# image: "postgres"
# restart: always
# environment:
# - "POSTGRES_PASSWORD=pyshelf"
# - "POSTGRES_USER=pyshelf"
# - "POSTGRES_DB=pyshelf"
# volumes:
# - "db_data:/var/lib/postgresql/data/"
# ports:
# - "5433:5432"
pyshelf:
image: "pyshelf/pyshelf"
restart: always
@@ -18,7 +20,7 @@ services:
- "1337:1337"
volumes:
- "${LOCAL_BOOK_DIR}:/books"
depends_on:
- db
volumes:
db_data:
# depends_on:
# - db
#volumes:
# db_data:

3
pyShelf.py vendored Executable file → Normal file
View File

@@ -6,7 +6,6 @@ from pathlib import Path
from threading import Thread
from src.backend.lib.config import Config
from src.backend.lib.storage import Storage
from src.backend.pyShelf_MakeCollections import MakeCollections
from src.backend.pyShelf_ScanLibrary import execute_scan
from src.frontend.lib.FastAPIServer import FastAPIServer
# import websockets
@@ -23,7 +22,7 @@ def run_import():
config.logger.info("Begining book import.")
execute_scan(PRG_PATH, config=config)
config.logger.info("Finished book import.")
MakeCollections(PRG_PATH, config=config)
# MakeCollections(PRG_PATH, config=config)
return "Import Complete"

4
pyproject.toml vendored
View File

@@ -21,7 +21,7 @@ classifiers = [
"Programming Language :: Python :: Implementation :: PyPy",
]
dependencies = [
"websockets", "loguru", "pypdf2", "bs4", "requests", "psycopg2",
"websockets", "loguru", "pypdf2", "bs4", "requests", "psycopg2-binary",
"mobi-python", "lxml", "sqlalchemy", "sqlalchemy.orm", "fastapi[all]",
"jinja2", "libsass", "nodejs-bin", "npm", "brotlipy", "debugpy", "pudb",
"ptipython", "chardet", "pre-commit"
@@ -165,4 +165,4 @@ use_parentheses = true
# NOTE: the known_third_party setting is managed by
# seed-isort-config and should not be modified directly.
# Any changes made to this setting will be overwritten.
known_third_party = ["backend", "bs4", "django", "interface", "mobi", "prompt_toolkit", "psycopg2", "pyfiglet", "requests"]
known_third_party = ["backend", "bs4", "django", "interface", "mobi", "prompt_toolkit", "psycopg2-binary", "pyfiglet", "requests"]

3
src/backend/lib/models.py vendored
View File

@@ -1,6 +1,6 @@
from typing import Optional
from typing_extensions import Annotated
from sqlalchemy import func, ForeignKey
from sqlalchemy import func
from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
import datetime
@@ -42,4 +42,3 @@ class Collection(Base):
id: Mapped[int] = mapped_column(primary_key=True)
collection: Mapped[str]
book_id: Mapped[int] = mapped_column(ForeignKey(Book.id))

4
src/backend/lib/storage.py vendored
View File

@@ -86,7 +86,8 @@ class Storage:
cover_image = None
if not book[1]:
pass
collections = self.parse_collections_from_path(book)
# collections = self.parse_collections_from_path(book)
# breakpoint()
_book = Book(
title=book[0],
author=book[1],
@@ -173,6 +174,7 @@ class Storage:
_q = _sess.execute(
select(Collection.id).where(
Collection.collection == _s,
# BUG: book.id is not the correct identifier.
Collection.book_id == book.id,
)
)

17
src/frontend/lib/objects.py vendored
View File

@@ -1,6 +1,4 @@
"""pyShelf's Frontend Objects."""
from sys import exit
from shutil import which
from subprocess import run
from pathlib import Path
from ...backend.lib.config import Config
@@ -16,16 +14,5 @@ class JSInterface():
def install(self):
"""Install the JavaScript dependencies."""
if which("npm"):
self.config.logger.info("Installing JavaScript dependencies...")
run(["npm", "install"], cwd=self.package_json.parent)
else:
self.config.logger.error("npm is not installed.")
exit(1)
if which("npx"):
self.config.logger.info("Compiling TypeScript...")
run(["npx", "tsc", "static/script/pyshelf.ts"], cwd=self.package_json.parent)
else:
self.config.logger.error("npx is not installed.")
exit(1)
run(["npm", "install"], cwd=self.package_json.parent)
run(["npx", "tsc", "static/script/pyshelf.ts"], cwd=self.package_json.parent)