Compare commits
26 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 570b9eb2da | |||
| 0c737b2a3e | |||
| 1f192f48f4 | |||
|
|
0b5f84f4bd | ||
|
|
61a8fda9e5 | ||
|
|
8f1177dfd0 | ||
|
|
3b30ebe28b | ||
|
|
28fad63e34 | ||
|
|
aa51c93fec | ||
|
|
6a7fb4ee09 | ||
|
|
6e15206887 | ||
|
|
d9566c2fcc | ||
|
|
dfd29e9e0b | ||
|
|
fc61a00beb | ||
|
|
a05ae0b9f4 | ||
| 185d6efc5a | |||
| 76e8832071 | |||
| 7d2503fe77 | |||
|
|
dcd80b7366 | ||
|
|
515888b156 | ||
|
|
57cc86d328 | ||
| d2f1bfa3bf | |||
| 00645e2370 | |||
| 6eadda95a9 | |||
| e091b2299e | |||
| 8f28548059 |
@@ -1,4 +1,4 @@
|
|||||||
name: Docker Image CI
|
name: Docker Image CI (Dockerhub)
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
@@ -7,11 +7,8 @@ on:
|
|||||||
branches: [ master ]
|
branches: [ master ]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
|
||||||
build:
|
build:
|
||||||
|
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- name: Login to Docker Hub
|
- name: Login to Docker Hub
|
||||||
@@ -20,7 +17,11 @@ jobs:
|
|||||||
DOCKER_PASSWORD: ${{secrets.DOCKER_HUB_PASSWORD}}
|
DOCKER_PASSWORD: ${{secrets.DOCKER_HUB_PASSWORD}}
|
||||||
run: |
|
run: |
|
||||||
docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
|
docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
|
||||||
|
- name: Install buildx
|
||||||
|
uses: crazy-max/ghaction-docker-buildx@v1
|
||||||
|
with:
|
||||||
|
version: latest
|
||||||
- name: Build the Docker image
|
- name: Build the Docker image
|
||||||
run: docker build . --file Dockerfile --tag ${{secrets.DOCKER_HUB_USERNAME}}/yt-dlp-webui:latest
|
run: docker buildx build . --file Dockerfile --tag ${{secrets.DOCKER_HUB_USERNAME}}/yt-dlp-webui:latest --platform linux/amd64,linux/arm/v7,linux/arm64
|
||||||
- name: Publish the Docker image
|
- name: Publish the Docker image
|
||||||
run: docker push ${{secrets.DOCKER_HUB_USERNAME}}/yt-dlp-webui:latest
|
run: docker push ${{secrets.DOCKER_HUB_USERNAME}}/yt-dlp-webui:latest
|
||||||
6
.github/workflows/docker-publish.yml
vendored
6
.github/workflows/docker-publish.yml
vendored
@@ -8,12 +8,12 @@ name: Docker
|
|||||||
on:
|
on:
|
||||||
# schedule:
|
# schedule:
|
||||||
# - cron: '39 13 * * *'
|
# - cron: '39 13 * * *'
|
||||||
push:
|
release:
|
||||||
branches: [ master ]
|
branches: [ master ]
|
||||||
# Publish semver tags as releases.
|
# Publish semver tags as releases.
|
||||||
tags: [ 'v*.*.*' ]
|
tags: [ 'v*.*.*' ]
|
||||||
pull_request:
|
# pull_request:
|
||||||
branches: [ master ]
|
# branches: [ master ]
|
||||||
|
|
||||||
env:
|
env:
|
||||||
# Use docker.io for Docker Hub if empty
|
# Use docker.io for Docker Hub if empty
|
||||||
|
|||||||
35
Dockerfile
35
Dockerfile
@@ -1,20 +1,29 @@
|
|||||||
FROM alpine:3.17
|
# Multi stage build Dockerfile
|
||||||
|
|
||||||
|
# There's no point in using the edge (development branch of alpine)
|
||||||
|
FROM alpine:3.17 AS build
|
||||||
# folder structure
|
# folder structure
|
||||||
WORKDIR /usr/src/yt-dlp-webui/downloads
|
|
||||||
VOLUME /usr/src/yt-dlp-webui/downloads
|
|
||||||
WORKDIR /usr/src/yt-dlp-webui
|
WORKDIR /usr/src/yt-dlp-webui
|
||||||
# install core dependencies
|
# install core dependencies
|
||||||
RUN apk update
|
RUN apk update && \
|
||||||
RUN apk add curl wget psmisc python3 ffmpeg nodejs npm go yt-dlp
|
apk add curl wget psmisc ffmpeg nodejs yarn go yt-dlp
|
||||||
# copy srcs
|
# copia la salsa
|
||||||
COPY . .
|
COPY . .
|
||||||
# install node dependencies
|
# build frontend
|
||||||
WORKDIR /usr/src/yt-dlp-webui/frontend
|
WORKDIR /usr/src/yt-dlp-webui/frontend
|
||||||
RUN npm i
|
RUN yarn install && \
|
||||||
RUN npm run build
|
yarn build
|
||||||
# install go dependencies
|
# build backend + incubator
|
||||||
WORKDIR /usr/src/yt-dlp-webui
|
WORKDIR /usr/src/yt-dlp-webui
|
||||||
RUN npm go build -o yt-dlp-webui
|
RUN go build -o yt-dlp-webui
|
||||||
# expose and run
|
|
||||||
|
|
||||||
|
FROM alpine:3.17
|
||||||
|
|
||||||
|
WORKDIR /usr/src/yt-dlp-webui/downloads
|
||||||
|
VOLUME /downloads
|
||||||
|
|
||||||
|
COPY --from=build /usr/src/yt-dlp-webui /usr/bin/yt-dlp-webui
|
||||||
|
|
||||||
EXPOSE 3033
|
EXPOSE 3033
|
||||||
CMD [ "yt-dlp-webui" , "--out", "./downloads" ]
|
CMD [ "/usr/bin/yt-dlp-webui" , "--out", "/downloads" ]
|
||||||
|
|||||||
373
LICENSE.md
Normal file
373
LICENSE.md
Normal file
@@ -0,0 +1,373 @@
|
|||||||
|
Mozilla Public License Version 2.0
|
||||||
|
==================================
|
||||||
|
|
||||||
|
1. Definitions
|
||||||
|
--------------
|
||||||
|
|
||||||
|
1.1. "Contributor"
|
||||||
|
means each individual or legal entity that creates, contributes to
|
||||||
|
the creation of, or owns Covered Software.
|
||||||
|
|
||||||
|
1.2. "Contributor Version"
|
||||||
|
means the combination of the Contributions of others (if any) used
|
||||||
|
by a Contributor and that particular Contributor's Contribution.
|
||||||
|
|
||||||
|
1.3. "Contribution"
|
||||||
|
means Covered Software of a particular Contributor.
|
||||||
|
|
||||||
|
1.4. "Covered Software"
|
||||||
|
means Source Code Form to which the initial Contributor has attached
|
||||||
|
the notice in Exhibit A, the Executable Form of such Source Code
|
||||||
|
Form, and Modifications of such Source Code Form, in each case
|
||||||
|
including portions thereof.
|
||||||
|
|
||||||
|
1.5. "Incompatible With Secondary Licenses"
|
||||||
|
means
|
||||||
|
|
||||||
|
(a) that the initial Contributor has attached the notice described
|
||||||
|
in Exhibit B to the Covered Software; or
|
||||||
|
|
||||||
|
(b) that the Covered Software was made available under the terms of
|
||||||
|
version 1.1 or earlier of the License, but not also under the
|
||||||
|
terms of a Secondary License.
|
||||||
|
|
||||||
|
1.6. "Executable Form"
|
||||||
|
means any form of the work other than Source Code Form.
|
||||||
|
|
||||||
|
1.7. "Larger Work"
|
||||||
|
means a work that combines Covered Software with other material, in
|
||||||
|
a separate file or files, that is not Covered Software.
|
||||||
|
|
||||||
|
1.8. "License"
|
||||||
|
means this document.
|
||||||
|
|
||||||
|
1.9. "Licensable"
|
||||||
|
means having the right to grant, to the maximum extent possible,
|
||||||
|
whether at the time of the initial grant or subsequently, any and
|
||||||
|
all of the rights conveyed by this License.
|
||||||
|
|
||||||
|
1.10. "Modifications"
|
||||||
|
means any of the following:
|
||||||
|
|
||||||
|
(a) any file in Source Code Form that results from an addition to,
|
||||||
|
deletion from, or modification of the contents of Covered
|
||||||
|
Software; or
|
||||||
|
|
||||||
|
(b) any new file in Source Code Form that contains any Covered
|
||||||
|
Software.
|
||||||
|
|
||||||
|
1.11. "Patent Claims" of a Contributor
|
||||||
|
means any patent claim(s), including without limitation, method,
|
||||||
|
process, and apparatus claims, in any patent Licensable by such
|
||||||
|
Contributor that would be infringed, but for the grant of the
|
||||||
|
License, by the making, using, selling, offering for sale, having
|
||||||
|
made, import, or transfer of either its Contributions or its
|
||||||
|
Contributor Version.
|
||||||
|
|
||||||
|
1.12. "Secondary License"
|
||||||
|
means either the GNU General Public License, Version 2.0, the GNU
|
||||||
|
Lesser General Public License, Version 2.1, the GNU Affero General
|
||||||
|
Public License, Version 3.0, or any later versions of those
|
||||||
|
licenses.
|
||||||
|
|
||||||
|
1.13. "Source Code Form"
|
||||||
|
means the form of the work preferred for making modifications.
|
||||||
|
|
||||||
|
1.14. "You" (or "Your")
|
||||||
|
means an individual or a legal entity exercising rights under this
|
||||||
|
License. For legal entities, "You" includes any entity that
|
||||||
|
controls, is controlled by, or is under common control with You. For
|
||||||
|
purposes of this definition, "control" means (a) the power, direct
|
||||||
|
or indirect, to cause the direction or management of such entity,
|
||||||
|
whether by contract or otherwise, or (b) ownership of more than
|
||||||
|
fifty percent (50%) of the outstanding shares or beneficial
|
||||||
|
ownership of such entity.
|
||||||
|
|
||||||
|
2. License Grants and Conditions
|
||||||
|
--------------------------------
|
||||||
|
|
||||||
|
2.1. Grants
|
||||||
|
|
||||||
|
Each Contributor hereby grants You a world-wide, royalty-free,
|
||||||
|
non-exclusive license:
|
||||||
|
|
||||||
|
(a) under intellectual property rights (other than patent or trademark)
|
||||||
|
Licensable by such Contributor to use, reproduce, make available,
|
||||||
|
modify, display, perform, distribute, and otherwise exploit its
|
||||||
|
Contributions, either on an unmodified basis, with Modifications, or
|
||||||
|
as part of a Larger Work; and
|
||||||
|
|
||||||
|
(b) under Patent Claims of such Contributor to make, use, sell, offer
|
||||||
|
for sale, have made, import, and otherwise transfer either its
|
||||||
|
Contributions or its Contributor Version.
|
||||||
|
|
||||||
|
2.2. Effective Date
|
||||||
|
|
||||||
|
The licenses granted in Section 2.1 with respect to any Contribution
|
||||||
|
become effective for each Contribution on the date the Contributor first
|
||||||
|
distributes such Contribution.
|
||||||
|
|
||||||
|
2.3. Limitations on Grant Scope
|
||||||
|
|
||||||
|
The licenses granted in this Section 2 are the only rights granted under
|
||||||
|
this License. No additional rights or licenses will be implied from the
|
||||||
|
distribution or licensing of Covered Software under this License.
|
||||||
|
Notwithstanding Section 2.1(b) above, no patent license is granted by a
|
||||||
|
Contributor:
|
||||||
|
|
||||||
|
(a) for any code that a Contributor has removed from Covered Software;
|
||||||
|
or
|
||||||
|
|
||||||
|
(b) for infringements caused by: (i) Your and any other third party's
|
||||||
|
modifications of Covered Software, or (ii) the combination of its
|
||||||
|
Contributions with other software (except as part of its Contributor
|
||||||
|
Version); or
|
||||||
|
|
||||||
|
(c) under Patent Claims infringed by Covered Software in the absence of
|
||||||
|
its Contributions.
|
||||||
|
|
||||||
|
This License does not grant any rights in the trademarks, service marks,
|
||||||
|
or logos of any Contributor (except as may be necessary to comply with
|
||||||
|
the notice requirements in Section 3.4).
|
||||||
|
|
||||||
|
2.4. Subsequent Licenses
|
||||||
|
|
||||||
|
No Contributor makes additional grants as a result of Your choice to
|
||||||
|
distribute the Covered Software under a subsequent version of this
|
||||||
|
License (see Section 10.2) or under the terms of a Secondary License (if
|
||||||
|
permitted under the terms of Section 3.3).
|
||||||
|
|
||||||
|
2.5. Representation
|
||||||
|
|
||||||
|
Each Contributor represents that the Contributor believes its
|
||||||
|
Contributions are its original creation(s) or it has sufficient rights
|
||||||
|
to grant the rights to its Contributions conveyed by this License.
|
||||||
|
|
||||||
|
2.6. Fair Use
|
||||||
|
|
||||||
|
This License is not intended to limit any rights You have under
|
||||||
|
applicable copyright doctrines of fair use, fair dealing, or other
|
||||||
|
equivalents.
|
||||||
|
|
||||||
|
2.7. Conditions
|
||||||
|
|
||||||
|
Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
|
||||||
|
in Section 2.1.
|
||||||
|
|
||||||
|
3. Responsibilities
|
||||||
|
-------------------
|
||||||
|
|
||||||
|
3.1. Distribution of Source Form
|
||||||
|
|
||||||
|
All distribution of Covered Software in Source Code Form, including any
|
||||||
|
Modifications that You create or to which You contribute, must be under
|
||||||
|
the terms of this License. You must inform recipients that the Source
|
||||||
|
Code Form of the Covered Software is governed by the terms of this
|
||||||
|
License, and how they can obtain a copy of this License. You may not
|
||||||
|
attempt to alter or restrict the recipients' rights in the Source Code
|
||||||
|
Form.
|
||||||
|
|
||||||
|
3.2. Distribution of Executable Form
|
||||||
|
|
||||||
|
If You distribute Covered Software in Executable Form then:
|
||||||
|
|
||||||
|
(a) such Covered Software must also be made available in Source Code
|
||||||
|
Form, as described in Section 3.1, and You must inform recipients of
|
||||||
|
the Executable Form how they can obtain a copy of such Source Code
|
||||||
|
Form by reasonable means in a timely manner, at a charge no more
|
||||||
|
than the cost of distribution to the recipient; and
|
||||||
|
|
||||||
|
(b) You may distribute such Executable Form under the terms of this
|
||||||
|
License, or sublicense it under different terms, provided that the
|
||||||
|
license for the Executable Form does not attempt to limit or alter
|
||||||
|
the recipients' rights in the Source Code Form under this License.
|
||||||
|
|
||||||
|
3.3. Distribution of a Larger Work
|
||||||
|
|
||||||
|
You may create and distribute a Larger Work under terms of Your choice,
|
||||||
|
provided that You also comply with the requirements of this License for
|
||||||
|
the Covered Software. If the Larger Work is a combination of Covered
|
||||||
|
Software with a work governed by one or more Secondary Licenses, and the
|
||||||
|
Covered Software is not Incompatible With Secondary Licenses, this
|
||||||
|
License permits You to additionally distribute such Covered Software
|
||||||
|
under the terms of such Secondary License(s), so that the recipient of
|
||||||
|
the Larger Work may, at their option, further distribute the Covered
|
||||||
|
Software under the terms of either this License or such Secondary
|
||||||
|
License(s).
|
||||||
|
|
||||||
|
3.4. Notices
|
||||||
|
|
||||||
|
You may not remove or alter the substance of any license notices
|
||||||
|
(including copyright notices, patent notices, disclaimers of warranty,
|
||||||
|
or limitations of liability) contained within the Source Code Form of
|
||||||
|
the Covered Software, except that You may alter any license notices to
|
||||||
|
the extent required to remedy known factual inaccuracies.
|
||||||
|
|
||||||
|
3.5. Application of Additional Terms
|
||||||
|
|
||||||
|
You may choose to offer, and to charge a fee for, warranty, support,
|
||||||
|
indemnity or liability obligations to one or more recipients of Covered
|
||||||
|
Software. However, You may do so only on Your own behalf, and not on
|
||||||
|
behalf of any Contributor. You must make it absolutely clear that any
|
||||||
|
such warranty, support, indemnity, or liability obligation is offered by
|
||||||
|
You alone, and You hereby agree to indemnify every Contributor for any
|
||||||
|
liability incurred by such Contributor as a result of warranty, support,
|
||||||
|
indemnity or liability terms You offer. You may include additional
|
||||||
|
disclaimers of warranty and limitations of liability specific to any
|
||||||
|
jurisdiction.
|
||||||
|
|
||||||
|
4. Inability to Comply Due to Statute or Regulation
|
||||||
|
---------------------------------------------------
|
||||||
|
|
||||||
|
If it is impossible for You to comply with any of the terms of this
|
||||||
|
License with respect to some or all of the Covered Software due to
|
||||||
|
statute, judicial order, or regulation then You must: (a) comply with
|
||||||
|
the terms of this License to the maximum extent possible; and (b)
|
||||||
|
describe the limitations and the code they affect. Such description must
|
||||||
|
be placed in a text file included with all distributions of the Covered
|
||||||
|
Software under this License. Except to the extent prohibited by statute
|
||||||
|
or regulation, such description must be sufficiently detailed for a
|
||||||
|
recipient of ordinary skill to be able to understand it.
|
||||||
|
|
||||||
|
5. Termination
|
||||||
|
--------------
|
||||||
|
|
||||||
|
5.1. The rights granted under this License will terminate automatically
|
||||||
|
if You fail to comply with any of its terms. However, if You become
|
||||||
|
compliant, then the rights granted under this License from a particular
|
||||||
|
Contributor are reinstated (a) provisionally, unless and until such
|
||||||
|
Contributor explicitly and finally terminates Your grants, and (b) on an
|
||||||
|
ongoing basis, if such Contributor fails to notify You of the
|
||||||
|
non-compliance by some reasonable means prior to 60 days after You have
|
||||||
|
come back into compliance. Moreover, Your grants from a particular
|
||||||
|
Contributor are reinstated on an ongoing basis if such Contributor
|
||||||
|
notifies You of the non-compliance by some reasonable means, this is the
|
||||||
|
first time You have received notice of non-compliance with this License
|
||||||
|
from such Contributor, and You become compliant prior to 30 days after
|
||||||
|
Your receipt of the notice.
|
||||||
|
|
||||||
|
5.2. If You initiate litigation against any entity by asserting a patent
|
||||||
|
infringement claim (excluding declaratory judgment actions,
|
||||||
|
counter-claims, and cross-claims) alleging that a Contributor Version
|
||||||
|
directly or indirectly infringes any patent, then the rights granted to
|
||||||
|
You by any and all Contributors for the Covered Software under Section
|
||||||
|
2.1 of this License shall terminate.
|
||||||
|
|
||||||
|
5.3. In the event of termination under Sections 5.1 or 5.2 above, all
|
||||||
|
end user license agreements (excluding distributors and resellers) which
|
||||||
|
have been validly granted by You or Your distributors under this License
|
||||||
|
prior to termination shall survive termination.
|
||||||
|
|
||||||
|
************************************************************************
|
||||||
|
* *
|
||||||
|
* 6. Disclaimer of Warranty *
|
||||||
|
* ------------------------- *
|
||||||
|
* *
|
||||||
|
* Covered Software is provided under this License on an "as is" *
|
||||||
|
* basis, without warranty of any kind, either expressed, implied, or *
|
||||||
|
* statutory, including, without limitation, warranties that the *
|
||||||
|
* Covered Software is free of defects, merchantable, fit for a *
|
||||||
|
* particular purpose or non-infringing. The entire risk as to the *
|
||||||
|
* quality and performance of the Covered Software is with You. *
|
||||||
|
* Should any Covered Software prove defective in any respect, You *
|
||||||
|
* (not any Contributor) assume the cost of any necessary servicing, *
|
||||||
|
* repair, or correction. This disclaimer of warranty constitutes an *
|
||||||
|
* essential part of this License. No use of any Covered Software is *
|
||||||
|
* authorized under this License except under this disclaimer. *
|
||||||
|
* *
|
||||||
|
************************************************************************
|
||||||
|
|
||||||
|
************************************************************************
|
||||||
|
* *
|
||||||
|
* 7. Limitation of Liability *
|
||||||
|
* -------------------------- *
|
||||||
|
* *
|
||||||
|
* Under no circumstances and under no legal theory, whether tort *
|
||||||
|
* (including negligence), contract, or otherwise, shall any *
|
||||||
|
* Contributor, or anyone who distributes Covered Software as *
|
||||||
|
* permitted above, be liable to You for any direct, indirect, *
|
||||||
|
* special, incidental, or consequential damages of any character *
|
||||||
|
* including, without limitation, damages for lost profits, loss of *
|
||||||
|
* goodwill, work stoppage, computer failure or malfunction, or any *
|
||||||
|
* and all other commercial damages or losses, even if such party *
|
||||||
|
* shall have been informed of the possibility of such damages. This *
|
||||||
|
* limitation of liability shall not apply to liability for death or *
|
||||||
|
* personal injury resulting from such party's negligence to the *
|
||||||
|
* extent applicable law prohibits such limitation. Some *
|
||||||
|
* jurisdictions do not allow the exclusion or limitation of *
|
||||||
|
* incidental or consequential damages, so this exclusion and *
|
||||||
|
* limitation may not apply to You. *
|
||||||
|
* *
|
||||||
|
************************************************************************
|
||||||
|
|
||||||
|
8. Litigation
|
||||||
|
-------------
|
||||||
|
|
||||||
|
Any litigation relating to this License may be brought only in the
|
||||||
|
courts of a jurisdiction where the defendant maintains its principal
|
||||||
|
place of business and such litigation shall be governed by laws of that
|
||||||
|
jurisdiction, without reference to its conflict-of-law provisions.
|
||||||
|
Nothing in this Section shall prevent a party's ability to bring
|
||||||
|
cross-claims or counter-claims.
|
||||||
|
|
||||||
|
9. Miscellaneous
|
||||||
|
----------------
|
||||||
|
|
||||||
|
This License represents the complete agreement concerning the subject
|
||||||
|
matter hereof. If any provision of this License is held to be
|
||||||
|
unenforceable, such provision shall be reformed only to the extent
|
||||||
|
necessary to make it enforceable. Any law or regulation which provides
|
||||||
|
that the language of a contract shall be construed against the drafter
|
||||||
|
shall not be used to construe this License against a Contributor.
|
||||||
|
|
||||||
|
10. Versions of the License
|
||||||
|
---------------------------
|
||||||
|
|
||||||
|
10.1. New Versions
|
||||||
|
|
||||||
|
Mozilla Foundation is the license steward. Except as provided in Section
|
||||||
|
10.3, no one other than the license steward has the right to modify or
|
||||||
|
publish new versions of this License. Each version will be given a
|
||||||
|
distinguishing version number.
|
||||||
|
|
||||||
|
10.2. Effect of New Versions
|
||||||
|
|
||||||
|
You may distribute the Covered Software under the terms of the version
|
||||||
|
of the License under which You originally received the Covered Software,
|
||||||
|
or under the terms of any subsequent version published by the license
|
||||||
|
steward.
|
||||||
|
|
||||||
|
10.3. Modified Versions
|
||||||
|
|
||||||
|
If you create software not governed by this License, and you want to
|
||||||
|
create a new license for such software, you may create and use a
|
||||||
|
modified version of this License if you rename the license and remove
|
||||||
|
any references to the name of the license steward (except to note that
|
||||||
|
such modified license differs from this License).
|
||||||
|
|
||||||
|
10.4. Distributing Source Code Form that is Incompatible With Secondary
|
||||||
|
Licenses
|
||||||
|
|
||||||
|
If You choose to distribute Source Code Form that is Incompatible With
|
||||||
|
Secondary Licenses under the terms of this version of the License, the
|
||||||
|
notice described in Exhibit B of this License must be attached.
|
||||||
|
|
||||||
|
Exhibit A - Source Code Form License Notice
|
||||||
|
-------------------------------------------
|
||||||
|
|
||||||
|
This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
|
If it is not possible or desirable to put the notice in a particular
|
||||||
|
file, then You may include the notice in a location (such as a LICENSE
|
||||||
|
file in a relevant directory) where a recipient would be likely to look
|
||||||
|
for such a notice.
|
||||||
|
|
||||||
|
You may add additional accurate notices of copyright ownership.
|
||||||
|
|
||||||
|
Exhibit B - "Incompatible With Secondary Licenses" Notice
|
||||||
|
---------------------------------------------------------
|
||||||
|
|
||||||
|
This Source Code Form is "Incompatible With Secondary Licenses", as
|
||||||
|
defined by the Mozilla Public License, v. 2.0.
|
||||||
159
README.md
159
README.md
@@ -1,27 +1,24 @@
|
|||||||
# yt-dlp Web UI
|
# yt-dlp Web UI
|
||||||
|
|
||||||
|
|
||||||
**To anyone who is interested i'm working on a [RPC server for yt-dlp](https://github.com/marcopeocchi/yt-dlp-rpc).**
|
|
||||||
|
|
||||||
|
|
||||||
A not so terrible web ui for yt-dlp.
|
A not so terrible web ui for yt-dlp.
|
||||||
Created for the only purpose of *fetching* videos from my server/nas.
|
Created for the only purpose of *fetching* videos from my server/nas.
|
||||||
|
|
||||||
Intended to be used with docker but standalone is fine too. 😎👍
|
Intended to be used with docker and in standalone mode. 😎👍
|
||||||
|
|
||||||
Developed to be as lightweight as possible (because my server is basically an intel atom sbc).
|
Developed to be as lightweight as possible (because my server is basically an intel atom sbc).
|
||||||
|
|
||||||
The bottleneck remains yt-dlp startup time (until yt-dlp will provide a rpc interface).
|
The bottleneck remains yt-dlp startup time.
|
||||||
|
|
||||||
**I strongly recomend the ghcr build instead of docker hub one.**
|
**I strongly recomend the ghcr build instead of docker hub one.**
|
||||||
|
|
||||||
```shell
|
```sh
|
||||||
docker pull ghcr.io/marcopeocchi/yt-dlp-web-ui:master
|
docker pull ghcr.io/marcopeocchi/yt-dlp-web-ui:latest
|
||||||
```
|
```
|
||||||
|
|
||||||
---
|

|
||||||
|

|
||||||
|
|
||||||
Changelog:
|
## Changelog
|
||||||
```
|
```
|
||||||
05/03/22: Korean translation by kimpig
|
05/03/22: Korean translation by kimpig
|
||||||
|
|
||||||
@@ -44,40 +41,33 @@ Refactoring and JSDoc.
|
|||||||
|
|
||||||
08/06/22: ARM builds.
|
08/06/22: ARM builds.
|
||||||
|
|
||||||
28/02/22: Reworked resume download feature. Now it's pratically instantaneous. It no longer stops and restarts each process, references to each process are saved in memory.
|
28/06/22: Reworked resume download feature. Now it's pratically instantaneous. It no longer stops and restarts each process, references to each process are saved in memory.
|
||||||
|
|
||||||
|
12/01/23: Switched from TypeScript to Golang on the backend. It was a great effort but it was worth it.
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
<img src="https://i.imgur.com/gRNYKjI.png">
|
|
||||||
|
|
||||||
## Now with dark mode
|
|
||||||
|
|
||||||
<img src="https://i.imgur.com/g52mjdD.png">
|
|
||||||
|
|
||||||
## Settings
|
## Settings
|
||||||
|
|
||||||
The avaible settings are currently only:
|
The currently avaible settings are:
|
||||||
- Server address
|
- Server address
|
||||||
- Switch theme
|
- Switch theme
|
||||||
- Extract audio
|
- Extract audio
|
||||||
- Switch language
|
- Switch language
|
||||||
- Optional format selection
|
- Optional format selection
|
||||||
|
- Override the output filename
|
||||||
|
- Override the output path
|
||||||
|
- Pass custom yt-dlp arguments safely
|
||||||
|
|
||||||
<img src="https://i.imgur.com/2zPs8FH.png">
|

|
||||||
<img src="https://i.imgur.com/b4Jhkfk.png">
|

|
||||||
<img src="https://i.imgur.com/knjLa8c.png">
|
|
||||||
|
|
||||||
## Format selection
|
## Format selection
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
This feature is disabled by default as this WebUI/Wrapper/Software/Bunch of Code is intended to be used to retrieve the best quality automatically.
|
This feature is disabled by default as this intended to be used to retrieve the best quality automatically.
|
||||||
|
|
||||||
To enable it go to the settings page:
|
To enable it just go to the settings page and enable the **Enable video/audio formats selection** flag!
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
And set it :D
|
|
||||||
|
|
||||||
Future releases will have:
|
Future releases will have:
|
||||||
- ~~Multi download~~ *done*
|
- ~~Multi download~~ *done*
|
||||||
@@ -87,46 +77,109 @@ Future releases will have:
|
|||||||
- ~~ARM Build~~ *done available through ghcr.io*
|
- ~~ARM Build~~ *done available through ghcr.io*
|
||||||
|
|
||||||
## Troubleshooting
|
## Troubleshooting
|
||||||
- **It says that it isn't connected/ip in the footer is not defined.**
|
- **It says that it isn't connected/ip in the header is not defined.**
|
||||||
- You must set the server ip address in the settings section (gear icon).
|
- You must set the server ip address in the settings section (gear icon).
|
||||||
- **The download doesn't start.**
|
- **The download doesn't start.**
|
||||||
- As before server address is not specified or simply yt-dlp process takes a lot of time to fire up. (Forking yt-dlp isn't fast especially if you have a lower-end/low-power NAS/server/desktop where the server is running)
|
- As before server address is not specified or simply yt-dlp process takes a lot of time to fire up. (Forking yt-dlp isn't fast especially if you have a lower-end/low-power NAS/server/desktop where the server is running)
|
||||||
- **Background jobs are not retrieved.**
|
|
||||||
- ~~As before forking yt-dlp isn't fast so resuming n background jobs takes _n_*_time to exec yt-dlp_ Just have patience.~~ Fixed.
|
|
||||||
|
|
||||||
## Docker installation
|
## [Docker](https://github.com/marcopeocchi/yt-dlp-web-ui/pkgs/container/yt-dlp-web-ui) installation
|
||||||
```shell
|
```sh
|
||||||
# recomended for ARM and x86 devices
|
# recomended for ARM and x86 devices
|
||||||
docker pull ghcr.io/marcopeocchi/yt-dlp-web-ui:master
|
docker pull ghcr.io/marcopeocchi/yt-dlp-web-ui:latest
|
||||||
docker run -d -p 3022:3022 -v <your dir>:/usr/src/yt-dlp-webui/downloads ghcr.io/marcopeocchi/yt-dlp-web-ui:master
|
docker run -d -p 3033:3033 -v <your dir>:/downloads ghcr.io/marcopeocchi/yt-dlp-web-ui:latest
|
||||||
|
|
||||||
# or even
|
# or even
|
||||||
docker pull ghcr.io/marcopeocchi/yt-dlp-web-ui:master
|
docker pull ghcr.io/marcopeocchi/yt-dlp-web-ui:latest
|
||||||
docker create --name yt-dlp-webui -p 8082:3022 -v <your dir>:/usr/src/yt-dlp-webui/downloads ghcr.io/marcopeocchi/yt-dlp-web-ui:master
|
docker create --name yt-dlp-webui -p 8082:3033 -v <your dir>:/downloads ghcr.io/marcopeocchi/yt-dlp-web-ui:latest
|
||||||
```
|
```
|
||||||
|
|
||||||
or
|
Or with docker but building the container manually.
|
||||||
|
|
||||||
|
```sh
|
||||||
|
docker build -t yt-dlp-webui .
|
||||||
|
docker run -d -p 3033:3033 -v <your dir>:/downloads yt-dlp-webui
|
||||||
|
```
|
||||||
|
|
||||||
|
## [Prebuilt binaries](https://github.com/marcopeocchi/yt-dlp-web-ui/releases) installation
|
||||||
|
|
||||||
|
```sh
|
||||||
|
# download the latest release from the releases page
|
||||||
|
mv yt-dlp-webui_linux-[your_system_arch] /usr/local/bin/yt-dlp-webui
|
||||||
|
|
||||||
|
# /home/user/downloads as an example and yt-dlp in $PATH
|
||||||
|
yt-dlp-webui --out /home/user/downloads
|
||||||
|
|
||||||
|
# specifying yt-dlp path
|
||||||
|
yt-dlp-webui --out /home/user/downloads --driver /opt/soemdir/yt-dlp
|
||||||
|
|
||||||
|
# specifying using a config file
|
||||||
|
yt-dlp-webui --conf /home/user/.config/yt-dlp-webui.conf
|
||||||
|
```
|
||||||
|
|
||||||
|
### Config file
|
||||||
|
By running `yt-dlp-webui` in standalone mode you have the ability to also specify a config file.
|
||||||
|
The config file **will overwrite what have been passed as cli argument**.
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
# Simple configuration file for yt-dlp webui
|
||||||
|
|
||||||
|
---
|
||||||
|
port: 8989
|
||||||
|
downloadPath: /home/ren/archive
|
||||||
|
downloaderPath: /usr/local/bin/yt-dlp
|
||||||
|
```
|
||||||
|
|
||||||
|
### Systemd integration
|
||||||
|
By defining a service file in `/etc/systemd/system/yt-dlp-webui.service` yt-dlp webui can be launched as in background.
|
||||||
|
|
||||||
|
```
|
||||||
|
[Unit]
|
||||||
|
Description=yt-dlp-webui service file
|
||||||
|
After=network.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
User=some_user
|
||||||
|
ExecStart=/usr/local/bin/yt-dlp-webui --out /mnt/share/downloads --port 8100
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
```
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
docker build -t yt-dlp-webui .
|
systemctl enable yt-dlp-webui
|
||||||
docker run -d -p 3022:3022 -v <your dir>:/usr/src/yt-dlp-webui/downloads yt-dlp-webui
|
systemctl start yt-dlp-webui
|
||||||
```
|
```
|
||||||
|
|
||||||
## Manual installation
|
## Manual installation
|
||||||
```shell
|
```sh
|
||||||
# the dependencies are: python3, ffmpeg, nodejs, psmisc.
|
# the dependencies are: python3, ffmpeg, nodejs, psmisc, go.
|
||||||
|
|
||||||
|
cd frontend
|
||||||
npm i
|
npm i
|
||||||
npm run build-all
|
npm run build
|
||||||
|
|
||||||
# edit the settings.json specifying port and download path or
|
go build -o yt-dlp-webui main.go
|
||||||
# it will default to the following created folder
|
|
||||||
|
|
||||||
mkdir downloads
|
|
||||||
|
|
||||||
node dist/main.js
|
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## Extendable
|
||||||
|
You dont'like the Material feel?
|
||||||
|
Want to build your own frontend? We got you covered 🤠
|
||||||
|
|
||||||
|
`yt-dlp-webui` now exposes a nice **JSON-RPC 1.0** interface through Websockets and HTTP-POST
|
||||||
|
It is **planned** to also expose a **gRPC** server.
|
||||||
|
|
||||||
|
Just as an overview, these are the available methods:
|
||||||
|
- Service.Exec
|
||||||
|
- Service.Progress
|
||||||
|
- Service.Formats
|
||||||
|
- Service.Pending
|
||||||
|
- Service.Running
|
||||||
|
- Service.Kill
|
||||||
|
- Service.KillAll
|
||||||
|
- Service.Clear
|
||||||
|
|
||||||
|
For more information open an issue on GitHub and I will provide more info ASAP.
|
||||||
|
|
||||||
## FAQ
|
## FAQ
|
||||||
- **Will it availabe for Raspberry Pi/ generic ARM devices?**
|
- **Will it availabe for Raspberry Pi/ generic ARM devices?**
|
||||||
- Yes, it's currently available through ghcr.io
|
- Yes, it's currently available through ghcr.io
|
||||||
@@ -136,7 +189,9 @@ node dist/main.js
|
|||||||
If you plan to use it on a Raspberry Pi ensure to have fast and durable storage.
|
If you plan to use it on a Raspberry Pi ensure to have fast and durable storage.
|
||||||
- **Why the docker image is so heavy?**
|
- **Why the docker image is so heavy?**
|
||||||
- Originally it was 1.8GB circa, now it has been slimmed to ~340MB compressed. This is due to the fact that it encapsule a basic Alpine linux image + FFmpeg + Node.js + Python3 + yt-dlp.
|
- Originally it was 1.8GB circa, now it has been slimmed to ~340MB compressed. This is due to the fact that it encapsule a basic Alpine linux image + FFmpeg + Node.js + Python3 + yt-dlp.
|
||||||
- **Am I forced to run it on port 3022?**
|
|
||||||
- Well, yes (until now).
|
|
||||||
- **Why is it so slow to start a download?**
|
- **Why is it so slow to start a download?**
|
||||||
- I genuinely don't know. I know that standalone yt-dlp is slow to start up even on my M1 Mac, so....
|
- I genuinely don't know. I know that standalone yt-dlp is slow to start up even on my M1 Mac, so....
|
||||||
|
|
||||||
|
## What yt-dlp-webui is not
|
||||||
|
`yt-dlp-webui` isn't your ordinary website where to download stuff from the internet, so don't try asking for links of where this is hosted. It's a self hosted platform for a Linux NAS.
|
||||||
|
|||||||
@@ -1,13 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
echo "Downloading latest yt-dlp build..."
|
|
||||||
|
|
||||||
rm -f yt-dlp
|
|
||||||
|
|
||||||
RELEASE=$(curl --silent "https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
|
|
||||||
|
|
||||||
wget "https://github.com/yt-dlp/yt-dlp/releases/download/$RELEASE/yt-dlp"
|
|
||||||
|
|
||||||
chmod +x yt-dlp
|
|
||||||
|
|
||||||
echo "Done!"
|
|
||||||
@@ -1,40 +1,36 @@
|
|||||||
{
|
{
|
||||||
"name": "yt-dlp-webui",
|
"name": "yt-dlp-webui",
|
||||||
"version": "1.1.0",
|
"version": "2.0.6",
|
||||||
"description": "A terrible webUI for yt-dlp, all-in-one solution.",
|
"description": "Frontend compontent of yt-dlp-webui",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
"build": "vite build"
|
"build": "vite build"
|
||||||
},
|
},
|
||||||
"author": "marcobaobao",
|
"author": "marcopeocchi",
|
||||||
"license": "ISC",
|
"license": "MPL-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@emotion/react": "^11.9.0",
|
"@emotion/react": "^11.10.5",
|
||||||
"@emotion/styled": "^11.8.1",
|
"@emotion/styled": "^11.10.5",
|
||||||
"@koa/cors": "^3.3.0",
|
"@mui/icons-material": "^5.11.0",
|
||||||
"@mui/icons-material": "^5.6.2",
|
"@mui/material": "^5.11.5",
|
||||||
"@mui/material": "^5.6.4",
|
"@reduxjs/toolkit": "^1.9.1",
|
||||||
"@reduxjs/toolkit": "^1.8.1",
|
|
||||||
"radash": "^10.6.0",
|
|
||||||
"react": "^18.2.0",
|
"react": "^18.2.0",
|
||||||
"react-dom": "^18.2.0",
|
"react-dom": "^18.2.0",
|
||||||
"react-redux": "^8.0.1",
|
"react-redux": "^8.0.5",
|
||||||
"react-router-dom": "^6.3.0",
|
"react-router-dom": "^6.7.0",
|
||||||
"rxjs": "^7.4.0",
|
"rxjs": "^7.8.0",
|
||||||
"uuid": "^8.3.2"
|
"uuid": "^9.0.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@modyfi/vite-plugin-yaml": "^1.0.2",
|
"@modyfi/vite-plugin-yaml": "^1.0.4",
|
||||||
"@types/node": "^18.11.18",
|
"@types/node": "^18.11.18",
|
||||||
"@types/react": "^18.0.21",
|
"@types/react": "^18.0.21",
|
||||||
"@types/react-dom": "^18.0.6",
|
"@types/react-dom": "^18.0.10",
|
||||||
"@types/react-router-dom": "^5.3.3",
|
"@types/react-router-dom": "^5.3.3",
|
||||||
"@types/uuid": "^8.3.4",
|
"@types/uuid": "^9.0.0",
|
||||||
"@vitejs/plugin-react": "^1.3.2",
|
"@vitejs/plugin-react": "^3.0.1",
|
||||||
"buffer": "^6.0.3",
|
"buffer": "^6.0.3",
|
||||||
"path-browserify": "^1.0.1",
|
"typescript": "^4.9.4",
|
||||||
"process": "^0.11.10",
|
"vite": "^4.0.4"
|
||||||
"typescript": "^4.6.4",
|
|
||||||
"vite": "^2.9.10"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -4,11 +4,13 @@ import {
|
|||||||
Dashboard,
|
Dashboard,
|
||||||
// Download,
|
// Download,
|
||||||
Menu, Settings as SettingsIcon,
|
Menu, Settings as SettingsIcon,
|
||||||
|
FormatListBulleted,
|
||||||
SettingsEthernet,
|
SettingsEthernet,
|
||||||
Storage
|
Storage
|
||||||
} from "@mui/icons-material";
|
} from "@mui/icons-material";
|
||||||
import {
|
import {
|
||||||
Box,
|
Box,
|
||||||
|
CircularProgress,
|
||||||
createTheme, CssBaseline,
|
createTheme, CssBaseline,
|
||||||
Divider,
|
Divider,
|
||||||
IconButton, List,
|
IconButton, List,
|
||||||
@@ -17,16 +19,16 @@ import {
|
|||||||
} from "@mui/material";
|
} from "@mui/material";
|
||||||
import { grey } from "@mui/material/colors";
|
import { grey } from "@mui/material/colors";
|
||||||
import ListItemButton from '@mui/material/ListItemButton';
|
import ListItemButton from '@mui/material/ListItemButton';
|
||||||
import { useMemo, useState } from "react";
|
import { lazy, Suspense, useMemo, useState } from "react";
|
||||||
import { Provider, useSelector } from "react-redux";
|
import { Provider, useDispatch, useSelector } from "react-redux";
|
||||||
import {
|
import {
|
||||||
BrowserRouter as Router, Link, Route,
|
BrowserRouter as Router, Link, Route,
|
||||||
Routes
|
Routes
|
||||||
} from 'react-router-dom';
|
} from 'react-router-dom';
|
||||||
import { AppBar } from "./components/AppBar";
|
import { AppBar } from "./components/AppBar";
|
||||||
import { Drawer } from "./components/Drawer";
|
import { Drawer } from "./components/Drawer";
|
||||||
|
import { toggleListView } from "./features/settings/settingsSlice";
|
||||||
import Home from "./Home";
|
import Home from "./Home";
|
||||||
import Settings from "./Settings";
|
|
||||||
import { RootState, store } from './stores/store';
|
import { RootState, store } from './stores/store';
|
||||||
import { formatGiB, getWebSocketEndpoint } from "./utils";
|
import { formatGiB, getWebSocketEndpoint } from "./utils";
|
||||||
|
|
||||||
@@ -35,6 +37,7 @@ function AppContent() {
|
|||||||
|
|
||||||
const settings = useSelector((state: RootState) => state.settings)
|
const settings = useSelector((state: RootState) => state.settings)
|
||||||
const status = useSelector((state: RootState) => state.status)
|
const status = useSelector((state: RootState) => state.status)
|
||||||
|
const dispatch = useDispatch()
|
||||||
|
|
||||||
const socket = useMemo(() => new WebSocket(getWebSocketEndpoint()), [])
|
const socket = useMemo(() => new WebSocket(getWebSocketEndpoint()), [])
|
||||||
|
|
||||||
@@ -54,6 +57,8 @@ function AppContent() {
|
|||||||
setOpen(!open)
|
setOpen(!open)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const Settings = lazy(() => import('./Settings'))
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ThemeProvider theme={theme}>
|
<ThemeProvider theme={theme}>
|
||||||
<Router>
|
<Router>
|
||||||
@@ -132,6 +137,12 @@ function AppContent() {
|
|||||||
<ListItemText primary="Home" />
|
<ListItemText primary="Home" />
|
||||||
</ListItemButton>
|
</ListItemButton>
|
||||||
</Link>
|
</Link>
|
||||||
|
<ListItemButton onClick={() => dispatch(toggleListView())}>
|
||||||
|
<ListItemIcon>
|
||||||
|
<FormatListBulleted />
|
||||||
|
</ListItemIcon>
|
||||||
|
<ListItemText primary="List view" />
|
||||||
|
</ListItemButton>
|
||||||
<Link to={'/settings'} style={
|
<Link to={'/settings'} style={
|
||||||
{
|
{
|
||||||
textDecoration: 'none',
|
textDecoration: 'none',
|
||||||
@@ -158,7 +169,11 @@ function AppContent() {
|
|||||||
<Toolbar />
|
<Toolbar />
|
||||||
<Routes>
|
<Routes>
|
||||||
<Route path="/" element={<Home socket={socket} />} />
|
<Route path="/" element={<Home socket={socket} />} />
|
||||||
<Route path="/settings" element={<Settings socket={socket} />} />
|
<Route path="/settings" element={
|
||||||
|
<Suspense fallback={<CircularProgress />}>
|
||||||
|
<Settings socket={socket} />
|
||||||
|
</Suspense>
|
||||||
|
} />
|
||||||
</Routes>
|
</Routes>
|
||||||
</Box>
|
</Box>
|
||||||
</Box>
|
</Box>
|
||||||
|
|||||||
@@ -19,9 +19,10 @@ import {
|
|||||||
Typography
|
Typography
|
||||||
} from "@mui/material";
|
} from "@mui/material";
|
||||||
import { Buffer } from 'buffer';
|
import { Buffer } from 'buffer';
|
||||||
import { Fragment, useEffect, useMemo, useState } from "react";
|
import { useEffect, useMemo, useState } from "react";
|
||||||
import { useDispatch, useSelector } from "react-redux";
|
import { useDispatch, useSelector } from "react-redux";
|
||||||
import { StackableResult } from "./components/StackableResult";
|
import { DownloadsCardView } from "./components/DownloadsCardView";
|
||||||
|
import { DownloadsListView } from "./components/DownloadsListView";
|
||||||
import { CliArguments } from "./features/core/argsParser";
|
import { CliArguments } from "./features/core/argsParser";
|
||||||
import I18nBuilder from "./features/core/intl";
|
import I18nBuilder from "./features/core/intl";
|
||||||
import { RPCClient } from "./features/core/rpcClient";
|
import { RPCClient } from "./features/core/rpcClient";
|
||||||
@@ -41,7 +42,7 @@ export default function Home({ socket }: Props) {
|
|||||||
const dispatch = useDispatch()
|
const dispatch = useDispatch()
|
||||||
|
|
||||||
// ephemeral state
|
// ephemeral state
|
||||||
const [activeDownloads, setActiveDownloads] = useState(new Array<RPCResult>());
|
const [activeDownloads, setActiveDownloads] = useState<Array<RPCResult>>();
|
||||||
const [downloadFormats, setDownloadFormats] = useState<IDLMetadata>();
|
const [downloadFormats, setDownloadFormats] = useState<IDLMetadata>();
|
||||||
const [pickedVideoFormat, setPickedVideoFormat] = useState('');
|
const [pickedVideoFormat, setPickedVideoFormat] = useState('');
|
||||||
const [pickedAudioFormat, setPickedAudioFormat] = useState('');
|
const [pickedAudioFormat, setPickedAudioFormat] = useState('');
|
||||||
@@ -56,7 +57,7 @@ export default function Home({ socket }: Props) {
|
|||||||
const [url, setUrl] = useState('');
|
const [url, setUrl] = useState('');
|
||||||
const [workingUrl, setWorkingUrl] = useState('');
|
const [workingUrl, setWorkingUrl] = useState('');
|
||||||
|
|
||||||
const [showBackdrop, setShowBackdrop] = useState(false);
|
const [showBackdrop, setShowBackdrop] = useState(true);
|
||||||
const [showToast, setShowToast] = useState(true);
|
const [showToast, setShowToast] = useState(true);
|
||||||
|
|
||||||
// memos
|
// memos
|
||||||
@@ -70,6 +71,7 @@ export default function Home({ socket }: Props) {
|
|||||||
socket.onopen = () => {
|
socket.onopen = () => {
|
||||||
dispatch(connected())
|
dispatch(connected())
|
||||||
setCustomArgs(localStorage.getItem('last-input-args') ?? '')
|
setCustomArgs(localStorage.getItem('last-input-args') ?? '')
|
||||||
|
setFilenameOverride(localStorage.getItem('last-filename-override') ?? '')
|
||||||
}
|
}
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
@@ -104,10 +106,10 @@ export default function Home({ socket }: Props) {
|
|||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (activeDownloads.length > 0 && showBackdrop) {
|
if (activeDownloads && activeDownloads.length >= 0) {
|
||||||
setShowBackdrop(false)
|
setShowBackdrop(false)
|
||||||
}
|
}
|
||||||
}, [activeDownloads, showBackdrop])
|
}, [activeDownloads?.length])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
client.directoryTree()
|
client.directoryTree()
|
||||||
@@ -136,7 +138,7 @@ export default function Home({ socket }: Props) {
|
|||||||
|
|
||||||
setUrl('')
|
setUrl('')
|
||||||
setWorkingUrl('')
|
setWorkingUrl('')
|
||||||
setFilenameOverride('')
|
setShowBackdrop(true)
|
||||||
|
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
resetInput()
|
resetInput()
|
||||||
@@ -179,6 +181,7 @@ export default function Home({ socket }: Props) {
|
|||||||
*/
|
*/
|
||||||
const handleFilenameOverrideChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
const handleFilenameOverrideChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||||
setFilenameOverride(e.target.value)
|
setFilenameOverride(e.target.value)
|
||||||
|
localStorage.setItem('last-filename-override', e.target.value)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -297,6 +300,7 @@ export default function Home({ socket }: Props) {
|
|||||||
fullWidth
|
fullWidth
|
||||||
label={i18n.t('customFilename')}
|
label={i18n.t('customFilename')}
|
||||||
variant="outlined"
|
variant="outlined"
|
||||||
|
value={fileNameOverride}
|
||||||
onChange={handleFilenameOverrideChange}
|
onChange={handleFilenameOverrideChange}
|
||||||
disabled={!status.connected || (settings.formatSelection && downloadFormats != null)}
|
disabled={!status.connected || (settings.formatSelection && downloadFormats != null)}
|
||||||
/>
|
/>
|
||||||
@@ -458,25 +462,11 @@ export default function Home({ socket }: Props) {
|
|||||||
</Grid>
|
</Grid>
|
||||||
</Grid> : null
|
</Grid> : null
|
||||||
}
|
}
|
||||||
<Grid container spacing={{ xs: 2, md: 2 }} columns={{ xs: 4, sm: 8, md: 12 }} pt={2}>
|
|
||||||
{
|
{
|
||||||
activeDownloads.map(download => (
|
settings.listView ?
|
||||||
<Grid item xs={4} sm={8} md={6} key={download.id}>
|
<DownloadsListView downloads={activeDownloads ?? []} abortFunction={abort} /> :
|
||||||
<Fragment>
|
<DownloadsCardView downloads={activeDownloads ?? []} abortFunction={abort} />
|
||||||
<StackableResult
|
|
||||||
title={download.info.title}
|
|
||||||
thumbnail={download.info.thumbnail}
|
|
||||||
percentage={download.progress.percentage}
|
|
||||||
stopCallback={() => abort(download.id)}
|
|
||||||
resolution={download.info.resolution ?? ''}
|
|
||||||
speed={download.progress.speed}
|
|
||||||
size={download.info.filesize_approx ?? 0}
|
|
||||||
/>
|
|
||||||
</Fragment>
|
|
||||||
</Grid>
|
|
||||||
))
|
|
||||||
}
|
}
|
||||||
</Grid>
|
|
||||||
<Snackbar
|
<Snackbar
|
||||||
open={showToast === status.connected}
|
open={showToast === status.connected}
|
||||||
autoHideDuration={1500}
|
autoHideDuration={1500}
|
||||||
|
|||||||
@@ -72,15 +72,15 @@ languages:
|
|||||||
toastConnected: '已连接到 '
|
toastConnected: '已连接到 '
|
||||||
toastUpdated: 已更新 yt-dlp 可执行文件!
|
toastUpdated: 已更新 yt-dlp 可执行文件!
|
||||||
formatSelectionEnabler: 启用视频/音频格式选择
|
formatSelectionEnabler: 启用视频/音频格式选择
|
||||||
themeSelect: 'Theme'
|
themeSelect: '主题'
|
||||||
languageSelect: 'Language'
|
languageSelect: '语言'
|
||||||
overridesAnchor: Overrides
|
overridesAnchor: 覆盖
|
||||||
pathOverrideOption: Enable output path overriding
|
pathOverrideOption: 启用输出路径覆盖
|
||||||
filenameOverrideOption: Enable output file name overriding
|
filenameOverrideOption: 启用输出文件名覆盖
|
||||||
customFilename: Custom filemame (leave blank to use default)
|
customFilename: 自定义文件名(留空使用默认值)
|
||||||
customPath: Custom path
|
customPath: 自定义路径
|
||||||
customArgs: Enable custom yt-dlp args (great power = great responsabilities)
|
customArgs: 启用自定义 yt-dlp 参数(能力越大 = 责任越大)
|
||||||
customArgsInput: Custom yt-dlp arguments
|
customArgsInput: 自定义 yt-dlp 参数
|
||||||
spanish:
|
spanish:
|
||||||
urlInput: YouTube or other supported service video url
|
urlInput: YouTube or other supported service video url
|
||||||
statusTitle: Status
|
statusTitle: Status
|
||||||
|
|||||||
33
frontend/src/components/DownloadsCardView.tsx
Normal file
33
frontend/src/components/DownloadsCardView.tsx
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
import { Grid } from "@mui/material"
|
||||||
|
import { Fragment } from "react"
|
||||||
|
import type { RPCResult } from "../types"
|
||||||
|
import { StackableResult } from "./StackableResult"
|
||||||
|
|
||||||
|
type Props = {
|
||||||
|
downloads: RPCResult[]
|
||||||
|
abortFunction: Function
|
||||||
|
}
|
||||||
|
|
||||||
|
export function DownloadsCardView({ downloads, abortFunction }: Props) {
|
||||||
|
return (
|
||||||
|
<Grid container spacing={{ xs: 2, md: 2 }} columns={{ xs: 4, sm: 8, md: 12 }} pt={2}>
|
||||||
|
{
|
||||||
|
downloads.map(download => (
|
||||||
|
<Grid item xs={4} sm={8} md={6} key={download.id}>
|
||||||
|
<Fragment>
|
||||||
|
<StackableResult
|
||||||
|
title={download.info.title}
|
||||||
|
thumbnail={download.info.thumbnail}
|
||||||
|
percentage={download.progress.percentage}
|
||||||
|
stopCallback={() => abortFunction(download.id)}
|
||||||
|
resolution={download.info.resolution ?? ''}
|
||||||
|
speed={download.progress.speed}
|
||||||
|
size={download.info.filesize_approx ?? 0}
|
||||||
|
/>
|
||||||
|
</Fragment>
|
||||||
|
</Grid>
|
||||||
|
))
|
||||||
|
}
|
||||||
|
</Grid>
|
||||||
|
)
|
||||||
|
}
|
||||||
70
frontend/src/components/DownloadsListView.tsx
Normal file
70
frontend/src/components/DownloadsListView.tsx
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
import { Button, CircularProgress, Grid, LinearProgress, Paper, Table, TableBody, TableCell, TableContainer, TableHead, TableRow, Typography } from "@mui/material"
|
||||||
|
import { RPCResult } from "../types"
|
||||||
|
import { ellipsis, formatSpeedMiB, roundMiB } from "../utils"
|
||||||
|
|
||||||
|
type Props = {
|
||||||
|
downloads: RPCResult[]
|
||||||
|
abortFunction: Function
|
||||||
|
}
|
||||||
|
|
||||||
|
export function DownloadsListView({ downloads, abortFunction }: Props) {
|
||||||
|
return (
|
||||||
|
<Grid container spacing={{ xs: 2, md: 2 }} columns={{ xs: 4, sm: 8, md: 12 }} pt={2}>
|
||||||
|
<Grid item xs={12}>
|
||||||
|
<TableContainer component={Paper} sx={{ minHeight: '65vh' }} elevation={2}>
|
||||||
|
<Table>
|
||||||
|
<TableHead>
|
||||||
|
<TableRow>
|
||||||
|
<TableCell>
|
||||||
|
<Typography fontWeight={500} fontSize={15}>Title</Typography>
|
||||||
|
</TableCell>
|
||||||
|
<TableCell>
|
||||||
|
<Typography fontWeight={500} fontSize={15}>Progress</Typography>
|
||||||
|
</TableCell>
|
||||||
|
<TableCell>
|
||||||
|
<Typography fontWeight={500} fontSize={15}>Speed</Typography>
|
||||||
|
</TableCell>
|
||||||
|
<TableCell>
|
||||||
|
<Typography fontWeight={500} fontSize={15}>Size</Typography>
|
||||||
|
</TableCell>
|
||||||
|
<TableCell>
|
||||||
|
<Typography fontWeight={500} fontSize={15}>Actions</Typography>
|
||||||
|
</TableCell>
|
||||||
|
</TableRow>
|
||||||
|
</TableHead>
|
||||||
|
<TableBody>
|
||||||
|
{
|
||||||
|
downloads.map(download => (
|
||||||
|
<TableRow key={download.id}>
|
||||||
|
<TableCell>{ellipsis(download.info.title, 80)}</TableCell>
|
||||||
|
<TableCell>
|
||||||
|
<LinearProgress
|
||||||
|
value={
|
||||||
|
download.progress.percentage === '-1' ? 100 :
|
||||||
|
Number(download.progress.percentage.replace('%', ''))
|
||||||
|
}
|
||||||
|
variant="determinate"
|
||||||
|
color={download.progress.percentage === '-1' ? 'success' : 'primary'}
|
||||||
|
/>
|
||||||
|
</TableCell>
|
||||||
|
<TableCell>{formatSpeedMiB(download.progress.speed)}</TableCell>
|
||||||
|
<TableCell>{roundMiB(download.info.filesize_approx ?? 0)}</TableCell>
|
||||||
|
<TableCell>
|
||||||
|
<Button
|
||||||
|
variant="contained"
|
||||||
|
size="small"
|
||||||
|
onClick={() => abortFunction(download.id)}
|
||||||
|
>
|
||||||
|
{download.progress.percentage === '-1' ? 'Remove' : 'Stop'}
|
||||||
|
</Button>
|
||||||
|
</TableCell>
|
||||||
|
</TableRow>
|
||||||
|
))
|
||||||
|
}
|
||||||
|
</TableBody>
|
||||||
|
</Table>
|
||||||
|
</TableContainer>
|
||||||
|
</Grid>
|
||||||
|
</Grid>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -13,7 +13,7 @@ import {
|
|||||||
Typography
|
Typography
|
||||||
} from "@mui/material";
|
} from "@mui/material";
|
||||||
import { useEffect, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
import { ellipsis } from "../utils";
|
import { ellipsis, formatSpeedMiB, roundMiB } from "../utils";
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
title: string,
|
title: string,
|
||||||
@@ -42,6 +42,8 @@ export function StackableResult({
|
|||||||
}
|
}
|
||||||
}, [percentage])
|
}, [percentage])
|
||||||
|
|
||||||
|
const percentageToNumber = () => isCompleted ? 100 : Number(percentage.replace('%', ''))
|
||||||
|
|
||||||
const guessResolution = (xByY: string): any => {
|
const guessResolution = (xByY: string): any => {
|
||||||
if (!xByY) return null;
|
if (!xByY) return null;
|
||||||
if (xByY.includes('4320')) return (<EightK color="primary" />);
|
if (xByY.includes('4320')) return (<EightK color="primary" />);
|
||||||
@@ -51,11 +53,6 @@ export function StackableResult({
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
const percentageToNumber = () => isCompleted ? 100 : Number(percentage.replace('%', ''))
|
|
||||||
|
|
||||||
const roundMiB = (bytes: number) => `${(bytes / 1_000_000).toFixed(2)} MiB`
|
|
||||||
const formatSpeedMiB = (val: number) => `${roundMiB(val)}/s`
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card>
|
<Card>
|
||||||
<CardActionArea>
|
<CardActionArea>
|
||||||
|
|||||||
@@ -1,28 +1,28 @@
|
|||||||
// @ts-nocheck
|
// @ts-nocheck
|
||||||
import i18n from "../../assets/i18n.yaml";
|
import i18n from "../../assets/i18n.yaml"
|
||||||
|
|
||||||
export default class I18nBuilder {
|
export default class I18nBuilder {
|
||||||
private language: string;
|
private language: string
|
||||||
private textMap = i18n.languages;
|
private textMap = i18n.languages
|
||||||
|
|
||||||
constructor(language: string) {
|
constructor(language: string) {
|
||||||
this.language = language;
|
this.language = language
|
||||||
}
|
}
|
||||||
|
|
||||||
getLanguage(): string {
|
getLanguage(): string {
|
||||||
return this.language;
|
return this.language
|
||||||
}
|
}
|
||||||
|
|
||||||
setLanguage(language: string): void {
|
setLanguage(language: string): void {
|
||||||
this.language = language;
|
this.language = language
|
||||||
}
|
}
|
||||||
|
|
||||||
t(key: string): string {
|
t(key: string): string {
|
||||||
const map = this.textMap[this.language]
|
const map = this.textMap[this.language]
|
||||||
if (map) {
|
if (map) {
|
||||||
const translation = map[key];
|
const translation = map[key]
|
||||||
return translation ?? 'caption not defined';
|
return translation ?? 'caption not defined'
|
||||||
}
|
}
|
||||||
return 'caption not defined';
|
return 'caption not defined'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -20,10 +20,13 @@ export class RPCClient {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private sendHTTP<T>(req: RPCRequest) {
|
private sendHTTP<T>(req: RPCRequest) {
|
||||||
return new Promise<RPCResponse<T>>((resolve, reject) => {
|
return new Promise<RPCResponse<T>>((resolve) => {
|
||||||
fetch(getHttpRPCEndpoint(), {
|
fetch(getHttpRPCEndpoint(), {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
body: JSON.stringify(req)
|
body: JSON.stringify({
|
||||||
|
id: this.incrementSeq(),
|
||||||
|
...req
|
||||||
|
})
|
||||||
})
|
})
|
||||||
.then(res => res.json())
|
.then(res => res.json())
|
||||||
.then(data => resolve(data))
|
.then(data => resolve(data))
|
||||||
@@ -59,6 +62,7 @@ export class RPCClient {
|
|||||||
|
|
||||||
public running() {
|
public running() {
|
||||||
this.send({
|
this.send({
|
||||||
|
id: this.incrementSeq(),
|
||||||
method: 'Service.Running',
|
method: 'Service.Running',
|
||||||
params: [],
|
params: [],
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ export interface SettingsState {
|
|||||||
fileRenaming: boolean
|
fileRenaming: boolean
|
||||||
pathOverriding: boolean
|
pathOverriding: boolean
|
||||||
enableCustomArgs: boolean
|
enableCustomArgs: boolean
|
||||||
|
listView: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
const initialState: SettingsState = {
|
const initialState: SettingsState = {
|
||||||
@@ -27,6 +28,7 @@ const initialState: SettingsState = {
|
|||||||
fileRenaming: localStorage.getItem("file-renaming") === "true",
|
fileRenaming: localStorage.getItem("file-renaming") === "true",
|
||||||
pathOverriding: localStorage.getItem("path-overriding") === "true",
|
pathOverriding: localStorage.getItem("path-overriding") === "true",
|
||||||
enableCustomArgs: localStorage.getItem("enable-custom-args") === "true",
|
enableCustomArgs: localStorage.getItem("enable-custom-args") === "true",
|
||||||
|
listView: localStorage.getItem("listview") === "true",
|
||||||
}
|
}
|
||||||
|
|
||||||
export const settingsSlice = createSlice({
|
export const settingsSlice = createSlice({
|
||||||
@@ -73,6 +75,10 @@ export const settingsSlice = createSlice({
|
|||||||
state.enableCustomArgs = action.payload
|
state.enableCustomArgs = action.payload
|
||||||
localStorage.setItem("enable-custom-args", action.payload.toString())
|
localStorage.setItem("enable-custom-args", action.payload.toString())
|
||||||
},
|
},
|
||||||
|
toggleListView: (state) => {
|
||||||
|
state.listView = !state.listView
|
||||||
|
localStorage.setItem("listview", state.listView.toString())
|
||||||
|
},
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -87,6 +93,7 @@ export const {
|
|||||||
setFileRenaming,
|
setFileRenaming,
|
||||||
setPathOverriding,
|
setPathOverriding,
|
||||||
setEnableCustomArgs,
|
setEnableCustomArgs,
|
||||||
|
toggleListView
|
||||||
} = settingsSlice.actions
|
} = settingsSlice.actions
|
||||||
|
|
||||||
export default settingsSlice.reducer
|
export default settingsSlice.reducer
|
||||||
@@ -84,3 +84,6 @@ export function getHttpRPCEndpoint() {
|
|||||||
export function formatGiB(bytes: number) {
|
export function formatGiB(bytes: number) {
|
||||||
return `${(bytes / 1_000_000_000).toFixed(0)}GiB`
|
return `${(bytes / 1_000_000_000).toFixed(0)}GiB`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const roundMiB = (bytes: number) => `${(bytes / 1_000_000).toFixed(2)} MiB`
|
||||||
|
export const formatSpeedMiB = (val: number) => `${roundMiB(val)}/s`
|
||||||
2
go.mod
2
go.mod
@@ -9,6 +9,7 @@ require (
|
|||||||
github.com/google/uuid v1.3.0
|
github.com/google/uuid v1.3.0
|
||||||
github.com/marcopeocchi/fazzoletti v0.0.0-20221114144444-1e802380a7db
|
github.com/marcopeocchi/fazzoletti v0.0.0-20221114144444-1e802380a7db
|
||||||
golang.org/x/sys v0.4.0
|
golang.org/x/sys v0.4.0
|
||||||
|
gopkg.in/yaml.v3 v3.0.1
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
@@ -23,5 +24,4 @@ require (
|
|||||||
github.com/valyala/bytebufferpool v1.0.0 // indirect
|
github.com/valyala/bytebufferpool v1.0.0 // indirect
|
||||||
github.com/valyala/fasthttp v1.43.0 // indirect
|
github.com/valyala/fasthttp v1.43.0 // indirect
|
||||||
github.com/valyala/tcplisten v1.0.0 // indirect
|
github.com/valyala/tcplisten v1.0.0 // indirect
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
|
||||||
)
|
)
|
||||||
|
|||||||
1
go.sum
1
go.sum
@@ -56,6 +56,7 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX
|
|||||||
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
||||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||||
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
|||||||
@@ -130,7 +130,6 @@ func (p *Process) Start(path, filename string) {
|
|||||||
go func() {
|
go func() {
|
||||||
defer r.Close()
|
defer r.Close()
|
||||||
defer p.Complete()
|
defer p.Complete()
|
||||||
defer close(eventChan)
|
|
||||||
for scan.Scan() {
|
for scan.Scan() {
|
||||||
eventChan <- scan.Text()
|
eventChan <- scan.Text()
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user