Merge remote-tracking branch 'upstream/master'

Author: mkody

Dockerfile

@@ -1,10 +1,10 @@
-FROM python:3.13.2-alpine3.20
+FROM python:3.13.2-alpine3.21
 
 RUN apk add --no-cache tini~=0.19.0
 
 RUN apk add --no-cache ffmpeg~=6.1
 
-RUN python -m pip install --no-cache-dir --upgrade streamlink==7.0.0
+RUN python -m pip install --no-cache-dir --upgrade streamlink==7.1.2
 
 COPY twitch-recorder.py /opt/
 

README.md

@@ -15,8 +15,13 @@ The container needs a few configuration parameters. These are:
 `QUALITY`       - this uses the streamlink [STREAM](https://streamlink.github.io/cli.html#cmdoption-arg-STREAM) setting to choose the quality to record.  
 `CLIENT_ID`     - you can grab this from [here](https://dev.twitch.tv/console/apps) once you register your application (Replace with your own!)  
 `CLIENT_SECRET` - you generate this [here](https://dev.twitch.tv/console/apps) as well, for your registered application (Replace with your own!)  
-`AUTH_TOKEN`    - optionally your [OAuth Token](https://streamlink.github.io/cli/plugins/twitch.html#authentication) to prevent ad breaks if you're subscribed to the streamer  
-                  (Only add the string consisting of 30 alphanumerical characters without any quotations!)
+`AUTH_TOKEN`    - optionally your [OAuth Token](https://streamlink.github.io/cli/plugins/twitch.html#authentication) to prevent ad breaks if you're subscribed to the streamer.  
+                  only add the string consisting of 30 alphanumerical characters without any quotations
+
+Additionally, there are more advanced settings to set:
+
+`DISABLE_FFMPEG`   - disables ffmpeg processing (fixing errors in recorded file) (Optional, defaults to True, Use "True" or "False")  
+`REFRESH`          - the interval to check user availability (Optional, can't be set below 15, defaults to 15)  
 
 ## Usage
 Start the container with the following `docker run` command:  

entrypoint.sh

@@ -16,5 +16,11 @@ client_secret = "${CLIENT_SECRET}"
 auth_token = "${AUTH_TOKEN}"
 EOF
 
+# Use optional variables, if present
+cat <<EOF >> /opt/config.py
+disable_ffmpeg = "${DISABLE_FFMPEG:-False}"
+refresh = "${REFRESH:-15}"
+EOF
+
 # Hand off to the CMD
 exec "$@"

twitch-recorder.py

@@ -25,8 +25,8 @@ class TwitchRecorder:
     def __init__(self):
         # global configuration
         self.ffmpeg_path = "ffmpeg"
-        self.disable_ffmpeg = False
-        self.refresh = 60
+        self.disable_ffmpeg = config.disable_ffmpeg
+        self.refresh = int(config.refresh)
         self.root_path = config.root_path
 
         # user configuration