Compare commits
17 Commits
2025.11.29
...
2025.12.30
| Author | SHA1 | Date | |
|---|---|---|---|
|
179452b4f4 | ||
|
4fce74d1ed | ||
|
|
09a2e95515 | ||
|
|
d947876a71 | ||
|
|
6ba681a3cd | ||
|
|
1f8fa7744e | ||
|
092765535f | ||
|
|
90299b227e | ||
|
|
6445517751 | ||
|
dae710a339 | ||
|
|
318f4f9f21 | ||
|
|
ca8e9e7907 | ||
|
183c4ba898 | ||
|
|
c6d487e48a | ||
|
77c3c93157 | ||
|
03f1fa106a | ||
|
|
9907e1b885 |
86
Dockerfile
86
Dockerfile
@@ -1,43 +1,43 @@
|
|||||||
FROM node:lts-alpine AS builder
|
FROM node:lts-alpine AS builder
|
||||||
|
|
||||||
WORKDIR /metube
|
WORKDIR /metube
|
||||||
COPY ui ./
|
COPY ui ./
|
||||||
RUN npm ci && \
|
RUN corepack enable && corepack prepare pnpm --activate
|
||||||
node_modules/.bin/ng build --configuration production
|
RUN pnpm install && pnpm run build
|
||||||
|
|
||||||
|
|
||||||
FROM python:3.13-alpine
|
FROM python:3.13-alpine
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
COPY pyproject.toml uv.lock docker-entrypoint.sh ./
|
COPY pyproject.toml uv.lock docker-entrypoint.sh ./
|
||||||
|
|
||||||
# Use sed to strip carriage-return characters from the entrypoint script (in case building on Windows)
|
# Use sed to strip carriage-return characters from the entrypoint script (in case building on Windows)
|
||||||
# Install dependencies
|
# Install dependencies
|
||||||
RUN sed -i 's/\r$//g' docker-entrypoint.sh && \
|
RUN sed -i 's/\r$//g' docker-entrypoint.sh && \
|
||||||
chmod +x docker-entrypoint.sh && \
|
chmod +x docker-entrypoint.sh && \
|
||||||
apk add --update ffmpeg aria2 coreutils shadow su-exec curl tini deno && \
|
apk add --update ffmpeg aria2 coreutils shadow su-exec curl tini deno && \
|
||||||
apk add --update --virtual .build-deps gcc g++ musl-dev uv && \
|
apk add --update --virtual .build-deps gcc g++ musl-dev uv && \
|
||||||
UV_PROJECT_ENVIRONMENT=/usr/local uv sync --frozen --no-dev --compile-bytecode && \
|
UV_PROJECT_ENVIRONMENT=/usr/local uv sync --frozen --no-dev --compile-bytecode && \
|
||||||
apk del .build-deps && \
|
apk del .build-deps && \
|
||||||
rm -rf /var/cache/apk/* && \
|
rm -rf /var/cache/apk/* && \
|
||||||
mkdir /.cache && chmod 777 /.cache
|
mkdir /.cache && chmod 777 /.cache
|
||||||
|
|
||||||
COPY app ./app
|
COPY app ./app
|
||||||
COPY --from=builder /metube/dist/metube ./ui/dist/metube
|
COPY --from=builder /metube/dist/metube ./ui/dist/metube
|
||||||
|
|
||||||
ENV UID=1000
|
ENV UID=1000
|
||||||
ENV GID=1000
|
ENV GID=1000
|
||||||
ENV UMASK=022
|
ENV UMASK=022
|
||||||
|
|
||||||
ENV DOWNLOAD_DIR /downloads
|
ENV DOWNLOAD_DIR /downloads
|
||||||
ENV STATE_DIR /downloads/.metube
|
ENV STATE_DIR /downloads/.metube
|
||||||
ENV TEMP_DIR /downloads
|
ENV TEMP_DIR /downloads
|
||||||
VOLUME /downloads
|
VOLUME /downloads
|
||||||
EXPOSE 8081
|
EXPOSE 8081
|
||||||
|
|
||||||
# Add build-time argument for version
|
# Add build-time argument for version
|
||||||
ARG VERSION=dev
|
ARG VERSION=dev
|
||||||
ENV METUBE_VERSION=$VERSION
|
ENV METUBE_VERSION=$VERSION
|
||||||
|
|
||||||
ENTRYPOINT ["/sbin/tini", "-g", "--", "./docker-entrypoint.sh"]
|
ENTRYPOINT ["/sbin/tini", "-g", "--", "./docker-entrypoint.sh"]
|
||||||
|
|||||||
582
README.md
582
README.md
@@ -1,291 +1,291 @@
|
|||||||
# MeTube
|
# MeTube
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
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).
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## 🐳 Run using Docker
|
## 🐳 Run using Docker
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
docker run -d -p 8081:8081 -v /path/to/downloads:/downloads ghcr.io/alexta69/metube
|
docker run -d -p 8081:8081 -v /path/to/downloads:/downloads ghcr.io/alexta69/metube
|
||||||
```
|
```
|
||||||
|
|
||||||
## 🐳 Run using docker-compose
|
## 🐳 Run using docker-compose
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
services:
|
services:
|
||||||
metube:
|
metube:
|
||||||
image: ghcr.io/alexta69/metube
|
image: ghcr.io/alexta69/metube
|
||||||
container_name: metube
|
container_name: metube
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
ports:
|
ports:
|
||||||
- "8081:8081"
|
- "8081:8081"
|
||||||
volumes:
|
volumes:
|
||||||
- /path/to/downloads:/downloads
|
- /path/to/downloads:/downloads
|
||||||
```
|
```
|
||||||
|
|
||||||
## ⚙️ Configuration via environment variables
|
## ⚙️ Configuration via environment variables
|
||||||
|
|
||||||
Certain values can be set via environment variables, using the `-e` parameter on the docker command line, or the `environment:` section in docker-compose.
|
Certain values can be set via environment variables, using the `-e` parameter on the docker command line, or the `environment:` section in docker-compose.
|
||||||
|
|
||||||
### ⬇️ Download Behavior
|
### ⬇️ Download Behavior
|
||||||
|
|
||||||
* __DOWNLOAD_MODE__: This flag controls how downloads are scheduled and executed. Options are `sequential`, `concurrent`, and `limited`. Defaults to `limited`:
|
* __DOWNLOAD_MODE__: This flag controls how downloads are scheduled and executed. Options are `sequential`, `concurrent`, and `limited`. Defaults to `limited`:
|
||||||
* `sequential`: Downloads are processed one at a time. A new download won't start until the previous one has finished. This mode is useful for conserving system resources or ensuring downloads occur in strict order.
|
* `sequential`: Downloads are processed one at a time. A new download won't start until the previous one has finished. This mode is useful for conserving system resources or ensuring downloads occur in strict order.
|
||||||
* `concurrent`: Downloads are started immediately as they are added, with no built-in limit on how many run simultaneously. This mode may overwhelm your system if too many downloads start at once.
|
* `concurrent`: Downloads are started immediately as they are added, with no built-in limit on how many run simultaneously. This mode may overwhelm your system if too many downloads start at once.
|
||||||
* `limited`: Downloads are started concurrently but are capped by a concurrency limit. In this mode, a semaphore is used so that at most a fixed number of downloads run at any given time.
|
* `limited`: Downloads are started concurrently but are capped by a concurrency limit. In this mode, a semaphore is used so that at most a fixed number of downloads run at any given time.
|
||||||
* __MAX_CONCURRENT_DOWNLOADS__: This flag is used only when `DOWNLOAD_MODE` is set to `limited`.
|
* __MAX_CONCURRENT_DOWNLOADS__: This flag is used only when `DOWNLOAD_MODE` is set to `limited`.
|
||||||
It specifies the maximum number of simultaneous downloads allowed. For example, if set to `5`, then at most five downloads will run concurrently, and any additional downloads will wait until one of the active downloads completes. Defaults to `3`.
|
It specifies the maximum number of simultaneous downloads allowed. For example, if set to `5`, then at most five downloads will run concurrently, and any additional downloads will wait until one of the active downloads completes. Defaults to `3`.
|
||||||
* __DELETE_FILE_ON_TRASHCAN__: if `true`, downloaded files are deleted on the server, when they are trashed from the "Completed" section of the UI. Defaults to `false`.
|
* __DELETE_FILE_ON_TRASHCAN__: if `true`, downloaded files are deleted on the server, when they are trashed from the "Completed" section of the UI. Defaults to `false`.
|
||||||
* __DEFAULT_OPTION_PLAYLIST_STRICT_MODE__: if `true`, the "Strict Playlist mode" switch will be enabled by default. In this mode the playlists will be downloaded only if the URL strictly points to a playlist. URLs to videos inside a playlist will be treated same as direct video URL. Defaults to `false` .
|
* __DEFAULT_OPTION_PLAYLIST_STRICT_MODE__: if `true`, the "Strict Playlist mode" switch will be enabled by default. In this mode the playlists will be downloaded only if the URL strictly points to a playlist. URLs to videos inside a playlist will be treated same as direct video URL. Defaults to `false` .
|
||||||
* __DEFAULT_OPTION_PLAYLIST_ITEM_LIMIT__: Maximum number of playlist items that can be downloaded. Defaults to `0` (no limit).
|
* __DEFAULT_OPTION_PLAYLIST_ITEM_LIMIT__: Maximum number of playlist items that can be downloaded. Defaults to `0` (no limit).
|
||||||
|
|
||||||
### 📁 Storage & Directories
|
### 📁 Storage & Directories
|
||||||
|
|
||||||
* __DOWNLOAD_DIR__: Path to where the downloads will be saved. Defaults to `/downloads` in the Docker image, and `.` otherwise.
|
* __DOWNLOAD_DIR__: Path to where the downloads will be saved. Defaults to `/downloads` in the Docker image, and `.` otherwise.
|
||||||
* __AUDIO_DOWNLOAD_DIR__: Path to where audio-only downloads will be saved, if you wish to separate them from the video downloads. Defaults to the value of `DOWNLOAD_DIR`.
|
* __AUDIO_DOWNLOAD_DIR__: Path to where audio-only downloads will be saved, if you wish to separate them from the video downloads. Defaults to the value of `DOWNLOAD_DIR`.
|
||||||
* __CUSTOM_DIRS__: Whether to enable downloading videos into custom directories within the __DOWNLOAD_DIR__ (or __AUDIO_DOWNLOAD_DIR__). When enabled, a dropdown appears next to the Add button to specify the download directory. Defaults to `true`.
|
* __CUSTOM_DIRS__: Whether to enable downloading videos into custom directories within the __DOWNLOAD_DIR__ (or __AUDIO_DOWNLOAD_DIR__). When enabled, a dropdown appears next to the Add button to specify the download directory. Defaults to `true`.
|
||||||
* __CREATE_CUSTOM_DIRS__: Whether to support automatically creating directories within the __DOWNLOAD_DIR__ (or __AUDIO_DOWNLOAD_DIR__) if they do not exist. When enabled, the download directory selector supports free-text input, and the specified directory will be created recursively. Defaults to `true`.
|
* __CREATE_CUSTOM_DIRS__: Whether to support automatically creating directories within the __DOWNLOAD_DIR__ (or __AUDIO_DOWNLOAD_DIR__) if they do not exist. When enabled, the download directory selector supports free-text input, and the specified directory will be created recursively. Defaults to `true`.
|
||||||
* __CUSTOM_DIRS_EXCLUDE_REGEX__: Regular expression to exclude some custom directories from the dropdown. Empty regex disables exclusion. Defaults to `(^|/)[.@].*$`, which means directories starting with `.` or `@`.
|
* __CUSTOM_DIRS_EXCLUDE_REGEX__: Regular expression to exclude some custom directories from the dropdown. Empty regex disables exclusion. Defaults to `(^|/)[.@].*$`, which means directories starting with `.` or `@`.
|
||||||
* __DOWNLOAD_DIRS_INDEXABLE__: If `true`, the download directories (__DOWNLOAD_DIR__ and __AUDIO_DOWNLOAD_DIR__) are indexable on the web server. Defaults to `false`.
|
* __DOWNLOAD_DIRS_INDEXABLE__: If `true`, the download directories (__DOWNLOAD_DIR__ and __AUDIO_DOWNLOAD_DIR__) are indexable on the web server. Defaults to `false`.
|
||||||
* __STATE_DIR__: Path to where the queue persistence files will be saved. Defaults to `/downloads/.metube` in the Docker image, and `.` otherwise.
|
* __STATE_DIR__: Path to where the queue persistence files will be saved. Defaults to `/downloads/.metube` in the Docker image, and `.` otherwise.
|
||||||
* __TEMP_DIR__: Path where intermediary download files will be saved. Defaults to `/downloads` in the Docker image, and `.` otherwise.
|
* __TEMP_DIR__: Path where intermediary download files will be saved. Defaults to `/downloads` in the Docker image, and `.` otherwise.
|
||||||
* Set this to an SSD or RAM filesystem (e.g., `tmpfs`) for better performance.
|
* Set this to an SSD or RAM filesystem (e.g., `tmpfs`) for better performance.
|
||||||
* __Note__: Using a RAM filesystem may prevent downloads from being resumed.
|
* __Note__: Using a RAM filesystem may prevent downloads from being resumed.
|
||||||
|
|
||||||
### 📝 File Naming & yt-dlp
|
### 📝 File Naming & yt-dlp
|
||||||
|
|
||||||
* __OUTPUT_TEMPLATE__: The template for the filenames of the downloaded videos, formatted according to [this spec](https://github.com/yt-dlp/yt-dlp/blob/master/README.md#output-template). Defaults to `%(title)s.%(ext)s`.
|
* __OUTPUT_TEMPLATE__: The template for the filenames of the downloaded videos, formatted according to [this spec](https://github.com/yt-dlp/yt-dlp/blob/master/README.md#output-template). Defaults to `%(title)s.%(ext)s`.
|
||||||
* __OUTPUT_TEMPLATE_CHAPTER__: The template for the filenames of the downloaded videos when split into chapters via postprocessors. Defaults to `%(title)s - %(section_number)s %(section_title)s.%(ext)s`.
|
* __OUTPUT_TEMPLATE_CHAPTER__: The template for the filenames of the downloaded videos when split into chapters via postprocessors. Defaults to `%(title)s - %(section_number)s %(section_title)s.%(ext)s`.
|
||||||
* __OUTPUT_TEMPLATE_PLAYLIST__: The template for the filenames of the downloaded videos when downloaded as a playlist. Defaults to `%(playlist_title)s/%(title)s.%(ext)s`. When empty, then `OUTPUT_TEMPLATE` is used.
|
* __OUTPUT_TEMPLATE_PLAYLIST__: The template for the filenames of the downloaded videos when downloaded as a playlist. Defaults to `%(playlist_title)s/%(title)s.%(ext)s`. When empty, then `OUTPUT_TEMPLATE` is used.
|
||||||
* __YTDL_OPTIONS__: Additional options to pass to yt-dlp in JSON format. [See available options here](https://github.com/yt-dlp/yt-dlp/blob/master/yt_dlp/YoutubeDL.py#L222). They roughly correspond to command-line options, though some do not have exact equivalents here. For example, `--recode-video` has to be specified via `postprocessors`. Also note that dashes are replaced with underscores. You may find [this script](https://github.com/yt-dlp/yt-dlp/blob/master/devscripts/cli_to_api.py) helpful for converting from command-line options to `YTDL_OPTIONS`.
|
* __YTDL_OPTIONS__: Additional options to pass to yt-dlp in JSON format. [See available options here](https://github.com/yt-dlp/yt-dlp/blob/master/yt_dlp/YoutubeDL.py#L222). They roughly correspond to command-line options, though some do not have exact equivalents here. For example, `--recode-video` has to be specified via `postprocessors`. Also note that dashes are replaced with underscores. You may find [this script](https://github.com/yt-dlp/yt-dlp/blob/master/devscripts/cli_to_api.py) helpful for converting from command-line options to `YTDL_OPTIONS`.
|
||||||
* __YTDL_OPTIONS_FILE__: A path to a JSON file that will be loaded and used for populating `YTDL_OPTIONS` above. Please note that if both `YTDL_OPTIONS_FILE` and `YTDL_OPTIONS` are specified, the options in `YTDL_OPTIONS` take precedence. The file will be monitored for changes and reloaded automatically when changes are detected.
|
* __YTDL_OPTIONS_FILE__: A path to a JSON file that will be loaded and used for populating `YTDL_OPTIONS` above. Please note that if both `YTDL_OPTIONS_FILE` and `YTDL_OPTIONS` are specified, the options in `YTDL_OPTIONS` take precedence. The file will be monitored for changes and reloaded automatically when changes are detected.
|
||||||
|
|
||||||
### 🌐 Web Server & URLs
|
### 🌐 Web Server & URLs
|
||||||
|
|
||||||
* __URL_PREFIX__: Base path for the web server (for use when hosting behind a reverse proxy). Defaults to `/`.
|
* __URL_PREFIX__: Base path for the web server (for use when hosting behind a reverse proxy). Defaults to `/`.
|
||||||
* __PUBLIC_HOST_URL__: Base URL for the download links shown in the UI for completed files. By default, MeTube serves them under its own URL. If your download directory is accessible on another URL and you want the download links to be based there, use this variable to set it.
|
* __PUBLIC_HOST_URL__: Base URL for the download links shown in the UI for completed files. By default, MeTube serves them under its own URL. If your download directory is accessible on another URL and you want the download links to be based there, use this variable to set it.
|
||||||
* __PUBLIC_HOST_AUDIO_URL__: Same as PUBLIC_HOST_URL but for audio downloads.
|
* __PUBLIC_HOST_AUDIO_URL__: Same as PUBLIC_HOST_URL but for audio downloads.
|
||||||
* __HTTPS__: Use `https` instead of `http` (__CERTFILE__ and __KEYFILE__ required). Defaults to `false`.
|
* __HTTPS__: Use `https` instead of `http` (__CERTFILE__ and __KEYFILE__ required). Defaults to `false`.
|
||||||
* __CERTFILE__: HTTPS certificate file path.
|
* __CERTFILE__: HTTPS certificate file path.
|
||||||
* __KEYFILE__: HTTPS key file path.
|
* __KEYFILE__: HTTPS key file path.
|
||||||
* __ROBOTS_TXT__: A path to a `robots.txt` file mounted in the container.
|
* __ROBOTS_TXT__: A path to a `robots.txt` file mounted in the container.
|
||||||
|
|
||||||
### 🏠 Basic Setup
|
### 🏠 Basic Setup
|
||||||
|
|
||||||
* __UID__: User under which MeTube will run. Defaults to `1000`.
|
* __UID__: User under which MeTube will run. Defaults to `1000`.
|
||||||
* __GID__: Group under which MeTube will run. Defaults to `1000`.
|
* __GID__: Group under which MeTube will run. Defaults to `1000`.
|
||||||
* __UMASK__: Umask value used by MeTube. Defaults to `022`.
|
* __UMASK__: Umask value used by MeTube. Defaults to `022`.
|
||||||
* __DEFAULT_THEME__: Default theme to use for the UI, can be set to `light`, `dark`, or `auto`. Defaults to `auto`.
|
* __DEFAULT_THEME__: Default theme to use for the UI, can be set to `light`, `dark`, or `auto`. Defaults to `auto`.
|
||||||
* __LOGLEVEL__: Log level, can be set to `DEBUG`, `INFO`, `WARNING`, `ERROR`, `CRITICAL`, or `NONE`. Defaults to `INFO`.
|
* __LOGLEVEL__: Log level, can be set to `DEBUG`, `INFO`, `WARNING`, `ERROR`, `CRITICAL`, or `NONE`. Defaults to `INFO`.
|
||||||
* __ENABLE_ACCESSLOG__: Whether to enable access log. Defaults to `false`.
|
* __ENABLE_ACCESSLOG__: Whether to enable access log. Defaults to `false`.
|
||||||
|
|
||||||
The project's Wiki contains examples of useful configurations contributed by users of MeTube:
|
The project's Wiki contains examples of useful configurations contributed by users of MeTube:
|
||||||
* [YTDL_OPTIONS Cookbook](https://github.com/alexta69/metube/wiki/YTDL_OPTIONS-Cookbook)
|
* [YTDL_OPTIONS Cookbook](https://github.com/alexta69/metube/wiki/YTDL_OPTIONS-Cookbook)
|
||||||
* [OUTPUT_TEMPLATE Cookbook](https://github.com/alexta69/metube/wiki/OUTPUT_TEMPLATE-Cookbook)
|
* [OUTPUT_TEMPLATE Cookbook](https://github.com/alexta69/metube/wiki/OUTPUT_TEMPLATE-Cookbook)
|
||||||
|
|
||||||
## 🍪 Using browser cookies
|
## 🍪 Using browser cookies
|
||||||
|
|
||||||
In case you need to use your browser's cookies with MeTube, for example to download restricted or private videos:
|
In case you need to use your browser's cookies with MeTube, for example to download restricted or private videos:
|
||||||
|
|
||||||
* Add the following to your docker-compose.yml:
|
* Add the following to your docker-compose.yml:
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
volumes:
|
volumes:
|
||||||
- /path/to/cookies:/cookies
|
- /path/to/cookies:/cookies
|
||||||
environment:
|
environment:
|
||||||
- YTDL_OPTIONS={"cookiefile":"/cookies/cookies.txt"}
|
- YTDL_OPTIONS={"cookiefile":"/cookies/cookies.txt"}
|
||||||
```
|
```
|
||||||
|
|
||||||
* Install in your browser an extension to extract cookies:
|
* Install in your browser an extension to extract cookies:
|
||||||
* [Firefox](https://addons.mozilla.org/en-US/firefox/addon/export-cookies-txt/)
|
* [Firefox](https://addons.mozilla.org/en-US/firefox/addon/export-cookies-txt/)
|
||||||
* [Chrome](https://chrome.google.com/webstore/detail/get-cookiestxt-locally/cclelndahbckbenkjhflpdbgdldlbecc)
|
* [Chrome](https://chrome.google.com/webstore/detail/get-cookiestxt-locally/cclelndahbckbenkjhflpdbgdldlbecc)
|
||||||
* Extract the cookies you need with the extension and rename the file `cookies.txt`
|
* Extract the cookies you need with the extension and rename the file `cookies.txt`
|
||||||
* Drop the file in the folder you configured in the docker-compose.yml above
|
* Drop the file in the folder you configured in the docker-compose.yml above
|
||||||
* Restart the container
|
* Restart the container
|
||||||
|
|
||||||
## 🔌 Browser extensions
|
## 🔌 Browser extensions
|
||||||
|
|
||||||
Browser extensions allow right-clicking videos and sending them directly to MeTube. Please note that if you're on an HTTPS page, your MeTube instance must be behind an HTTPS reverse proxy (see below) for the extensions to work.
|
Browser extensions allow right-clicking videos and sending them directly to MeTube. Please note that if you're on an HTTPS page, your MeTube instance must be behind an HTTPS reverse proxy (see below) for the extensions to work.
|
||||||
|
|
||||||
__Chrome:__ contributed by [Rpsl](https://github.com/rpsl). You can install it from [Google Chrome Webstore](https://chrome.google.com/webstore/detail/metube-downloader/fbmkmdnlhacefjljljlbhkodfmfkijdh) or use developer mode and install [from sources](https://github.com/Rpsl/metube-browser-extension).
|
__Chrome:__ contributed by [Rpsl](https://github.com/rpsl). You can install it from [Google Chrome Webstore](https://chrome.google.com/webstore/detail/metube-downloader/fbmkmdnlhacefjljljlbhkodfmfkijdh) or use developer mode and install [from sources](https://github.com/Rpsl/metube-browser-extension).
|
||||||
|
|
||||||
__Firefox:__ contributed by [nanocortex](https://github.com/nanocortex). You can install it from [Firefox Addons](https://addons.mozilla.org/en-US/firefox/addon/metube-downloader) or get sources from [here](https://github.com/nanocortex/metube-firefox-addon).
|
__Firefox:__ contributed by [nanocortex](https://github.com/nanocortex). You can install it from [Firefox Addons](https://addons.mozilla.org/en-US/firefox/addon/metube-downloader) or get sources from [here](https://github.com/nanocortex/metube-firefox-addon).
|
||||||
|
|
||||||
## 📱 iOS Shortcut
|
## 📱 iOS Shortcut
|
||||||
|
|
||||||
[rithask](https://github.com/rithask) created an iOS shortcut to send URLs to MeTube from Safari. Enter the MeTube instance address when prompted which will be saved for later use. You can run the shortcut from Safari’s share menu. The shortcut can be downloaded from [this iCloud link](https://www.icloud.com/shortcuts/66627a9f334c467baabdb2769763a1a6).
|
[rithask](https://github.com/rithask) created an iOS shortcut to send URLs to MeTube from Safari. Enter the MeTube instance address when prompted which will be saved for later use. You can run the shortcut from Safari’s share menu. The shortcut can be downloaded from [this iCloud link](https://www.icloud.com/shortcuts/66627a9f334c467baabdb2769763a1a6).
|
||||||
|
|
||||||
## 📱 iOS Compatibility
|
## 📱 iOS Compatibility
|
||||||
|
|
||||||
iOS has strict requirements for video files, requiring h264 or h265 video codec and aac audio codec in MP4 container. This can sometimes be a lower quality than the best quality available. To accommodate iOS requirements, when downloading a MP4 format you can choose "Best (iOS)" to get the best quality formats as compatible as possible with iOS requirements.
|
iOS has strict requirements for video files, requiring h264 or h265 video codec and aac audio codec in MP4 container. This can sometimes be a lower quality than the best quality available. To accommodate iOS requirements, when downloading a MP4 format you can choose "Best (iOS)" to get the best quality formats as compatible as possible with iOS requirements.
|
||||||
|
|
||||||
To force all downloads to be converted to an iOS-compatible codec, insert this as an environment variable:
|
To force all downloads to be converted to an iOS-compatible codec, insert this as an environment variable:
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
environment:
|
environment:
|
||||||
- 'YTDL_OPTIONS={"format": "best", "exec": "ffmpeg -i %(filepath)q -c:v libx264 -c:a aac %(filepath)q.h264.mp4"}'
|
- 'YTDL_OPTIONS={"format": "best", "exec": "ffmpeg -i %(filepath)q -c:v libx264 -c:a aac %(filepath)q.h264.mp4"}'
|
||||||
```
|
```
|
||||||
|
|
||||||
## 🔖 Bookmarklet
|
## 🔖 Bookmarklet
|
||||||
|
|
||||||
[kushfest](https://github.com/kushfest) has created a Chrome bookmarklet for sending the currently open webpage to MeTube. Please note that if you're on an HTTPS page, your MeTube instance must be configured with `HTTPS` as `true` in the environment, or be behind an HTTPS reverse proxy (see below) for the bookmarklet to work.
|
[kushfest](https://github.com/kushfest) has created a Chrome bookmarklet for sending the currently open webpage to MeTube. Please note that if you're on an HTTPS page, your MeTube instance must be configured with `HTTPS` as `true` in the environment, or be behind an HTTPS reverse proxy (see below) for the bookmarklet to work.
|
||||||
|
|
||||||
GitHub doesn't allow embedding JavaScript as a link, so the bookmarklet has to be created manually by copying the following code to a new bookmark you create on your bookmarks bar. Change the hostname in the URL below to point to your MeTube instance.
|
GitHub doesn't allow embedding JavaScript as a link, so the bookmarklet has to be created manually by copying the following code to a new bookmark you create on your bookmarks bar. Change the hostname in the URL below to point to your MeTube instance.
|
||||||
|
|
||||||
```javascript
|
```javascript
|
||||||
javascript:!function(){xhr=new XMLHttpRequest();xhr.open("POST","https://metube.domain.com/add");xhr.withCredentials=true;xhr.send(JSON.stringify({"url":document.location.href,"quality":"best"}));xhr.onload=function(){if(xhr.status==200){alert("Sent to metube!")}else{alert("Send to metube failed. Check the javascript console for clues.")}}}();
|
javascript:!function(){xhr=new XMLHttpRequest();xhr.open("POST","https://metube.domain.com/add");xhr.withCredentials=true;xhr.send(JSON.stringify({"url":document.location.href,"quality":"best"}));xhr.onload=function(){if(xhr.status==200){alert("Sent to metube!")}else{alert("Send to metube failed. Check the javascript console for clues.")}}}();
|
||||||
```
|
```
|
||||||
|
|
||||||
[shoonya75](https://github.com/shoonya75) has contributed a Firefox version:
|
[shoonya75](https://github.com/shoonya75) has contributed a Firefox version:
|
||||||
|
|
||||||
```javascript
|
```javascript
|
||||||
javascript:(function(){xhr=new XMLHttpRequest();xhr.open("POST","https://metube.domain.com/add");xhr.send(JSON.stringify({"url":document.location.href,"quality":"best"}));xhr.onload=function(){if(xhr.status==200){alert("Sent to metube!")}else{alert("Send to metube failed. Check the javascript console for clues.")}}})();
|
javascript:(function(){xhr=new XMLHttpRequest();xhr.open("POST","https://metube.domain.com/add");xhr.send(JSON.stringify({"url":document.location.href,"quality":"best"}));xhr.onload=function(){if(xhr.status==200){alert("Sent to metube!")}else{alert("Send to metube failed. Check the javascript console for clues.")}}})();
|
||||||
```
|
```
|
||||||
|
|
||||||
The above bookmarklets use `alert()` as a success/failure notification. The following will show a toast message instead:
|
The above bookmarklets use `alert()` as a success/failure notification. The following will show a toast message instead:
|
||||||
|
|
||||||
Chrome:
|
Chrome:
|
||||||
|
|
||||||
```javascript
|
```javascript
|
||||||
javascript:!function(){function notify(msg) {var sc = document.scrollingElement.scrollTop; var text = document.createElement('span');text.innerHTML=msg;var ts = text.style;ts.all = 'revert';ts.color = '#000';ts.fontFamily = 'Verdana, sans-serif';ts.fontSize = '15px';ts.backgroundColor = 'white';ts.padding = '15px';ts.border = '1px solid gainsboro';ts.boxShadow = '3px 3px 10px';ts.zIndex = '100';document.body.appendChild(text);ts.position = 'absolute'; ts.top = 50 + sc + 'px'; ts.left = (window.innerWidth / 2)-(text.offsetWidth / 2) + 'px'; setTimeout(function () { text.style.visibility = "hidden"; }, 1500);}xhr=new XMLHttpRequest();xhr.open("POST","https://metube.domain.com/add");xhr.send(JSON.stringify({"url":document.location.href,"quality":"best"}));xhr.onload=function() { if(xhr.status==200){notify("Sent to metube!")}else {notify("Send to metube failed. Check the javascript console for clues.")}}}();
|
javascript:!function(){function notify(msg) {var sc = document.scrollingElement.scrollTop; var text = document.createElement('span');text.innerHTML=msg;var ts = text.style;ts.all = 'revert';ts.color = '#000';ts.fontFamily = 'Verdana, sans-serif';ts.fontSize = '15px';ts.backgroundColor = 'white';ts.padding = '15px';ts.border = '1px solid gainsboro';ts.boxShadow = '3px 3px 10px';ts.zIndex = '100';document.body.appendChild(text);ts.position = 'absolute'; ts.top = 50 + sc + 'px'; ts.left = (window.innerWidth / 2)-(text.offsetWidth / 2) + 'px'; setTimeout(function () { text.style.visibility = "hidden"; }, 1500);}xhr=new XMLHttpRequest();xhr.open("POST","https://metube.domain.com/add");xhr.send(JSON.stringify({"url":document.location.href,"quality":"best"}));xhr.onload=function() { if(xhr.status==200){notify("Sent to metube!")}else {notify("Send to metube failed. Check the javascript console for clues.")}}}();
|
||||||
```
|
```
|
||||||
|
|
||||||
Firefox:
|
Firefox:
|
||||||
|
|
||||||
```javascript
|
```javascript
|
||||||
javascript:(function(){function notify(msg) {var sc = document.scrollingElement.scrollTop; var text = document.createElement('span');text.innerHTML=msg;var ts = text.style;ts.all = 'revert';ts.color = '#000';ts.fontFamily = 'Verdana, sans-serif';ts.fontSize = '15px';ts.backgroundColor = 'white';ts.padding = '15px';ts.border = '1px solid gainsboro';ts.boxShadow = '3px 3px 10px';ts.zIndex = '100';document.body.appendChild(text);ts.position = 'absolute'; ts.top = 50 + sc + 'px'; ts.left = (window.innerWidth / 2)-(text.offsetWidth / 2) + 'px'; setTimeout(function () { text.style.visibility = "hidden"; }, 1500);}xhr=new XMLHttpRequest();xhr.open("POST","https://metube.domain.com/add");xhr.send(JSON.stringify({"url":document.location.href,"quality":"best"}));xhr.onload=function() { if(xhr.status==200){notify("Sent to metube!")}else {notify("Send to metube failed. Check the javascript console for clues.")}}})();
|
javascript:(function(){function notify(msg) {var sc = document.scrollingElement.scrollTop; var text = document.createElement('span');text.innerHTML=msg;var ts = text.style;ts.all = 'revert';ts.color = '#000';ts.fontFamily = 'Verdana, sans-serif';ts.fontSize = '15px';ts.backgroundColor = 'white';ts.padding = '15px';ts.border = '1px solid gainsboro';ts.boxShadow = '3px 3px 10px';ts.zIndex = '100';document.body.appendChild(text);ts.position = 'absolute'; ts.top = 50 + sc + 'px'; ts.left = (window.innerWidth / 2)-(text.offsetWidth / 2) + 'px'; setTimeout(function () { text.style.visibility = "hidden"; }, 1500);}xhr=new XMLHttpRequest();xhr.open("POST","https://metube.domain.com/add");xhr.send(JSON.stringify({"url":document.location.href,"quality":"best"}));xhr.onload=function() { if(xhr.status==200){notify("Sent to metube!")}else {notify("Send to metube failed. Check the javascript console for clues.")}}})();
|
||||||
```
|
```
|
||||||
|
|
||||||
## ⚡ Raycast extension
|
## ⚡ Raycast extension
|
||||||
|
|
||||||
[dotvhs](https://github.com/dotvhs) has created an [extension for Raycast](https://www.raycast.com/dot/metube) that allows adding videos to MeTube directly from Raycast.
|
[dotvhs](https://github.com/dotvhs) has created an [extension for Raycast](https://www.raycast.com/dot/metube) that allows adding videos to MeTube directly from Raycast.
|
||||||
|
|
||||||
## 🔒 HTTPS support, and running behind a reverse proxy
|
## 🔒 HTTPS support, and running behind a reverse proxy
|
||||||
|
|
||||||
It's possible to configure MeTube to listen in HTTPS mode. `docker-compose` example:
|
It's possible to configure MeTube to listen in HTTPS mode. `docker-compose` example:
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
services:
|
services:
|
||||||
metube:
|
metube:
|
||||||
image: ghcr.io/alexta69/metube
|
image: ghcr.io/alexta69/metube
|
||||||
container_name: metube
|
container_name: metube
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
ports:
|
ports:
|
||||||
- "8081:8081"
|
- "8081:8081"
|
||||||
volumes:
|
volumes:
|
||||||
- /path/to/downloads:/downloads
|
- /path/to/downloads:/downloads
|
||||||
- /path/to/ssl/crt:/ssl/crt.pem
|
- /path/to/ssl/crt:/ssl/crt.pem
|
||||||
- /path/to/ssl/key:/ssl/key.pem
|
- /path/to/ssl/key:/ssl/key.pem
|
||||||
environment:
|
environment:
|
||||||
- HTTPS=true
|
- HTTPS=true
|
||||||
- CERTFILE=/ssl/crt.pem
|
- CERTFILE=/ssl/crt.pem
|
||||||
- KEYFILE=/ssl/key.pem
|
- KEYFILE=/ssl/key.pem
|
||||||
```
|
```
|
||||||
|
|
||||||
It's also possible to run MeTube behind a reverse proxy, in order to support authentication. HTTPS support can also be added in this way.
|
It's also possible to run MeTube behind a reverse proxy, in order to support authentication. HTTPS support can also be added in this way.
|
||||||
|
|
||||||
When running behind a reverse proxy which remaps the URL (i.e. serves MeTube under a subdirectory and not under root), don't forget to set the URL_PREFIX environment variable to the correct value.
|
When running behind a reverse proxy which remaps the URL (i.e. serves MeTube under a subdirectory and not under root), don't forget to set the URL_PREFIX environment variable to the correct value.
|
||||||
|
|
||||||
If you're using the [linuxserver/swag](https://docs.linuxserver.io/general/swag) image for your reverse proxying needs (which I can heartily recommend), it already includes ready snippets for proxying MeTube both in [subfolder](https://github.com/linuxserver/reverse-proxy-confs/blob/master/metube.subfolder.conf.sample) and [subdomain](https://github.com/linuxserver/reverse-proxy-confs/blob/master/metube.subdomain.conf.sample) modes under the `nginx/proxy-confs` directory in the configuration volume. It also includes Authelia which can be used for authentication.
|
If you're using the [linuxserver/swag](https://docs.linuxserver.io/general/swag) image for your reverse proxying needs (which I can heartily recommend), it already includes ready snippets for proxying MeTube both in [subfolder](https://github.com/linuxserver/reverse-proxy-confs/blob/master/metube.subfolder.conf.sample) and [subdomain](https://github.com/linuxserver/reverse-proxy-confs/blob/master/metube.subdomain.conf.sample) modes under the `nginx/proxy-confs` directory in the configuration volume. It also includes Authelia which can be used for authentication.
|
||||||
|
|
||||||
### 🌐 NGINX
|
### 🌐 NGINX
|
||||||
|
|
||||||
```nginx
|
```nginx
|
||||||
location /metube/ {
|
location /metube/ {
|
||||||
proxy_pass http://metube:8081;
|
proxy_pass http://metube:8081;
|
||||||
proxy_http_version 1.1;
|
proxy_http_version 1.1;
|
||||||
proxy_set_header Upgrade $http_upgrade;
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
proxy_set_header Connection "upgrade";
|
proxy_set_header Connection "upgrade";
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $host;
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
Note: the extra `proxy_set_header` directives are there to make WebSocket work.
|
Note: the extra `proxy_set_header` directives are there to make WebSocket work.
|
||||||
|
|
||||||
### 🌐 Apache
|
### 🌐 Apache
|
||||||
|
|
||||||
Contributed by [PIE-yt](https://github.com/PIE-yt). Source [here](https://gist.github.com/PIE-yt/29e7116588379032427f5bd446b2cac4).
|
Contributed by [PIE-yt](https://github.com/PIE-yt). Source [here](https://gist.github.com/PIE-yt/29e7116588379032427f5bd446b2cac4).
|
||||||
|
|
||||||
```apache
|
```apache
|
||||||
# For putting in your Apache sites site.conf
|
# For putting in your Apache sites site.conf
|
||||||
# Serves MeTube under a /metube/ subdir (http://yourdomain.com/metube/)
|
# Serves MeTube under a /metube/ subdir (http://yourdomain.com/metube/)
|
||||||
<Location /metube/>
|
<Location /metube/>
|
||||||
ProxyPass http://localhost:8081/ retry=0 timeout=30
|
ProxyPass http://localhost:8081/ retry=0 timeout=30
|
||||||
ProxyPassReverse http://localhost:8081/
|
ProxyPassReverse http://localhost:8081/
|
||||||
</Location>
|
</Location>
|
||||||
|
|
||||||
<Location /metube/socket.io>
|
<Location /metube/socket.io>
|
||||||
RewriteEngine On
|
RewriteEngine On
|
||||||
RewriteCond %{QUERY_STRING} transport=websocket [NC]
|
RewriteCond %{QUERY_STRING} transport=websocket [NC]
|
||||||
RewriteRule /(.*) ws://localhost:8081/socket.io/$1 [P,L]
|
RewriteRule /(.*) ws://localhost:8081/socket.io/$1 [P,L]
|
||||||
ProxyPass http://localhost:8081/socket.io retry=0 timeout=30
|
ProxyPass http://localhost:8081/socket.io retry=0 timeout=30
|
||||||
ProxyPassReverse http://localhost:8081/socket.io
|
ProxyPassReverse http://localhost:8081/socket.io
|
||||||
</Location>
|
</Location>
|
||||||
```
|
```
|
||||||
|
|
||||||
### 🌐 Caddy
|
### 🌐 Caddy
|
||||||
|
|
||||||
The following example Caddyfile gets a reverse proxy going behind [caddy](https://caddyserver.com).
|
The following example Caddyfile gets a reverse proxy going behind [caddy](https://caddyserver.com).
|
||||||
|
|
||||||
```caddyfile
|
```caddyfile
|
||||||
example.com {
|
example.com {
|
||||||
route /metube/* {
|
route /metube/* {
|
||||||
uri strip_prefix metube
|
uri strip_prefix metube
|
||||||
reverse_proxy metube:8081
|
reverse_proxy metube:8081
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
## 🔄 Updating yt-dlp
|
## 🔄 Updating yt-dlp
|
||||||
|
|
||||||
The engine which powers the actual video downloads in MeTube is [yt-dlp](https://github.com/yt-dlp/yt-dlp). Since video sites regularly change their layouts, frequent updates of yt-dlp are required to keep up.
|
The engine which powers the actual video downloads in MeTube is [yt-dlp](https://github.com/yt-dlp/yt-dlp). Since video sites regularly change their layouts, frequent updates of yt-dlp are required to keep up.
|
||||||
|
|
||||||
There's an automatic nightly build of MeTube which looks for a new version of yt-dlp, and if one exists, the build pulls it and publishes an updated docker image. Therefore, in order to keep up with the changes, it's recommended that you update your MeTube container regularly with the latest image.
|
There's an automatic nightly build of MeTube which looks for a new version of yt-dlp, and if one exists, the build pulls it and publishes an updated docker image. Therefore, in order to keep up with the changes, it's recommended that you update your MeTube container regularly with the latest image.
|
||||||
|
|
||||||
I recommend installing and setting up [watchtower](https://github.com/containrrr/watchtower) for this purpose.
|
I recommend installing and setting up [watchtower](https://github.com/nicholas-fedor/watchtower) for this purpose.
|
||||||
|
|
||||||
## 🔧 Troubleshooting and submitting issues
|
## 🔧 Troubleshooting and submitting issues
|
||||||
|
|
||||||
Before asking a question or submitting an issue for MeTube, please remember that MeTube is only a UI for [yt-dlp](https://github.com/yt-dlp/yt-dlp). Any issues you might be experiencing with authentication to video websites, postprocessing, permissions, other `YTDL_OPTIONS` configurations which seem not to work, or anything else that concerns the workings of the underlying yt-dlp library, need not be opened on the MeTube project. In order to debug and troubleshoot them, it's advised to try using the yt-dlp binary directly first, bypassing the UI, and once that is working, importing the options that worked for you into `YTDL_OPTIONS`.
|
Before asking a question or submitting an issue for MeTube, please remember that MeTube is only a UI for [yt-dlp](https://github.com/yt-dlp/yt-dlp). Any issues you might be experiencing with authentication to video websites, postprocessing, permissions, other `YTDL_OPTIONS` configurations which seem not to work, or anything else that concerns the workings of the underlying yt-dlp library, need not be opened on the MeTube project. In order to debug and troubleshoot them, it's advised to try using the yt-dlp binary directly first, bypassing the UI, and once that is working, importing the options that worked for you into `YTDL_OPTIONS`.
|
||||||
|
|
||||||
In order to test with the yt-dlp command directly, you can either download it and run it locally, or for a better simulation of its actual conditions, you can run it within the MeTube container itself. Assuming your MeTube container is called `metube`, run the following on your Docker host to get a shell inside the container:
|
In order to test with the yt-dlp command directly, you can either download it and run it locally, or for a better simulation of its actual conditions, you can run it within the MeTube container itself. Assuming your MeTube container is called `metube`, run the following on your Docker host to get a shell inside the container:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
docker exec -ti metube sh
|
docker exec -ti metube sh
|
||||||
cd /downloads
|
cd /downloads
|
||||||
```
|
```
|
||||||
|
|
||||||
Once there, you can use the yt-dlp command freely.
|
Once there, you can use the yt-dlp command freely.
|
||||||
|
|
||||||
## 💡 Submitting feature requests
|
## 💡 Submitting feature requests
|
||||||
|
|
||||||
MeTube development relies on code contributions by the community. The program as it currently stands fits my own use cases, and is therefore feature-complete as far as I'm concerned. If your use cases are different and require additional features, please feel free to submit PRs that implement those features. It's advisable to create an issue first to discuss the planned implementation, because in an effort to reduce bloat, some PRs may not be accepted. However, note that opening a feature request when you don't intend to implement the feature will rarely result in the request being fulfilled.
|
MeTube development relies on code contributions by the community. The program as it currently stands fits my own use cases, and is therefore feature-complete as far as I'm concerned. If your use cases are different and require additional features, please feel free to submit PRs that implement those features. It's advisable to create an issue first to discuss the planned implementation, because in an effort to reduce bloat, some PRs may not be accepted. However, note that opening a feature request when you don't intend to implement the feature will rarely result in the request being fulfilled.
|
||||||
|
|
||||||
## 🛠️ Building and running locally
|
## 🛠️ Building and running locally
|
||||||
|
|
||||||
Make sure you have Node.js and Python 3.13 installed.
|
Make sure you have Node.js 22+ and Python 3.13 installed.
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
cd metube/ui
|
cd metube/ui
|
||||||
# install Angular and build the UI
|
# install Angular and build the UI
|
||||||
npm install
|
pnpm install
|
||||||
node_modules/.bin/ng build
|
pnpm run build
|
||||||
# install python dependencies
|
# install python dependencies
|
||||||
cd ..
|
cd ..
|
||||||
curl -LsSf https://astral.sh/uv/install.sh | sh
|
curl -LsSf https://astral.sh/uv/install.sh | sh
|
||||||
uv sync
|
uv sync
|
||||||
# run
|
# run
|
||||||
uv run python3 app/main.py
|
uv run python3 app/main.py
|
||||||
```
|
```
|
||||||
|
|
||||||
A Docker image can be built locally (it will build the UI too):
|
A Docker image can be built locally (it will build the UI too):
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
docker build -t metube .
|
docker build -t metube .
|
||||||
```
|
```
|
||||||
|
|
||||||
Note that if you're running the server in VSCode, your downloads will go to your user's Downloads folder (this is configured via the environment in `.vscode/launch.json`).
|
Note that if you're running the server in VSCode, your downloads will go to your user's Downloads folder (this is configured via the environment in `.vscode/launch.json`).
|
||||||
|
|||||||
847
app/main.py
847
app/main.py
@@ -1,419 +1,428 @@
|
|||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
# pylint: disable=no-member,method-hidden
|
# pylint: disable=no-member,method-hidden
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
import asyncio
|
import asyncio
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from aiohttp import web
|
from aiohttp import web
|
||||||
from aiohttp.log import access_logger
|
from aiohttp.log import access_logger
|
||||||
import ssl
|
import ssl
|
||||||
import socket
|
import socket
|
||||||
import socketio
|
import socketio
|
||||||
import logging
|
import logging
|
||||||
import json
|
import json
|
||||||
import pathlib
|
import pathlib
|
||||||
import re
|
import re
|
||||||
from watchfiles import DefaultFilter, Change, awatch
|
from watchfiles import DefaultFilter, Change, awatch
|
||||||
|
|
||||||
from ytdl import DownloadQueueNotifier, DownloadQueue
|
from ytdl import DownloadQueueNotifier, DownloadQueue
|
||||||
from yt_dlp.version import __version__ as yt_dlp_version
|
from yt_dlp.version import __version__ as yt_dlp_version
|
||||||
|
|
||||||
log = logging.getLogger('main')
|
log = logging.getLogger('main')
|
||||||
|
|
||||||
class Config:
|
def parseLogLevel(logLevel):
|
||||||
_DEFAULTS = {
|
match logLevel:
|
||||||
'DOWNLOAD_DIR': '.',
|
case 'DEBUG':
|
||||||
'AUDIO_DOWNLOAD_DIR': '%%DOWNLOAD_DIR',
|
return logging.DEBUG
|
||||||
'TEMP_DIR': '%%DOWNLOAD_DIR',
|
case 'INFO':
|
||||||
'DOWNLOAD_DIRS_INDEXABLE': 'false',
|
return logging.INFO
|
||||||
'CUSTOM_DIRS': 'true',
|
case 'WARNING':
|
||||||
'CREATE_CUSTOM_DIRS': 'true',
|
return logging.WARNING
|
||||||
'CUSTOM_DIRS_EXCLUDE_REGEX': r'(^|/)[.@].*$',
|
case 'ERROR':
|
||||||
'DELETE_FILE_ON_TRASHCAN': 'false',
|
return logging.ERROR
|
||||||
'STATE_DIR': '.',
|
case 'CRITICAL':
|
||||||
'URL_PREFIX': '',
|
return logging.CRITICAL
|
||||||
'PUBLIC_HOST_URL': 'download/',
|
case _:
|
||||||
'PUBLIC_HOST_AUDIO_URL': 'audio_download/',
|
return None
|
||||||
'OUTPUT_TEMPLATE': '%(title)s.%(ext)s',
|
|
||||||
'OUTPUT_TEMPLATE_CHAPTER': '%(title)s - %(section_number)s %(section_title)s.%(ext)s',
|
# Configure logging before Config() uses it so early messages are not dropped.
|
||||||
'OUTPUT_TEMPLATE_PLAYLIST': '%(playlist_title)s/%(title)s.%(ext)s',
|
# Only configure if no handlers are set (avoid clobbering hosting app settings).
|
||||||
'DEFAULT_OPTION_PLAYLIST_STRICT_MODE' : 'false',
|
if not logging.getLogger().hasHandlers():
|
||||||
'DEFAULT_OPTION_PLAYLIST_ITEM_LIMIT' : '0',
|
logging.basicConfig(level=parseLogLevel(os.environ.get('LOGLEVEL', 'INFO')) or logging.INFO)
|
||||||
'YTDL_OPTIONS': '{}',
|
|
||||||
'YTDL_OPTIONS_FILE': '',
|
class Config:
|
||||||
'ROBOTS_TXT': '',
|
_DEFAULTS = {
|
||||||
'HOST': '0.0.0.0',
|
'DOWNLOAD_DIR': '.',
|
||||||
'PORT': '8081',
|
'AUDIO_DOWNLOAD_DIR': '%%DOWNLOAD_DIR',
|
||||||
'HTTPS': 'false',
|
'TEMP_DIR': '%%DOWNLOAD_DIR',
|
||||||
'CERTFILE': '',
|
'DOWNLOAD_DIRS_INDEXABLE': 'false',
|
||||||
'KEYFILE': '',
|
'CUSTOM_DIRS': 'true',
|
||||||
'BASE_DIR': '',
|
'CREATE_CUSTOM_DIRS': 'true',
|
||||||
'DEFAULT_THEME': 'auto',
|
'CUSTOM_DIRS_EXCLUDE_REGEX': r'(^|/)[.@].*$',
|
||||||
'DOWNLOAD_MODE': 'limited',
|
'DELETE_FILE_ON_TRASHCAN': 'false',
|
||||||
'MAX_CONCURRENT_DOWNLOADS': 3,
|
'STATE_DIR': '.',
|
||||||
'LOGLEVEL': 'INFO',
|
'URL_PREFIX': '',
|
||||||
'ENABLE_ACCESSLOG': 'false',
|
'PUBLIC_HOST_URL': 'download/',
|
||||||
}
|
'PUBLIC_HOST_AUDIO_URL': 'audio_download/',
|
||||||
|
'OUTPUT_TEMPLATE': '%(title)s.%(ext)s',
|
||||||
_BOOLEAN = ('DOWNLOAD_DIRS_INDEXABLE', 'CUSTOM_DIRS', 'CREATE_CUSTOM_DIRS', 'DELETE_FILE_ON_TRASHCAN', 'DEFAULT_OPTION_PLAYLIST_STRICT_MODE', 'HTTPS', 'ENABLE_ACCESSLOG')
|
'OUTPUT_TEMPLATE_CHAPTER': '%(title)s - %(section_number)s %(section_title)s.%(ext)s',
|
||||||
|
'OUTPUT_TEMPLATE_PLAYLIST': '%(playlist_title)s/%(title)s.%(ext)s',
|
||||||
def __init__(self):
|
'DEFAULT_OPTION_PLAYLIST_STRICT_MODE' : 'false',
|
||||||
for k, v in self._DEFAULTS.items():
|
'DEFAULT_OPTION_PLAYLIST_ITEM_LIMIT' : '0',
|
||||||
setattr(self, k, os.environ.get(k, v))
|
'YTDL_OPTIONS': '{}',
|
||||||
|
'YTDL_OPTIONS_FILE': '',
|
||||||
for k, v in self.__dict__.items():
|
'ROBOTS_TXT': '',
|
||||||
if isinstance(v, str) and v.startswith('%%'):
|
'HOST': '0.0.0.0',
|
||||||
setattr(self, k, getattr(self, v[2:]))
|
'PORT': '8081',
|
||||||
if k in self._BOOLEAN:
|
'HTTPS': 'false',
|
||||||
if v not in ('true', 'false', 'True', 'False', 'on', 'off', '1', '0'):
|
'CERTFILE': '',
|
||||||
log.error(f'Environment variable "{k}" is set to a non-boolean value "{v}"')
|
'KEYFILE': '',
|
||||||
sys.exit(1)
|
'BASE_DIR': '',
|
||||||
setattr(self, k, v in ('true', 'True', 'on', '1'))
|
'DEFAULT_THEME': 'auto',
|
||||||
|
'DOWNLOAD_MODE': 'limited',
|
||||||
if not self.URL_PREFIX.endswith('/'):
|
'MAX_CONCURRENT_DOWNLOADS': 3,
|
||||||
self.URL_PREFIX += '/'
|
'LOGLEVEL': 'INFO',
|
||||||
|
'ENABLE_ACCESSLOG': 'false',
|
||||||
# Convert relative addresses to absolute addresses to prevent the failure of file address comparison
|
}
|
||||||
if self.YTDL_OPTIONS_FILE and self.YTDL_OPTIONS_FILE.startswith('.'):
|
|
||||||
self.YTDL_OPTIONS_FILE = str(Path(self.YTDL_OPTIONS_FILE).resolve())
|
_BOOLEAN = ('DOWNLOAD_DIRS_INDEXABLE', 'CUSTOM_DIRS', 'CREATE_CUSTOM_DIRS', 'DELETE_FILE_ON_TRASHCAN', 'DEFAULT_OPTION_PLAYLIST_STRICT_MODE', 'HTTPS', 'ENABLE_ACCESSLOG')
|
||||||
|
|
||||||
success,_ = self.load_ytdl_options()
|
def __init__(self):
|
||||||
if not success:
|
for k, v in self._DEFAULTS.items():
|
||||||
sys.exit(1)
|
setattr(self, k, os.environ.get(k, v))
|
||||||
|
|
||||||
def load_ytdl_options(self) -> tuple[bool, str]:
|
for k, v in self.__dict__.items():
|
||||||
try:
|
if isinstance(v, str) and v.startswith('%%'):
|
||||||
self.YTDL_OPTIONS = json.loads(os.environ.get('YTDL_OPTIONS', '{}'))
|
setattr(self, k, getattr(self, v[2:]))
|
||||||
assert isinstance(self.YTDL_OPTIONS, dict)
|
if k in self._BOOLEAN:
|
||||||
except (json.decoder.JSONDecodeError, AssertionError):
|
if v not in ('true', 'false', 'True', 'False', 'on', 'off', '1', '0'):
|
||||||
msg = 'Environment variable YTDL_OPTIONS is invalid'
|
log.error(f'Environment variable "{k}" is set to a non-boolean value "{v}"')
|
||||||
log.error(msg)
|
sys.exit(1)
|
||||||
return (False, msg)
|
setattr(self, k, v in ('true', 'True', 'on', '1'))
|
||||||
|
|
||||||
if not self.YTDL_OPTIONS_FILE:
|
if not self.URL_PREFIX.endswith('/'):
|
||||||
return (True, '')
|
self.URL_PREFIX += '/'
|
||||||
|
|
||||||
log.info(f'Loading yt-dlp custom options from "{self.YTDL_OPTIONS_FILE}"')
|
# Convert relative addresses to absolute addresses to prevent the failure of file address comparison
|
||||||
if not os.path.exists(self.YTDL_OPTIONS_FILE):
|
if self.YTDL_OPTIONS_FILE and self.YTDL_OPTIONS_FILE.startswith('.'):
|
||||||
msg = f'File "{self.YTDL_OPTIONS_FILE}" not found'
|
self.YTDL_OPTIONS_FILE = str(Path(self.YTDL_OPTIONS_FILE).resolve())
|
||||||
log.error(msg)
|
|
||||||
return (False, msg)
|
success,_ = self.load_ytdl_options()
|
||||||
try:
|
if not success:
|
||||||
with open(self.YTDL_OPTIONS_FILE) as json_data:
|
sys.exit(1)
|
||||||
opts = json.load(json_data)
|
|
||||||
assert isinstance(opts, dict)
|
def load_ytdl_options(self) -> tuple[bool, str]:
|
||||||
except (json.decoder.JSONDecodeError, AssertionError):
|
try:
|
||||||
msg = 'YTDL_OPTIONS_FILE contents is invalid'
|
self.YTDL_OPTIONS = json.loads(os.environ.get('YTDL_OPTIONS', '{}'))
|
||||||
log.error(msg)
|
assert isinstance(self.YTDL_OPTIONS, dict)
|
||||||
return (False, msg)
|
except (json.decoder.JSONDecodeError, AssertionError):
|
||||||
|
msg = 'Environment variable YTDL_OPTIONS is invalid'
|
||||||
self.YTDL_OPTIONS.update(opts)
|
log.error(msg)
|
||||||
return (True, '')
|
return (False, msg)
|
||||||
|
|
||||||
config = Config()
|
if not self.YTDL_OPTIONS_FILE:
|
||||||
|
return (True, '')
|
||||||
class ObjectSerializer(json.JSONEncoder):
|
|
||||||
def default(self, obj):
|
log.info(f'Loading yt-dlp custom options from "{self.YTDL_OPTIONS_FILE}"')
|
||||||
# First try to use __dict__ for custom objects
|
if not os.path.exists(self.YTDL_OPTIONS_FILE):
|
||||||
if hasattr(obj, '__dict__'):
|
msg = f'File "{self.YTDL_OPTIONS_FILE}" not found'
|
||||||
return obj.__dict__
|
log.error(msg)
|
||||||
# Convert iterables (generators, dict_items, etc.) to lists
|
return (False, msg)
|
||||||
# Exclude strings and bytes which are also iterable
|
try:
|
||||||
elif hasattr(obj, '__iter__') and not isinstance(obj, (str, bytes)):
|
with open(self.YTDL_OPTIONS_FILE) as json_data:
|
||||||
try:
|
opts = json.load(json_data)
|
||||||
return list(obj)
|
assert isinstance(opts, dict)
|
||||||
except:
|
except (json.decoder.JSONDecodeError, AssertionError):
|
||||||
pass
|
msg = 'YTDL_OPTIONS_FILE contents is invalid'
|
||||||
# Fall back to default behavior
|
log.error(msg)
|
||||||
return json.JSONEncoder.default(self, obj)
|
return (False, msg)
|
||||||
|
|
||||||
serializer = ObjectSerializer()
|
self.YTDL_OPTIONS.update(opts)
|
||||||
app = web.Application()
|
return (True, '')
|
||||||
sio = socketio.AsyncServer(cors_allowed_origins='*')
|
|
||||||
sio.attach(app, socketio_path=config.URL_PREFIX + 'socket.io')
|
config = Config()
|
||||||
routes = web.RouteTableDef()
|
# Align root logger level with Config (keeps a single source of truth).
|
||||||
|
# This re-applies the log level after Config loads, in case LOGLEVEL was
|
||||||
class Notifier(DownloadQueueNotifier):
|
# overridden by config file settings or differs from the environment variable.
|
||||||
async def added(self, dl):
|
logging.getLogger().setLevel(parseLogLevel(str(config.LOGLEVEL)) or logging.INFO)
|
||||||
log.info(f"Notifier: Download added - {dl.title}")
|
|
||||||
await sio.emit('added', serializer.encode(dl))
|
class ObjectSerializer(json.JSONEncoder):
|
||||||
|
def default(self, obj):
|
||||||
async def updated(self, dl):
|
# First try to use __dict__ for custom objects
|
||||||
log.info(f"Notifier: Download updated - {dl.title}")
|
if hasattr(obj, '__dict__'):
|
||||||
await sio.emit('updated', serializer.encode(dl))
|
return obj.__dict__
|
||||||
|
# Convert iterables (generators, dict_items, etc.) to lists
|
||||||
async def completed(self, dl):
|
# Exclude strings and bytes which are also iterable
|
||||||
log.info(f"Notifier: Download completed - {dl.title}")
|
elif hasattr(obj, '__iter__') and not isinstance(obj, (str, bytes)):
|
||||||
await sio.emit('completed', serializer.encode(dl))
|
try:
|
||||||
|
return list(obj)
|
||||||
async def canceled(self, id):
|
except:
|
||||||
log.info(f"Notifier: Download canceled - {id}")
|
pass
|
||||||
await sio.emit('canceled', serializer.encode(id))
|
# Fall back to default behavior
|
||||||
|
return json.JSONEncoder.default(self, obj)
|
||||||
async def cleared(self, id):
|
|
||||||
log.info(f"Notifier: Download cleared - {id}")
|
serializer = ObjectSerializer()
|
||||||
await sio.emit('cleared', serializer.encode(id))
|
app = web.Application()
|
||||||
|
sio = socketio.AsyncServer(cors_allowed_origins='*')
|
||||||
dqueue = DownloadQueue(config, Notifier())
|
sio.attach(app, socketio_path=config.URL_PREFIX + 'socket.io')
|
||||||
app.on_startup.append(lambda app: dqueue.initialize())
|
routes = web.RouteTableDef()
|
||||||
|
|
||||||
class FileOpsFilter(DefaultFilter):
|
class Notifier(DownloadQueueNotifier):
|
||||||
def __call__(self, change_type: int, path: str) -> bool:
|
async def added(self, dl):
|
||||||
# Check if this path matches our YTDL_OPTIONS_FILE
|
log.info(f"Notifier: Download added - {dl.title}")
|
||||||
if path != config.YTDL_OPTIONS_FILE:
|
await sio.emit('added', serializer.encode(dl))
|
||||||
return False
|
|
||||||
|
async def updated(self, dl):
|
||||||
# For existing files, use samefile comparison to handle symlinks correctly
|
log.debug(f"Notifier: Download updated - {dl.title}")
|
||||||
if os.path.exists(config.YTDL_OPTIONS_FILE):
|
await sio.emit('updated', serializer.encode(dl))
|
||||||
try:
|
|
||||||
if not os.path.samefile(path, config.YTDL_OPTIONS_FILE):
|
async def completed(self, dl):
|
||||||
return False
|
log.info(f"Notifier: Download completed - {dl.title}")
|
||||||
except (OSError, IOError):
|
await sio.emit('completed', serializer.encode(dl))
|
||||||
# If samefile fails, fall back to string comparison
|
|
||||||
if path != config.YTDL_OPTIONS_FILE:
|
async def canceled(self, id):
|
||||||
return False
|
log.info(f"Notifier: Download canceled - {id}")
|
||||||
|
await sio.emit('canceled', serializer.encode(id))
|
||||||
# Accept all change types for our file: modified, added, deleted
|
|
||||||
return change_type in (Change.modified, Change.added, Change.deleted)
|
async def cleared(self, id):
|
||||||
|
log.info(f"Notifier: Download cleared - {id}")
|
||||||
def get_options_update_time(success=True, msg=''):
|
await sio.emit('cleared', serializer.encode(id))
|
||||||
result = {
|
|
||||||
'success': success,
|
dqueue = DownloadQueue(config, Notifier())
|
||||||
'msg': msg,
|
app.on_startup.append(lambda app: dqueue.initialize())
|
||||||
'update_time': None
|
|
||||||
}
|
class FileOpsFilter(DefaultFilter):
|
||||||
|
def __call__(self, change_type: int, path: str) -> bool:
|
||||||
# Only try to get file modification time if YTDL_OPTIONS_FILE is set and file exists
|
# Check if this path matches our YTDL_OPTIONS_FILE
|
||||||
if config.YTDL_OPTIONS_FILE and os.path.exists(config.YTDL_OPTIONS_FILE):
|
if path != config.YTDL_OPTIONS_FILE:
|
||||||
try:
|
return False
|
||||||
result['update_time'] = os.path.getmtime(config.YTDL_OPTIONS_FILE)
|
|
||||||
except (OSError, IOError) as e:
|
# For existing files, use samefile comparison to handle symlinks correctly
|
||||||
log.warning(f"Could not get modification time for {config.YTDL_OPTIONS_FILE}: {e}")
|
if os.path.exists(config.YTDL_OPTIONS_FILE):
|
||||||
result['update_time'] = None
|
try:
|
||||||
|
if not os.path.samefile(path, config.YTDL_OPTIONS_FILE):
|
||||||
return result
|
return False
|
||||||
|
except (OSError, IOError):
|
||||||
async def watch_files():
|
# If samefile fails, fall back to string comparison
|
||||||
async def _watch_files():
|
if path != config.YTDL_OPTIONS_FILE:
|
||||||
async for changes in awatch(config.YTDL_OPTIONS_FILE, watch_filter=FileOpsFilter()):
|
return False
|
||||||
success, msg = config.load_ytdl_options()
|
|
||||||
result = get_options_update_time(success, msg)
|
# Accept all change types for our file: modified, added, deleted
|
||||||
await sio.emit('ytdl_options_changed', serializer.encode(result))
|
return change_type in (Change.modified, Change.added, Change.deleted)
|
||||||
|
|
||||||
log.info(f'Starting Watch File: {config.YTDL_OPTIONS_FILE}')
|
def get_options_update_time(success=True, msg=''):
|
||||||
asyncio.create_task(_watch_files())
|
result = {
|
||||||
|
'success': success,
|
||||||
if config.YTDL_OPTIONS_FILE:
|
'msg': msg,
|
||||||
app.on_startup.append(lambda app: watch_files())
|
'update_time': None
|
||||||
|
}
|
||||||
@routes.post(config.URL_PREFIX + 'add')
|
|
||||||
async def add(request):
|
# Only try to get file modification time if YTDL_OPTIONS_FILE is set and file exists
|
||||||
log.info("Received request to add download")
|
if config.YTDL_OPTIONS_FILE and os.path.exists(config.YTDL_OPTIONS_FILE):
|
||||||
post = await request.json()
|
try:
|
||||||
log.info(f"Request data: {post}")
|
result['update_time'] = os.path.getmtime(config.YTDL_OPTIONS_FILE)
|
||||||
url = post.get('url')
|
except (OSError, IOError) as e:
|
||||||
quality = post.get('quality')
|
log.warning(f"Could not get modification time for {config.YTDL_OPTIONS_FILE}: {e}")
|
||||||
if not url or not quality:
|
result['update_time'] = None
|
||||||
log.error("Bad request: missing 'url' or 'quality'")
|
|
||||||
raise web.HTTPBadRequest()
|
return result
|
||||||
format = post.get('format')
|
|
||||||
folder = post.get('folder')
|
async def watch_files():
|
||||||
custom_name_prefix = post.get('custom_name_prefix')
|
async def _watch_files():
|
||||||
playlist_strict_mode = post.get('playlist_strict_mode')
|
async for changes in awatch(config.YTDL_OPTIONS_FILE, watch_filter=FileOpsFilter()):
|
||||||
playlist_item_limit = post.get('playlist_item_limit')
|
success, msg = config.load_ytdl_options()
|
||||||
auto_start = post.get('auto_start')
|
result = get_options_update_time(success, msg)
|
||||||
|
await sio.emit('ytdl_options_changed', serializer.encode(result))
|
||||||
if custom_name_prefix is None:
|
|
||||||
custom_name_prefix = ''
|
log.info(f'Starting Watch File: {config.YTDL_OPTIONS_FILE}')
|
||||||
if auto_start is None:
|
asyncio.create_task(_watch_files())
|
||||||
auto_start = True
|
|
||||||
if playlist_strict_mode is None:
|
if config.YTDL_OPTIONS_FILE:
|
||||||
playlist_strict_mode = config.DEFAULT_OPTION_PLAYLIST_STRICT_MODE
|
app.on_startup.append(lambda app: watch_files())
|
||||||
if playlist_item_limit is None:
|
|
||||||
playlist_item_limit = config.DEFAULT_OPTION_PLAYLIST_ITEM_LIMIT
|
@routes.post(config.URL_PREFIX + 'add')
|
||||||
|
async def add(request):
|
||||||
playlist_item_limit = int(playlist_item_limit)
|
log.info("Received request to add download")
|
||||||
|
post = await request.json()
|
||||||
status = await dqueue.add(url, quality, format, folder, custom_name_prefix, playlist_strict_mode, playlist_item_limit, auto_start)
|
log.info(f"Request data: {post}")
|
||||||
return web.Response(text=serializer.encode(status))
|
url = post.get('url')
|
||||||
|
quality = post.get('quality')
|
||||||
@routes.post(config.URL_PREFIX + 'delete')
|
if not url or not quality:
|
||||||
async def delete(request):
|
log.error("Bad request: missing 'url' or 'quality'")
|
||||||
post = await request.json()
|
raise web.HTTPBadRequest()
|
||||||
ids = post.get('ids')
|
format = post.get('format')
|
||||||
where = post.get('where')
|
folder = post.get('folder')
|
||||||
if not ids or where not in ['queue', 'done']:
|
custom_name_prefix = post.get('custom_name_prefix')
|
||||||
log.error("Bad request: missing 'ids' or incorrect 'where' value")
|
playlist_strict_mode = post.get('playlist_strict_mode')
|
||||||
raise web.HTTPBadRequest()
|
playlist_item_limit = post.get('playlist_item_limit')
|
||||||
status = await (dqueue.cancel(ids) if where == 'queue' else dqueue.clear(ids))
|
auto_start = post.get('auto_start')
|
||||||
log.info(f"Download delete request processed for ids: {ids}, where: {where}")
|
|
||||||
return web.Response(text=serializer.encode(status))
|
if custom_name_prefix is None:
|
||||||
|
custom_name_prefix = ''
|
||||||
@routes.post(config.URL_PREFIX + 'start')
|
if auto_start is None:
|
||||||
async def start(request):
|
auto_start = True
|
||||||
post = await request.json()
|
if playlist_strict_mode is None:
|
||||||
ids = post.get('ids')
|
playlist_strict_mode = config.DEFAULT_OPTION_PLAYLIST_STRICT_MODE
|
||||||
log.info(f"Received request to start pending downloads for ids: {ids}")
|
if playlist_item_limit is None:
|
||||||
status = await dqueue.start_pending(ids)
|
playlist_item_limit = config.DEFAULT_OPTION_PLAYLIST_ITEM_LIMIT
|
||||||
return web.Response(text=serializer.encode(status))
|
|
||||||
|
playlist_item_limit = int(playlist_item_limit)
|
||||||
@routes.get(config.URL_PREFIX + 'history')
|
|
||||||
async def history(request):
|
status = await dqueue.add(url, quality, format, folder, custom_name_prefix, playlist_strict_mode, playlist_item_limit, auto_start)
|
||||||
history = { 'done': [], 'queue': [], 'pending': []}
|
return web.Response(text=serializer.encode(status))
|
||||||
|
|
||||||
for _, v in dqueue.queue.saved_items():
|
@routes.post(config.URL_PREFIX + 'delete')
|
||||||
history['queue'].append(v)
|
async def delete(request):
|
||||||
for _, v in dqueue.done.saved_items():
|
post = await request.json()
|
||||||
history['done'].append(v)
|
ids = post.get('ids')
|
||||||
for _, v in dqueue.pending.saved_items():
|
where = post.get('where')
|
||||||
history['pending'].append(v)
|
if not ids or where not in ['queue', 'done']:
|
||||||
|
log.error("Bad request: missing 'ids' or incorrect 'where' value")
|
||||||
log.info("Sending download history")
|
raise web.HTTPBadRequest()
|
||||||
return web.Response(text=serializer.encode(history))
|
status = await (dqueue.cancel(ids) if where == 'queue' else dqueue.clear(ids))
|
||||||
|
log.info(f"Download delete request processed for ids: {ids}, where: {where}")
|
||||||
@sio.event
|
return web.Response(text=serializer.encode(status))
|
||||||
async def connect(sid, environ):
|
|
||||||
log.info(f"Client connected: {sid}")
|
@routes.post(config.URL_PREFIX + 'start')
|
||||||
await sio.emit('all', serializer.encode(dqueue.get()), to=sid)
|
async def start(request):
|
||||||
await sio.emit('configuration', serializer.encode(config), to=sid)
|
post = await request.json()
|
||||||
if config.CUSTOM_DIRS:
|
ids = post.get('ids')
|
||||||
await sio.emit('custom_dirs', serializer.encode(get_custom_dirs()), to=sid)
|
log.info(f"Received request to start pending downloads for ids: {ids}")
|
||||||
if config.YTDL_OPTIONS_FILE:
|
status = await dqueue.start_pending(ids)
|
||||||
await sio.emit('ytdl_options_changed', serializer.encode(get_options_update_time()), to=sid)
|
return web.Response(text=serializer.encode(status))
|
||||||
|
|
||||||
def get_custom_dirs():
|
@routes.get(config.URL_PREFIX + 'history')
|
||||||
def recursive_dirs(base):
|
async def history(request):
|
||||||
path = pathlib.Path(base)
|
history = { 'done': [], 'queue': [], 'pending': []}
|
||||||
|
|
||||||
# Converts PosixPath object to string, and remove base/ prefix
|
for _, v in dqueue.queue.saved_items():
|
||||||
def convert(p):
|
history['queue'].append(v)
|
||||||
s = str(p)
|
for _, v in dqueue.done.saved_items():
|
||||||
if s.startswith(base):
|
history['done'].append(v)
|
||||||
s = s[len(base):]
|
for _, v in dqueue.pending.saved_items():
|
||||||
|
history['pending'].append(v)
|
||||||
if s.startswith('/'):
|
|
||||||
s = s[1:]
|
log.info("Sending download history")
|
||||||
|
return web.Response(text=serializer.encode(history))
|
||||||
return s
|
|
||||||
|
@sio.event
|
||||||
# Include only directories which do not match the exclude filter
|
async def connect(sid, environ):
|
||||||
def include_dir(d):
|
log.info(f"Client connected: {sid}")
|
||||||
if len(config.CUSTOM_DIRS_EXCLUDE_REGEX) == 0:
|
await sio.emit('all', serializer.encode(dqueue.get()), to=sid)
|
||||||
return True
|
await sio.emit('configuration', serializer.encode(config), to=sid)
|
||||||
else:
|
if config.CUSTOM_DIRS:
|
||||||
return re.search(config.CUSTOM_DIRS_EXCLUDE_REGEX, d) is None
|
await sio.emit('custom_dirs', serializer.encode(get_custom_dirs()), to=sid)
|
||||||
|
if config.YTDL_OPTIONS_FILE:
|
||||||
# Recursively lists all subdirectories of DOWNLOAD_DIR
|
await sio.emit('ytdl_options_changed', serializer.encode(get_options_update_time()), to=sid)
|
||||||
dirs = list(filter(include_dir, map(convert, path.glob('**/'))))
|
|
||||||
|
def get_custom_dirs():
|
||||||
return dirs
|
def recursive_dirs(base):
|
||||||
|
path = pathlib.Path(base)
|
||||||
download_dir = recursive_dirs(config.DOWNLOAD_DIR)
|
|
||||||
|
# Converts PosixPath object to string, and remove base/ prefix
|
||||||
audio_download_dir = download_dir
|
def convert(p):
|
||||||
if config.DOWNLOAD_DIR != config.AUDIO_DOWNLOAD_DIR:
|
s = str(p)
|
||||||
audio_download_dir = recursive_dirs(config.AUDIO_DOWNLOAD_DIR)
|
if s.startswith(base):
|
||||||
|
s = s[len(base):]
|
||||||
return {
|
|
||||||
"download_dir": download_dir,
|
if s.startswith('/'):
|
||||||
"audio_download_dir": audio_download_dir
|
s = s[1:]
|
||||||
}
|
|
||||||
|
return s
|
||||||
@routes.get(config.URL_PREFIX)
|
|
||||||
def index(request):
|
# Include only directories which do not match the exclude filter
|
||||||
response = web.FileResponse(os.path.join(config.BASE_DIR, 'ui/dist/metube/browser/index.html'))
|
def include_dir(d):
|
||||||
if 'metube_theme' not in request.cookies:
|
if len(config.CUSTOM_DIRS_EXCLUDE_REGEX) == 0:
|
||||||
response.set_cookie('metube_theme', config.DEFAULT_THEME)
|
return True
|
||||||
return response
|
else:
|
||||||
|
return re.search(config.CUSTOM_DIRS_EXCLUDE_REGEX, d) is None
|
||||||
@routes.get(config.URL_PREFIX + 'robots.txt')
|
|
||||||
def robots(request):
|
# Recursively lists all subdirectories of DOWNLOAD_DIR
|
||||||
if config.ROBOTS_TXT:
|
dirs = list(filter(include_dir, map(convert, path.glob('**/'))))
|
||||||
response = web.FileResponse(os.path.join(config.BASE_DIR, config.ROBOTS_TXT))
|
|
||||||
else:
|
return dirs
|
||||||
response = web.Response(
|
|
||||||
text="User-agent: *\nDisallow: /download/\nDisallow: /audio_download/\n"
|
download_dir = recursive_dirs(config.DOWNLOAD_DIR)
|
||||||
)
|
|
||||||
return response
|
audio_download_dir = download_dir
|
||||||
|
if config.DOWNLOAD_DIR != config.AUDIO_DOWNLOAD_DIR:
|
||||||
@routes.get(config.URL_PREFIX + 'version')
|
audio_download_dir = recursive_dirs(config.AUDIO_DOWNLOAD_DIR)
|
||||||
def version(request):
|
|
||||||
return web.json_response({
|
return {
|
||||||
"yt-dlp": yt_dlp_version,
|
"download_dir": download_dir,
|
||||||
"version": os.getenv("METUBE_VERSION", "dev")
|
"audio_download_dir": audio_download_dir
|
||||||
})
|
}
|
||||||
|
|
||||||
if config.URL_PREFIX != '/':
|
@routes.get(config.URL_PREFIX)
|
||||||
@routes.get('/')
|
def index(request):
|
||||||
def index_redirect_root(request):
|
response = web.FileResponse(os.path.join(config.BASE_DIR, 'ui/dist/metube/browser/index.html'))
|
||||||
return web.HTTPFound(config.URL_PREFIX)
|
if 'metube_theme' not in request.cookies:
|
||||||
|
response.set_cookie('metube_theme', config.DEFAULT_THEME)
|
||||||
@routes.get(config.URL_PREFIX[:-1])
|
return response
|
||||||
def index_redirect_dir(request):
|
|
||||||
return web.HTTPFound(config.URL_PREFIX)
|
@routes.get(config.URL_PREFIX + 'robots.txt')
|
||||||
|
def robots(request):
|
||||||
routes.static(config.URL_PREFIX + 'download/', config.DOWNLOAD_DIR, show_index=config.DOWNLOAD_DIRS_INDEXABLE)
|
if config.ROBOTS_TXT:
|
||||||
routes.static(config.URL_PREFIX + 'audio_download/', config.AUDIO_DOWNLOAD_DIR, show_index=config.DOWNLOAD_DIRS_INDEXABLE)
|
response = web.FileResponse(os.path.join(config.BASE_DIR, config.ROBOTS_TXT))
|
||||||
routes.static(config.URL_PREFIX, os.path.join(config.BASE_DIR, 'ui/dist/metube/browser'))
|
else:
|
||||||
try:
|
response = web.Response(
|
||||||
app.add_routes(routes)
|
text="User-agent: *\nDisallow: /download/\nDisallow: /audio_download/\n"
|
||||||
except ValueError as e:
|
)
|
||||||
if 'ui/dist/metube/browser' in str(e):
|
return response
|
||||||
raise RuntimeError('Could not find the frontend UI static assets. Please run `node_modules/.bin/ng build` inside the ui folder') from e
|
|
||||||
raise e
|
@routes.get(config.URL_PREFIX + 'version')
|
||||||
|
def version(request):
|
||||||
# https://github.com/aio-libs/aiohttp/pull/4615 waiting for release
|
return web.json_response({
|
||||||
# @routes.options(config.URL_PREFIX + 'add')
|
"yt-dlp": yt_dlp_version,
|
||||||
async def add_cors(request):
|
"version": os.getenv("METUBE_VERSION", "dev")
|
||||||
return web.Response(text=serializer.encode({"status": "ok"}))
|
})
|
||||||
|
|
||||||
app.router.add_route('OPTIONS', config.URL_PREFIX + 'add', add_cors)
|
if config.URL_PREFIX != '/':
|
||||||
|
@routes.get('/')
|
||||||
async def on_prepare(request, response):
|
def index_redirect_root(request):
|
||||||
if 'Origin' in request.headers:
|
return web.HTTPFound(config.URL_PREFIX)
|
||||||
response.headers['Access-Control-Allow-Origin'] = request.headers['Origin']
|
|
||||||
response.headers['Access-Control-Allow-Headers'] = 'Content-Type'
|
@routes.get(config.URL_PREFIX[:-1])
|
||||||
|
def index_redirect_dir(request):
|
||||||
app.on_response_prepare.append(on_prepare)
|
return web.HTTPFound(config.URL_PREFIX)
|
||||||
|
|
||||||
def supports_reuse_port():
|
routes.static(config.URL_PREFIX + 'download/', config.DOWNLOAD_DIR, show_index=config.DOWNLOAD_DIRS_INDEXABLE)
|
||||||
try:
|
routes.static(config.URL_PREFIX + 'audio_download/', config.AUDIO_DOWNLOAD_DIR, show_index=config.DOWNLOAD_DIRS_INDEXABLE)
|
||||||
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
routes.static(config.URL_PREFIX, os.path.join(config.BASE_DIR, 'ui/dist/metube/browser'))
|
||||||
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
|
try:
|
||||||
sock.close()
|
app.add_routes(routes)
|
||||||
return True
|
except ValueError as e:
|
||||||
except (AttributeError, OSError):
|
if 'ui/dist/metube/browser' in str(e):
|
||||||
return False
|
raise RuntimeError('Could not find the frontend UI static assets. Please run `node_modules/.bin/ng build` inside the ui folder') from e
|
||||||
|
raise e
|
||||||
def parseLogLevel(logLevel):
|
|
||||||
match logLevel:
|
# https://github.com/aio-libs/aiohttp/pull/4615 waiting for release
|
||||||
case 'DEBUG':
|
# @routes.options(config.URL_PREFIX + 'add')
|
||||||
return logging.DEBUG
|
async def add_cors(request):
|
||||||
case 'INFO':
|
return web.Response(text=serializer.encode({"status": "ok"}))
|
||||||
return logging.INFO
|
|
||||||
case 'WARNING':
|
app.router.add_route('OPTIONS', config.URL_PREFIX + 'add', add_cors)
|
||||||
return logging.WARNING
|
|
||||||
case 'ERROR':
|
async def on_prepare(request, response):
|
||||||
return logging.ERROR
|
if 'Origin' in request.headers:
|
||||||
case 'CRITICAL':
|
response.headers['Access-Control-Allow-Origin'] = request.headers['Origin']
|
||||||
return logging.CRITICAL
|
response.headers['Access-Control-Allow-Headers'] = 'Content-Type'
|
||||||
case _:
|
|
||||||
return None
|
app.on_response_prepare.append(on_prepare)
|
||||||
|
|
||||||
def isAccessLogEnabled():
|
def supports_reuse_port():
|
||||||
if config.ENABLE_ACCESSLOG:
|
try:
|
||||||
return access_logger
|
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||||
else:
|
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
|
||||||
return None
|
sock.close()
|
||||||
|
return True
|
||||||
if __name__ == '__main__':
|
except (AttributeError, OSError):
|
||||||
logging.basicConfig(level=parseLogLevel(config.LOGLEVEL))
|
return False
|
||||||
log.info(f"Listening on {config.HOST}:{config.PORT}")
|
|
||||||
|
def isAccessLogEnabled():
|
||||||
if config.HTTPS:
|
if config.ENABLE_ACCESSLOG:
|
||||||
ssl_context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
|
return access_logger
|
||||||
ssl_context.load_cert_chain(certfile=config.CERTFILE, keyfile=config.KEYFILE)
|
else:
|
||||||
web.run_app(app, host=config.HOST, port=int(config.PORT), reuse_port=supports_reuse_port(), ssl_context=ssl_context, access_log=isAccessLogEnabled())
|
return None
|
||||||
else:
|
|
||||||
web.run_app(app, host=config.HOST, port=int(config.PORT), reuse_port=supports_reuse_port(), access_log=isAccessLogEnabled())
|
if __name__ == '__main__':
|
||||||
|
logging.getLogger().setLevel(parseLogLevel(config.LOGLEVEL) or logging.INFO)
|
||||||
|
log.info(f"Listening on {config.HOST}:{config.PORT}")
|
||||||
|
|
||||||
|
if config.HTTPS:
|
||||||
|
ssl_context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
|
||||||
|
ssl_context.load_cert_chain(certfile=config.CERTFILE, keyfile=config.KEYFILE)
|
||||||
|
web.run_app(app, host=config.HOST, port=int(config.PORT), reuse_port=supports_reuse_port(), ssl_context=ssl_context, access_log=isAccessLogEnabled())
|
||||||
|
else:
|
||||||
|
web.run_app(app, host=config.HOST, port=int(config.PORT), reuse_port=supports_reuse_port(), access_log=isAccessLogEnabled())
|
||||||
|
|||||||
964
app/ytdl.py
964
app/ytdl.py
@@ -1,480 +1,484 @@
|
|||||||
import os
|
import os
|
||||||
import yt_dlp
|
import yt_dlp
|
||||||
from collections import OrderedDict
|
from collections import OrderedDict
|
||||||
import shelve
|
import shelve
|
||||||
import time
|
import time
|
||||||
import asyncio
|
import asyncio
|
||||||
import multiprocessing
|
import multiprocessing
|
||||||
import logging
|
import logging
|
||||||
import re
|
import re
|
||||||
import types
|
import types
|
||||||
|
|
||||||
import yt_dlp.networking.impersonate
|
import yt_dlp.networking.impersonate
|
||||||
from dl_formats import get_format, get_opts, AUDIO_FORMATS
|
from dl_formats import get_format, get_opts, AUDIO_FORMATS
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
log = logging.getLogger('ytdl')
|
log = logging.getLogger('ytdl')
|
||||||
|
|
||||||
def _convert_generators_to_lists(obj):
|
def _convert_generators_to_lists(obj):
|
||||||
"""Recursively convert generators to lists in a dictionary to make it pickleable."""
|
"""Recursively convert generators to lists in a dictionary to make it pickleable."""
|
||||||
if isinstance(obj, types.GeneratorType):
|
if isinstance(obj, types.GeneratorType):
|
||||||
return list(obj)
|
return list(obj)
|
||||||
elif isinstance(obj, dict):
|
elif isinstance(obj, dict):
|
||||||
return {k: _convert_generators_to_lists(v) for k, v in obj.items()}
|
return {k: _convert_generators_to_lists(v) for k, v in obj.items()}
|
||||||
elif isinstance(obj, (list, tuple)):
|
elif isinstance(obj, (list, tuple)):
|
||||||
return type(obj)(_convert_generators_to_lists(item) for item in obj)
|
return type(obj)(_convert_generators_to_lists(item) for item in obj)
|
||||||
else:
|
else:
|
||||||
return obj
|
return obj
|
||||||
|
|
||||||
class DownloadQueueNotifier:
|
class DownloadQueueNotifier:
|
||||||
async def added(self, dl):
|
async def added(self, dl):
|
||||||
raise NotImplementedError
|
raise NotImplementedError
|
||||||
|
|
||||||
async def updated(self, dl):
|
async def updated(self, dl):
|
||||||
raise NotImplementedError
|
raise NotImplementedError
|
||||||
|
|
||||||
async def completed(self, dl):
|
async def completed(self, dl):
|
||||||
raise NotImplementedError
|
raise NotImplementedError
|
||||||
|
|
||||||
async def canceled(self, id):
|
async def canceled(self, id):
|
||||||
raise NotImplementedError
|
raise NotImplementedError
|
||||||
|
|
||||||
async def cleared(self, id):
|
async def cleared(self, id):
|
||||||
raise NotImplementedError
|
raise NotImplementedError
|
||||||
|
|
||||||
class DownloadInfo:
|
class DownloadInfo:
|
||||||
def __init__(self, id, title, url, quality, format, folder, custom_name_prefix, error, entry, playlist_item_limit):
|
def __init__(self, id, title, url, quality, format, folder, custom_name_prefix, error, entry, playlist_item_limit):
|
||||||
self.id = id if len(custom_name_prefix) == 0 else f'{custom_name_prefix}.{id}'
|
self.id = id if len(custom_name_prefix) == 0 else f'{custom_name_prefix}.{id}'
|
||||||
self.title = title if len(custom_name_prefix) == 0 else f'{custom_name_prefix}.{title}'
|
self.title = title if len(custom_name_prefix) == 0 else f'{custom_name_prefix}.{title}'
|
||||||
self.url = url
|
self.url = url
|
||||||
self.quality = quality
|
self.quality = quality
|
||||||
self.format = format
|
self.format = format
|
||||||
self.folder = folder
|
self.folder = folder
|
||||||
self.custom_name_prefix = custom_name_prefix
|
self.custom_name_prefix = custom_name_prefix
|
||||||
self.msg = self.percent = self.speed = self.eta = None
|
self.msg = self.percent = self.speed = self.eta = None
|
||||||
self.status = "pending"
|
self.status = "pending"
|
||||||
self.size = None
|
self.size = None
|
||||||
self.timestamp = time.time_ns()
|
self.timestamp = time.time_ns()
|
||||||
self.error = error
|
self.error = error
|
||||||
# Convert generators to lists to make entry pickleable
|
# Convert generators to lists to make entry pickleable
|
||||||
self.entry = _convert_generators_to_lists(entry) if entry is not None else None
|
self.entry = _convert_generators_to_lists(entry) if entry is not None else None
|
||||||
self.playlist_item_limit = playlist_item_limit
|
self.playlist_item_limit = playlist_item_limit
|
||||||
|
|
||||||
class Download:
|
class Download:
|
||||||
manager = None
|
manager = None
|
||||||
|
|
||||||
def __init__(self, download_dir, temp_dir, output_template, output_template_chapter, quality, format, ytdl_opts, info):
|
def __init__(self, download_dir, temp_dir, output_template, output_template_chapter, quality, format, ytdl_opts, info):
|
||||||
self.download_dir = download_dir
|
self.download_dir = download_dir
|
||||||
self.temp_dir = temp_dir
|
self.temp_dir = temp_dir
|
||||||
self.output_template = output_template
|
self.output_template = output_template
|
||||||
self.output_template_chapter = output_template_chapter
|
self.output_template_chapter = output_template_chapter
|
||||||
self.format = get_format(format, quality)
|
self.format = get_format(format, quality)
|
||||||
self.ytdl_opts = get_opts(format, quality, ytdl_opts)
|
self.ytdl_opts = get_opts(format, quality, ytdl_opts)
|
||||||
if "impersonate" in self.ytdl_opts:
|
if "impersonate" in self.ytdl_opts:
|
||||||
self.ytdl_opts["impersonate"] = yt_dlp.networking.impersonate.ImpersonateTarget.from_str(self.ytdl_opts["impersonate"])
|
self.ytdl_opts["impersonate"] = yt_dlp.networking.impersonate.ImpersonateTarget.from_str(self.ytdl_opts["impersonate"])
|
||||||
self.info = info
|
self.info = info
|
||||||
self.canceled = False
|
self.canceled = False
|
||||||
self.tmpfilename = None
|
self.tmpfilename = None
|
||||||
self.status_queue = None
|
self.status_queue = None
|
||||||
self.proc = None
|
self.proc = None
|
||||||
self.loop = None
|
self.loop = None
|
||||||
self.notifier = None
|
self.notifier = None
|
||||||
|
|
||||||
def _download(self):
|
def _download(self):
|
||||||
log.info(f"Starting download for: {self.info.title} ({self.info.url})")
|
log.info(f"Starting download for: {self.info.title} ({self.info.url})")
|
||||||
try:
|
try:
|
||||||
def put_status(st):
|
debug_logging = logging.getLogger().isEnabledFor(logging.DEBUG)
|
||||||
self.status_queue.put({k: v for k, v in st.items() if k in (
|
def put_status(st):
|
||||||
'tmpfilename',
|
self.status_queue.put({k: v for k, v in st.items() if k in (
|
||||||
'filename',
|
'tmpfilename',
|
||||||
'status',
|
'filename',
|
||||||
'msg',
|
'status',
|
||||||
'total_bytes',
|
'msg',
|
||||||
'total_bytes_estimate',
|
'total_bytes',
|
||||||
'downloaded_bytes',
|
'total_bytes_estimate',
|
||||||
'speed',
|
'downloaded_bytes',
|
||||||
'eta',
|
'speed',
|
||||||
)})
|
'eta',
|
||||||
|
)})
|
||||||
def put_status_postprocessor(d):
|
|
||||||
if d['postprocessor'] == 'MoveFiles' and d['status'] == 'finished':
|
def put_status_postprocessor(d):
|
||||||
if '__finaldir' in d['info_dict']:
|
if d['postprocessor'] == 'MoveFiles' and d['status'] == 'finished':
|
||||||
filename = os.path.join(d['info_dict']['__finaldir'], os.path.basename(d['info_dict']['filepath']))
|
if '__finaldir' in d['info_dict']:
|
||||||
else:
|
filename = os.path.join(d['info_dict']['__finaldir'], os.path.basename(d['info_dict']['filepath']))
|
||||||
filename = d['info_dict']['filepath']
|
else:
|
||||||
self.status_queue.put({'status': 'finished', 'filename': filename})
|
filename = d['info_dict']['filepath']
|
||||||
|
self.status_queue.put({'status': 'finished', 'filename': filename})
|
||||||
ret = yt_dlp.YoutubeDL(params={
|
|
||||||
'quiet': True,
|
ret = yt_dlp.YoutubeDL(params={
|
||||||
'no_color': True,
|
'quiet': not debug_logging,
|
||||||
'paths': {"home": self.download_dir, "temp": self.temp_dir},
|
'verbose': debug_logging,
|
||||||
'outtmpl': { "default": self.output_template, "chapter": self.output_template_chapter },
|
'no_color': True,
|
||||||
'format': self.format,
|
'paths': {"home": self.download_dir, "temp": self.temp_dir},
|
||||||
'socket_timeout': 30,
|
'outtmpl': { "default": self.output_template, "chapter": self.output_template_chapter },
|
||||||
'ignore_no_formats_error': True,
|
'format': self.format,
|
||||||
'progress_hooks': [put_status],
|
'socket_timeout': 30,
|
||||||
'postprocessor_hooks': [put_status_postprocessor],
|
'ignore_no_formats_error': True,
|
||||||
**self.ytdl_opts,
|
'progress_hooks': [put_status],
|
||||||
}).download([self.info.url])
|
'postprocessor_hooks': [put_status_postprocessor],
|
||||||
self.status_queue.put({'status': 'finished' if ret == 0 else 'error'})
|
**self.ytdl_opts,
|
||||||
log.info(f"Finished download for: {self.info.title}")
|
}).download([self.info.url])
|
||||||
except yt_dlp.utils.YoutubeDLError as exc:
|
self.status_queue.put({'status': 'finished' if ret == 0 else 'error'})
|
||||||
log.error(f"Download error for {self.info.title}: {str(exc)}")
|
log.info(f"Finished download for: {self.info.title}")
|
||||||
self.status_queue.put({'status': 'error', 'msg': str(exc)})
|
except yt_dlp.utils.YoutubeDLError as exc:
|
||||||
|
log.error(f"Download error for {self.info.title}: {str(exc)}")
|
||||||
async def start(self, notifier):
|
self.status_queue.put({'status': 'error', 'msg': str(exc)})
|
||||||
log.info(f"Preparing download for: {self.info.title}")
|
|
||||||
if Download.manager is None:
|
async def start(self, notifier):
|
||||||
Download.manager = multiprocessing.Manager()
|
log.info(f"Preparing download for: {self.info.title}")
|
||||||
self.status_queue = Download.manager.Queue()
|
if Download.manager is None:
|
||||||
self.proc = multiprocessing.Process(target=self._download)
|
Download.manager = multiprocessing.Manager()
|
||||||
self.proc.start()
|
self.status_queue = Download.manager.Queue()
|
||||||
self.loop = asyncio.get_running_loop()
|
self.proc = multiprocessing.Process(target=self._download)
|
||||||
self.notifier = notifier
|
self.proc.start()
|
||||||
self.info.status = 'preparing'
|
self.loop = asyncio.get_running_loop()
|
||||||
await self.notifier.updated(self.info)
|
self.notifier = notifier
|
||||||
asyncio.create_task(self.update_status())
|
self.info.status = 'preparing'
|
||||||
return await self.loop.run_in_executor(None, self.proc.join)
|
await self.notifier.updated(self.info)
|
||||||
|
asyncio.create_task(self.update_status())
|
||||||
def cancel(self):
|
return await self.loop.run_in_executor(None, self.proc.join)
|
||||||
log.info(f"Cancelling download: {self.info.title}")
|
|
||||||
if self.running():
|
def cancel(self):
|
||||||
try:
|
log.info(f"Cancelling download: {self.info.title}")
|
||||||
self.proc.kill()
|
if self.running():
|
||||||
except Exception as e:
|
try:
|
||||||
log.error(f"Error killing process for {self.info.title}: {e}")
|
self.proc.kill()
|
||||||
self.canceled = True
|
except Exception as e:
|
||||||
if self.status_queue is not None:
|
log.error(f"Error killing process for {self.info.title}: {e}")
|
||||||
self.status_queue.put(None)
|
self.canceled = True
|
||||||
|
if self.status_queue is not None:
|
||||||
def close(self):
|
self.status_queue.put(None)
|
||||||
log.info(f"Closing download process for: {self.info.title}")
|
|
||||||
if self.started():
|
def close(self):
|
||||||
self.proc.close()
|
log.info(f"Closing download process for: {self.info.title}")
|
||||||
if self.status_queue is not None:
|
if self.started():
|
||||||
self.status_queue.put(None)
|
self.proc.close()
|
||||||
|
if self.status_queue is not None:
|
||||||
def running(self):
|
self.status_queue.put(None)
|
||||||
try:
|
|
||||||
return self.proc is not None and self.proc.is_alive()
|
def running(self):
|
||||||
except ValueError:
|
try:
|
||||||
return False
|
return self.proc is not None and self.proc.is_alive()
|
||||||
|
except ValueError:
|
||||||
def started(self):
|
return False
|
||||||
return self.proc is not None
|
|
||||||
|
def started(self):
|
||||||
async def update_status(self):
|
return self.proc is not None
|
||||||
while True:
|
|
||||||
status = await self.loop.run_in_executor(None, self.status_queue.get)
|
async def update_status(self):
|
||||||
if status is None:
|
while True:
|
||||||
log.info(f"Status update finished for: {self.info.title}")
|
status = await self.loop.run_in_executor(None, self.status_queue.get)
|
||||||
return
|
if status is None:
|
||||||
if self.canceled:
|
log.info(f"Status update finished for: {self.info.title}")
|
||||||
log.info(f"Download {self.info.title} is canceled; stopping status updates.")
|
return
|
||||||
return
|
if self.canceled:
|
||||||
self.tmpfilename = status.get('tmpfilename')
|
log.info(f"Download {self.info.title} is canceled; stopping status updates.")
|
||||||
if 'filename' in status:
|
return
|
||||||
fileName = status.get('filename')
|
self.tmpfilename = status.get('tmpfilename')
|
||||||
self.info.filename = os.path.relpath(fileName, self.download_dir)
|
if 'filename' in status:
|
||||||
self.info.size = os.path.getsize(fileName) if os.path.exists(fileName) else None
|
fileName = status.get('filename')
|
||||||
if self.info.format == 'thumbnail':
|
self.info.filename = os.path.relpath(fileName, self.download_dir)
|
||||||
self.info.filename = re.sub(r'\.webm$', '.jpg', self.info.filename)
|
self.info.size = os.path.getsize(fileName) if os.path.exists(fileName) else None
|
||||||
self.info.status = status['status']
|
if self.info.format == 'thumbnail':
|
||||||
self.info.msg = status.get('msg')
|
self.info.filename = re.sub(r'\.webm$', '.jpg', self.info.filename)
|
||||||
if 'downloaded_bytes' in status:
|
self.info.status = status['status']
|
||||||
total = status.get('total_bytes') or status.get('total_bytes_estimate')
|
self.info.msg = status.get('msg')
|
||||||
if total:
|
if 'downloaded_bytes' in status:
|
||||||
self.info.percent = status['downloaded_bytes'] / total * 100
|
total = status.get('total_bytes') or status.get('total_bytes_estimate')
|
||||||
self.info.speed = status.get('speed')
|
if total:
|
||||||
self.info.eta = status.get('eta')
|
self.info.percent = status['downloaded_bytes'] / total * 100
|
||||||
log.info(f"Updating status for {self.info.title}: {status}")
|
self.info.speed = status.get('speed')
|
||||||
await self.notifier.updated(self.info)
|
self.info.eta = status.get('eta')
|
||||||
|
log.debug(f"Updating status for {self.info.title}: {status}")
|
||||||
class PersistentQueue:
|
await self.notifier.updated(self.info)
|
||||||
def __init__(self, path):
|
|
||||||
pdir = os.path.dirname(path)
|
class PersistentQueue:
|
||||||
if not os.path.isdir(pdir):
|
def __init__(self, path):
|
||||||
os.mkdir(pdir)
|
pdir = os.path.dirname(path)
|
||||||
with shelve.open(path, 'c'):
|
if not os.path.isdir(pdir):
|
||||||
pass
|
os.mkdir(pdir)
|
||||||
self.path = path
|
with shelve.open(path, 'c'):
|
||||||
self.dict = OrderedDict()
|
pass
|
||||||
|
self.path = path
|
||||||
def load(self):
|
self.dict = OrderedDict()
|
||||||
for k, v in self.saved_items():
|
|
||||||
self.dict[k] = Download(None, None, None, None, None, None, {}, v)
|
def load(self):
|
||||||
|
for k, v in self.saved_items():
|
||||||
def exists(self, key):
|
self.dict[k] = Download(None, None, None, None, None, None, {}, v)
|
||||||
return key in self.dict
|
|
||||||
|
def exists(self, key):
|
||||||
def get(self, key):
|
return key in self.dict
|
||||||
return self.dict[key]
|
|
||||||
|
def get(self, key):
|
||||||
def items(self):
|
return self.dict[key]
|
||||||
return self.dict.items()
|
|
||||||
|
def items(self):
|
||||||
def saved_items(self):
|
return self.dict.items()
|
||||||
with shelve.open(self.path, 'r') as shelf:
|
|
||||||
return sorted(shelf.items(), key=lambda item: item[1].timestamp)
|
def saved_items(self):
|
||||||
|
with shelve.open(self.path, 'r') as shelf:
|
||||||
def put(self, value):
|
return sorted(shelf.items(), key=lambda item: item[1].timestamp)
|
||||||
key = value.info.url
|
|
||||||
self.dict[key] = value
|
def put(self, value):
|
||||||
with shelve.open(self.path, 'w') as shelf:
|
key = value.info.url
|
||||||
shelf[key] = value.info
|
self.dict[key] = value
|
||||||
|
with shelve.open(self.path, 'w') as shelf:
|
||||||
def delete(self, key):
|
shelf[key] = value.info
|
||||||
if key in self.dict:
|
|
||||||
del self.dict[key]
|
def delete(self, key):
|
||||||
with shelve.open(self.path, 'w') as shelf:
|
if key in self.dict:
|
||||||
shelf.pop(key, None)
|
del self.dict[key]
|
||||||
|
with shelve.open(self.path, 'w') as shelf:
|
||||||
def next(self):
|
shelf.pop(key, None)
|
||||||
k, v = next(iter(self.dict.items()))
|
|
||||||
return k, v
|
def next(self):
|
||||||
|
k, v = next(iter(self.dict.items()))
|
||||||
def empty(self):
|
return k, v
|
||||||
return not bool(self.dict)
|
|
||||||
|
def empty(self):
|
||||||
class DownloadQueue:
|
return not bool(self.dict)
|
||||||
def __init__(self, config, notifier):
|
|
||||||
self.config = config
|
class DownloadQueue:
|
||||||
self.notifier = notifier
|
def __init__(self, config, notifier):
|
||||||
self.queue = PersistentQueue(self.config.STATE_DIR + '/queue')
|
self.config = config
|
||||||
self.done = PersistentQueue(self.config.STATE_DIR + '/completed')
|
self.notifier = notifier
|
||||||
self.pending = PersistentQueue(self.config.STATE_DIR + '/pending')
|
self.queue = PersistentQueue(self.config.STATE_DIR + '/queue')
|
||||||
self.active_downloads = set()
|
self.done = PersistentQueue(self.config.STATE_DIR + '/completed')
|
||||||
self.semaphore = None
|
self.pending = PersistentQueue(self.config.STATE_DIR + '/pending')
|
||||||
# For sequential mode, use an asyncio lock to ensure one-at-a-time execution.
|
self.active_downloads = set()
|
||||||
if self.config.DOWNLOAD_MODE == 'sequential':
|
self.semaphore = None
|
||||||
self.seq_lock = asyncio.Lock()
|
# For sequential mode, use an asyncio lock to ensure one-at-a-time execution.
|
||||||
elif self.config.DOWNLOAD_MODE == 'limited':
|
if self.config.DOWNLOAD_MODE == 'sequential':
|
||||||
self.semaphore = asyncio.Semaphore(int(self.config.MAX_CONCURRENT_DOWNLOADS))
|
self.seq_lock = asyncio.Lock()
|
||||||
|
elif self.config.DOWNLOAD_MODE == 'limited':
|
||||||
self.done.load()
|
self.semaphore = asyncio.Semaphore(int(self.config.MAX_CONCURRENT_DOWNLOADS))
|
||||||
|
|
||||||
async def __import_queue(self):
|
self.done.load()
|
||||||
for k, v in self.queue.saved_items():
|
|
||||||
await self.__add_download(v, True)
|
async def __import_queue(self):
|
||||||
|
for k, v in self.queue.saved_items():
|
||||||
async def __import_pending(self):
|
await self.__add_download(v, True)
|
||||||
for k, v in self.pending.saved_items():
|
|
||||||
await self.__add_download(v, False)
|
async def __import_pending(self):
|
||||||
|
for k, v in self.pending.saved_items():
|
||||||
async def initialize(self):
|
await self.__add_download(v, False)
|
||||||
log.info("Initializing DownloadQueue")
|
|
||||||
asyncio.create_task(self.__import_queue())
|
async def initialize(self):
|
||||||
asyncio.create_task(self.__import_pending())
|
log.info("Initializing DownloadQueue")
|
||||||
|
asyncio.create_task(self.__import_queue())
|
||||||
async def __start_download(self, download):
|
asyncio.create_task(self.__import_pending())
|
||||||
if download.canceled:
|
|
||||||
log.info(f"Download {download.info.title} was canceled, skipping start.")
|
async def __start_download(self, download):
|
||||||
return
|
if download.canceled:
|
||||||
if self.config.DOWNLOAD_MODE == 'sequential':
|
log.info(f"Download {download.info.title} was canceled, skipping start.")
|
||||||
async with self.seq_lock:
|
return
|
||||||
log.info("Starting sequential download.")
|
if self.config.DOWNLOAD_MODE == 'sequential':
|
||||||
await download.start(self.notifier)
|
async with self.seq_lock:
|
||||||
self._post_download_cleanup(download)
|
log.info("Starting sequential download.")
|
||||||
elif self.config.DOWNLOAD_MODE == 'limited' and self.semaphore is not None:
|
await download.start(self.notifier)
|
||||||
await self.__limited_concurrent_download(download)
|
self._post_download_cleanup(download)
|
||||||
else:
|
elif self.config.DOWNLOAD_MODE == 'limited' and self.semaphore is not None:
|
||||||
await self.__concurrent_download(download)
|
await self.__limited_concurrent_download(download)
|
||||||
|
else:
|
||||||
async def __concurrent_download(self, download):
|
await self.__concurrent_download(download)
|
||||||
log.info("Starting concurrent download without limits.")
|
|
||||||
asyncio.create_task(self._run_download(download))
|
async def __concurrent_download(self, download):
|
||||||
|
log.info("Starting concurrent download without limits.")
|
||||||
async def __limited_concurrent_download(self, download):
|
asyncio.create_task(self._run_download(download))
|
||||||
log.info("Starting limited concurrent download.")
|
|
||||||
async with self.semaphore:
|
async def __limited_concurrent_download(self, download):
|
||||||
await self._run_download(download)
|
log.info("Starting limited concurrent download.")
|
||||||
|
async with self.semaphore:
|
||||||
async def _run_download(self, download):
|
await self._run_download(download)
|
||||||
if download.canceled:
|
|
||||||
log.info(f"Download {download.info.title} is canceled; skipping start.")
|
async def _run_download(self, download):
|
||||||
return
|
if download.canceled:
|
||||||
await download.start(self.notifier)
|
log.info(f"Download {download.info.title} is canceled; skipping start.")
|
||||||
self._post_download_cleanup(download)
|
return
|
||||||
|
await download.start(self.notifier)
|
||||||
def _post_download_cleanup(self, download):
|
self._post_download_cleanup(download)
|
||||||
if download.info.status != 'finished':
|
|
||||||
if download.tmpfilename and os.path.isfile(download.tmpfilename):
|
def _post_download_cleanup(self, download):
|
||||||
try:
|
if download.info.status != 'finished':
|
||||||
os.remove(download.tmpfilename)
|
if download.tmpfilename and os.path.isfile(download.tmpfilename):
|
||||||
except:
|
try:
|
||||||
pass
|
os.remove(download.tmpfilename)
|
||||||
download.info.status = 'error'
|
except:
|
||||||
download.close()
|
pass
|
||||||
if self.queue.exists(download.info.url):
|
download.info.status = 'error'
|
||||||
self.queue.delete(download.info.url)
|
download.close()
|
||||||
if download.canceled:
|
if self.queue.exists(download.info.url):
|
||||||
asyncio.create_task(self.notifier.canceled(download.info.url))
|
self.queue.delete(download.info.url)
|
||||||
else:
|
if download.canceled:
|
||||||
self.done.put(download)
|
asyncio.create_task(self.notifier.canceled(download.info.url))
|
||||||
asyncio.create_task(self.notifier.completed(download.info))
|
else:
|
||||||
|
self.done.put(download)
|
||||||
def __extract_info(self, url, playlist_strict_mode):
|
asyncio.create_task(self.notifier.completed(download.info))
|
||||||
return yt_dlp.YoutubeDL(params={
|
|
||||||
'quiet': True,
|
def __extract_info(self, url, playlist_strict_mode):
|
||||||
'no_color': True,
|
debug_logging = logging.getLogger().isEnabledFor(logging.DEBUG)
|
||||||
'extract_flat': True,
|
return yt_dlp.YoutubeDL(params={
|
||||||
'ignore_no_formats_error': True,
|
'quiet': not debug_logging,
|
||||||
'noplaylist': playlist_strict_mode,
|
'verbose': debug_logging,
|
||||||
'paths': {"home": self.config.DOWNLOAD_DIR, "temp": self.config.TEMP_DIR},
|
'no_color': True,
|
||||||
**self.config.YTDL_OPTIONS,
|
'extract_flat': True,
|
||||||
**({'impersonate': yt_dlp.networking.impersonate.ImpersonateTarget.from_str(self.config.YTDL_OPTIONS['impersonate'])} if 'impersonate' in self.config.YTDL_OPTIONS else {}),
|
'ignore_no_formats_error': True,
|
||||||
}).extract_info(url, download=False)
|
'noplaylist': playlist_strict_mode,
|
||||||
|
'paths': {"home": self.config.DOWNLOAD_DIR, "temp": self.config.TEMP_DIR},
|
||||||
def __calc_download_path(self, quality, format, folder):
|
**self.config.YTDL_OPTIONS,
|
||||||
base_directory = self.config.DOWNLOAD_DIR if (quality != 'audio' and format not in AUDIO_FORMATS) else self.config.AUDIO_DOWNLOAD_DIR
|
**({'impersonate': yt_dlp.networking.impersonate.ImpersonateTarget.from_str(self.config.YTDL_OPTIONS['impersonate'])} if 'impersonate' in self.config.YTDL_OPTIONS else {}),
|
||||||
if folder:
|
}).extract_info(url, download=False)
|
||||||
if not self.config.CUSTOM_DIRS:
|
|
||||||
return None, {'status': 'error', 'msg': f'A folder for the download was specified but CUSTOM_DIRS is not true in the configuration.'}
|
def __calc_download_path(self, quality, format, folder):
|
||||||
dldirectory = os.path.realpath(os.path.join(base_directory, folder))
|
base_directory = self.config.DOWNLOAD_DIR if (quality != 'audio' and format not in AUDIO_FORMATS) else self.config.AUDIO_DOWNLOAD_DIR
|
||||||
real_base_directory = os.path.realpath(base_directory)
|
if folder:
|
||||||
if not dldirectory.startswith(real_base_directory):
|
if not self.config.CUSTOM_DIRS:
|
||||||
return None, {'status': 'error', 'msg': f'Folder "{folder}" must resolve inside the base download directory "{real_base_directory}"'}
|
return None, {'status': 'error', 'msg': f'A folder for the download was specified but CUSTOM_DIRS is not true in the configuration.'}
|
||||||
if not os.path.isdir(dldirectory):
|
dldirectory = os.path.realpath(os.path.join(base_directory, folder))
|
||||||
if not self.config.CREATE_CUSTOM_DIRS:
|
real_base_directory = os.path.realpath(base_directory)
|
||||||
return None, {'status': 'error', 'msg': f'Folder "{folder}" for download does not exist inside base directory "{real_base_directory}", and CREATE_CUSTOM_DIRS is not true in the configuration.'}
|
if not dldirectory.startswith(real_base_directory):
|
||||||
os.makedirs(dldirectory, exist_ok=True)
|
return None, {'status': 'error', 'msg': f'Folder "{folder}" must resolve inside the base download directory "{real_base_directory}"'}
|
||||||
else:
|
if not os.path.isdir(dldirectory):
|
||||||
dldirectory = base_directory
|
if not self.config.CREATE_CUSTOM_DIRS:
|
||||||
return dldirectory, None
|
return None, {'status': 'error', 'msg': f'Folder "{folder}" for download does not exist inside base directory "{real_base_directory}", and CREATE_CUSTOM_DIRS is not true in the configuration.'}
|
||||||
|
os.makedirs(dldirectory, exist_ok=True)
|
||||||
async def __add_download(self, dl, auto_start):
|
else:
|
||||||
dldirectory, error_message = self.__calc_download_path(dl.quality, dl.format, dl.folder)
|
dldirectory = base_directory
|
||||||
if error_message is not None:
|
return dldirectory, None
|
||||||
return error_message
|
|
||||||
output = self.config.OUTPUT_TEMPLATE if len(dl.custom_name_prefix) == 0 else f'{dl.custom_name_prefix}.{self.config.OUTPUT_TEMPLATE}'
|
async def __add_download(self, dl, auto_start):
|
||||||
output_chapter = self.config.OUTPUT_TEMPLATE_CHAPTER
|
dldirectory, error_message = self.__calc_download_path(dl.quality, dl.format, dl.folder)
|
||||||
entry = getattr(dl, 'entry', None)
|
if error_message is not None:
|
||||||
if entry is not None and 'playlist' in entry and entry['playlist'] is not None:
|
return error_message
|
||||||
if len(self.config.OUTPUT_TEMPLATE_PLAYLIST):
|
output = self.config.OUTPUT_TEMPLATE if len(dl.custom_name_prefix) == 0 else f'{dl.custom_name_prefix}.{self.config.OUTPUT_TEMPLATE}'
|
||||||
output = self.config.OUTPUT_TEMPLATE_PLAYLIST
|
output_chapter = self.config.OUTPUT_TEMPLATE_CHAPTER
|
||||||
for property, value in entry.items():
|
entry = getattr(dl, 'entry', None)
|
||||||
if property.startswith("playlist"):
|
if entry is not None and 'playlist' in entry and entry['playlist'] is not None:
|
||||||
output = output.replace(f"%({property})s", str(value))
|
if len(self.config.OUTPUT_TEMPLATE_PLAYLIST):
|
||||||
ytdl_options = dict(self.config.YTDL_OPTIONS)
|
output = self.config.OUTPUT_TEMPLATE_PLAYLIST
|
||||||
playlist_item_limit = getattr(dl, 'playlist_item_limit', 0)
|
for property, value in entry.items():
|
||||||
if playlist_item_limit > 0:
|
if property.startswith("playlist"):
|
||||||
log.info(f'playlist limit is set. Processing only first {playlist_item_limit} entries')
|
output = output.replace(f"%({property})s", str(value))
|
||||||
ytdl_options['playlistend'] = playlist_item_limit
|
ytdl_options = dict(self.config.YTDL_OPTIONS)
|
||||||
download = Download(dldirectory, self.config.TEMP_DIR, output, output_chapter, dl.quality, dl.format, ytdl_options, dl)
|
playlist_item_limit = getattr(dl, 'playlist_item_limit', 0)
|
||||||
if auto_start is True:
|
if playlist_item_limit > 0:
|
||||||
self.queue.put(download)
|
log.info(f'playlist limit is set. Processing only first {playlist_item_limit} entries')
|
||||||
asyncio.create_task(self.__start_download(download))
|
ytdl_options['playlistend'] = playlist_item_limit
|
||||||
else:
|
download = Download(dldirectory, self.config.TEMP_DIR, output, output_chapter, dl.quality, dl.format, ytdl_options, dl)
|
||||||
self.pending.put(download)
|
if auto_start is True:
|
||||||
await self.notifier.added(dl)
|
self.queue.put(download)
|
||||||
|
asyncio.create_task(self.__start_download(download))
|
||||||
async def __add_entry(self, entry, quality, format, folder, custom_name_prefix, playlist_strict_mode, playlist_item_limit, auto_start, already):
|
else:
|
||||||
if not entry:
|
self.pending.put(download)
|
||||||
return {'status': 'error', 'msg': "Invalid/empty data was given."}
|
await self.notifier.added(dl)
|
||||||
|
|
||||||
error = None
|
async def __add_entry(self, entry, quality, format, folder, custom_name_prefix, playlist_strict_mode, playlist_item_limit, auto_start, already):
|
||||||
if "live_status" in entry and "release_timestamp" in entry and entry.get("live_status") == "is_upcoming":
|
if not entry:
|
||||||
dt_ts = datetime.fromtimestamp(entry.get("release_timestamp")).strftime('%Y-%m-%d %H:%M:%S %z')
|
return {'status': 'error', 'msg': "Invalid/empty data was given."}
|
||||||
error = f"Live stream is scheduled to start at {dt_ts}"
|
|
||||||
else:
|
error = None
|
||||||
if "msg" in entry:
|
if "live_status" in entry and "release_timestamp" in entry and entry.get("live_status") == "is_upcoming":
|
||||||
error = entry["msg"]
|
dt_ts = datetime.fromtimestamp(entry.get("release_timestamp")).strftime('%Y-%m-%d %H:%M:%S %z')
|
||||||
|
error = f"Live stream is scheduled to start at {dt_ts}"
|
||||||
etype = entry.get('_type') or 'video'
|
else:
|
||||||
|
if "msg" in entry:
|
||||||
if etype.startswith('url'):
|
error = entry["msg"]
|
||||||
log.debug('Processing as an url')
|
|
||||||
return await self.add(entry['url'], quality, format, folder, custom_name_prefix, playlist_strict_mode, playlist_item_limit, auto_start, already)
|
etype = entry.get('_type') or 'video'
|
||||||
elif etype == 'playlist':
|
|
||||||
log.debug('Processing as a playlist')
|
if etype.startswith('url'):
|
||||||
entries = entry['entries']
|
log.debug('Processing as an url')
|
||||||
# Convert generator to list if needed (for len() and slicing operations)
|
return await self.add(entry['url'], quality, format, folder, custom_name_prefix, playlist_strict_mode, playlist_item_limit, auto_start, already)
|
||||||
if isinstance(entries, types.GeneratorType):
|
elif etype == 'playlist':
|
||||||
entries = list(entries)
|
log.debug('Processing as a playlist')
|
||||||
log.info(f'playlist detected with {len(entries)} entries')
|
entries = entry['entries']
|
||||||
playlist_index_digits = len(str(len(entries)))
|
# Convert generator to list if needed (for len() and slicing operations)
|
||||||
results = []
|
if isinstance(entries, types.GeneratorType):
|
||||||
if playlist_item_limit > 0:
|
entries = list(entries)
|
||||||
log.info(f'Playlist item limit is set. Processing only first {playlist_item_limit} entries')
|
log.info(f'playlist detected with {len(entries)} entries')
|
||||||
entries = entries[:playlist_item_limit]
|
playlist_index_digits = len(str(len(entries)))
|
||||||
for index, etr in enumerate(entries, start=1):
|
results = []
|
||||||
etr["_type"] = "video"
|
if playlist_item_limit > 0:
|
||||||
etr["playlist"] = entry["id"]
|
log.info(f'Playlist item limit is set. Processing only first {playlist_item_limit} entries')
|
||||||
etr["playlist_index"] = '{{0:0{0:d}d}}'.format(playlist_index_digits).format(index)
|
entries = entries[:playlist_item_limit]
|
||||||
for property in ("id", "title", "uploader", "uploader_id"):
|
for index, etr in enumerate(entries, start=1):
|
||||||
if property in entry:
|
etr["_type"] = "video"
|
||||||
etr[f"playlist_{property}"] = entry[property]
|
etr["playlist"] = entry["id"]
|
||||||
results.append(await self.__add_entry(etr, quality, format, folder, custom_name_prefix, playlist_strict_mode, playlist_item_limit, auto_start, already))
|
etr["playlist_index"] = '{{0:0{0:d}d}}'.format(playlist_index_digits).format(index)
|
||||||
if any(res['status'] == 'error' for res in results):
|
for property in ("id", "title", "uploader", "uploader_id"):
|
||||||
return {'status': 'error', 'msg': ', '.join(res['msg'] for res in results if res['status'] == 'error' and 'msg' in res)}
|
if property in entry:
|
||||||
return {'status': 'ok'}
|
etr[f"playlist_{property}"] = entry[property]
|
||||||
elif etype == 'video' or (etype.startswith('url') and 'id' in entry and 'title' in entry):
|
results.append(await self.__add_entry(etr, quality, format, folder, custom_name_prefix, playlist_strict_mode, playlist_item_limit, auto_start, already))
|
||||||
log.debug('Processing as a video')
|
if any(res['status'] == 'error' for res in results):
|
||||||
key = entry.get('webpage_url') or entry['url']
|
return {'status': 'error', 'msg': ', '.join(res['msg'] for res in results if res['status'] == 'error' and 'msg' in res)}
|
||||||
if not self.queue.exists(key):
|
return {'status': 'ok'}
|
||||||
dl = DownloadInfo(entry['id'], entry.get('title') or entry['id'], key, quality, format, folder, custom_name_prefix, error, entry, playlist_item_limit)
|
elif etype == 'video' or (etype.startswith('url') and 'id' in entry and 'title' in entry):
|
||||||
await self.__add_download(dl, auto_start)
|
log.debug('Processing as a video')
|
||||||
return {'status': 'ok'}
|
key = entry.get('webpage_url') or entry['url']
|
||||||
return {'status': 'error', 'msg': f'Unsupported resource "{etype}"'}
|
if not self.queue.exists(key):
|
||||||
|
dl = DownloadInfo(entry['id'], entry.get('title') or entry['id'], key, quality, format, folder, custom_name_prefix, error, entry, playlist_item_limit)
|
||||||
async def add(self, url, quality, format, folder, custom_name_prefix, playlist_strict_mode, playlist_item_limit, auto_start=True, already=None):
|
await self.__add_download(dl, auto_start)
|
||||||
log.info(f'adding {url}: {quality=} {format=} {already=} {folder=} {custom_name_prefix=} {playlist_strict_mode=} {playlist_item_limit=} {auto_start=}')
|
return {'status': 'ok'}
|
||||||
already = set() if already is None else already
|
return {'status': 'error', 'msg': f'Unsupported resource "{etype}"'}
|
||||||
if url in already:
|
|
||||||
log.info('recursion detected, skipping')
|
async def add(self, url, quality, format, folder, custom_name_prefix, playlist_strict_mode, playlist_item_limit, auto_start=True, already=None):
|
||||||
return {'status': 'ok'}
|
log.info(f'adding {url}: {quality=} {format=} {already=} {folder=} {custom_name_prefix=} {playlist_strict_mode=} {playlist_item_limit=} {auto_start=}')
|
||||||
else:
|
already = set() if already is None else already
|
||||||
already.add(url)
|
if url in already:
|
||||||
try:
|
log.info('recursion detected, skipping')
|
||||||
entry = await asyncio.get_running_loop().run_in_executor(None, self.__extract_info, url, playlist_strict_mode)
|
return {'status': 'ok'}
|
||||||
except yt_dlp.utils.YoutubeDLError as exc:
|
else:
|
||||||
return {'status': 'error', 'msg': str(exc)}
|
already.add(url)
|
||||||
return await self.__add_entry(entry, quality, format, folder, custom_name_prefix, playlist_strict_mode, playlist_item_limit, auto_start, already)
|
try:
|
||||||
|
entry = await asyncio.get_running_loop().run_in_executor(None, self.__extract_info, url, playlist_strict_mode)
|
||||||
async def start_pending(self, ids):
|
except yt_dlp.utils.YoutubeDLError as exc:
|
||||||
for id in ids:
|
return {'status': 'error', 'msg': str(exc)}
|
||||||
if not self.pending.exists(id):
|
return await self.__add_entry(entry, quality, format, folder, custom_name_prefix, playlist_strict_mode, playlist_item_limit, auto_start, already)
|
||||||
log.warn(f'requested start for non-existent download {id}')
|
|
||||||
continue
|
async def start_pending(self, ids):
|
||||||
dl = self.pending.get(id)
|
for id in ids:
|
||||||
self.queue.put(dl)
|
if not self.pending.exists(id):
|
||||||
self.pending.delete(id)
|
log.warn(f'requested start for non-existent download {id}')
|
||||||
asyncio.create_task(self.__start_download(dl))
|
continue
|
||||||
return {'status': 'ok'}
|
dl = self.pending.get(id)
|
||||||
|
self.queue.put(dl)
|
||||||
async def cancel(self, ids):
|
self.pending.delete(id)
|
||||||
for id in ids:
|
asyncio.create_task(self.__start_download(dl))
|
||||||
if self.pending.exists(id):
|
return {'status': 'ok'}
|
||||||
self.pending.delete(id)
|
|
||||||
await self.notifier.canceled(id)
|
async def cancel(self, ids):
|
||||||
continue
|
for id in ids:
|
||||||
if not self.queue.exists(id):
|
if self.pending.exists(id):
|
||||||
log.warn(f'requested cancel for non-existent download {id}')
|
self.pending.delete(id)
|
||||||
continue
|
await self.notifier.canceled(id)
|
||||||
if self.queue.get(id).started():
|
continue
|
||||||
self.queue.get(id).cancel()
|
if not self.queue.exists(id):
|
||||||
else:
|
log.warn(f'requested cancel for non-existent download {id}')
|
||||||
self.queue.delete(id)
|
continue
|
||||||
await self.notifier.canceled(id)
|
if self.queue.get(id).started():
|
||||||
return {'status': 'ok'}
|
self.queue.get(id).cancel()
|
||||||
|
else:
|
||||||
async def clear(self, ids):
|
self.queue.delete(id)
|
||||||
for id in ids:
|
await self.notifier.canceled(id)
|
||||||
if not self.done.exists(id):
|
return {'status': 'ok'}
|
||||||
log.warn(f'requested delete for non-existent download {id}')
|
|
||||||
continue
|
async def clear(self, ids):
|
||||||
if self.config.DELETE_FILE_ON_TRASHCAN:
|
for id in ids:
|
||||||
dl = self.done.get(id)
|
if not self.done.exists(id):
|
||||||
try:
|
log.warn(f'requested delete for non-existent download {id}')
|
||||||
dldirectory, _ = self.__calc_download_path(dl.info.quality, dl.info.format, dl.info.folder)
|
continue
|
||||||
os.remove(os.path.join(dldirectory, dl.info.filename))
|
if self.config.DELETE_FILE_ON_TRASHCAN:
|
||||||
except Exception as e:
|
dl = self.done.get(id)
|
||||||
log.warn(f'deleting file for download {id} failed with error message {e!r}')
|
try:
|
||||||
self.done.delete(id)
|
dldirectory, _ = self.__calc_download_path(dl.info.quality, dl.info.format, dl.info.folder)
|
||||||
await self.notifier.cleared(id)
|
os.remove(os.path.join(dldirectory, dl.info.filename))
|
||||||
return {'status': 'ok'}
|
except Exception as e:
|
||||||
|
log.warn(f'deleting file for download {id} failed with error message {e!r}')
|
||||||
def get(self):
|
self.done.delete(id)
|
||||||
return (list((k, v.info) for k, v in self.queue.items()) +
|
await self.notifier.cleared(id)
|
||||||
list((k, v.info) for k, v in self.pending.items()),
|
return {'status': 'ok'}
|
||||||
list((k, v.info) for k, v in self.done.items()))
|
|
||||||
|
def get(self):
|
||||||
|
return (list((k, v.info) for k, v in self.queue.items()) +
|
||||||
|
list((k, v.info) for k, v in self.pending.items()),
|
||||||
|
list((k, v.info) for k, v in self.done.items()))
|
||||||
|
|||||||
117
ui/angular.json
117
ui/angular.json
@@ -15,17 +15,13 @@
|
|||||||
"prefix": "app",
|
"prefix": "app",
|
||||||
"architect": {
|
"architect": {
|
||||||
"build": {
|
"build": {
|
||||||
"builder": "@angular-devkit/build-angular:application",
|
"builder": "@angular/build:application",
|
||||||
"options": {
|
"options": {
|
||||||
"outputPath": {
|
"outputPath": {
|
||||||
"base": "dist/metube"
|
"base": "dist/metube"
|
||||||
},
|
},
|
||||||
"index": "src/index.html",
|
"index": "src/index.html",
|
||||||
"polyfills": [
|
|
||||||
"src/polyfills.ts"
|
|
||||||
],
|
|
||||||
"tsConfig": "tsconfig.app.json",
|
"tsConfig": "tsconfig.app.json",
|
||||||
"aot": true,
|
|
||||||
"assets": [
|
"assets": [
|
||||||
"src/favicon.ico",
|
"src/favicon.ico",
|
||||||
"src/assets",
|
"src/assets",
|
||||||
@@ -41,17 +37,14 @@
|
|||||||
"node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"
|
"node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"
|
||||||
],
|
],
|
||||||
"serviceWorker": "ngsw-config.json",
|
"serviceWorker": "ngsw-config.json",
|
||||||
"browser": "src/main.ts"
|
"browser": "src/main.ts",
|
||||||
|
"polyfills": [
|
||||||
|
"zone.js",
|
||||||
|
"@angular/localize/init"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"configurations": {
|
"configurations": {
|
||||||
"production": {
|
"production": {
|
||||||
"fileReplacements": [
|
|
||||||
{
|
|
||||||
"replace": "src/environments/environment.ts",
|
|
||||||
"with": "src/environments/environment.prod.ts"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"optimization": true,
|
|
||||||
"outputHashing": "all",
|
"outputHashing": "all",
|
||||||
"sourceMap": false,
|
"sourceMap": false,
|
||||||
"namedChunks": false,
|
"namedChunks": false,
|
||||||
@@ -68,74 +61,70 @@
|
|||||||
"maximumError": "10kb"
|
"maximumError": "10kb"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
},
|
||||||
|
"development": {
|
||||||
|
"optimization": false,
|
||||||
|
"extractLicenses": false,
|
||||||
|
"sourceMap": true
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
|
"defaultConfiguration": "production"
|
||||||
},
|
},
|
||||||
"serve": {
|
"serve": {
|
||||||
"builder": "@angular-devkit/build-angular:dev-server",
|
"builder": "@angular/build:dev-server",
|
||||||
"options": {
|
|
||||||
"buildTarget": "metube:build"
|
|
||||||
},
|
|
||||||
"configurations": {
|
"configurations": {
|
||||||
"production": {
|
"production": {
|
||||||
"buildTarget": "metube:build:production"
|
"buildTarget": "metube:build:production"
|
||||||
|
},
|
||||||
|
"development": {
|
||||||
|
"buildTarget": "metube:build:development"
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
},
|
"defaultConfiguration": "development"
|
||||||
"extract-i18n": {
|
|
||||||
"builder": "@angular-devkit/build-angular:extract-i18n",
|
|
||||||
"options": {
|
|
||||||
"buildTarget": "metube:build"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"test": {
|
"test": {
|
||||||
"builder": "@angular-devkit/build-angular:karma",
|
"builder": "@angular/build:unit-test"
|
||||||
"options": {
|
|
||||||
"main": "src/test.ts",
|
|
||||||
"polyfills": "src/polyfills.ts",
|
|
||||||
"tsConfig": "tsconfig.spec.json",
|
|
||||||
"karmaConfig": "karma.conf.js",
|
|
||||||
"assets": [
|
|
||||||
"src/favicon.ico",
|
|
||||||
"src/assets",
|
|
||||||
"src/manifest.webmanifest",
|
|
||||||
"src/custom-service-worker.js"
|
|
||||||
],
|
|
||||||
"styles": [
|
|
||||||
"src/styles.sass"
|
|
||||||
],
|
|
||||||
"scripts": []
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"lint": {
|
"lint": {
|
||||||
"builder": "@angular-devkit/build-angular:tslint",
|
"builder": "@angular-eslint/builder:lint",
|
||||||
"options": {
|
"options": {
|
||||||
"tsConfig": [
|
"lintFilePatterns": [
|
||||||
"tsconfig.app.json",
|
"src/**/*.ts",
|
||||||
"tsconfig.spec.json",
|
"src/**/*.html"
|
||||||
"e2e/tsconfig.json"
|
|
||||||
],
|
|
||||||
"exclude": [
|
|
||||||
"**/node_modules/**"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"e2e": {
|
|
||||||
"builder": "@angular-devkit/build-angular:protractor",
|
|
||||||
"options": {
|
|
||||||
"protractorConfig": "e2e/protractor.conf.js",
|
|
||||||
"devServerTarget": "metube:serve"
|
|
||||||
},
|
|
||||||
"configurations": {
|
|
||||||
"production": {
|
|
||||||
"devServerTarget": "metube:serve:production"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"cli": {
|
"cli": {
|
||||||
"analytics": false
|
"analytics": false,
|
||||||
|
"packageManager": "pnpm"
|
||||||
|
},
|
||||||
|
"schematics": {
|
||||||
|
"@schematics/angular:component": {
|
||||||
|
"type": "component"
|
||||||
|
},
|
||||||
|
"@schematics/angular:directive": {
|
||||||
|
"type": "directive"
|
||||||
|
},
|
||||||
|
"@schematics/angular:service": {
|
||||||
|
"type": "service"
|
||||||
|
},
|
||||||
|
"@schematics/angular:guard": {
|
||||||
|
"typeSeparator": "."
|
||||||
|
},
|
||||||
|
"@schematics/angular:interceptor": {
|
||||||
|
"typeSeparator": "."
|
||||||
|
},
|
||||||
|
"@schematics/angular:module": {
|
||||||
|
"typeSeparator": "."
|
||||||
|
},
|
||||||
|
"@schematics/angular:pipe": {
|
||||||
|
"typeSeparator": "."
|
||||||
|
},
|
||||||
|
"@schematics/angular:resolver": {
|
||||||
|
"typeSeparator": "."
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,36 +0,0 @@
|
|||||||
// @ts-check
|
|
||||||
// Protractor configuration file, see link for more information
|
|
||||||
// https://github.com/angular/protractor/blob/master/lib/config.ts
|
|
||||||
|
|
||||||
const { SpecReporter, StacktraceOption } = require('jasmine-spec-reporter');
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @type { import("protractor").Config }
|
|
||||||
*/
|
|
||||||
exports.config = {
|
|
||||||
allScriptsTimeout: 11000,
|
|
||||||
specs: [
|
|
||||||
'./src/**/*.e2e-spec.ts'
|
|
||||||
],
|
|
||||||
capabilities: {
|
|
||||||
browserName: 'chrome'
|
|
||||||
},
|
|
||||||
directConnect: true,
|
|
||||||
baseUrl: 'http://localhost:4200/',
|
|
||||||
framework: 'jasmine',
|
|
||||||
jasmineNodeOpts: {
|
|
||||||
showColors: true,
|
|
||||||
defaultTimeoutInterval: 30000,
|
|
||||||
print: function() {}
|
|
||||||
},
|
|
||||||
onPrepare() {
|
|
||||||
require('ts-node').register({
|
|
||||||
project: require('path').join(__dirname, './tsconfig.json')
|
|
||||||
});
|
|
||||||
jasmine.getEnv().addReporter(new SpecReporter({
|
|
||||||
spec: {
|
|
||||||
displayStacktrace: StacktraceOption.PRETTY
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
};
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
import { AppPage } from './app.po';
|
|
||||||
import { browser, logging } from 'protractor';
|
|
||||||
|
|
||||||
describe('workspace-project App', () => {
|
|
||||||
let page: AppPage;
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
page = new AppPage();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should display welcome message', () => {
|
|
||||||
page.navigateTo();
|
|
||||||
expect(page.getTitleText()).toEqual('metube app is running!');
|
|
||||||
});
|
|
||||||
|
|
||||||
afterEach(async () => {
|
|
||||||
// Assert that there are no errors emitted from the browser
|
|
||||||
const logs = await browser.manage().logs().get(logging.Type.BROWSER);
|
|
||||||
expect(logs).not.toContain(jasmine.objectContaining({
|
|
||||||
level: logging.Level.SEVERE,
|
|
||||||
} as logging.Entry));
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
import { browser, by, element } from 'protractor';
|
|
||||||
|
|
||||||
export class AppPage {
|
|
||||||
navigateTo(): Promise<unknown> {
|
|
||||||
return browser.get(browser.baseUrl) as Promise<unknown>;
|
|
||||||
}
|
|
||||||
|
|
||||||
getTitleText(): Promise<string> {
|
|
||||||
return element(by.css('app-root .content span')).getText() as Promise<string>;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
/* To learn more about this file see: https://angular.io/config/tsconfig. */
|
|
||||||
{
|
|
||||||
"extends": "../tsconfig.json",
|
|
||||||
"compilerOptions": {
|
|
||||||
"outDir": "../out-tsc/e2e",
|
|
||||||
"module": "commonjs",
|
|
||||||
"target": "es2018",
|
|
||||||
"types": [
|
|
||||||
"jasmine",
|
|
||||||
"jasminewd2",
|
|
||||||
"node"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
44
ui/eslint.config.js
Normal file
44
ui/eslint.config.js
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
// @ts-check
|
||||||
|
const eslint = require("@eslint/js");
|
||||||
|
const { defineConfig } = require("eslint/config");
|
||||||
|
const tseslint = require("typescript-eslint");
|
||||||
|
const angular = require("angular-eslint");
|
||||||
|
|
||||||
|
module.exports = defineConfig([
|
||||||
|
{
|
||||||
|
files: ["**/*.ts"],
|
||||||
|
extends: [
|
||||||
|
eslint.configs.recommended,
|
||||||
|
tseslint.configs.recommended,
|
||||||
|
tseslint.configs.stylistic,
|
||||||
|
angular.configs.tsRecommended,
|
||||||
|
],
|
||||||
|
processor: angular.processInlineTemplates,
|
||||||
|
rules: {
|
||||||
|
"@angular-eslint/directive-selector": [
|
||||||
|
"error",
|
||||||
|
{
|
||||||
|
type: "attribute",
|
||||||
|
prefix: "app",
|
||||||
|
style: "camelCase",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
"@angular-eslint/component-selector": [
|
||||||
|
"error",
|
||||||
|
{
|
||||||
|
type: "element",
|
||||||
|
prefix: "app",
|
||||||
|
style: "kebab-case",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
files: ["**/*.html"],
|
||||||
|
extends: [
|
||||||
|
angular.configs.templateRecommended,
|
||||||
|
angular.configs.templateAccessibility,
|
||||||
|
],
|
||||||
|
rules: {},
|
||||||
|
}
|
||||||
|
]);
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
// Karma configuration file, see link for more information
|
|
||||||
// https://karma-runner.github.io/1.0/config/configuration-file.html
|
|
||||||
|
|
||||||
module.exports = function (config) {
|
|
||||||
config.set({
|
|
||||||
basePath: '',
|
|
||||||
frameworks: ['jasmine', '@angular-devkit/build-angular'],
|
|
||||||
plugins: [
|
|
||||||
require('karma-jasmine'),
|
|
||||||
require('karma-chrome-launcher'),
|
|
||||||
require('karma-jasmine-html-reporter'),
|
|
||||||
require('karma-coverage-istanbul-reporter'),
|
|
||||||
require('@angular-devkit/build-angular/plugins/karma')
|
|
||||||
],
|
|
||||||
client: {
|
|
||||||
clearContext: false // leave Jasmine Spec Runner output visible in browser
|
|
||||||
},
|
|
||||||
coverageIstanbulReporter: {
|
|
||||||
dir: require('path').join(__dirname, './coverage/metube'),
|
|
||||||
reports: ['html', 'lcovonly', 'text-summary'],
|
|
||||||
fixWebpackSourcePaths: true
|
|
||||||
},
|
|
||||||
reporters: ['progress', 'kjhtml'],
|
|
||||||
port: 9876,
|
|
||||||
colors: true,
|
|
||||||
logLevel: config.LOG_INFO,
|
|
||||||
autoWatch: true,
|
|
||||||
browsers: ['Chrome'],
|
|
||||||
singleRun: false,
|
|
||||||
restartOnFileChange: true
|
|
||||||
});
|
|
||||||
};
|
|
||||||
14656
ui/package-lock.json
generated
14656
ui/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -5,44 +5,58 @@
|
|||||||
"ng": "ng",
|
"ng": "ng",
|
||||||
"start": "ng serve",
|
"start": "ng serve",
|
||||||
"build": "ng build",
|
"build": "ng build",
|
||||||
|
"build:watch": "ng build --watch",
|
||||||
"test": "ng test",
|
"test": "ng test",
|
||||||
"lint": "ng lint",
|
"lint": "ng lint"
|
||||||
"e2e": "ng e2e"
|
},
|
||||||
|
"prettier": {
|
||||||
|
"printWidth": 100,
|
||||||
|
"singleQuote": true,
|
||||||
|
"overrides": [
|
||||||
|
{
|
||||||
|
"files": "*.html",
|
||||||
|
"options": {
|
||||||
|
"parser": "angular"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@angular/animations": "^19.2.14",
|
"@angular/animations": "^21.0.0",
|
||||||
"@angular/common": "^19.2.14",
|
"@angular/common": "^21.0.0",
|
||||||
"@angular/compiler": "^19.2.14",
|
"@angular/compiler": "^21.0.0",
|
||||||
"@angular/core": "^19.2.14",
|
"@angular/core": "^21.0.0",
|
||||||
"@angular/forms": "^19.2.14",
|
"@angular/forms": "^21.0.0",
|
||||||
"@angular/localize": "^19.2.14",
|
"@angular/platform-browser": "^21.0.0",
|
||||||
"@angular/platform-browser": "^19.2.14",
|
"@angular/platform-browser-dynamic": "^21.0.0",
|
||||||
"@angular/platform-browser-dynamic": "^19.2.14",
|
"@angular/service-worker": "^21.0.0",
|
||||||
"@angular/router": "^19.2.14",
|
"@fortawesome/angular-fontawesome": "~4.0.0",
|
||||||
"@angular/service-worker": "^19.2.14",
|
"@fortawesome/fontawesome-svg-core": "^7.1.0",
|
||||||
"@fortawesome/angular-fontawesome": "~1.0.0",
|
"@fortawesome/free-brands-svg-icons": "^7.1.0",
|
||||||
"@fortawesome/fontawesome-svg-core": "^6.7.0",
|
"@fortawesome/free-regular-svg-icons": "^7.1.0",
|
||||||
"@fortawesome/free-brands-svg-icons": "^6.7.2",
|
"@fortawesome/free-solid-svg-icons": "^7.1.0",
|
||||||
"@fortawesome/free-regular-svg-icons": "^6.7.0",
|
"@ng-bootstrap/ng-bootstrap": "^20.0.0",
|
||||||
"@fortawesome/free-solid-svg-icons": "^6.7.0",
|
"@ng-select/ng-select": "^21.1.0",
|
||||||
"@ng-bootstrap/ng-bootstrap": "^18.0.0",
|
|
||||||
"@ng-select/ng-select": "^14.0.0",
|
|
||||||
"bootstrap": "^5.3.6",
|
"bootstrap": "^5.3.6",
|
||||||
"ngx-cookie-service": "^19.0.0",
|
"ngx-cookie-service": "^21.1.0",
|
||||||
"ngx-socket-io": "~4.8.0",
|
"ngx-socket-io": "~4.9.3",
|
||||||
"rxjs": "~7.8.0",
|
"rxjs": "~7.8.0",
|
||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"zone.js": "~0.15.1"
|
"zone.js": "0.15.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@angular-devkit/build-angular": "^19.2.14",
|
"@angular-eslint/builder": "21.1.0",
|
||||||
"@angular/cli": "^19.2.14",
|
"@angular/build": "^21.0.3",
|
||||||
"@angular/compiler-cli": "^19.2.14",
|
"@angular/cli": "^21.0.3",
|
||||||
"@types/node": "^22.15.29",
|
"@angular/compiler-cli": "^21.0.0",
|
||||||
"codelyzer": "^6.0.2",
|
"@angular/localize": "^21.0.0",
|
||||||
"ts-node": "~10.9.1",
|
"@eslint/js": "^9.39.1",
|
||||||
"tslint": "~6.1.3",
|
"angular-eslint": "21.1.0",
|
||||||
"typescript": "~5.8.3"
|
"eslint": "^9.39.1",
|
||||||
|
"jsdom": "^27.1.0",
|
||||||
|
"typescript": "~5.9.2",
|
||||||
|
"typescript-eslint": "8.47.0",
|
||||||
|
"vitest": "^4.0.8"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
7163
ui/pnpm-lock.yaml
generated
Normal file
7163
ui/pnpm-lock.yaml
generated
Normal file
File diff suppressed because it is too large
Load Diff
@@ -1,402 +0,0 @@
|
|||||||
<nav class="navbar navbar-expand-md navbar-dark">
|
|
||||||
<div class="container-fluid">
|
|
||||||
<a class="navbar-brand d-flex align-items-center" href="#">
|
|
||||||
<img src="assets/icons/android-chrome-192x192.png" alt="MeTube Logo" height="32" class="me-2">
|
|
||||||
MeTube
|
|
||||||
</a>
|
|
||||||
<div class="download-metrics">
|
|
||||||
<div class="metric" *ngIf="activeDownloads > 0">
|
|
||||||
<fa-icon [icon]="faDownload" class="text-primary"></fa-icon>
|
|
||||||
<span>{{activeDownloads}} downloading</span>
|
|
||||||
</div>
|
|
||||||
<div class="metric" *ngIf="queuedDownloads > 0">
|
|
||||||
<fa-icon [icon]="faClock" class="text-warning"></fa-icon>
|
|
||||||
<span>{{queuedDownloads}} queued</span>
|
|
||||||
</div>
|
|
||||||
<div class="metric" *ngIf="completedDownloads > 0">
|
|
||||||
<fa-icon [icon]="faCheck" class="text-success"></fa-icon>
|
|
||||||
<span>{{completedDownloads}} completed</span>
|
|
||||||
</div>
|
|
||||||
<div class="metric" *ngIf="failedDownloads > 0">
|
|
||||||
<fa-icon [icon]="faTimesCircle" class="text-danger"></fa-icon>
|
|
||||||
<span>{{failedDownloads}} failed</span>
|
|
||||||
</div>
|
|
||||||
<div class="metric" *ngIf="(totalSpeed | speed) !== ''">
|
|
||||||
<fa-icon [icon]="faTachometerAlt" class="text-info"></fa-icon>
|
|
||||||
<span>{{totalSpeed | speed }}</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<!--
|
|
||||||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsDefault" aria-controls="navbarsDefault" aria-expanded="false" aria-label="Toggle navigation">
|
|
||||||
<span class="navbar-toggler-icon"></span>
|
|
||||||
</button>
|
|
||||||
<div class="collapse navbar-collapse" id="navbarsDefault">
|
|
||||||
<ul class="navbar-nav mr-auto">
|
|
||||||
<li class="nav-item active">
|
|
||||||
<a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
-->
|
|
||||||
<div class="navbar-nav ms-auto">
|
|
||||||
<div class="nav-item dropdown">
|
|
||||||
<button class="btn btn-link nav-link py-2 px-0 px-sm-2 dropdown-toggle d-flex align-items-center"
|
|
||||||
id="theme-select"
|
|
||||||
type="button"
|
|
||||||
aria-expanded="false"
|
|
||||||
data-bs-toggle="dropdown"
|
|
||||||
data-bs-display="static">
|
|
||||||
<fa-icon [icon]="activeTheme.icon"></fa-icon>
|
|
||||||
</button>
|
|
||||||
<ul class="dropdown-menu dropdown-menu-end position-absolute" aria-labelledby="theme-select">
|
|
||||||
<li *ngFor="let theme of themes">
|
|
||||||
<button type="button" class="dropdown-item d-flex align-items-center" [ngClass]="{'active' : activeTheme == theme}" (click)="themeChanged(theme)">
|
|
||||||
<span class="me-2 opacity-50">
|
|
||||||
<fa-icon [icon]="theme.icon"></fa-icon>
|
|
||||||
</span>
|
|
||||||
{{ theme.displayName }}
|
|
||||||
<span class="ms-auto" [ngClass]="{'d-none' : activeTheme != theme}">
|
|
||||||
<fa-icon [icon]="faCheck"></fa-icon>
|
|
||||||
</span>
|
|
||||||
</button>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</nav>
|
|
||||||
|
|
||||||
<main role="main" class="container container-xl">
|
|
||||||
<form #f="ngForm">
|
|
||||||
<div class="container add-url-box">
|
|
||||||
<!-- Main URL Input with Download Button -->
|
|
||||||
<div class="row mb-4">
|
|
||||||
<div class="col">
|
|
||||||
<div class="input-group input-group-lg shadow-sm">
|
|
||||||
<input type="text"
|
|
||||||
autocomplete="off"
|
|
||||||
spellcheck="false"
|
|
||||||
class="form-control form-control-lg"
|
|
||||||
placeholder="Enter video or playlist URL"
|
|
||||||
name="addUrl"
|
|
||||||
[(ngModel)]="addUrl"
|
|
||||||
[disabled]="addInProgress || downloads.loading">
|
|
||||||
<button class="btn btn-primary btn-lg px-4"
|
|
||||||
type="submit"
|
|
||||||
(click)="addDownload()"
|
|
||||||
[disabled]="addInProgress || downloads.loading">
|
|
||||||
<span class="spinner-border spinner-border-sm" role="status" id="add-spinner" *ngIf="addInProgress"></span>
|
|
||||||
{{ addInProgress ? "Adding..." : "Download" }}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Options Row -->
|
|
||||||
<div class="row mb-3 g-3">
|
|
||||||
<div class="col-md-4">
|
|
||||||
<div class="input-group">
|
|
||||||
<span class="input-group-text">Quality</span>
|
|
||||||
<select class="form-select"
|
|
||||||
name="quality"
|
|
||||||
[(ngModel)]="quality"
|
|
||||||
(change)="qualityChanged()"
|
|
||||||
[disabled]="addInProgress || downloads.loading">
|
|
||||||
<option *ngFor="let q of qualities" [ngValue]="q.id">{{ q.text }}</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-md-4">
|
|
||||||
<div class="input-group">
|
|
||||||
<span class="input-group-text">Format</span>
|
|
||||||
<select class="form-select"
|
|
||||||
name="format"
|
|
||||||
[(ngModel)]="format"
|
|
||||||
(change)="formatChanged()"
|
|
||||||
[disabled]="addInProgress || downloads.loading">
|
|
||||||
<option *ngFor="let f of formats" [ngValue]="f.id">{{ f.text }}</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-md-4">
|
|
||||||
<button type="button"
|
|
||||||
class="btn btn-outline-secondary w-100 h-100"
|
|
||||||
(click)="toggleAdvanced()">
|
|
||||||
Advanced Options
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Advanced Options Panel -->
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-12">
|
|
||||||
<div class="collapse show" id="advancedOptions" [ngbCollapse]="!isAdvancedOpen">
|
|
||||||
<div class="card card-body">
|
|
||||||
<!-- Advanced Settings -->
|
|
||||||
<div class="row g-3 mb-2">
|
|
||||||
<div class="col-md-6">
|
|
||||||
<div class="input-group">
|
|
||||||
<span class="input-group-text">Auto Start</span>
|
|
||||||
<select class="form-select"
|
|
||||||
name="autoStart"
|
|
||||||
[(ngModel)]="autoStart"
|
|
||||||
(change)="autoStartChanged()"
|
|
||||||
[disabled]="addInProgress || downloads.loading"
|
|
||||||
ngbTooltip="Automatically start downloads when added">
|
|
||||||
<option [ngValue]="true">Yes</option>
|
|
||||||
<option [ngValue]="false">No</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-md-6">
|
|
||||||
<div class="input-group">
|
|
||||||
<span class="input-group-text">Download Folder</span>
|
|
||||||
<ng-select [items]="customDirs$ | async"
|
|
||||||
placeholder="Default"
|
|
||||||
[addTag]="allowCustomDir.bind(this)"
|
|
||||||
addTagText="Create directory"
|
|
||||||
bindLabel="folder"
|
|
||||||
[(ngModel)]="folder"
|
|
||||||
[disabled]="addInProgress || downloads.loading"
|
|
||||||
[virtualScroll]="true"
|
|
||||||
[clearable]="true"
|
|
||||||
[loading]="downloads.loading"
|
|
||||||
[searchable]="true"
|
|
||||||
[closeOnSelect]="true"
|
|
||||||
ngbTooltip="Choose where to save downloads. Type to create a new folder.">
|
|
||||||
</ng-select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-md-6">
|
|
||||||
<div class="input-group">
|
|
||||||
<span class="input-group-text">Custom Name Prefix</span>
|
|
||||||
<input type="text"
|
|
||||||
class="form-control"
|
|
||||||
placeholder="Default"
|
|
||||||
name="customNamePrefix"
|
|
||||||
[(ngModel)]="customNamePrefix"
|
|
||||||
[disabled]="addInProgress || downloads.loading"
|
|
||||||
ngbTooltip="Add a prefix to downloaded filenames">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-md-6">
|
|
||||||
<div class="input-group">
|
|
||||||
<span class="input-group-text">Items Limit</span>
|
|
||||||
<input type="number"
|
|
||||||
min="0"
|
|
||||||
class="form-control"
|
|
||||||
placeholder="Default"
|
|
||||||
name="playlistItemLimit"
|
|
||||||
(keydown)="isNumber($event)"
|
|
||||||
[(ngModel)]="playlistItemLimit"
|
|
||||||
[disabled]="addInProgress || downloads.loading"
|
|
||||||
ngbTooltip="Maximum number of items to download from a playlist (0 = no limit)">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-12">
|
|
||||||
<div class="form-check form-switch">
|
|
||||||
<input class="form-check-input"
|
|
||||||
type="checkbox"
|
|
||||||
role="switch"
|
|
||||||
name="playlistStrictMode"
|
|
||||||
[(ngModel)]="playlistStrictMode"
|
|
||||||
[disabled]="addInProgress || downloads.loading"
|
|
||||||
ngbTooltip="Only download playlists when URL explicitly points to a playlist">
|
|
||||||
<label class="form-check-label">Strict Playlist Mode</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Advanced Actions -->
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-12">
|
|
||||||
<hr class="my-3">
|
|
||||||
<div class="row g-2">
|
|
||||||
<div class="col-md-4">
|
|
||||||
<button type="button"
|
|
||||||
class="btn btn-secondary w-100"
|
|
||||||
(click)="openBatchImportModal()">
|
|
||||||
<fa-icon [icon]="faFileImport" class="me-2"></fa-icon>
|
|
||||||
Import URLs
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div class="col-md-4">
|
|
||||||
<button type="button"
|
|
||||||
class="btn btn-secondary w-100"
|
|
||||||
(click)="exportBatchUrls('all')">
|
|
||||||
<fa-icon [icon]="faFileExport" class="me-2"></fa-icon>
|
|
||||||
Export URLs
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div class="col-md-4">
|
|
||||||
<button type="button"
|
|
||||||
class="btn btn-secondary w-100"
|
|
||||||
(click)="copyBatchUrls('all')">
|
|
||||||
<fa-icon [icon]="faCopy" class="me-2"></fa-icon>
|
|
||||||
Copy URLs
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
|
|
||||||
<!-- Batch Import Modal -->
|
|
||||||
<div class="modal fade" tabindex="-1" role="dialog" [ngClass]="{'show': batchImportModalOpen}" [ngStyle]="{'display': batchImportModalOpen ? 'block' : 'none'}">
|
|
||||||
<div class="modal-dialog" role="document">
|
|
||||||
<div class="modal-content">
|
|
||||||
<div class="modal-header">
|
|
||||||
<h5 class="modal-title">Batch Import URLs</h5>
|
|
||||||
<button type="button" class="btn-close" aria-label="Close" (click)="closeBatchImportModal()"></button>
|
|
||||||
</div>
|
|
||||||
<div class="modal-body">
|
|
||||||
<textarea [(ngModel)]="batchImportText" class="form-control" rows="6"
|
|
||||||
placeholder="Paste one video URL per line"></textarea>
|
|
||||||
<div class="mt-2">
|
|
||||||
<small *ngIf="batchImportStatus">{{ batchImportStatus }}</small>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="modal-footer">
|
|
||||||
<button type="button" class="btn btn-danger me-auto" *ngIf="importInProgress" (click)="cancelBatchImport()">
|
|
||||||
Cancel Import
|
|
||||||
</button>
|
|
||||||
<button type="button" class="btn btn-secondary" (click)="closeBatchImportModal()">Close</button>
|
|
||||||
<button type="button" class="btn btn-primary" (click)="startBatchImport()" [disabled]="importInProgress">
|
|
||||||
Import URLs
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<div *ngIf="downloads.loading" class="alert alert-info" role="alert">
|
|
||||||
Connecting to server...
|
|
||||||
</div>
|
|
||||||
<div class="metube-section-header">Downloading</div>
|
|
||||||
<div class="px-2 py-3 border-bottom">
|
|
||||||
<button type="button" class="btn btn-link text-decoration-none px-0 me-4" disabled #queueDelSelected (click)="delSelectedDownloads('queue')"><fa-icon [icon]="faTrashAlt"></fa-icon> Cancel selected</button>
|
|
||||||
<button type="button" class="btn btn-link text-decoration-none px-0 me-4" disabled #queueDownloadSelected (click)="startSelectedDownloads('queue')"><fa-icon [icon]="faDownload"></fa-icon> Download selected</button>
|
|
||||||
</div>
|
|
||||||
<div class="overflow-auto">
|
|
||||||
<table class="table">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th scope="col" style="width: 1rem;">
|
|
||||||
<app-master-checkbox #queueMasterCheckbox [id]="'queue'" [list]="downloads.queue" (changed)="queueSelectionChanged($event)"></app-master-checkbox>
|
|
||||||
</th>
|
|
||||||
<th scope="col">Video</th>
|
|
||||||
<th scope="col" style="width: 8rem;">Speed</th>
|
|
||||||
<th scope="col" style="width: 7rem;">ETA</th>
|
|
||||||
<th scope="col" style="width: 6rem;"></th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
<tr *ngFor="let download of downloads.queue | keyvalue: asIsOrder; trackBy: identifyDownloadRow" [class.disabled]='download.value.deleting'>
|
|
||||||
<td>
|
|
||||||
<app-slave-checkbox [id]="download.key" [master]="queueMasterCheckbox" [checkable]="download.value"></app-slave-checkbox>
|
|
||||||
</td>
|
|
||||||
<td title="{{ download.value.filename }}">
|
|
||||||
<div class="d-flex flex-column flex-sm-row align-items-center row-gap-2 column-gap-3">
|
|
||||||
<div>{{ download.value.title }}</div>
|
|
||||||
<ngb-progressbar height="1.5rem" [showValue]="download.value.status != 'preparing'" [striped]="download.value.status == 'preparing'" [animated]="download.value.status == 'preparing'" type="success" [value]="download.value.status == 'preparing' ? 100 : download.value.percent | number:'1.0-0'" class="download-progressbar"></ngb-progressbar>
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
<td>{{ download.value.speed | speed }}</td>
|
|
||||||
<td>{{ download.value.eta | eta }}</td>
|
|
||||||
<td>
|
|
||||||
<div class="d-flex">
|
|
||||||
<button *ngIf="download.value.status === 'pending'" type="button" class="btn btn-link" (click)="downloadItemByKey(download.key)"><fa-icon [icon]="faDownload"></fa-icon></button>
|
|
||||||
<button type="button" class="btn btn-link" (click)="delDownload('queue', download.key)"><fa-icon [icon]="faTrashAlt"></fa-icon></button>
|
|
||||||
<a href="{{download.value.url}}" target="_blank" class="btn btn-link"><fa-icon [icon]="faExternalLinkAlt"></fa-icon></a>
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="metube-section-header">Completed</div>
|
|
||||||
<div class="px-2 py-3 border-bottom">
|
|
||||||
<button type="button" class="btn btn-link text-decoration-none px-0 me-4" disabled #doneDelSelected (click)="delSelectedDownloads('done')"><fa-icon [icon]="faTrashAlt"></fa-icon> Clear selected</button>
|
|
||||||
<button type="button" class="btn btn-link text-decoration-none px-0 me-4" disabled #doneClearCompleted (click)="clearCompletedDownloads()"><fa-icon [icon]="faCheckCircle"></fa-icon> Clear completed</button>
|
|
||||||
<button type="button" class="btn btn-link text-decoration-none px-0 me-4" disabled #doneClearFailed (click)="clearFailedDownloads()"><fa-icon [icon]="faTimesCircle"></fa-icon> Clear failed</button>
|
|
||||||
<button type="button" class="btn btn-link text-decoration-none px-0 me-4" disabled #doneRetryFailed (click)="retryFailedDownloads()"><fa-icon [icon]="faRedoAlt"></fa-icon> Retry failed</button>
|
|
||||||
<button type="button" class="btn btn-link text-decoration-none px-0 me-4" disabled #doneDownloadSelected (click)="downloadSelectedFiles()"><fa-icon [icon]="faDownload"></fa-icon> Download Selected</button>
|
|
||||||
</div>
|
|
||||||
<div class="overflow-auto">
|
|
||||||
<table class="table">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th scope="col" style="width: 1rem;">
|
|
||||||
<app-master-checkbox #doneMasterCheckbox [id]="'done'" [list]="downloads.done" (changed)="doneSelectionChanged($event)"></app-master-checkbox>
|
|
||||||
</th>
|
|
||||||
<th scope="col">Video</th>
|
|
||||||
<th scope="col">File Size</th>
|
|
||||||
<th scope="col" style="width: 8rem;"></th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
<tr *ngFor="let download of downloads.done | keyvalue: asIsOrder; trackBy: identifyDownloadRow" [class.disabled]='download.value.deleting'>
|
|
||||||
<td>
|
|
||||||
<app-slave-checkbox [id]="download.key" [master]="doneMasterCheckbox" [checkable]="download.value"></app-slave-checkbox>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<div style="display: inline-block; width: 1.5rem;">
|
|
||||||
<fa-icon *ngIf="download.value.status == 'finished'" [icon]="faCheckCircle" class="text-success"></fa-icon>
|
|
||||||
<fa-icon *ngIf="download.value.status == 'error'" [icon]="faTimesCircle" class="text-danger"></fa-icon>
|
|
||||||
</div>
|
|
||||||
<span ngbTooltip="{{download.value.msg}} | {{download.value.error}}"><a *ngIf="!!download.value.filename; else noDownloadLink" href="{{buildDownloadLink(download.value)}}" target="_blank">{{ download.value.title }}</a></span>
|
|
||||||
<ng-template #noDownloadLink>
|
|
||||||
{{download.value.title}}
|
|
||||||
<span *ngIf="download.value.msg"><br>{{download.value.msg}}</span>
|
|
||||||
<span *ngIf="download.value.error"><br>Error: {{download.value.error}}</span>
|
|
||||||
</ng-template>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<span *ngIf="download.value.size">{{ download.value.size | fileSize }}</span>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<div class="d-flex">
|
|
||||||
<button *ngIf="download.value.status == 'error'" type="button" class="btn btn-link" (click)="retryDownload(download.key, download.value)"><fa-icon [icon]="faRedoAlt"></fa-icon></button>
|
|
||||||
<a *ngIf="download.value.filename" href="{{buildDownloadLink(download.value)}}" download class="btn btn-link"><fa-icon [icon]="faDownload"></fa-icon></a>
|
|
||||||
<a href="{{download.value.url}}" target="_blank" class="btn btn-link"><fa-icon [icon]="faExternalLinkAlt"></fa-icon></a>
|
|
||||||
<button type="button" class="btn btn-link" (click)="delDownload('done', download.key)"><fa-icon [icon]="faTrashAlt"></fa-icon></button>
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
</main><!-- /.container -->
|
|
||||||
|
|
||||||
<footer class="footer navbar-dark bg-dark py-3 mt-5">
|
|
||||||
<div class="container text-center">
|
|
||||||
<div class="footer-content" *ngIf="ytDlpVersion && metubeVersion">
|
|
||||||
<div class="version-item">
|
|
||||||
<span class="version-label">yt-dlp</span>
|
|
||||||
<span class="version-value">{{ytDlpVersion}}</span>
|
|
||||||
</div>
|
|
||||||
<div class="version-separator"></div>
|
|
||||||
<div class="version-item">
|
|
||||||
<span class="version-label">MeTube</span>
|
|
||||||
<span class="version-value">{{metubeVersion}}</span>
|
|
||||||
</div>
|
|
||||||
<div class="version-separator"></div>
|
|
||||||
<div class="version-item" *ngIf="ytDlpOptionsUpdateTime">
|
|
||||||
<span class="version-label">yt-dlp-options</span>
|
|
||||||
<span class="version-value">{{ytDlpOptionsUpdateTime}}</span>
|
|
||||||
</div>
|
|
||||||
<div class="version-separator" *ngIf="ytDlpOptionsUpdateTime"></div>
|
|
||||||
<a href="https://github.com/alexta69/metube" target="_blank" class="github-link">
|
|
||||||
<fa-icon [icon]="faGithub"></fa-icon>
|
|
||||||
<span>GitHub</span>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</footer>
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
import { TestBed } from '@angular/core/testing';
|
|
||||||
import { AppComponent } from './app.component';
|
|
||||||
|
|
||||||
describe('AppComponent', () => {
|
|
||||||
beforeEach(async () => {
|
|
||||||
await TestBed.configureTestingModule({
|
|
||||||
declarations: [
|
|
||||||
AppComponent
|
|
||||||
],
|
|
||||||
}).compileComponents();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should create the app', () => {
|
|
||||||
const fixture = TestBed.createComponent(AppComponent);
|
|
||||||
const app = fixture.componentInstance;
|
|
||||||
expect(app).toBeTruthy();
|
|
||||||
});
|
|
||||||
|
|
||||||
it(`should have as title 'metube'`, () => {
|
|
||||||
const fixture = TestBed.createComponent(AppComponent);
|
|
||||||
const app = fixture.componentInstance;
|
|
||||||
expect(app.title).toEqual('metube');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should render title', () => {
|
|
||||||
const fixture = TestBed.createComponent(AppComponent);
|
|
||||||
fixture.detectChanges();
|
|
||||||
const compiled = fixture.nativeElement;
|
|
||||||
expect(compiled.querySelector('.content span').textContent).toContain('metube app is running!');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
17
ui/src/app/app.config.ts
Normal file
17
ui/src/app/app.config.ts
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
import { ApplicationConfig, provideBrowserGlobalErrorListeners, isDevMode, provideZonelessChangeDetection, provideZoneChangeDetection } from '@angular/core';
|
||||||
|
import { provideServiceWorker } from '@angular/service-worker';
|
||||||
|
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
|
||||||
|
|
||||||
|
export const appConfig: ApplicationConfig = {
|
||||||
|
providers: [
|
||||||
|
provideBrowserGlobalErrorListeners(),
|
||||||
|
provideZoneChangeDetection({ eventCoalescing: true }),
|
||||||
|
provideServiceWorker('custom-service-worker.js', {
|
||||||
|
enabled: !isDevMode(),
|
||||||
|
// Register the ServiceWorker as soon as the application is stable
|
||||||
|
// or after 30 seconds (whichever comes first).
|
||||||
|
registrationStrategy: 'registerWhenStable:30000'
|
||||||
|
}),
|
||||||
|
provideHttpClient(withInterceptorsFromDi()),
|
||||||
|
]
|
||||||
|
};
|
||||||
464
ui/src/app/app.html
Normal file
464
ui/src/app/app.html
Normal file
@@ -0,0 +1,464 @@
|
|||||||
|
<nav class="navbar navbar-expand-md navbar-dark">
|
||||||
|
<div class="container-fluid">
|
||||||
|
<a class="navbar-brand d-flex align-items-center" href="#">
|
||||||
|
<img src="assets/icons/android-chrome-192x192.png" alt="MeTube Logo" height="32" class="me-2">
|
||||||
|
MeTube
|
||||||
|
</a>
|
||||||
|
<div class="download-metrics">
|
||||||
|
@if (activeDownloads > 0) {
|
||||||
|
<div class="metric">
|
||||||
|
<fa-icon [icon]="faDownload" class="text-primary" />
|
||||||
|
<span>{{activeDownloads}} downloading</span>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
@if (queuedDownloads > 0) {
|
||||||
|
<div class="metric">
|
||||||
|
<fa-icon [icon]="faClock" class="text-warning" />
|
||||||
|
<span>{{queuedDownloads}} queued</span>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
@if (completedDownloads > 0) {
|
||||||
|
<div class="metric">
|
||||||
|
<fa-icon [icon]="faCheck" class="text-success" />
|
||||||
|
<span>{{completedDownloads}} completed</span>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
@if (failedDownloads > 0) {
|
||||||
|
<div class="metric">
|
||||||
|
<fa-icon [icon]="faTimesCircle" class="text-danger" />
|
||||||
|
<span>{{failedDownloads}} failed</span>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
@if ((totalSpeed | speed) !== '') {
|
||||||
|
<div class="metric">
|
||||||
|
<fa-icon [icon]="faTachometerAlt" class="text-info" />
|
||||||
|
<span>{{totalSpeed | speed }}</span>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
<!--
|
||||||
|
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsDefault" aria-controls="navbarsDefault" aria-expanded="false" aria-label="Toggle navigation">
|
||||||
|
<span class="navbar-toggler-icon"></span>
|
||||||
|
</button>
|
||||||
|
<div class="collapse navbar-collapse" id="navbarsDefault">
|
||||||
|
<ul class="navbar-nav mr-auto">
|
||||||
|
<li class="nav-item active">
|
||||||
|
<a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
-->
|
||||||
|
<div class="navbar-nav ms-auto">
|
||||||
|
<div class="nav-item dropdown">
|
||||||
|
<button class="btn btn-link nav-link py-2 px-0 px-sm-2 dropdown-toggle d-flex align-items-center"
|
||||||
|
id="theme-select"
|
||||||
|
type="button"
|
||||||
|
aria-expanded="false"
|
||||||
|
data-bs-toggle="dropdown"
|
||||||
|
data-bs-display="static">
|
||||||
|
@if(activeTheme){
|
||||||
|
<fa-icon [icon]="activeTheme.icon" />
|
||||||
|
}
|
||||||
|
</button>
|
||||||
|
<ul class="dropdown-menu dropdown-menu-end position-absolute" aria-labelledby="theme-select">
|
||||||
|
@for (theme of themes; track theme) {
|
||||||
|
<li>
|
||||||
|
<button type="button" class="dropdown-item d-flex align-items-center"
|
||||||
|
[class.active]="activeTheme === theme"
|
||||||
|
(click)="themeChanged(theme)">
|
||||||
|
<span class="me-2 opacity-50">
|
||||||
|
<fa-icon [icon]="theme.icon" />
|
||||||
|
</span>
|
||||||
|
{{ theme.displayName }}
|
||||||
|
<span class="ms-auto"
|
||||||
|
[class.d-none]="activeTheme !== theme">
|
||||||
|
<fa-icon [icon]="faCheck" />
|
||||||
|
</span>
|
||||||
|
</button>
|
||||||
|
</li>
|
||||||
|
}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</nav>
|
||||||
|
|
||||||
|
<main role="main" class="container container-xl">
|
||||||
|
<form #f="ngForm">
|
||||||
|
<div class="container add-url-box">
|
||||||
|
<!-- Main URL Input with Download Button -->
|
||||||
|
<div class="row mb-4">
|
||||||
|
<div class="col">
|
||||||
|
<div class="input-group input-group-lg shadow-sm">
|
||||||
|
<input type="text"
|
||||||
|
autocomplete="off"
|
||||||
|
spellcheck="false"
|
||||||
|
class="form-control form-control-lg"
|
||||||
|
placeholder="Enter video or playlist URL"
|
||||||
|
name="addUrl"
|
||||||
|
[(ngModel)]="addUrl"
|
||||||
|
[disabled]="addInProgress || downloads.loading">
|
||||||
|
<button class="btn btn-primary btn-lg px-4"
|
||||||
|
type="submit"
|
||||||
|
(click)="addDownload()"
|
||||||
|
[disabled]="addInProgress || downloads.loading">
|
||||||
|
@if (addInProgress) {
|
||||||
|
<span class="spinner-border spinner-border-sm" role="status" id="add-spinner"></span>
|
||||||
|
}
|
||||||
|
{{ addInProgress ? "Adding..." : "Download" }}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Options Row -->
|
||||||
|
<div class="row mb-3 g-3">
|
||||||
|
<div class="col-md-4">
|
||||||
|
<div class="input-group">
|
||||||
|
<span class="input-group-text">Quality</span>
|
||||||
|
<select class="form-select"
|
||||||
|
name="quality"
|
||||||
|
[(ngModel)]="quality"
|
||||||
|
(change)="qualityChanged()"
|
||||||
|
[disabled]="addInProgress || downloads.loading">
|
||||||
|
@for (q of qualities; track q) {
|
||||||
|
<option [ngValue]="q.id">{{ q.text }}</option>
|
||||||
|
}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-4">
|
||||||
|
<div class="input-group">
|
||||||
|
<span class="input-group-text">Format</span>
|
||||||
|
<select class="form-select"
|
||||||
|
name="format"
|
||||||
|
[(ngModel)]="format"
|
||||||
|
(change)="formatChanged()"
|
||||||
|
[disabled]="addInProgress || downloads.loading">
|
||||||
|
@for (f of formats; track f) {
|
||||||
|
<option [ngValue]="f.id">{{ f.text }}</option>
|
||||||
|
}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-4">
|
||||||
|
<button type="button"
|
||||||
|
class="btn btn-outline-secondary w-100 h-100"
|
||||||
|
(click)="toggleAdvanced()">
|
||||||
|
Advanced Options
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Advanced Options Panel -->
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-12">
|
||||||
|
<div class="collapse show" id="advancedOptions" [ngbCollapse]="!isAdvancedOpen">
|
||||||
|
<div class="card card-body">
|
||||||
|
<!-- Advanced Settings -->
|
||||||
|
<div class="row g-3 mb-2">
|
||||||
|
<div class="col-md-6">
|
||||||
|
<div class="input-group">
|
||||||
|
<span class="input-group-text">Auto Start</span>
|
||||||
|
<select class="form-select"
|
||||||
|
name="autoStart"
|
||||||
|
[(ngModel)]="autoStart"
|
||||||
|
(change)="autoStartChanged()"
|
||||||
|
[disabled]="addInProgress || downloads.loading"
|
||||||
|
ngbTooltip="Automatically start downloads when added">
|
||||||
|
<option [ngValue]="true">Yes</option>
|
||||||
|
<option [ngValue]="false">No</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-6">
|
||||||
|
<div class="input-group">
|
||||||
|
<span class="input-group-text">Download Folder</span>
|
||||||
|
@if (customDirs$ | async; as customDirs) {
|
||||||
|
<ng-select [items]="customDirs"
|
||||||
|
placeholder="Default"
|
||||||
|
[addTag]="allowCustomDir.bind(this)"
|
||||||
|
addTagText="Create directory"
|
||||||
|
bindLabel="folder"
|
||||||
|
[(ngModel)]="folder"
|
||||||
|
[disabled]="addInProgress || downloads.loading"
|
||||||
|
[virtualScroll]="true"
|
||||||
|
[clearable]="true"
|
||||||
|
[loading]="downloads.loading"
|
||||||
|
[searchable]="true"
|
||||||
|
[closeOnSelect]="true"
|
||||||
|
ngbTooltip="Choose where to save downloads. Type to create a new folder." />
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<div class="col-md-6">
|
||||||
|
<div class="input-group">
|
||||||
|
<span class="input-group-text">Custom Name Prefix</span>
|
||||||
|
<input type="text"
|
||||||
|
class="form-control"
|
||||||
|
placeholder="Default"
|
||||||
|
name="customNamePrefix"
|
||||||
|
[(ngModel)]="customNamePrefix"
|
||||||
|
[disabled]="addInProgress || downloads.loading"
|
||||||
|
ngbTooltip="Add a prefix to downloaded filenames">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-6">
|
||||||
|
<div class="input-group">
|
||||||
|
<span class="input-group-text">Items Limit</span>
|
||||||
|
<input type="number"
|
||||||
|
min="0"
|
||||||
|
class="form-control"
|
||||||
|
placeholder="Default"
|
||||||
|
name="playlistItemLimit"
|
||||||
|
(keydown)="isNumber($event)"
|
||||||
|
[(ngModel)]="playlistItemLimit"
|
||||||
|
[disabled]="addInProgress || downloads.loading"
|
||||||
|
ngbTooltip="Maximum number of items to download from a playlist (0 = no limit)">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-12">
|
||||||
|
<div class="form-check form-switch">
|
||||||
|
<input class="form-check-input"
|
||||||
|
type="checkbox"
|
||||||
|
role="switch"
|
||||||
|
id="checkbox-strict-mode"
|
||||||
|
name="playlistStrictMode"
|
||||||
|
[(ngModel)]="playlistStrictMode"
|
||||||
|
[disabled]="addInProgress || downloads.loading"
|
||||||
|
ngbTooltip="Only download playlists when URL explicitly points to a playlist">
|
||||||
|
<label class="form-check-label" for="checkbox-strict-mode">Strict Playlist Mode</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Advanced Actions -->
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-12">
|
||||||
|
<hr class="my-3">
|
||||||
|
<div class="row g-2">
|
||||||
|
<div class="col-md-4">
|
||||||
|
<button type="button"
|
||||||
|
class="btn btn-secondary w-100"
|
||||||
|
(click)="openBatchImportModal()">
|
||||||
|
<fa-icon [icon]="faFileImport" class="me-2" />
|
||||||
|
Import URLs
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-4">
|
||||||
|
<button type="button"
|
||||||
|
class="btn btn-secondary w-100"
|
||||||
|
(click)="exportBatchUrls('all')">
|
||||||
|
<fa-icon [icon]="faFileExport" class="me-2" />
|
||||||
|
Export URLs
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-4">
|
||||||
|
<button type="button"
|
||||||
|
class="btn btn-secondary w-100"
|
||||||
|
(click)="copyBatchUrls('all')">
|
||||||
|
<fa-icon [icon]="faCopy" class="me-2" />
|
||||||
|
Copy URLs
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
<!-- Batch Import Modal -->
|
||||||
|
<div class="modal fade" tabindex="-1" role="dialog"
|
||||||
|
[class.show]="batchImportModalOpen"
|
||||||
|
[style.display]="batchImportModalOpen ? 'block' : 'none'">
|
||||||
|
<div class="modal-dialog" role="document">
|
||||||
|
<div class="modal-content">
|
||||||
|
<div class="modal-header">
|
||||||
|
<h5 class="modal-title">Batch Import URLs</h5>
|
||||||
|
<button type="button" class="btn-close" aria-label="Close" (click)="closeBatchImportModal()"></button>
|
||||||
|
</div>
|
||||||
|
<div class="modal-body">
|
||||||
|
<textarea [(ngModel)]="batchImportText" class="form-control" rows="6"
|
||||||
|
placeholder="Paste one video URL per line"></textarea>
|
||||||
|
<div class="mt-2">
|
||||||
|
@if (batchImportStatus) {
|
||||||
|
<small>{{ batchImportStatus }}</small>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="modal-footer">
|
||||||
|
@if (importInProgress) {
|
||||||
|
<button type="button" class="btn btn-danger me-auto" (click)="cancelBatchImport()">
|
||||||
|
Cancel Import
|
||||||
|
</button>
|
||||||
|
}
|
||||||
|
<button type="button" class="btn btn-secondary" (click)="closeBatchImportModal()">Close</button>
|
||||||
|
<button type="button" class="btn btn-primary" (click)="startBatchImport()" [disabled]="importInProgress">
|
||||||
|
Import URLs
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
@if (downloads.loading) {
|
||||||
|
<div class="alert alert-info" role="alert">
|
||||||
|
Connecting to server...
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
<div class="metube-section-header">Downloading</div>
|
||||||
|
<div class="px-2 py-3 border-bottom">
|
||||||
|
<button type="button" class="btn btn-link text-decoration-none px-0 me-4" disabled #queueDelSelected (click)="delSelectedDownloads('queue')"><fa-icon [icon]="faTrashAlt" /> Cancel selected</button>
|
||||||
|
<button type="button" class="btn btn-link text-decoration-none px-0 me-4" disabled #queueDownloadSelected (click)="startSelectedDownloads('queue')"><fa-icon [icon]="faDownload" /> Download selected</button>
|
||||||
|
</div>
|
||||||
|
<div class="overflow-auto">
|
||||||
|
<table class="table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th scope="col" style="width: 1rem;">
|
||||||
|
<app-master-checkbox #queueMasterCheckboxRef [id]="'queue'" [list]="downloads.queue" (changed)="queueSelectionChanged($event)" />
|
||||||
|
</th>
|
||||||
|
<th scope="col">Video</th>
|
||||||
|
<th scope="col" style="width: 8rem;">Speed</th>
|
||||||
|
<th scope="col" style="width: 7rem;">ETA</th>
|
||||||
|
<th scope="col" style="width: 6rem;"></th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
@for (download of downloads.queue | keyvalue: asIsOrder; track download.value.id) {
|
||||||
|
<tr [class.disabled]='download.value.deleting'>
|
||||||
|
<td>
|
||||||
|
<app-slave-checkbox [id]="download.key" [master]="queueMasterCheckboxRef" [checkable]="download.value" />
|
||||||
|
</td>
|
||||||
|
<td title="{{ download.value.filename }}">
|
||||||
|
<div class="d-flex flex-column flex-sm-row align-items-center row-gap-2 column-gap-3">
|
||||||
|
<div>{{ download.value.title }} </div>
|
||||||
|
<ngb-progressbar height="1.5rem" [showValue]="download.value.status !== 'preparing'" [striped]="download.value.status === 'preparing'" [animated]="download.value.status === 'preparing'" type="success"
|
||||||
|
[value]="download.value.status === 'preparing' ? 100 : download.value.percent" class="download-progressbar" />
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td>{{ download.value.speed | speed }}</td>
|
||||||
|
<td>{{ download.value.eta | eta }}</td>
|
||||||
|
<td>
|
||||||
|
<div class="d-flex">
|
||||||
|
@if (download.value.status === 'pending') {
|
||||||
|
<button type="button" class="btn btn-link" (click)="downloadItemByKey(download.key)"><fa-icon [icon]="faDownload" /></button>
|
||||||
|
}
|
||||||
|
<button type="button" class="btn btn-link" (click)="delDownload('queue', download.key)"><fa-icon [icon]="faTrashAlt" /></button>
|
||||||
|
<a href="{{download.value.url}}" target="_blank" class="btn btn-link"><fa-icon [icon]="faExternalLinkAlt" /></a>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="metube-section-header">Completed</div>
|
||||||
|
<div class="px-2 py-3 border-bottom">
|
||||||
|
<button type="button" class="btn btn-link text-decoration-none px-0 me-4" disabled #doneDelSelected (click)="delSelectedDownloads('done')"><fa-icon [icon]="faTrashAlt" /> Clear selected</button>
|
||||||
|
<button type="button" class="btn btn-link text-decoration-none px-0 me-4" disabled #doneClearCompleted (click)="clearCompletedDownloads()"><fa-icon [icon]="faCheckCircle" /> Clear completed</button>
|
||||||
|
<button type="button" class="btn btn-link text-decoration-none px-0 me-4" disabled #doneClearFailed (click)="clearFailedDownloads()"><fa-icon [icon]="faTimesCircle" /> Clear failed</button>
|
||||||
|
<button type="button" class="btn btn-link text-decoration-none px-0 me-4" disabled #doneRetryFailed (click)="retryFailedDownloads()"><fa-icon [icon]="faRedoAlt" /> Retry failed</button>
|
||||||
|
<button type="button" class="btn btn-link text-decoration-none px-0 me-4" disabled #doneDownloadSelected (click)="downloadSelectedFiles()"><fa-icon [icon]="faDownload" /> Download Selected</button>
|
||||||
|
</div>
|
||||||
|
<div class="overflow-auto">
|
||||||
|
<table class="table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th scope="col" style="width: 1rem;">
|
||||||
|
<app-master-checkbox #doneMasterCheckboxRef [id]="'done'" [list]="downloads.done" (changed)="doneSelectionChanged($event)" />
|
||||||
|
</th>
|
||||||
|
<th scope="col">Video</th>
|
||||||
|
<th scope="col">File Size</th>
|
||||||
|
<th scope="col" style="width: 8rem;"></th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
@for (download of downloads.done | keyvalue: asIsOrder; track download.value.id) {
|
||||||
|
<tr [class.disabled]='download.value.deleting'>
|
||||||
|
<td>
|
||||||
|
<app-slave-checkbox [id]="download.key" [master]="doneMasterCheckboxRef" [checkable]="download.value" />
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<div style="display: inline-block; width: 1.5rem;">
|
||||||
|
@if (download.value.status === 'finished') {
|
||||||
|
<fa-icon [icon]="faCheckCircle" class="text-success" />
|
||||||
|
}
|
||||||
|
@if (download.value.status === 'error') {
|
||||||
|
<fa-icon [icon]="faTimesCircle" class="text-danger" />
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
<span ngbTooltip="{{buildResultItemTooltip(download.value)}}">@if (!!download.value.filename) {
|
||||||
|
<a href="{{buildDownloadLink(download.value)}}" target="_blank">{{ download.value.title }}</a>
|
||||||
|
} @else {
|
||||||
|
{{download.value.title}}
|
||||||
|
@if (download.value.msg) {
|
||||||
|
<span><br>{{download.value.msg}}</span>
|
||||||
|
}
|
||||||
|
@if (download.value.error) {
|
||||||
|
<span><br>Error: {{download.value.error}}</span>
|
||||||
|
}
|
||||||
|
}</span>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
@if (download.value.size) {
|
||||||
|
<span>{{ download.value.size | fileSize }}</span>
|
||||||
|
}
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<div class="d-flex">
|
||||||
|
@if (download.value.status === 'error') {
|
||||||
|
<button type="button" class="btn btn-link" (click)="retryDownload(download.key, download.value)"><fa-icon [icon]="faRedoAlt" /></button>
|
||||||
|
}
|
||||||
|
@if (download.value.filename) {
|
||||||
|
<a href="{{buildDownloadLink(download.value)}}" download class="btn btn-link"><fa-icon [icon]="faDownload" /></a>
|
||||||
|
}
|
||||||
|
<a href="{{download.value.url}}" target="_blank" class="btn btn-link"><fa-icon [icon]="faExternalLinkAlt" /></a>
|
||||||
|
<button type="button" class="btn btn-link" (click)="delDownload('done', download.key)"><fa-icon [icon]="faTrashAlt" /></button>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</main><!-- /.container -->
|
||||||
|
|
||||||
|
<footer class="footer navbar-dark bg-dark py-3 mt-5">
|
||||||
|
<div class="container text-center">
|
||||||
|
@if (ytDlpVersion && metubeVersion) {
|
||||||
|
<div class="footer-content">
|
||||||
|
<div class="version-item">
|
||||||
|
<span class="version-label">yt-dlp</span>
|
||||||
|
<span class="version-value">{{ytDlpVersion}}</span>
|
||||||
|
</div>
|
||||||
|
<div class="version-separator"></div>
|
||||||
|
<div class="version-item">
|
||||||
|
<span class="version-label">MeTube</span>
|
||||||
|
<span class="version-value">{{metubeVersion}}</span>
|
||||||
|
</div>
|
||||||
|
<div class="version-separator"></div>
|
||||||
|
@if (ytDlpOptionsUpdateTime) {
|
||||||
|
<div class="version-item">
|
||||||
|
<span class="version-label">yt-dlp-options</span>
|
||||||
|
<span class="version-value">{{ytDlpOptionsUpdateTime}}</span>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
@if (ytDlpOptionsUpdateTime) {
|
||||||
|
<div class="version-separator"></div>
|
||||||
|
}
|
||||||
|
<a href="https://github.com/alexta69/metube" target="_blank" class="github-link">
|
||||||
|
<fa-icon [icon]="faGithub" />
|
||||||
|
<span>GitHub</span>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
</footer>
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
import { BrowserModule } from '@angular/platform-browser';
|
|
||||||
import { NgModule, isDevMode } from '@angular/core';
|
|
||||||
import { FormsModule } from '@angular/forms';
|
|
||||||
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
|
||||||
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
|
|
||||||
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
|
|
||||||
import { CookieService } from 'ngx-cookie-service';
|
|
||||||
|
|
||||||
import { AppComponent } from './app.component';
|
|
||||||
import { EtaPipe, SpeedPipe, EncodeURIComponent, FileSizePipe } from './downloads.pipe';
|
|
||||||
import { MasterCheckboxComponent, SlaveCheckboxComponent } from './master-checkbox.component';
|
|
||||||
import { MeTubeSocket } from './metube-socket';
|
|
||||||
import { NgSelectModule } from '@ng-select/ng-select';
|
|
||||||
import { ServiceWorkerModule } from '@angular/service-worker';
|
|
||||||
|
|
||||||
@NgModule({ declarations: [
|
|
||||||
AppComponent,
|
|
||||||
EtaPipe,
|
|
||||||
SpeedPipe,
|
|
||||||
FileSizePipe,
|
|
||||||
EncodeURIComponent,
|
|
||||||
MasterCheckboxComponent,
|
|
||||||
SlaveCheckboxComponent
|
|
||||||
],
|
|
||||||
bootstrap: [AppComponent], imports: [BrowserModule,
|
|
||||||
FormsModule,
|
|
||||||
NgbModule,
|
|
||||||
FontAwesomeModule,
|
|
||||||
NgSelectModule,
|
|
||||||
ServiceWorkerModule.register('custom-service-worker.js', {
|
|
||||||
enabled: !isDevMode(),
|
|
||||||
// Register the ServiceWorker as soon as the application is stable
|
|
||||||
// or after 30 seconds (whichever comes first).
|
|
||||||
registrationStrategy: 'registerWhenStable:30000'
|
|
||||||
})], providers: [CookieService, MeTubeSocket, provideHttpClient(withInterceptorsFromDi())] })
|
|
||||||
export class AppModule { }
|
|
||||||
@@ -1,211 +1,211 @@
|
|||||||
.button-toggle-theme:focus, .button-toggle-theme:active
|
.button-toggle-theme:focus, .button-toggle-theme:active
|
||||||
box-shadow: none
|
box-shadow: none
|
||||||
outline: 0px
|
outline: 0px
|
||||||
|
|
||||||
.add-url-box
|
.add-url-box
|
||||||
max-width: 960px
|
max-width: 960px
|
||||||
margin: 4rem auto
|
margin: 4rem auto
|
||||||
|
|
||||||
.add-url-component
|
.add-url-component
|
||||||
margin: 0.5rem auto
|
margin: 0.5rem auto
|
||||||
|
|
||||||
.add-url-group
|
.add-url-group
|
||||||
width: 100%
|
width: 100%
|
||||||
|
|
||||||
button.add-url
|
button.add-url
|
||||||
width: 100%
|
width: 100%
|
||||||
|
|
||||||
.folder-dropdown-menu
|
.folder-dropdown-menu
|
||||||
width: 500px
|
width: 500px
|
||||||
max-width: calc(100vw - 3rem)
|
max-width: calc(100vw - 3rem)
|
||||||
|
|
||||||
.folder-dropdown-menu .input-group
|
.folder-dropdown-menu .input-group
|
||||||
display: flex
|
display: flex
|
||||||
padding-left: 5px
|
padding-left: 5px
|
||||||
padding-right: 5px
|
padding-right: 5px
|
||||||
|
|
||||||
.metube-section-header
|
.metube-section-header
|
||||||
font-size: 1.8rem
|
font-size: 1.8rem
|
||||||
font-weight: 300
|
font-weight: 300
|
||||||
position: relative
|
position: relative
|
||||||
background: var(--bs-secondary-bg)
|
background: var(--bs-secondary-bg)
|
||||||
padding: 0.5rem 0
|
padding: 0.5rem 0
|
||||||
margin-top: 3.5rem
|
margin-top: 3.5rem
|
||||||
|
|
||||||
.metube-section-header:before
|
.metube-section-header:before
|
||||||
content: ""
|
content: ""
|
||||||
position: absolute
|
position: absolute
|
||||||
top: 0
|
top: 0
|
||||||
bottom: 0
|
bottom: 0
|
||||||
left: -9999px
|
left: -9999px
|
||||||
right: 0
|
right: 0
|
||||||
border-left: 9999px solid var(--bs-secondary-bg)
|
border-left: 9999px solid var(--bs-secondary-bg)
|
||||||
box-shadow: 9999px 0 0 var(--bs-secondary-bg)
|
box-shadow: 9999px 0 0 var(--bs-secondary-bg)
|
||||||
|
|
||||||
button:hover
|
button:hover
|
||||||
text-decoration: none
|
text-decoration: none
|
||||||
|
|
||||||
th
|
th
|
||||||
border-top: 0
|
border-top: 0
|
||||||
border-bottom-width: 3px !important
|
border-bottom-width: 3px !important
|
||||||
vertical-align: middle !important
|
vertical-align: middle !important
|
||||||
white-space: nowrap
|
white-space: nowrap
|
||||||
|
|
||||||
td
|
td
|
||||||
vertical-align: middle
|
vertical-align: middle
|
||||||
|
|
||||||
.disabled
|
.disabled
|
||||||
opacity: 0.5
|
opacity: 0.5
|
||||||
pointer-events: none
|
pointer-events: none
|
||||||
|
|
||||||
.form-switch
|
.form-switch
|
||||||
input
|
input
|
||||||
margin-top: 5px
|
margin-top: 5px
|
||||||
|
|
||||||
.download-progressbar
|
.download-progressbar
|
||||||
width: 12rem
|
width: 12rem
|
||||||
margin-left: auto
|
margin-left: auto
|
||||||
|
|
||||||
.batch-panel
|
.batch-panel
|
||||||
margin-top: 15px
|
margin-top: 15px
|
||||||
border: 1px solid #ccc
|
border: 1px solid #ccc
|
||||||
border-radius: 8px
|
border-radius: 8px
|
||||||
padding: 15px
|
padding: 15px
|
||||||
background-color: #fff
|
background-color: #fff
|
||||||
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1)
|
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1)
|
||||||
|
|
||||||
.batch-panel-header
|
.batch-panel-header
|
||||||
border-bottom: 1px solid #eee
|
border-bottom: 1px solid #eee
|
||||||
padding-bottom: 8px
|
padding-bottom: 8px
|
||||||
margin-bottom: 15px
|
margin-bottom: 15px
|
||||||
h4
|
h4
|
||||||
font-size: 1.5rem
|
font-size: 1.5rem
|
||||||
margin: 0
|
margin: 0
|
||||||
|
|
||||||
.batch-panel-body
|
.batch-panel-body
|
||||||
textarea.form-control
|
textarea.form-control
|
||||||
resize: vertical
|
resize: vertical
|
||||||
|
|
||||||
.batch-status
|
.batch-status
|
||||||
font-size: 0.9rem
|
font-size: 0.9rem
|
||||||
color: #555
|
color: #555
|
||||||
|
|
||||||
.d-flex.my-3
|
.d-flex.my-3
|
||||||
margin-top: 1rem
|
margin-top: 1rem
|
||||||
margin-bottom: 1rem
|
margin-bottom: 1rem
|
||||||
|
|
||||||
.modal.fade.show
|
.modal.fade.show
|
||||||
background-color: rgba(0, 0, 0, 0.5)
|
background-color: rgba(0, 0, 0, 0.5)
|
||||||
|
|
||||||
.modal-header
|
.modal-header
|
||||||
border-bottom: 1px solid #eee
|
border-bottom: 1px solid #eee
|
||||||
|
|
||||||
.modal-body
|
.modal-body
|
||||||
textarea.form-control
|
textarea.form-control
|
||||||
resize: vertical
|
resize: vertical
|
||||||
|
|
||||||
.add-url
|
.add-url
|
||||||
display: inline-flex
|
display: inline-flex
|
||||||
align-items: center
|
align-items: center
|
||||||
justify-content: center
|
justify-content: center
|
||||||
|
|
||||||
.spinner-border
|
.spinner-border
|
||||||
margin-right: 0.5rem
|
margin-right: 0.5rem
|
||||||
|
|
||||||
::ng-deep .ng-select
|
::ng-deep .ng-select
|
||||||
flex: 1
|
flex: 1
|
||||||
.ng-select-container
|
.ng-select-container
|
||||||
min-height: 38px
|
min-height: 38px
|
||||||
.ng-value
|
.ng-value
|
||||||
white-space: nowrap
|
white-space: nowrap
|
||||||
overflow: visible
|
overflow: visible
|
||||||
.ng-dropdown-panel
|
.ng-dropdown-panel
|
||||||
.ng-dropdown-panel-items
|
.ng-dropdown-panel-items
|
||||||
max-height: 300px
|
max-height: 300px
|
||||||
.ng-option
|
.ng-option
|
||||||
white-space: nowrap
|
white-space: nowrap
|
||||||
overflow: visible
|
overflow: visible
|
||||||
text-overflow: ellipsis
|
text-overflow: ellipsis
|
||||||
|
|
||||||
:host
|
:host
|
||||||
display: flex
|
display: flex
|
||||||
flex-direction: column
|
flex-direction: column
|
||||||
min-height: 100vh
|
min-height: 100vh
|
||||||
|
|
||||||
main
|
main
|
||||||
flex-grow: 1
|
flex-grow: 1
|
||||||
|
|
||||||
.footer
|
.footer
|
||||||
width: 100%
|
width: 100%
|
||||||
padding: 10px 0
|
padding: 10px 0
|
||||||
background: linear-gradient(to bottom, rgba(0,0,0,0.2), rgba(0,0,0,0.1))
|
background: linear-gradient(to bottom, rgba(0,0,0,0.2), rgba(0,0,0,0.1))
|
||||||
|
|
||||||
.footer-content
|
.footer-content
|
||||||
display: flex
|
display: flex
|
||||||
justify-content: center
|
justify-content: center
|
||||||
align-items: center
|
align-items: center
|
||||||
gap: 20px
|
gap: 20px
|
||||||
color: #fff
|
color: #fff
|
||||||
font-size: 0.9rem
|
font-size: 0.9rem
|
||||||
|
|
||||||
.version-item
|
.version-item
|
||||||
display: flex
|
display: flex
|
||||||
align-items: center
|
align-items: center
|
||||||
gap: 8px
|
gap: 8px
|
||||||
|
|
||||||
.version-label
|
.version-label
|
||||||
font-size: 0.75rem
|
font-size: 0.75rem
|
||||||
text-transform: uppercase
|
text-transform: uppercase
|
||||||
letter-spacing: 0.5px
|
letter-spacing: 0.5px
|
||||||
opacity: 0.7
|
opacity: 0.7
|
||||||
|
|
||||||
.version-value
|
.version-value
|
||||||
font-family: monospace
|
font-family: monospace
|
||||||
font-size: 0.85rem
|
font-size: 0.85rem
|
||||||
padding: 2px 6px
|
padding: 2px 6px
|
||||||
background: rgba(255,255,255,0.1)
|
background: rgba(255,255,255,0.1)
|
||||||
border-radius: 4px
|
border-radius: 4px
|
||||||
|
|
||||||
.version-separator
|
.version-separator
|
||||||
width: 1px
|
width: 1px
|
||||||
height: 16px
|
height: 16px
|
||||||
background: rgba(255,255,255,0.2)
|
background: rgba(255,255,255,0.2)
|
||||||
margin: 0 4px
|
margin: 0 4px
|
||||||
|
|
||||||
.github-link
|
.github-link
|
||||||
display: flex
|
display: flex
|
||||||
align-items: center
|
align-items: center
|
||||||
gap: 6px
|
gap: 6px
|
||||||
color: #fff
|
color: #fff
|
||||||
text-decoration: none
|
text-decoration: none
|
||||||
font-size: 0.85rem
|
font-size: 0.85rem
|
||||||
padding: 2px 8px
|
padding: 2px 8px
|
||||||
border-radius: 4px
|
border-radius: 4px
|
||||||
transition: background-color 0.2s ease
|
transition: background-color 0.2s ease
|
||||||
|
|
||||||
&:hover
|
&:hover
|
||||||
background: rgba(255,255,255,0.1)
|
background: rgba(255,255,255,0.1)
|
||||||
color: #fff
|
color: #fff
|
||||||
text-decoration: none
|
text-decoration: none
|
||||||
|
|
||||||
i
|
i
|
||||||
font-size: 1rem
|
font-size: 1rem
|
||||||
|
|
||||||
.download-metrics
|
.download-metrics
|
||||||
display: flex
|
display: flex
|
||||||
align-items: center
|
align-items: center
|
||||||
gap: 16px
|
gap: 16px
|
||||||
margin-left: 24px
|
margin-left: 24px
|
||||||
|
|
||||||
.metric
|
.metric
|
||||||
display: flex
|
display: flex
|
||||||
align-items: center
|
align-items: center
|
||||||
gap: 6px
|
gap: 6px
|
||||||
font-size: 0.9rem
|
font-size: 0.9rem
|
||||||
color: #adb5bd
|
color: #adb5bd
|
||||||
|
|
||||||
fa-icon
|
fa-icon
|
||||||
font-size: 1rem
|
font-size: 1rem
|
||||||
|
|
||||||
span
|
span
|
||||||
white-space: nowrap
|
white-space: nowrap
|
||||||
33
ui/src/app/app.spec.ts
Normal file
33
ui/src/app/app.spec.ts
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
import { App } from './app';
|
||||||
|
|
||||||
|
vi.hoisted(() => {
|
||||||
|
Object.defineProperty(window, "matchMedia", {
|
||||||
|
writable: true,
|
||||||
|
enumerable: true,
|
||||||
|
value: vi.fn().mockImplementation((query) => ({
|
||||||
|
matches: false,
|
||||||
|
media: query,
|
||||||
|
onchange: null,
|
||||||
|
addEventListener: vi.fn(),
|
||||||
|
removeEventListener: vi.fn(),
|
||||||
|
dispatchEvent: vi.fn(),
|
||||||
|
})),
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
describe('App', () => {
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [App],
|
||||||
|
}).compileComponents();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create the app', () => {
|
||||||
|
const fixture = TestBed.createComponent(App);
|
||||||
|
const app = fixture.componentInstance;
|
||||||
|
expect(app).toBeTruthy();
|
||||||
|
});
|
||||||
|
|
||||||
|
});
|
||||||
@@ -1,39 +1,58 @@
|
|||||||
import { Component, ViewChild, ElementRef, AfterViewInit } from '@angular/core';
|
import { AsyncPipe, KeyValuePipe } from '@angular/common';
|
||||||
import { HttpClient } from '@angular/common/http';
|
import { HttpClient } from '@angular/common/http';
|
||||||
import { faTrashAlt, faCheckCircle, faTimesCircle, IconDefinition } from '@fortawesome/free-regular-svg-icons';
|
import { AfterViewInit, Component, ElementRef, viewChild, inject, OnInit } from '@angular/core';
|
||||||
import { faRedoAlt, faSun, faMoon, faCircleHalfStroke, faCheck, faExternalLinkAlt, faDownload, faFileImport, faFileExport, faCopy, faClock, faTachometerAlt } from '@fortawesome/free-solid-svg-icons';
|
import { Observable, map, distinctUntilChanged } from 'rxjs';
|
||||||
|
import { FormsModule } from '@angular/forms';
|
||||||
|
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
|
||||||
|
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
||||||
|
import { NgSelectModule } from '@ng-select/ng-select';
|
||||||
|
import { faTrashAlt, faCheckCircle, faTimesCircle, faRedoAlt, faSun, faMoon, faCheck, faCircleHalfStroke, faDownload, faExternalLinkAlt, faFileImport, faFileExport, faCopy, faClock, faTachometerAlt } from '@fortawesome/free-solid-svg-icons';
|
||||||
import { faGithub } from '@fortawesome/free-brands-svg-icons';
|
import { faGithub } from '@fortawesome/free-brands-svg-icons';
|
||||||
import { CookieService } from 'ngx-cookie-service';
|
import { CookieService } from 'ngx-cookie-service';
|
||||||
import { map, Observable, of, distinctUntilChanged } from 'rxjs';
|
import { DownloadsService } from './services/downloads.service';
|
||||||
|
import { Themes } from './theme';
|
||||||
import { Download, DownloadsService, Status } from './downloads.service';
|
import { Download, Status, Theme , Quality, Format, Formats, State } from './interfaces';
|
||||||
import { MasterCheckboxComponent } from './master-checkbox.component';
|
import { EtaPipe, SpeedPipe, FileSizePipe } from './pipes';
|
||||||
import { Formats, Format, Quality } from './formats';
|
import { MasterCheckboxComponent , SlaveCheckboxComponent} from './components/';
|
||||||
import { Theme, Themes } from './theme';
|
|
||||||
import {KeyValue} from "@angular/common";
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-root',
|
selector: 'app-root',
|
||||||
templateUrl: './app.component.html',
|
imports: [
|
||||||
styleUrls: ['./app.component.sass'],
|
FormsModule,
|
||||||
standalone: false
|
KeyValuePipe,
|
||||||
|
AsyncPipe,
|
||||||
|
FontAwesomeModule,
|
||||||
|
NgbModule,
|
||||||
|
NgSelectModule,
|
||||||
|
EtaPipe,
|
||||||
|
SpeedPipe,
|
||||||
|
FileSizePipe,
|
||||||
|
MasterCheckboxComponent,
|
||||||
|
SlaveCheckboxComponent,
|
||||||
|
],
|
||||||
|
templateUrl: './app.html',
|
||||||
|
styleUrl: './app.sass',
|
||||||
})
|
})
|
||||||
export class AppComponent implements AfterViewInit {
|
export class App implements AfterViewInit, OnInit {
|
||||||
addUrl: string;
|
downloads = inject(DownloadsService);
|
||||||
|
private cookieService = inject(CookieService);
|
||||||
|
private http = inject(HttpClient);
|
||||||
|
|
||||||
|
addUrl!: string;
|
||||||
formats: Format[] = Formats;
|
formats: Format[] = Formats;
|
||||||
qualities: Quality[];
|
qualities!: Quality[];
|
||||||
quality: string;
|
quality: string;
|
||||||
format: string;
|
format: string;
|
||||||
folder: string;
|
folder!: string;
|
||||||
customNamePrefix: string;
|
customNamePrefix!: string;
|
||||||
autoStart: boolean;
|
autoStart: boolean;
|
||||||
playlistStrictMode: boolean;
|
playlistStrictMode!: boolean;
|
||||||
playlistItemLimit: number;
|
playlistItemLimit!: number;
|
||||||
addInProgress = false;
|
addInProgress = false;
|
||||||
themes: Theme[] = Themes;
|
themes: Theme[] = Themes;
|
||||||
activeTheme: Theme;
|
activeTheme: Theme | undefined;
|
||||||
customDirs$: Observable<string[]>;
|
customDirs$!: Observable<string[]>;
|
||||||
showBatchPanel: boolean = false;
|
showBatchPanel = false;
|
||||||
batchImportModalOpen = false;
|
batchImportModalOpen = false;
|
||||||
batchImportText = '';
|
batchImportText = '';
|
||||||
batchImportStatus = '';
|
batchImportStatus = '';
|
||||||
@@ -51,15 +70,15 @@ export class AppComponent implements AfterViewInit {
|
|||||||
failedDownloads = 0;
|
failedDownloads = 0;
|
||||||
totalSpeed = 0;
|
totalSpeed = 0;
|
||||||
|
|
||||||
@ViewChild('queueMasterCheckbox') queueMasterCheckbox: MasterCheckboxComponent;
|
readonly queueMasterCheckbox = viewChild<MasterCheckboxComponent>('queueMasterCheckboxRef');
|
||||||
@ViewChild('queueDelSelected') queueDelSelected: ElementRef;
|
readonly queueDelSelected = viewChild.required<ElementRef>('queueDelSelected');
|
||||||
@ViewChild('queueDownloadSelected') queueDownloadSelected: ElementRef;
|
readonly queueDownloadSelected = viewChild.required<ElementRef>('queueDownloadSelected');
|
||||||
@ViewChild('doneMasterCheckbox') doneMasterCheckbox: MasterCheckboxComponent;
|
readonly doneMasterCheckbox = viewChild<MasterCheckboxComponent>('doneMasterCheckboxRef');
|
||||||
@ViewChild('doneDelSelected') doneDelSelected: ElementRef;
|
readonly doneDelSelected = viewChild.required<ElementRef>('doneDelSelected');
|
||||||
@ViewChild('doneClearCompleted') doneClearCompleted: ElementRef;
|
readonly doneClearCompleted = viewChild.required<ElementRef>('doneClearCompleted');
|
||||||
@ViewChild('doneClearFailed') doneClearFailed: ElementRef;
|
readonly doneClearFailed = viewChild.required<ElementRef>('doneClearFailed');
|
||||||
@ViewChild('doneRetryFailed') doneRetryFailed: ElementRef;
|
readonly doneRetryFailed = viewChild.required<ElementRef>('doneRetryFailed');
|
||||||
@ViewChild('doneDownloadSelected') doneDownloadSelected: ElementRef;
|
readonly doneDownloadSelected = viewChild.required<ElementRef>('doneDownloadSelected');
|
||||||
|
|
||||||
faTrashAlt = faTrashAlt;
|
faTrashAlt = faTrashAlt;
|
||||||
faCheckCircle = faCheckCircle;
|
faCheckCircle = faCheckCircle;
|
||||||
@@ -78,14 +97,14 @@ export class AppComponent implements AfterViewInit {
|
|||||||
faClock = faClock;
|
faClock = faClock;
|
||||||
faTachometerAlt = faTachometerAlt;
|
faTachometerAlt = faTachometerAlt;
|
||||||
|
|
||||||
constructor(public downloads: DownloadsService, private cookieService: CookieService, private http: HttpClient) {
|
constructor() {
|
||||||
this.format = cookieService.get('metube_format') || 'any';
|
this.format = this.cookieService.get('metube_format') || 'any';
|
||||||
// Needs to be set or qualities won't automatically be set
|
// Needs to be set or qualities won't automatically be set
|
||||||
this.setQualities()
|
this.setQualities()
|
||||||
this.quality = cookieService.get('metube_quality') || 'best';
|
this.quality = this.cookieService.get('metube_quality') || 'best';
|
||||||
this.autoStart = cookieService.get('metube_auto_start') !== 'false';
|
this.autoStart = this.cookieService.get('metube_auto_start') !== 'false';
|
||||||
|
|
||||||
this.activeTheme = this.getPreferredTheme(cookieService);
|
this.activeTheme = this.getPreferredTheme(this.cookieService);
|
||||||
|
|
||||||
// Subscribe to download updates
|
// Subscribe to download updates
|
||||||
this.downloads.queueChanged.subscribe(() => {
|
this.downloads.queueChanged.subscribe(() => {
|
||||||
@@ -104,10 +123,10 @@ export class AppComponent implements AfterViewInit {
|
|||||||
this.getConfiguration();
|
this.getConfiguration();
|
||||||
this.getYtdlOptionsUpdateTime();
|
this.getYtdlOptionsUpdateTime();
|
||||||
this.customDirs$ = this.getMatchingCustomDir();
|
this.customDirs$ = this.getMatchingCustomDir();
|
||||||
this.setTheme(this.activeTheme);
|
this.setTheme(this.activeTheme!);
|
||||||
|
|
||||||
window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => {
|
window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => {
|
||||||
if (this.activeTheme.id === 'auto') {
|
if (this.activeTheme && this.activeTheme.id === 'auto') {
|
||||||
this.setTheme(this.activeTheme);
|
this.setTheme(this.activeTheme);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -115,27 +134,30 @@ export class AppComponent implements AfterViewInit {
|
|||||||
|
|
||||||
ngAfterViewInit() {
|
ngAfterViewInit() {
|
||||||
this.downloads.queueChanged.subscribe(() => {
|
this.downloads.queueChanged.subscribe(() => {
|
||||||
this.queueMasterCheckbox.selectionChanged();
|
this.queueMasterCheckbox()?.selectionChanged();
|
||||||
});
|
});
|
||||||
this.downloads.doneChanged.subscribe(() => {
|
this.downloads.doneChanged.subscribe(() => {
|
||||||
this.doneMasterCheckbox.selectionChanged();
|
this.doneMasterCheckbox()?.selectionChanged();
|
||||||
let completed: number = 0, failed: number = 0;
|
let completed = 0, failed = 0;
|
||||||
this.downloads.done.forEach(dl => {
|
this.downloads.done.forEach(dl => {
|
||||||
if (dl.status === 'finished')
|
if (dl.status === 'finished')
|
||||||
completed++;
|
completed++;
|
||||||
else if (dl.status === 'error')
|
else if (dl.status === 'error')
|
||||||
failed++;
|
failed++;
|
||||||
});
|
});
|
||||||
this.doneClearCompleted.nativeElement.disabled = completed === 0;
|
this.doneClearCompleted().nativeElement.disabled = completed === 0;
|
||||||
this.doneClearFailed.nativeElement.disabled = failed === 0;
|
this.doneClearFailed().nativeElement.disabled = failed === 0;
|
||||||
this.doneRetryFailed.nativeElement.disabled = failed === 0;
|
this.doneRetryFailed().nativeElement.disabled = failed === 0;
|
||||||
});
|
});
|
||||||
this.fetchVersionInfo();
|
this.fetchVersionInfo();
|
||||||
}
|
}
|
||||||
|
|
||||||
// workaround to allow fetching of Map values in the order they were inserted
|
// workaround to allow fetching of Map values in the order they were inserted
|
||||||
// https://github.com/angular/angular/issues/31420
|
// https://github.com/angular/angular/issues/31420
|
||||||
asIsOrder(a, b) {
|
|
||||||
|
|
||||||
|
|
||||||
|
asIsOrder() {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -162,7 +184,8 @@ export class AppComponent implements AfterViewInit {
|
|||||||
|
|
||||||
getMatchingCustomDir() : Observable<string[]> {
|
getMatchingCustomDir() : Observable<string[]> {
|
||||||
return this.downloads.customDirsChanged.asObservable().pipe(
|
return this.downloads.customDirsChanged.asObservable().pipe(
|
||||||
map((output) => {
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
|
map((output: any) => {
|
||||||
// Keep logic consistent with app/ytdl.py
|
// Keep logic consistent with app/ytdl.py
|
||||||
if (this.isAudioType()) {
|
if (this.isAudioType()) {
|
||||||
console.debug("Showing audio-specific download directories");
|
console.debug("Showing audio-specific download directories");
|
||||||
@@ -178,7 +201,8 @@ export class AppComponent implements AfterViewInit {
|
|||||||
|
|
||||||
getYtdlOptionsUpdateTime() {
|
getYtdlOptionsUpdateTime() {
|
||||||
this.downloads.ytdlOptionsChanged.subscribe({
|
this.downloads.ytdlOptionsChanged.subscribe({
|
||||||
next: (data) => {
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
|
next: (data:any) => {
|
||||||
if (data['success']){
|
if (data['success']){
|
||||||
const date = new Date(data['update_time'] * 1000);
|
const date = new Date(data['update_time'] * 1000);
|
||||||
this.ytDlpOptionsUpdateTime=date.toLocaleString();
|
this.ytDlpOptionsUpdateTime=date.toLocaleString();
|
||||||
@@ -190,7 +214,8 @@ export class AppComponent implements AfterViewInit {
|
|||||||
}
|
}
|
||||||
getConfiguration() {
|
getConfiguration() {
|
||||||
this.downloads.configurationChanged.subscribe({
|
this.downloads.configurationChanged.subscribe({
|
||||||
next: (config) => {
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
|
next: (config: any) => {
|
||||||
this.playlistStrictMode = config['DEFAULT_OPTION_PLAYLIST_STRICT_MODE'];
|
this.playlistStrictMode = config['DEFAULT_OPTION_PLAYLIST_STRICT_MODE'];
|
||||||
const playlistItemLimit = config['DEFAULT_OPTION_PLAYLIST_ITEM_LIMIT'];
|
const playlistItemLimit = config['DEFAULT_OPTION_PLAYLIST_ITEM_LIMIT'];
|
||||||
if (playlistItemLimit !== '0') {
|
if (playlistItemLimit !== '0') {
|
||||||
@@ -236,21 +261,24 @@ export class AppComponent implements AfterViewInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
queueSelectionChanged(checked: number) {
|
queueSelectionChanged(checked: number) {
|
||||||
this.queueDelSelected.nativeElement.disabled = checked == 0;
|
this.queueDelSelected().nativeElement.disabled = checked == 0;
|
||||||
this.queueDownloadSelected.nativeElement.disabled = checked == 0;
|
this.queueDownloadSelected().nativeElement.disabled = checked == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
doneSelectionChanged(checked: number) {
|
doneSelectionChanged(checked: number) {
|
||||||
this.doneDelSelected.nativeElement.disabled = checked == 0;
|
this.doneDelSelected().nativeElement.disabled = checked == 0;
|
||||||
this.doneDownloadSelected.nativeElement.disabled = checked == 0;
|
this.doneDownloadSelected().nativeElement.disabled = checked == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
setQualities() {
|
setQualities() {
|
||||||
// qualities for specific format
|
// qualities for specific format
|
||||||
this.qualities = this.formats.find(el => el.id == this.format).qualities
|
const format = this.formats.find(el => el.id == this.format)
|
||||||
const exists = this.qualities.find(el => el.id === this.quality)
|
if (format) {
|
||||||
this.quality = exists ? this.quality : 'best'
|
this.qualities = format.qualities
|
||||||
|
const exists = this.qualities.find(el => el.id === this.quality)
|
||||||
|
this.quality = exists ? this.quality : 'best'
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
addDownload(url?: string, quality?: string, format?: string, folder?: string, customNamePrefix?: string, playlistStrictMode?: boolean, playlistItemLimit?: number, autoStart?: boolean) {
|
addDownload(url?: string, quality?: string, format?: string, folder?: string, customNamePrefix?: string, playlistStrictMode?: boolean, playlistItemLimit?: number, autoStart?: boolean) {
|
||||||
url = url ?? this.addUrl
|
url = url ?? this.addUrl
|
||||||
@@ -283,16 +311,16 @@ export class AppComponent implements AfterViewInit {
|
|||||||
this.downloads.delById('done', [key]).subscribe();
|
this.downloads.delById('done', [key]).subscribe();
|
||||||
}
|
}
|
||||||
|
|
||||||
delDownload(where: string, id: string) {
|
delDownload(where: State, id: string) {
|
||||||
this.downloads.delById(where, [id]).subscribe();
|
this.downloads.delById(where, [id]).subscribe();
|
||||||
}
|
}
|
||||||
|
|
||||||
startSelectedDownloads(where: string){
|
startSelectedDownloads(where: State){
|
||||||
this.downloads.startByFilter(where, dl => dl.checked).subscribe();
|
this.downloads.startByFilter(where, dl => !!dl.checked).subscribe();
|
||||||
}
|
}
|
||||||
|
|
||||||
delSelectedDownloads(where: string) {
|
delSelectedDownloads(where: State) {
|
||||||
this.downloads.delByFilter(where, dl => dl.checked).subscribe();
|
this.downloads.delByFilter(where, dl => !!dl.checked).subscribe();
|
||||||
}
|
}
|
||||||
|
|
||||||
clearCompletedDownloads() {
|
clearCompletedDownloads() {
|
||||||
@@ -312,7 +340,8 @@ export class AppComponent implements AfterViewInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
downloadSelectedFiles() {
|
downloadSelectedFiles() {
|
||||||
this.downloads.done.forEach((dl, key) => {
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
||||||
|
this.downloads.done.forEach((dl, _) => {
|
||||||
if (dl.status === 'finished' && dl.checked) {
|
if (dl.status === 'finished' && dl.checked) {
|
||||||
const link = document.createElement('a');
|
const link = document.createElement('a');
|
||||||
link.href = this.buildDownloadLink(dl);
|
link.href = this.buildDownloadLink(dl);
|
||||||
@@ -338,13 +367,20 @@ export class AppComponent implements AfterViewInit {
|
|||||||
return baseDir + encodeURIComponent(download.filename);
|
return baseDir + encodeURIComponent(download.filename);
|
||||||
}
|
}
|
||||||
|
|
||||||
identifyDownloadRow(index: number, row: KeyValue<string, Download>) {
|
buildResultItemTooltip(download: Download) {
|
||||||
return row.key;
|
const parts = [];
|
||||||
|
if (download.msg) {
|
||||||
|
parts.push(download.msg);
|
||||||
|
}
|
||||||
|
if (download.error) {
|
||||||
|
parts.push(download.error);
|
||||||
|
}
|
||||||
|
return parts.join(' | ');
|
||||||
}
|
}
|
||||||
|
|
||||||
isNumber(event) {
|
isNumber(event: KeyboardEvent) {
|
||||||
const charCode = (event.which) ? event.which : event.keyCode;
|
const charCode = +event.code || event.keyCode;
|
||||||
if (charCode > 31 && (charCode < 48 || charCode > 57)) {
|
if (charCode > 31 && (charCode < 48 || charCode > 57)) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -485,6 +521,7 @@ export class AppComponent implements AfterViewInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fetchVersionInfo(): void {
|
fetchVersionInfo(): void {
|
||||||
|
// eslint-disable-next-line no-useless-escape
|
||||||
const baseUrl = `${window.location.origin}${window.location.pathname.replace(/\/[^\/]*$/, '/')}`;
|
const baseUrl = `${window.location.origin}${window.location.pathname.replace(/\/[^\/]*$/, '/')}`;
|
||||||
const versionUrl = `${baseUrl}version`;
|
const versionUrl = `${baseUrl}version`;
|
||||||
this.http.get<{ 'yt-dlp': string, version: string }>(versionUrl)
|
this.http.get<{ 'yt-dlp': string, version: string }>(versionUrl)
|
||||||
2
ui/src/app/components/index.ts
Normal file
2
ui/src/app/components/index.ts
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
export { MasterCheckboxComponent } from './master-checkbox.component';
|
||||||
|
export { SlaveCheckboxComponent } from './slave-checkbox.component';
|
||||||
40
ui/src/app/components/master-checkbox.component.ts
Normal file
40
ui/src/app/components/master-checkbox.component.ts
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
import { Component, ElementRef, viewChild, output, input } from "@angular/core";
|
||||||
|
import { Checkable } from "../interfaces";
|
||||||
|
import { FormsModule } from "@angular/forms";
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-master-checkbox',
|
||||||
|
template: `
|
||||||
|
<div class="form-check">
|
||||||
|
<input type="checkbox" class="form-check-input" id="{{id()}}-select-all" #masterCheckbox [(ngModel)]="selected" (change)="clicked()">
|
||||||
|
<label class="form-check-label" for="{{id()}}-select-all"></label>
|
||||||
|
</div>
|
||||||
|
`,
|
||||||
|
imports: [
|
||||||
|
FormsModule
|
||||||
|
]
|
||||||
|
})
|
||||||
|
export class MasterCheckboxComponent {
|
||||||
|
readonly id = input.required<string>();
|
||||||
|
readonly list = input.required<Map<string, Checkable>>();
|
||||||
|
readonly changed = output<number>();
|
||||||
|
|
||||||
|
readonly masterCheckbox = viewChild.required<ElementRef>('masterCheckbox');
|
||||||
|
selected!: boolean;
|
||||||
|
|
||||||
|
clicked() {
|
||||||
|
this.list().forEach(item => item.checked = this.selected);
|
||||||
|
this.selectionChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
selectionChanged() {
|
||||||
|
const masterCheckbox = this.masterCheckbox();
|
||||||
|
if (!masterCheckbox)
|
||||||
|
return;
|
||||||
|
let checked = 0;
|
||||||
|
this.list().forEach(item => { if(item.checked) checked++ });
|
||||||
|
this.selected = checked > 0 && checked == this.list().size;
|
||||||
|
masterCheckbox.nativeElement.indeterminate = checked > 0 && checked < this.list().size;
|
||||||
|
this.changed.emit(checked);
|
||||||
|
}
|
||||||
|
}
|
||||||
22
ui/src/app/components/slave-checkbox.component.ts
Normal file
22
ui/src/app/components/slave-checkbox.component.ts
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
import { Component, input } from '@angular/core';
|
||||||
|
import { MasterCheckboxComponent } from './master-checkbox.component';
|
||||||
|
import { Checkable } from '../interfaces';
|
||||||
|
import { FormsModule } from '@angular/forms';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-slave-checkbox',
|
||||||
|
template: `
|
||||||
|
<div class="form-check">
|
||||||
|
<input type="checkbox" class="form-check-input" id="{{master().id()}}-{{id()}}-select" [(ngModel)]="checkable().checked" (change)="master().selectionChanged()">
|
||||||
|
<label class="form-check-label" for="{{master().id()}}-{{id()}}-select"></label>
|
||||||
|
</div>
|
||||||
|
`,
|
||||||
|
imports: [
|
||||||
|
FormsModule
|
||||||
|
]
|
||||||
|
})
|
||||||
|
export class SlaveCheckboxComponent {
|
||||||
|
readonly id = input.required<string>();
|
||||||
|
readonly master = input.required<MasterCheckboxComponent>();
|
||||||
|
readonly checkable = input.required<Checkable>();
|
||||||
|
}
|
||||||
@@ -1,93 +0,0 @@
|
|||||||
import { Pipe, PipeTransform } from '@angular/core';
|
|
||||||
import { SpeedService } from './speed.service';
|
|
||||||
import { BehaviorSubject } from 'rxjs';
|
|
||||||
import { throttleTime } from 'rxjs/operators';
|
|
||||||
|
|
||||||
@Pipe({
|
|
||||||
name: 'eta',
|
|
||||||
standalone: false
|
|
||||||
})
|
|
||||||
export class EtaPipe implements PipeTransform {
|
|
||||||
transform(value: number, ...args: any[]): any {
|
|
||||||
if (value === null) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
if (value < 60) {
|
|
||||||
return `${Math.round(value)}s`;
|
|
||||||
}
|
|
||||||
if (value < 3600) {
|
|
||||||
return `${Math.floor(value/60)}m ${Math.round(value%60)}s`;
|
|
||||||
}
|
|
||||||
const hours = Math.floor(value/3600)
|
|
||||||
const minutes = value % 3600
|
|
||||||
return `${hours}h ${Math.floor(minutes/60)}m ${Math.round(minutes%60)}s`;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Pipe({
|
|
||||||
name: 'speed',
|
|
||||||
standalone: false,
|
|
||||||
pure: false // Make the pipe impure so it can handle async updates
|
|
||||||
})
|
|
||||||
export class SpeedPipe implements PipeTransform {
|
|
||||||
private speedSubject = new BehaviorSubject<number>(0);
|
|
||||||
private formattedSpeed: string = '';
|
|
||||||
|
|
||||||
constructor(private speedService: SpeedService) {
|
|
||||||
// Throttle updates to once per second
|
|
||||||
this.speedSubject.pipe(
|
|
||||||
throttleTime(1000)
|
|
||||||
).subscribe(speed => {
|
|
||||||
// If speed is invalid or 0, return empty string
|
|
||||||
if (speed === null || speed === undefined || isNaN(speed) || speed <= 0) {
|
|
||||||
this.formattedSpeed = '';
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const k = 1024;
|
|
||||||
const dm = 2;
|
|
||||||
const sizes = ['B/s', 'KB/s', 'MB/s', 'GB/s', 'TB/s', 'PB/s', 'EB/s', 'ZB/s', 'YB/s'];
|
|
||||||
const i = Math.floor(Math.log(speed) / Math.log(k));
|
|
||||||
this.formattedSpeed = parseFloat((speed / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i];
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
transform(value: number, ...args: any[]): any {
|
|
||||||
// If speed is invalid or 0, return empty string
|
|
||||||
if (value === null || value === undefined || isNaN(value) || value <= 0) {
|
|
||||||
return '';
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update the speed subject
|
|
||||||
this.speedSubject.next(value);
|
|
||||||
|
|
||||||
// Return the last formatted speed
|
|
||||||
return this.formattedSpeed;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Pipe({
|
|
||||||
name: 'encodeURIComponent',
|
|
||||||
standalone: false
|
|
||||||
})
|
|
||||||
export class EncodeURIComponent implements PipeTransform {
|
|
||||||
transform(value: string, ...args: any[]): any {
|
|
||||||
return encodeURIComponent(value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Pipe({
|
|
||||||
name: 'fileSize',
|
|
||||||
standalone: false
|
|
||||||
})
|
|
||||||
export class FileSizePipe implements PipeTransform {
|
|
||||||
transform(value: number): string {
|
|
||||||
if (isNaN(value) || value === 0) return '0 Bytes';
|
|
||||||
|
|
||||||
const units = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
|
|
||||||
const unitIndex = Math.floor(Math.log(value) / Math.log(1000)); // Use 1000 for common units
|
|
||||||
|
|
||||||
const unitValue = value / Math.pow(1000, unitIndex);
|
|
||||||
return `${unitValue.toFixed(2)} ${units[unitIndex]}`;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
3
ui/src/app/interfaces/checkable.ts
Normal file
3
ui/src/app/interfaces/checkable.ts
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
export interface Checkable {
|
||||||
|
checked: boolean;
|
||||||
|
}
|
||||||
22
ui/src/app/interfaces/download.ts
Normal file
22
ui/src/app/interfaces/download.ts
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
|
||||||
|
export interface Download {
|
||||||
|
id: string;
|
||||||
|
title: string;
|
||||||
|
url: string;
|
||||||
|
quality: string;
|
||||||
|
format: string;
|
||||||
|
folder: string;
|
||||||
|
custom_name_prefix: string;
|
||||||
|
playlist_strict_mode: boolean;
|
||||||
|
playlist_item_limit: number;
|
||||||
|
status: string;
|
||||||
|
msg: string;
|
||||||
|
percent: number;
|
||||||
|
speed: number;
|
||||||
|
eta: number;
|
||||||
|
filename: string;
|
||||||
|
checked: boolean;
|
||||||
|
size?: number;
|
||||||
|
error?: string;
|
||||||
|
deleting?: boolean;
|
||||||
|
}
|
||||||
7
ui/src/app/interfaces/format.ts
Normal file
7
ui/src/app/interfaces/format.ts
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
import { Quality } from "./quality";
|
||||||
|
|
||||||
|
export interface Format {
|
||||||
|
id: string;
|
||||||
|
text: string;
|
||||||
|
qualities: Quality[];
|
||||||
|
}
|
||||||
@@ -1,13 +1,5 @@
|
|||||||
export interface Format {
|
import { Format } from "./format";
|
||||||
id: string;
|
|
||||||
text: string;
|
|
||||||
qualities: Quality[];
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface Quality {
|
|
||||||
id: string;
|
|
||||||
text: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export const Formats: Format[] = [
|
export const Formats: Format[] = [
|
||||||
{
|
{
|
||||||
9
ui/src/app/interfaces/index.ts
Normal file
9
ui/src/app/interfaces/index.ts
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
export * from './theme';
|
||||||
|
export * from './status';
|
||||||
|
export * from './quality';
|
||||||
|
export * from './state';
|
||||||
|
export * from './download';
|
||||||
|
export * from './checkable';
|
||||||
|
export * from './format';
|
||||||
|
export * from './formats';
|
||||||
|
|
||||||
5
ui/src/app/interfaces/quality.ts
Normal file
5
ui/src/app/interfaces/quality.ts
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
|
||||||
|
export interface Quality {
|
||||||
|
id: string;
|
||||||
|
text: string;
|
||||||
|
}
|
||||||
1
ui/src/app/interfaces/state.ts
Normal file
1
ui/src/app/interfaces/state.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export type State = 'queue' | 'done';
|
||||||
4
ui/src/app/interfaces/status.ts
Normal file
4
ui/src/app/interfaces/status.ts
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
export interface Status {
|
||||||
|
status: string;
|
||||||
|
msg?: string;
|
||||||
|
}
|
||||||
7
ui/src/app/interfaces/theme.ts
Normal file
7
ui/src/app/interfaces/theme.ts
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
import { IconDefinition } from "@fortawesome/fontawesome-svg-core";
|
||||||
|
|
||||||
|
export interface Theme {
|
||||||
|
id: string;
|
||||||
|
displayName: string;
|
||||||
|
icon: IconDefinition;
|
||||||
|
}
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
import { Component, Input, ViewChild, ElementRef, Output, EventEmitter } from '@angular/core';
|
|
||||||
|
|
||||||
interface Checkable {
|
|
||||||
checked: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'app-master-checkbox',
|
|
||||||
template: `
|
|
||||||
<div class="form-check">
|
|
||||||
<input type="checkbox" class="form-check-input" id="{{id}}-select-all" #masterCheckbox [(ngModel)]="selected" (change)="clicked()">
|
|
||||||
<label class="form-check-label" for="{{id}}-select-all"></label>
|
|
||||||
</div>
|
|
||||||
`,
|
|
||||||
standalone: false
|
|
||||||
})
|
|
||||||
export class MasterCheckboxComponent {
|
|
||||||
@Input() id: string;
|
|
||||||
@Input() list: Map<String, Checkable>;
|
|
||||||
@Output() changed = new EventEmitter<number>();
|
|
||||||
|
|
||||||
@ViewChild('masterCheckbox') masterCheckbox: ElementRef;
|
|
||||||
selected: boolean;
|
|
||||||
|
|
||||||
clicked() {
|
|
||||||
this.list.forEach(item => item.checked = this.selected);
|
|
||||||
this.selectionChanged();
|
|
||||||
}
|
|
||||||
|
|
||||||
selectionChanged() {
|
|
||||||
if (!this.masterCheckbox)
|
|
||||||
return;
|
|
||||||
let checked: number = 0;
|
|
||||||
this.list.forEach(item => { if(item.checked) checked++ });
|
|
||||||
this.selected = checked > 0 && checked == this.list.size;
|
|
||||||
this.masterCheckbox.nativeElement.indeterminate = checked > 0 && checked < this.list.size;
|
|
||||||
this.changed.emit(checked);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'app-slave-checkbox',
|
|
||||||
template: `
|
|
||||||
<div class="form-check">
|
|
||||||
<input type="checkbox" class="form-check-input" id="{{master.id}}-{{id}}-select" [(ngModel)]="checkable.checked" (change)="master.selectionChanged()">
|
|
||||||
<label class="form-check-label" for="{{master.id}}-{{id}}-select"></label>
|
|
||||||
</div>
|
|
||||||
`,
|
|
||||||
standalone: false
|
|
||||||
})
|
|
||||||
export class SlaveCheckboxComponent {
|
|
||||||
@Input() id: string;
|
|
||||||
@Input() master: MasterCheckboxComponent;
|
|
||||||
@Input() checkable: Checkable;
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
import { Injectable } from '@angular/core';
|
|
||||||
import { Socket } from 'ngx-socket-io';
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
export class MeTubeSocket extends Socket {
|
|
||||||
constructor() {
|
|
||||||
const path =
|
|
||||||
document.location.pathname.replace(/share-target/, '') + 'socket.io';
|
|
||||||
super({ url: '', options: { path } });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
21
ui/src/app/pipes/eta.pipe.ts
Normal file
21
ui/src/app/pipes/eta.pipe.ts
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
import { Pipe, PipeTransform } from "@angular/core";
|
||||||
|
|
||||||
|
@Pipe({
|
||||||
|
name: 'eta',
|
||||||
|
})
|
||||||
|
export class EtaPipe implements PipeTransform {
|
||||||
|
transform(value: number): string | null {
|
||||||
|
if (value === null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
if (value < 60) {
|
||||||
|
return `${Math.round(value)}s`;
|
||||||
|
}
|
||||||
|
if (value < 3600) {
|
||||||
|
return `${Math.floor(value/60)}m ${Math.round(value%60)}s`;
|
||||||
|
}
|
||||||
|
const hours = Math.floor(value/3600)
|
||||||
|
const minutes = value % 3600
|
||||||
|
return `${hours}h ${Math.floor(minutes/60)}m ${Math.round(minutes%60)}s`;
|
||||||
|
}
|
||||||
|
}
|
||||||
16
ui/src/app/pipes/file-size.pipe.ts
Normal file
16
ui/src/app/pipes/file-size.pipe.ts
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
import { Pipe, PipeTransform } from "@angular/core";
|
||||||
|
|
||||||
|
@Pipe({
|
||||||
|
name: 'fileSize',
|
||||||
|
})
|
||||||
|
export class FileSizePipe implements PipeTransform {
|
||||||
|
transform(value: number): string {
|
||||||
|
if (isNaN(value) || value === 0) return '0 Bytes';
|
||||||
|
|
||||||
|
const units = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
|
||||||
|
const unitIndex = Math.floor(Math.log(value) / Math.log(1000)); // Use 1000 for common units
|
||||||
|
|
||||||
|
const unitValue = value / Math.pow(1000, unitIndex);
|
||||||
|
return `${unitValue.toFixed(2)} ${units[unitIndex]}`;
|
||||||
|
}
|
||||||
|
}
|
||||||
3
ui/src/app/pipes/index.ts
Normal file
3
ui/src/app/pipes/index.ts
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
export { EtaPipe } from './eta.pipe';
|
||||||
|
export { SpeedPipe } from './speed.pipe';
|
||||||
|
export { FileSizePipe } from './file-size.pipe';
|
||||||
43
ui/src/app/pipes/speed.pipe.ts
Normal file
43
ui/src/app/pipes/speed.pipe.ts
Normal file
@@ -0,0 +1,43 @@
|
|||||||
|
import { Pipe, PipeTransform } from "@angular/core";
|
||||||
|
import { BehaviorSubject, throttleTime } from "rxjs";
|
||||||
|
|
||||||
|
@Pipe({
|
||||||
|
name: 'speed',
|
||||||
|
pure: false // Make the pipe impure so it can handle async updates
|
||||||
|
})
|
||||||
|
export class SpeedPipe implements PipeTransform {
|
||||||
|
private speedSubject = new BehaviorSubject<number>(0);
|
||||||
|
private formattedSpeed = '';
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
// Throttle updates to once per second
|
||||||
|
this.speedSubject.pipe(
|
||||||
|
throttleTime(1000)
|
||||||
|
).subscribe(speed => {
|
||||||
|
// If speed is invalid or 0, return empty string
|
||||||
|
if (speed === null || speed === undefined || isNaN(speed) || speed <= 0) {
|
||||||
|
this.formattedSpeed = '';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const k = 1024;
|
||||||
|
const dm = 2;
|
||||||
|
const sizes = ['B/s', 'KB/s', 'MB/s', 'GB/s', 'TB/s', 'PB/s', 'EB/s', 'ZB/s', 'YB/s'];
|
||||||
|
const i = Math.floor(Math.log(speed) / Math.log(k));
|
||||||
|
this.formattedSpeed = parseFloat((speed / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i];
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
transform(value: number): string {
|
||||||
|
// If speed is invalid or 0, return empty string
|
||||||
|
if (value === null || value === undefined || isNaN(value) || value <= 0) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update the speed subject
|
||||||
|
this.speedSubject.next(value);
|
||||||
|
|
||||||
|
// Return the last formatted speed
|
||||||
|
return this.formattedSpeed;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,38 +1,16 @@
|
|||||||
import { Injectable } from '@angular/core';
|
import { inject, Injectable } from '@angular/core';
|
||||||
import { HttpClient, HttpErrorResponse } from '@angular/common/http';
|
import { HttpClient, HttpErrorResponse } from '@angular/common/http';
|
||||||
import { Observable, of, Subject } from 'rxjs';
|
import { of, Subject } from 'rxjs';
|
||||||
import { catchError } from 'rxjs/operators';
|
import { catchError } from 'rxjs/operators';
|
||||||
import { MeTubeSocket } from './metube-socket';
|
import { MeTubeSocket } from './metube-socket.service';
|
||||||
|
import { Download, Status, State } from '../interfaces';
|
||||||
export interface Status {
|
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
|
||||||
status: string;
|
|
||||||
msg?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface Download {
|
|
||||||
id: string;
|
|
||||||
title: string;
|
|
||||||
url: string;
|
|
||||||
quality: string;
|
|
||||||
format: string;
|
|
||||||
folder: string;
|
|
||||||
custom_name_prefix: string;
|
|
||||||
playlist_strict_mode: boolean;
|
|
||||||
playlist_item_limit: number;
|
|
||||||
status: string;
|
|
||||||
msg: string;
|
|
||||||
percent: number;
|
|
||||||
speed: number;
|
|
||||||
eta: number;
|
|
||||||
filename: string;
|
|
||||||
checked?: boolean;
|
|
||||||
deleting?: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root'
|
providedIn: 'root'
|
||||||
})
|
})
|
||||||
export class DownloadsService {
|
export class DownloadsService {
|
||||||
|
private http = inject(HttpClient);
|
||||||
|
private socket = inject(MeTubeSocket);
|
||||||
loading = true;
|
loading = true;
|
||||||
queue = new Map<string, Download>();
|
queue = new Map<string, Download>();
|
||||||
done = new Map<string, Download>();
|
done = new Map<string, Download>();
|
||||||
@@ -43,13 +21,16 @@ export class DownloadsService {
|
|||||||
configurationChanged = new Subject();
|
configurationChanged = new Subject();
|
||||||
updated = new Subject();
|
updated = new Subject();
|
||||||
|
|
||||||
configuration = {};
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
|
configuration: any = {};
|
||||||
customDirs = {};
|
customDirs = {};
|
||||||
|
|
||||||
constructor(private http: HttpClient, private socket: MeTubeSocket) {
|
constructor() {
|
||||||
socket.fromEvent('all').subscribe((strdata: string) => {
|
this.socket.fromEvent('all')
|
||||||
|
.pipe(takeUntilDestroyed())
|
||||||
|
.subscribe((strdata: string) => {
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
let data: [[[string, Download]], [[string, Download]]] = JSON.parse(strdata);
|
const data: [[[string, Download]], [[string, Download]]] = JSON.parse(strdata);
|
||||||
this.queue.clear();
|
this.queue.clear();
|
||||||
data[0].forEach(entry => this.queue.set(...entry));
|
data[0].forEach(entry => this.queue.set(...entry));
|
||||||
this.done.clear();
|
this.done.clear();
|
||||||
@@ -57,56 +38,72 @@ export class DownloadsService {
|
|||||||
this.queueChanged.next(null);
|
this.queueChanged.next(null);
|
||||||
this.doneChanged.next(null);
|
this.doneChanged.next(null);
|
||||||
});
|
});
|
||||||
socket.fromEvent('added').subscribe((strdata: string) => {
|
this.socket.fromEvent('added')
|
||||||
let data: Download = JSON.parse(strdata);
|
.pipe(takeUntilDestroyed())
|
||||||
|
.subscribe((strdata: string) => {
|
||||||
|
const data: Download = JSON.parse(strdata);
|
||||||
this.queue.set(data.url, data);
|
this.queue.set(data.url, data);
|
||||||
this.queueChanged.next(null);
|
this.queueChanged.next(null);
|
||||||
});
|
});
|
||||||
socket.fromEvent('updated').subscribe((strdata: string) => {
|
this.socket.fromEvent('updated')
|
||||||
let data: Download = JSON.parse(strdata);
|
.pipe(takeUntilDestroyed())
|
||||||
let dl: Download = this.queue.get(data.url);
|
.subscribe((strdata: string) => {
|
||||||
data.checked = dl.checked;
|
const data: Download = JSON.parse(strdata);
|
||||||
data.deleting = dl.deleting;
|
const dl: Download | undefined = this.queue.get(data.url);
|
||||||
|
data.checked = !!dl?.checked;
|
||||||
|
data.deleting = !!dl?.deleting;
|
||||||
this.queue.set(data.url, data);
|
this.queue.set(data.url, data);
|
||||||
this.updated.next(null);
|
this.updated.next(null);
|
||||||
});
|
});
|
||||||
socket.fromEvent('completed').subscribe((strdata: string) => {
|
this.socket.fromEvent('completed')
|
||||||
let data: Download = JSON.parse(strdata);
|
.pipe(takeUntilDestroyed())
|
||||||
|
.subscribe((strdata: string) => {
|
||||||
|
const data: Download = JSON.parse(strdata);
|
||||||
this.queue.delete(data.url);
|
this.queue.delete(data.url);
|
||||||
this.done.set(data.url, data);
|
this.done.set(data.url, data);
|
||||||
this.queueChanged.next(null);
|
this.queueChanged.next(null);
|
||||||
this.doneChanged.next(null);
|
this.doneChanged.next(null);
|
||||||
});
|
});
|
||||||
socket.fromEvent('canceled').subscribe((strdata: string) => {
|
this.socket.fromEvent('canceled')
|
||||||
let data: string = JSON.parse(strdata);
|
.pipe(takeUntilDestroyed())
|
||||||
|
.subscribe((strdata: string) => {
|
||||||
|
const data: string = JSON.parse(strdata);
|
||||||
this.queue.delete(data);
|
this.queue.delete(data);
|
||||||
this.queueChanged.next(null);
|
this.queueChanged.next(null);
|
||||||
});
|
});
|
||||||
socket.fromEvent('cleared').subscribe((strdata: string) => {
|
this.socket.fromEvent('cleared')
|
||||||
let data: string = JSON.parse(strdata);
|
.pipe(takeUntilDestroyed())
|
||||||
|
.subscribe((strdata: string) => {
|
||||||
|
const data: string = JSON.parse(strdata);
|
||||||
this.done.delete(data);
|
this.done.delete(data);
|
||||||
this.doneChanged.next(null);
|
this.doneChanged.next(null);
|
||||||
});
|
});
|
||||||
socket.fromEvent('configuration').subscribe((strdata: string) => {
|
this.socket.fromEvent('configuration')
|
||||||
let data = JSON.parse(strdata);
|
.pipe(takeUntilDestroyed())
|
||||||
|
.subscribe((strdata: string) => {
|
||||||
|
const data = JSON.parse(strdata);
|
||||||
console.debug("got configuration:", data);
|
console.debug("got configuration:", data);
|
||||||
this.configuration = data;
|
this.configuration = data;
|
||||||
this.configurationChanged.next(data);
|
this.configurationChanged.next(data);
|
||||||
});
|
});
|
||||||
socket.fromEvent('custom_dirs').subscribe((strdata: string) => {
|
this.socket.fromEvent('custom_dirs')
|
||||||
let data = JSON.parse(strdata);
|
.pipe(takeUntilDestroyed())
|
||||||
|
.subscribe((strdata: string) => {
|
||||||
|
const data = JSON.parse(strdata);
|
||||||
console.debug("got custom_dirs:", data);
|
console.debug("got custom_dirs:", data);
|
||||||
this.customDirs = data;
|
this.customDirs = data;
|
||||||
this.customDirsChanged.next(data);
|
this.customDirsChanged.next(data);
|
||||||
});
|
});
|
||||||
socket.fromEvent('ytdl_options_changed').subscribe((strdata: string) => {
|
this.socket.fromEvent('ytdl_options_changed')
|
||||||
let data = JSON.parse(strdata);
|
.pipe(takeUntilDestroyed())
|
||||||
|
.subscribe((strdata: string) => {
|
||||||
|
const data = JSON.parse(strdata);
|
||||||
this.ytdlOptionsChanged.next(data);
|
this.ytdlOptionsChanged.next(data);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
handleHTTPError(error: HttpErrorResponse) {
|
handleHTTPError(error: HttpErrorResponse) {
|
||||||
var msg = error.error instanceof ErrorEvent ? error.error.message : error.error;
|
const msg = error.error instanceof ErrorEvent ? error.error.message : error.error;
|
||||||
return of({status: 'error', msg: msg})
|
return of({status: 'error', msg: msg})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -120,23 +117,32 @@ export class DownloadsService {
|
|||||||
return this.http.post('start', {ids: ids});
|
return this.http.post('start', {ids: ids});
|
||||||
}
|
}
|
||||||
|
|
||||||
public delById(where: string, ids: string[]) {
|
public delById(where: State, ids: string[]) {
|
||||||
ids.forEach(id => this[where].get(id).deleting = true);
|
ids.forEach(id => {
|
||||||
|
const obj = this[where].get(id)
|
||||||
|
if (obj) {
|
||||||
|
obj.deleting = true
|
||||||
|
}
|
||||||
|
});
|
||||||
return this.http.post('delete', {where: where, ids: ids});
|
return this.http.post('delete', {where: where, ids: ids});
|
||||||
}
|
}
|
||||||
|
|
||||||
public startByFilter(where: string, filter: (dl: Download) => boolean) {
|
public startByFilter(where: State, filter: (dl: Download) => boolean) {
|
||||||
let ids: string[] = [];
|
const ids: string[] = [];
|
||||||
this[where].forEach((dl: Download) => { if (filter(dl)) ids.push(dl.url) });
|
this[where].forEach((dl: Download) => { if (filter(dl)) ids.push(dl.url) });
|
||||||
return this.startById(ids);
|
return this.startById(ids);
|
||||||
}
|
}
|
||||||
|
|
||||||
public delByFilter(where: string, filter: (dl: Download) => boolean) {
|
public delByFilter(where: State, filter: (dl: Download) => boolean) {
|
||||||
let ids: string[] = [];
|
const ids: string[] = [];
|
||||||
this[where].forEach((dl: Download) => { if (filter(dl)) ids.push(dl.url) });
|
this[where].forEach((dl: Download) => { if (filter(dl)) ids.push(dl.url) });
|
||||||
return this.delById(where, ids);
|
return this.delById(where, ids);
|
||||||
}
|
}
|
||||||
public addDownloadByUrl(url: string): Promise<any> {
|
public addDownloadByUrl(url: string): Promise<{
|
||||||
|
response: Status} | {
|
||||||
|
status: string;
|
||||||
|
msg?: string;
|
||||||
|
}> {
|
||||||
const defaultQuality = 'best';
|
const defaultQuality = 'best';
|
||||||
const defaultFormat = 'mp4';
|
const defaultFormat = 'mp4';
|
||||||
const defaultFolder = '';
|
const defaultFolder = '';
|
||||||
@@ -147,10 +153,10 @@ export class DownloadsService {
|
|||||||
|
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
this.add(url, defaultQuality, defaultFormat, defaultFolder, defaultCustomNamePrefix, defaultPlaylistStrictMode, defaultPlaylistItemLimit, defaultAutoStart)
|
this.add(url, defaultQuality, defaultFormat, defaultFolder, defaultCustomNamePrefix, defaultPlaylistStrictMode, defaultPlaylistItemLimit, defaultAutoStart)
|
||||||
.subscribe(
|
.subscribe({
|
||||||
response => resolve(response),
|
next: (response) => resolve(response),
|
||||||
error => reject(error)
|
error: (error) => reject(error)
|
||||||
);
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
public exportQueueUrls(): string[] {
|
public exportQueueUrls(): string[] {
|
||||||
3
ui/src/app/services/index.ts
Normal file
3
ui/src/app/services/index.ts
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
export { DownloadsService } from './downloads.service';
|
||||||
|
export { SpeedService } from './speed.service';
|
||||||
|
export { MeTubeSocket } from './metube-socket.service';
|
||||||
17
ui/src/app/services/metube-socket.service.ts
Normal file
17
ui/src/app/services/metube-socket.service.ts
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
import { Injectable, inject } from '@angular/core';
|
||||||
|
import { ApplicationRef } from '@angular/core';
|
||||||
|
import { Socket } from 'ngx-socket-io';
|
||||||
|
|
||||||
|
@Injectable(
|
||||||
|
{ providedIn: 'root' }
|
||||||
|
)
|
||||||
|
export class MeTubeSocket extends Socket {
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
const appRef = inject(ApplicationRef);
|
||||||
|
|
||||||
|
const path =
|
||||||
|
document.location.pathname.replace(/share-target/, '') + 'socket.io';
|
||||||
|
super({ url: '', options: { path } }, appRef);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,11 +1,6 @@
|
|||||||
import { IconDefinition } from "@fortawesome/fontawesome-svg-core";
|
|
||||||
import { faCircleHalfStroke, faMoon, faSun } from "@fortawesome/free-solid-svg-icons";
|
import { faCircleHalfStroke, faMoon, faSun } from "@fortawesome/free-solid-svg-icons";
|
||||||
|
import { Theme } from "./interfaces/theme";
|
||||||
|
|
||||||
export interface Theme {
|
|
||||||
id: string;
|
|
||||||
displayName: string;
|
|
||||||
icon: IconDefinition;
|
|
||||||
}
|
|
||||||
|
|
||||||
export const Themes: Theme[] = [
|
export const Themes: Theme[] = [
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,3 +0,0 @@
|
|||||||
export const environment = {
|
|
||||||
production: true
|
|
||||||
};
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
// This file can be replaced during build by using the `fileReplacements` array.
|
|
||||||
// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
|
|
||||||
// The list of file replacements can be found in `angular.json`.
|
|
||||||
|
|
||||||
export const environment = {
|
|
||||||
production: false
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* For easier debugging in development mode, you can import the following file
|
|
||||||
* to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.
|
|
||||||
*
|
|
||||||
* This import should be commented out in production mode because it will have a negative impact
|
|
||||||
* on performance if an error is thrown.
|
|
||||||
*/
|
|
||||||
// import 'zone.js/dist/zone-error'; // Included with Angular CLI.
|
|
||||||
@@ -1,12 +1,9 @@
|
|||||||
import { enableProdMode } from '@angular/core';
|
/// <reference types="@angular/localize" />
|
||||||
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
|
|
||||||
|
|
||||||
import { AppModule } from './app/app.module';
|
import { bootstrapApplication } from '@angular/platform-browser';
|
||||||
import { environment } from './environments/environment';
|
import { appConfig } from './app/app.config';
|
||||||
|
import { App } from './app/app';
|
||||||
|
|
||||||
if (environment.production) {
|
|
||||||
enableProdMode();
|
|
||||||
}
|
|
||||||
|
|
||||||
platformBrowserDynamic().bootstrapModule(AppModule)
|
bootstrapApplication(App, appConfig)
|
||||||
.catch(err => console.error(err));
|
.catch((err) => console.error(err));
|
||||||
@@ -1,69 +0,0 @@
|
|||||||
/***************************************************************************************************
|
|
||||||
* Load `$localize` onto the global scope - used if i18n tags appear in Angular templates.
|
|
||||||
*/
|
|
||||||
import '@angular/localize/init';
|
|
||||||
/**
|
|
||||||
* This file includes polyfills needed by Angular and is loaded before the app.
|
|
||||||
* You can add your own extra polyfills to this file.
|
|
||||||
*
|
|
||||||
* This file is divided into 2 sections:
|
|
||||||
* 1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers.
|
|
||||||
* 2. Application imports. Files imported after ZoneJS that should be loaded before your main
|
|
||||||
* file.
|
|
||||||
*
|
|
||||||
* The current setup is for so-called "evergreen" browsers; the last versions of browsers that
|
|
||||||
* automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
|
|
||||||
* Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
|
|
||||||
*
|
|
||||||
* Learn more in https://angular.io/guide/browser-support
|
|
||||||
*/
|
|
||||||
|
|
||||||
/***************************************************************************************************
|
|
||||||
* BROWSER POLYFILLS
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* IE11 requires the following for NgClass support on SVG elements
|
|
||||||
*/
|
|
||||||
// import 'classlist.js'; // Run `npm install --save classlist.js`.
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Web Animations `@angular/platform-browser/animations`
|
|
||||||
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
|
|
||||||
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
|
|
||||||
*/
|
|
||||||
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
|
|
||||||
|
|
||||||
/**
|
|
||||||
* By default, zone.js will patch all possible macroTask and DomEvents
|
|
||||||
* user can disable parts of macroTask/DomEvents patch by setting following flags
|
|
||||||
* because those flags need to be set before `zone.js` being loaded, and webpack
|
|
||||||
* will put import in the top of bundle, so user need to create a separate file
|
|
||||||
* in this directory (for example: zone-flags.ts), and put the following flags
|
|
||||||
* into that file, and then add the following code before importing zone.js.
|
|
||||||
* import './zone-flags';
|
|
||||||
*
|
|
||||||
* The flags allowed in zone-flags.ts are listed here.
|
|
||||||
*
|
|
||||||
* The following flags will work for all browsers.
|
|
||||||
*
|
|
||||||
* (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
|
|
||||||
* (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
|
|
||||||
* (window as any).__zone_symbol__UNPATCHED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
|
|
||||||
*
|
|
||||||
* in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
|
|
||||||
* with the following flag, it will bypass `zone.js` patch for IE/Edge
|
|
||||||
*
|
|
||||||
* (window as any).__Zone_enable_cross_context_check = true;
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
/***************************************************************************************************
|
|
||||||
* Zone JS is required by default for Angular itself.
|
|
||||||
*/
|
|
||||||
import 'zone.js'; // Included with Angular CLI.
|
|
||||||
|
|
||||||
|
|
||||||
/***************************************************************************************************
|
|
||||||
* APPLICATION IMPORTS
|
|
||||||
*/
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
// This file is required by karma.conf.js and loads recursively all the .spec and framework files
|
|
||||||
|
|
||||||
import 'zone.js/dist/zone-testing';
|
|
||||||
import { getTestBed } from '@angular/core/testing';
|
|
||||||
import {
|
|
||||||
BrowserDynamicTestingModule,
|
|
||||||
platformBrowserDynamicTesting
|
|
||||||
} from '@angular/platform-browser-dynamic/testing';
|
|
||||||
|
|
||||||
// First, initialize the Angular testing environment.
|
|
||||||
getTestBed().initTestEnvironment(
|
|
||||||
BrowserDynamicTestingModule,
|
|
||||||
platformBrowserDynamicTesting()
|
|
||||||
);
|
|
||||||
@@ -3,13 +3,14 @@
|
|||||||
"extends": "./tsconfig.json",
|
"extends": "./tsconfig.json",
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"outDir": "./out-tsc/app",
|
"outDir": "./out-tsc/app",
|
||||||
"types": []
|
"types": [
|
||||||
|
"@angular/localize"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"files": [
|
|
||||||
"src/main.ts",
|
|
||||||
"src/polyfills.ts"
|
|
||||||
],
|
|
||||||
"include": [
|
"include": [
|
||||||
"src/**/*.d.ts"
|
"src/**/*.ts"
|
||||||
|
],
|
||||||
|
"exclude": [
|
||||||
|
"src/**/*.spec.ts"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,20 +2,30 @@
|
|||||||
{
|
{
|
||||||
"compileOnSave": false,
|
"compileOnSave": false,
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"baseUrl": "./",
|
"strict": true,
|
||||||
"outDir": "./dist/out-tsc",
|
"noImplicitOverride": true,
|
||||||
"sourceMap": true,
|
"noPropertyAccessFromIndexSignature": true,
|
||||||
"esModuleInterop": true,
|
"noImplicitReturns": true,
|
||||||
"declaration": false,
|
"noFallthroughCasesInSwitch": true,
|
||||||
|
"skipLibCheck": true,
|
||||||
|
"isolatedModules": true,
|
||||||
"experimentalDecorators": true,
|
"experimentalDecorators": true,
|
||||||
"moduleResolution": "node",
|
|
||||||
"importHelpers": true,
|
"importHelpers": true,
|
||||||
"target": "ES2022",
|
"target": "ES2022",
|
||||||
"module": "es2020",
|
"module": "preserve"
|
||||||
"lib": [
|
},
|
||||||
"es2018",
|
"angularCompilerOptions": {
|
||||||
"dom"
|
"strictInjectionParameters": true,
|
||||||
],
|
"strictInputAccessModifiers": true,
|
||||||
"useDefineForClassFields": false
|
"strictTemplates": true
|
||||||
}
|
},
|
||||||
|
"files": [],
|
||||||
|
"references": [
|
||||||
|
{
|
||||||
|
"path": "./tsconfig.app.json"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"path": "./tsconfig.spec.json"
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,13 +4,9 @@
|
|||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"outDir": "./out-tsc/spec",
|
"outDir": "./out-tsc/spec",
|
||||||
"types": [
|
"types": [
|
||||||
"jasmine"
|
"vitest/globals"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"files": [
|
|
||||||
"src/test.ts",
|
|
||||||
"src/polyfills.ts"
|
|
||||||
],
|
|
||||||
"include": [
|
"include": [
|
||||||
"src/**/*.spec.ts",
|
"src/**/*.spec.ts",
|
||||||
"src/**/*.d.ts"
|
"src/**/*.d.ts"
|
||||||
|
|||||||
152
ui/tslint.json
152
ui/tslint.json
@@ -1,152 +0,0 @@
|
|||||||
{
|
|
||||||
"extends": "tslint:recommended",
|
|
||||||
"rulesDirectory": [
|
|
||||||
"codelyzer"
|
|
||||||
],
|
|
||||||
"rules": {
|
|
||||||
"align": {
|
|
||||||
"options": [
|
|
||||||
"parameters",
|
|
||||||
"statements"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"array-type": false,
|
|
||||||
"arrow-return-shorthand": true,
|
|
||||||
"curly": true,
|
|
||||||
"deprecation": {
|
|
||||||
"severity": "warning"
|
|
||||||
},
|
|
||||||
"eofline": true,
|
|
||||||
"import-blacklist": [
|
|
||||||
true,
|
|
||||||
"rxjs/Rx"
|
|
||||||
],
|
|
||||||
"import-spacing": true,
|
|
||||||
"indent": {
|
|
||||||
"options": [
|
|
||||||
"spaces"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"max-classes-per-file": false,
|
|
||||||
"max-line-length": [
|
|
||||||
true,
|
|
||||||
140
|
|
||||||
],
|
|
||||||
"member-ordering": [
|
|
||||||
true,
|
|
||||||
{
|
|
||||||
"order": [
|
|
||||||
"static-field",
|
|
||||||
"instance-field",
|
|
||||||
"static-method",
|
|
||||||
"instance-method"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"no-console": [
|
|
||||||
true,
|
|
||||||
"debug",
|
|
||||||
"info",
|
|
||||||
"time",
|
|
||||||
"timeEnd",
|
|
||||||
"trace"
|
|
||||||
],
|
|
||||||
"no-empty": false,
|
|
||||||
"no-inferrable-types": [
|
|
||||||
true,
|
|
||||||
"ignore-params"
|
|
||||||
],
|
|
||||||
"no-non-null-assertion": true,
|
|
||||||
"no-redundant-jsdoc": true,
|
|
||||||
"no-switch-case-fall-through": true,
|
|
||||||
"no-var-requires": false,
|
|
||||||
"object-literal-key-quotes": [
|
|
||||||
true,
|
|
||||||
"as-needed"
|
|
||||||
],
|
|
||||||
"quotemark": [
|
|
||||||
true,
|
|
||||||
"single"
|
|
||||||
],
|
|
||||||
"semicolon": {
|
|
||||||
"options": [
|
|
||||||
"always"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"space-before-function-paren": {
|
|
||||||
"options": {
|
|
||||||
"anonymous": "never",
|
|
||||||
"asyncArrow": "always",
|
|
||||||
"constructor": "never",
|
|
||||||
"method": "never",
|
|
||||||
"named": "never"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"typedef": [
|
|
||||||
true,
|
|
||||||
"call-signature"
|
|
||||||
],
|
|
||||||
"typedef-whitespace": {
|
|
||||||
"options": [
|
|
||||||
{
|
|
||||||
"call-signature": "nospace",
|
|
||||||
"index-signature": "nospace",
|
|
||||||
"parameter": "nospace",
|
|
||||||
"property-declaration": "nospace",
|
|
||||||
"variable-declaration": "nospace"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"call-signature": "onespace",
|
|
||||||
"index-signature": "onespace",
|
|
||||||
"parameter": "onespace",
|
|
||||||
"property-declaration": "onespace",
|
|
||||||
"variable-declaration": "onespace"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"variable-name": {
|
|
||||||
"options": [
|
|
||||||
"ban-keywords",
|
|
||||||
"check-format",
|
|
||||||
"allow-pascal-case"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"whitespace": {
|
|
||||||
"options": [
|
|
||||||
"check-branch",
|
|
||||||
"check-decl",
|
|
||||||
"check-operator",
|
|
||||||
"check-separator",
|
|
||||||
"check-type",
|
|
||||||
"check-typecast"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"component-class-suffix": true,
|
|
||||||
"contextual-lifecycle": true,
|
|
||||||
"directive-class-suffix": true,
|
|
||||||
"no-conflicting-lifecycle": true,
|
|
||||||
"no-host-metadata-property": true,
|
|
||||||
"no-input-rename": true,
|
|
||||||
"no-inputs-metadata-property": true,
|
|
||||||
"no-output-native": true,
|
|
||||||
"no-output-on-prefix": true,
|
|
||||||
"no-output-rename": true,
|
|
||||||
"no-outputs-metadata-property": true,
|
|
||||||
"template-banana-in-box": true,
|
|
||||||
"template-no-negated-async": true,
|
|
||||||
"use-lifecycle-interface": true,
|
|
||||||
"use-pipe-transform-interface": true,
|
|
||||||
"directive-selector": [
|
|
||||||
true,
|
|
||||||
"attribute",
|
|
||||||
"app",
|
|
||||||
"camelCase"
|
|
||||||
],
|
|
||||||
"component-selector": [
|
|
||||||
true,
|
|
||||||
"element",
|
|
||||||
"app",
|
|
||||||
"kebab-case"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
12
uv.lock
generated
12
uv.lock
generated
@@ -922,11 +922,11 @@ wheels = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "yt-dlp"
|
name = "yt-dlp"
|
||||||
version = "2025.11.12"
|
version = "2025.12.8"
|
||||||
source = { registry = "https://pypi.org/simple" }
|
source = { registry = "https://pypi.org/simple" }
|
||||||
sdist = { url = "https://files.pythonhosted.org/packages/cf/41/53ad8c6e74d6627bd598dfbb8ad7c19d5405e438210ad0bbaf1b288387e7/yt_dlp-2025.11.12.tar.gz", hash = "sha256:5f0795a6b8fc57a5c23332d67d6c6acf819a0b46b91a6324bae29414fa97f052", size = 3076928, upload-time = "2025-11-12T01:00:38.43Z" }
|
sdist = { url = "https://files.pythonhosted.org/packages/14/77/db924ebbd99d0b2b571c184cb08ed232cf4906c6f9b76eed763cd2c84170/yt_dlp-2025.12.8.tar.gz", hash = "sha256:b773c81bb6b71cb2c111cfb859f453c7a71cf2ef44eff234ff155877184c3e4f", size = 3088947, upload-time = "2025-12-08T00:16:01.649Z" }
|
||||||
wheels = [
|
wheels = [
|
||||||
{ url = "https://files.pythonhosted.org/packages/5f/16/fdebbee6473473a1c0576bd165a50e4a70762484d638c1d59fa9074e175b/yt_dlp-2025.11.12-py3-none-any.whl", hash = "sha256:b47af37bbb16b08efebb36825a280ea25a507c051f93bf413a6e4a0e586c6e79", size = 3279151, upload-time = "2025-11-12T01:00:35.813Z" },
|
{ url = "https://files.pythonhosted.org/packages/6e/2f/98c3596ad923f8efd32c90dca62e241e8ad9efcebf20831173c357042ba0/yt_dlp-2025.12.8-py3-none-any.whl", hash = "sha256:36e2584342e409cfbfa0b5e61448a1c5189e345cf4564294456ee509e7d3e065", size = 3291464, upload-time = "2025-12-08T00:15:58.556Z" },
|
||||||
]
|
]
|
||||||
|
|
||||||
[package.optional-dependencies]
|
[package.optional-dependencies]
|
||||||
@@ -947,9 +947,9 @@ default = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "yt-dlp-ejs"
|
name = "yt-dlp-ejs"
|
||||||
version = "0.3.1"
|
version = "0.3.2"
|
||||||
source = { registry = "https://pypi.org/simple" }
|
source = { registry = "https://pypi.org/simple" }
|
||||||
sdist = { url = "https://files.pythonhosted.org/packages/fe/02/58b16dee54ad7f9f8c4b5b490960478dbbd31a27da4be2c876d8c09ac8e3/yt_dlp_ejs-0.3.1.tar.gz", hash = "sha256:7f2119eb02864800f651fa33825ddfe13d152a1f730fa103d9864f091df24227", size = 33805, upload-time = "2025-11-07T20:36:29.144Z" }
|
sdist = { url = "https://files.pythonhosted.org/packages/de/72/57d02cf78eb45126bd171298d6a58a5bd48ce1a398b6b7ff00fc904f1f0c/yt_dlp_ejs-0.3.2.tar.gz", hash = "sha256:31a41292799992bdc913e03c9fac2a8c90c82a5cbbc792b2e3373b01da841e3e", size = 34678, upload-time = "2025-12-07T23:44:48.258Z" }
|
||||||
wheels = [
|
wheels = [
|
||||||
{ url = "https://files.pythonhosted.org/packages/e7/fd/34fbdaf0d53386c47e219c532a479766cd9336fde34c00834c8e0123df7a/yt_dlp_ejs-0.3.1-py3-none-any.whl", hash = "sha256:a6e3548874db7c774388931752bb46c7f4642c044b2a189e56968f3d5ecab622", size = 53155, upload-time = "2025-11-07T20:36:27.952Z" },
|
{ url = "https://files.pythonhosted.org/packages/9d/0d/1f0d7a735ca60b87953271b15d00eff5eef05f6118390ddf6f81982526ed/yt_dlp_ejs-0.3.2-py3-none-any.whl", hash = "sha256:f2dc6b3d1b909af1f13e021621b0af048056fca5fb07c4db6aa9bbb37a4f66a9", size = 53252, upload-time = "2025-12-07T23:44:46.605Z" },
|
||||||
]
|
]
|
||||||
|
|||||||
Reference in New Issue
Block a user