From 4556b2595348cf8f2d87337b6b2b677e2394cf9a Mon Sep 17 00:00:00 2001 From: Herwin Date: Mon, 28 Feb 2022 17:00:54 +0100 Subject: [PATCH] Fixed issues with Cocker on ARM & Linux, Fixed issues in the readme, Bumped to 0.7.1 Update Dockerfile, readme.md, and __version__.py --- Dockerfile | 9 +++++---- readme.md | 15 ++++++--------- yaa/__version__.py | 2 +- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index fa3d5e2..f83d7de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,15 +9,16 @@ ARG BGID=1000 # Installing dependencies. # * 'g++', 'make' -> Compiling some dependencies. +# * 'libxslt-dev', 'libxml2-dev' -> Compiling some dependencies (ARM only, apparently). # * 'py3-lxml' -> Pre-compiled module, allows you to ignore compilation errors. RUN apk update && apk upgrade && \ - apk add --no-cache g++ make py3-lxml ffmpeg + apk add --no-cache g++ make py3-lxml ffmpeg libxslt-dev libxml2-dev # Previously used to compile lxml for streamlink. (Not used for the moment) -# RUN apk add --no-cache libxslt-dev libxml2-dev +# RUN apk add --no-cache # Installing required Python packages. -ADD --chown=BUID:BGID ./requirements.txt /app/requirements.txt +ADD --chown=$BUID:$BGID ./requirements.txt /app/requirements.txt RUN pip install --upgrade -r /app/requirements.txt # Removing packages that are no longer needed and were used for compiling streamlink and its dependencies. @@ -26,7 +27,7 @@ RUN pip install --upgrade -r /app/requirements.txt RUN apk del g++ make # Copying the app's files to the container -ADD --chown=BUID:BGID . /app +ADD --chown=$BUID:$BGID . /app # Running the application. # * Thanks to jdpus for the "-u" flag, it fixes the output (https://stackoverflow.com/a/29745541/4135541) diff --git a/readme.md b/readme.md index 9a22c89..0b2832c 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,4 @@ -# Youtube Auto Archiver v0.7.0 +# Youtube Auto Archiver v0.7.1 A simple and yet highly configurable Python application that automatically checks if a Youtuber is streaming, and downloads said streams while also archiving its latest uploads. @@ -28,7 +28,7 @@ The application isn't designed to be used by another one as a module. * Native support for cookies for *yt-dlp* and maybe *streamlink*. * Better support to prevent command injection. (Will block some features if used) * Planned for later - * Using TOML for the config file only Python 3.11 is released and stable. + * Using TOML for the config file when Python 3.11 is released and stable. ## Requirements * [Python](https://www.python.org/) >= v3.9, < v3.11 (Preferably) @@ -88,19 +88,14 @@ root since the output volume binding's permissions can't be properly configured. docker-compose up --build ``` -## Configuration -For information on how to configure the app, check the relevant section on the project's readme. - -For information regarding the configuration of this container, all you have to do is change the `/data` volume if you need it in a specific location. - -Please note that the [docker-compose.yml](docker/docker-compose.yml) files already has its environment variables set, as well as an independent config file setup. - ## Config The config is stored in [config.json](config.json) and has to be in the same folder as [app.py](app.py), unless the appropriate [environment variables](#environment-variables) tells the application to look elsewhere for it. Please refer to [config.md](config.md) for more information on the config file and its fields. +Regarding the configuration of this container, all you have to do is change the `/data` volume if you need it in a specific location. + ## Build Arguments *(Docker)* @@ -126,6 +121,8 @@ Please refer to [config.md](config.md) for more information on the config file a ## Environment Variables Any environment variable that is not set will have the effect of its default value. +Please note that the [docker-compose.yml](docker/docker-compose.yml) files already has its environment variables set, as well as an independent config file setup. +
diff --git a/yaa/__version__.py b/yaa/__version__.py index 347c34b..4eb46a3 100644 --- a/yaa/__version__.py +++ b/yaa/__version__.py @@ -4,7 +4,7 @@ VERSION_MINOR = 7 """Current minor version number of the application""" -VERSION_PATCH = 0 +VERSION_PATCH = 1 """Current patch version number of the application""" VERSION = "{}.{}.{}".format(VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH)
Variable