diff --git a/.gitignore b/.gitignore index c76fa4f..efa407c 100644 --- a/.gitignore +++ b/.gitignore @@ -159,8 +159,4 @@ cython_debug/ # be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore # and can be added to the global gitignore or merged into this file. For a more nuclear # option (not recommended) you can uncomment the following to ignore the entire idea folder. -#.idea/ - - -vendor/czkawka/* -vendor/ffmpeg/* \ No newline at end of file +#.idea/ \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 4bb6c45..8cb7134 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,16 +14,18 @@ RUN pip install --no-cache-dir -r requirements.txt RUN pip install gunicorn # Copy the FastAPI project files into the container -COPY . . +COPY src/ . -# Copy the czkawka binary into the container -COPY vendor/czkawka /bin/ +# Copy the patterns.txt file into the container +COPY config/patterns.txt /config/patterns.txt -# Install ffmpeg with ffprobe -RUN apt-get update && apt-get install -y ffmpeg +# Install binary dependencies +RUN apt-get update && apt-get install -y wget ffmpeg +RUN wget -O /usr/local/bin/czkawka https://github.com/qarmin/czkawka/releases/download/8.0.0/linux_czkawka_cli +RUN chmod +x /usr/local/bin/czkawka # Expose the port the app runs on EXPOSE 8000 # Command to run the FastAPI app using gunicorn with uvicorn workers -CMD ["gunicorn", "-w", "4", "-k", "uvicorn.workers.UvicornWorker", "main:app", "--bind", "0.0.0.0:8000"] \ No newline at end of file +CMD ["gunicorn", "-w", "4", "-k", "uvicorn.workers.UvicornWorker", "src.main:app", "--bind", "0.0.0.0:8000"] \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 49e0235..4ac5332 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,5 @@ requests +python-dotenv fastapi +uvicorn pytest ; extra == 'dev' \ No newline at end of file diff --git a/src/main.py b/src/main.py index 6fdf5ec..bb8ee15 100644 --- a/src/main.py +++ b/src/main.py @@ -7,7 +7,6 @@ from qbittorrent_api import get_qbittorrent_files_downloading from filemoving import group_files_by_prefix from deduplication import deduplicate_files import uuid -import time logger = logging.getLogger(__name__)