Made changes requested by original author

- Recombined COPY and RUN commands in Dockerfile
- Modified 'supported sites' URL in README
- Undid automatic formatting in ytdlp.py

Dockerfile

@@ -10,10 +10,13 @@ FROM python:3.8-alpine
 
 WORKDIR /app
 
-COPY Pipfile* .
+COPY Pipfile* docker-entrypoint.sh .
 
+# Use sed to strip carriage-return characters from the entrypoint script (in case building on Windows)
 # Install dependencies
-RUN apk add --update ffmpeg aria2 coreutils shadow su-exec && \
+RUN sed -i 's/\r$//g' docker-entrypoint.sh && \
+    chmod +x docker-entrypoint.sh && \
+    apk add --update ffmpeg aria2 coreutils shadow su-exec && \
     apk add --update --virtual .build-deps gcc g++ musl-dev && \
     pip install --no-cache-dir pipenv && \
     pipenv install --system --deploy --clear && \
@@ -23,11 +26,6 @@ RUN apk add --update ffmpeg aria2 coreutils shadow su-exec && \
     mkdir /.cache && chmod 777 /.cache
 
 COPY favicon ./favicon
-COPY docker-entrypoint.sh .
-
-# Use sed to strip carriage-return characters from the entrypoint script (in case building on Windows)
-RUN sed -i 's/\r$//g' docker-entrypoint.sh && chmod +x docker-entrypoint.sh
-
 COPY app ./app
 COPY --from=builder /metube/dist/metube ./ui/dist/metube
 

README.md

@@ -3,7 +3,7 @@
 ![Build Status](https://github.com/alexta69/metube/actions/workflows/main.yml/badge.svg)
 ![Docker Pulls](https://img.shields.io/docker/pulls/alexta69/metube.svg)
 
-Web GUI for youtube-dl (using the [yt-dlp](https://github.com/yt-dlp/yt-dlp) fork) with playlist support. Allows you to download videos from YouTube and dozens of other sites (<https://github.com/yt-dlp/yt-dlp/blob/master/supportedsites.md>).
+Web GUI for youtube-dl (using the [yt-dlp](https://github.com/yt-dlp/yt-dlp) fork) with playlist support. Allows you to download videos from YouTube and [dozens of other sites](https://github.com/yt-dlp/yt-dlp/blob/master/supportedsites.md).
 
 ![screenshot1](https://github.com/alexta69/metube/raw/master/screenshot.gif)
 

app/ytdl.py

@@ -45,9 +45,7 @@ class DownloadInfo:
 class Download:
     manager = None
 
-    def __init__(
+    def __init__(self, download_dir, temp_dir, output_template, output_template_chapter, quality, format, ytdl_opts, info):
-        self, download_dir, temp_dir, output_template, output_template_chapter, quality, format, ytdl_opts, info
-    ):
         self.download_dir = download_dir
         self.temp_dir = temp_dir
         self.output_template = output_template
@@ -66,24 +64,17 @@ class Download:
         try:
 
             def put_status(st):
-                self.status_queue.put(
+                self.status_queue.put({k: v for k, v in st.items() if k in (
-                    {
+                    'tmpfilename',
-                        k: v
+                    'filename',
-                        for k, v in st.items()
+                    'status',
-                        if k
+                    'msg',
-                        in (
+                    'total_bytes',
-                            "tmpfilename",
+                    'total_bytes_estimate',
-                            "filename",
+                    'downloaded_bytes',
-                            "status",
+                    'speed',
-                            "msg",
+                    'eta',
-                            "total_bytes",
+                )})
-                            "total_bytes_estimate",
-                            "downloaded_bytes",
-                            "speed",
-                            "eta",
-                        )
-                    }
-                )
 
             def put_status_postprocessor(d):
                 if d["postprocessor"] == "MoveFiles" and d["status"] == "finished":