diff --git a/config.py b/config.py index 14c5377..d88e971 100644 --- a/config.py +++ b/config.py @@ -2,17 +2,17 @@ import os from werkzeug.security import generate_password_hash from sys import platform -#CONTENT_BASE_DIR = os.getenv("CONTENT_BASE_DIR", "/library") #docker +CONTENT_BASE_DIR = os.getenv("CONTENT_BASE_DIR", "/library") #docker -if platform == "linux" or platform == "linux2": - CONTENT_BASE_DIR = os.getenv("CONTENT_BASE_DIR", "/home/drudoo/ComicsTest/Comics") #linux -elif platform == "win32": - CONTENT_BASE_DIR = os.getenv("CONTENT_BASE_DIR", "/Comics/ComicRack") #windows +#if platform == "linux" or platform == "linux2": +# CONTENT_BASE_DIR = os.getenv("CONTENT_BASE_DIR", "/home/drudoo/ComicsTest/Comics") #linux +#elif platform == "win32": +# CONTENT_BASE_DIR = os.getenv("CONTENT_BASE_DIR", "/Comics/ComicRack") #windows #CONTENT_BASE_DIR = os.getenv("CONTENT_BASE_DIR", "testlibrary") #windows test library # Added folder for thumbnails. These are loaded as covers for the files. -THUMBNAIL_DIR = os.getenv("THUMBNAIL_DIR",'thumbnails') +THUMBNAIL_DIR = os.getenv("THUMBNAIL_DIR",'/thumbnails') # If using Windows, insert the drive letter of your comics here. # Both the script and comics needs to be on the same drive. diff --git a/docker-compose.yml b/docker-compose.yml index e29ce45..c7ba813 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,12 +1,13 @@ version: '3.3' services: comicopds: - image: . + image: comicopds container_name: comicopds restart: unless-stopped ports: - '5000:5000' volumes: #- '/opt/data/Comics/ComicRack:/library:ro' - - '~/ComicsTest/Comics:/library:ro' + - '/home/drudoo/Pi1/Comics/ComicRack:/library:ro' + - '${PWD}/thumbnails:/thumbnails:ro' - '${PWD}/:/app' diff --git a/main.py b/main.py index 0d61bf2..9936c32 100644 --- a/main.py +++ b/main.py @@ -144,7 +144,7 @@ def generate(): image = Image.open(BytesIO(cover)) rgb_im = image.convert("RGB") - image.thumbnail(config.MAXSIZE,Image.ANTIALIAS) + image.thumbnail(config.MAXSIZE,Image.LANCZOS) image.save(config.THUMBNAIL_DIR + "/" + str(CVDB) + ".jpg") # Old way of saving without resize @@ -163,7 +163,7 @@ def generate(): #xyz = [i for i, x in enumerate(filelist) if re.match('*\.py$',x)] #config._print(xyz) image = Image.open(BytesIO(cover)) - image.thumbnail(config.MAXSIZE,Image.ANTIALIAS) + image.thumbnail(config.MAXSIZE,Image.LANCZOS) image.save(config.THUMBNAIL_DIR + "/" + str(CVDB) + ".jpg") generated = generated + 1 except Exception as e: diff --git a/requirements.txt b/requirements.txt index 7076143..ff32247 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,6 @@ Flask==2.0.2 +Werkzeug==2.2.2 +numpy Jinja2==3.0.2 requests==2.26.0 Flask-HTTPAuth==4.5.0