Compare commits
139 Commits
v3.0.6
...
215-files-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b0dac0adda | ||
|
|
8c0e7b3cb8 | ||
| 38da65a848 | |||
|
|
64fbdbbbdf | ||
|
|
a00059ca88 | ||
|
|
7abccaec71 | ||
|
|
f075d3d531 | ||
|
|
190d891578 | ||
| 645cc6f9a1 | |||
|
|
01cf9ef56d | ||
|
|
504d9dcb55 | ||
| 1845f3e491 | |||
|
|
a2793f9541 | ||
| ef0d7ba5f8 | |||
| f36ec7e6d3 | |||
| 0f260100f2 | |||
| 4f4ea1a599 | |||
| 03ee338f15 | |||
|
|
fb2642de2c | ||
| ffc7f29688 | |||
| 2c30bff45d | |||
| dc7a0ae6b7 | |||
| d3cf53c609 | |||
|
|
0555277c50 | ||
|
|
aa4b168c44 | ||
|
|
650f1cad92 | ||
|
|
8eebd424c8 | ||
|
|
a1a3aaca18 | ||
|
|
d779830df6 | ||
| 4375cd3ebc | |||
| b0c7c13e5e | |||
|
|
bb4db5d342 | ||
|
|
64df0e0b32 | ||
|
|
72c9634832 | ||
| a4cfc53581 | |||
| d4feefd639 | |||
| 434efc79d8 | |||
| 54771b2d78 | |||
| fceb36c723 | |||
| c4075fb640 | |||
|
|
aa8191b0cd | ||
| a6626973ac | |||
| 79f1473c6a | |||
|
|
b76f2b72be | ||
| 8f2d9eaf6e | |||
|
|
c51f320a6f | ||
| 8b26bf513f | |||
| 25210ccc22 | |||
| 3205711bb1 | |||
| 92e3fd994e | |||
| 01e9da61eb | |||
|
|
fd5e62e23b | ||
| a64798644a | |||
|
|
b7511eb064 | ||
|
|
16f8f74f9b | ||
| 61891839d9 | |||
|
|
17cd2d54d0 | ||
| 9b61436a05 | |||
| 31e3cfab24 | |||
| ed437ec367 | |||
|
|
92aabc0086 | ||
| 38a0cedc9c | |||
| c0c2fcb009 | |||
| 3edebbdb6c | |||
|
|
98f0ea3bd2 | ||
| 0daf36719b | |||
| 38683bfe85 | |||
| 4066a6d5e3 | |||
| ee18929196 | |||
| 9c09c88d06 | |||
| d402d71815 | |||
| 848f716d08 | |||
| 14a14a9f38 | |||
| 6ffca7d64f | |||
| 0b0ba4718c | |||
| 7ea1c0b205 | |||
| d614433501 | |||
| c108428243 | |||
| f4c4d6928b | |||
| 00ca9156fb | |||
| 2f0afe27cc | |||
| acac2f41a5 | |||
| 9cbce3b66c | |||
| fad2f1d0da | |||
| a331329125 | |||
| 1138e66bc7 | |||
| 589468ed0e | |||
| 7c86e1dd23 | |||
| ed79e70ee3 | |||
| 8efa72c964 | |||
| d4a35f1d1d | |||
| 4013a66b04 | |||
| 4cc1ed681a | |||
|
|
306e673f59 | ||
| 22e80893f3 | |||
| f2389a6e6a | |||
|
|
e0e923822c | ||
| 46926eb873 | |||
| 472db89ea3 | |||
|
|
fee7f86182 | ||
|
|
1da32f3c65 | ||
| c10f60d4d4 | |||
| da84eb14f3 | |||
| f5f0af7e1e | |||
|
|
ace6621d4a | ||
| e0202ff631 | |||
| 8f10baf09b | |||
| 62eadb52a6 | |||
| 6abfb57598 | |||
| dc2828b884 | |||
| d58a2e6692 | |||
| 00bacf5c41 | |||
| 01c327d308 | |||
| 83f6444df2 | |||
| e09c52dd05 | |||
| 3da81affb3 | |||
| a73b8d362e | |||
| 205f2e5cdf | |||
| 294ad29bf2 | |||
| d336b92e46 | |||
| 2f02293a52 | |||
| 566f0f2ac2 | |||
| 15ab37de11 | |||
|
|
f2fab66626 | ||
|
|
86db8176ff | ||
| 1b8d2e0da6 | |||
| c6e48f4baa | |||
| 82ccb68a56 | |||
| bf2e24009e | |||
|
|
e7639c2720 | ||
|
|
02832f9de4 | ||
| 29dfebe48b | |||
|
|
52862156b9 | ||
|
|
193ac9f043 | ||
|
|
6e4dff5f3a | ||
| 371704db57 | |||
| 43e5c94b58 | |||
| 48c9258088 | |||
|
|
87956a6aad |
@@ -1,18 +0,0 @@
|
|||||||
dist
|
|
||||||
package-lock.json
|
|
||||||
pnpm-lock.yaml
|
|
||||||
.pnpm-debug.log
|
|
||||||
node_modules
|
|
||||||
.env
|
|
||||||
*.mp4
|
|
||||||
*.ytdl
|
|
||||||
*.part
|
|
||||||
*.db
|
|
||||||
downloads
|
|
||||||
.DS_Store
|
|
||||||
build/
|
|
||||||
yt-dlp-webui
|
|
||||||
session.dat
|
|
||||||
config.yml
|
|
||||||
cookies.txt
|
|
||||||
examples/
|
|
||||||
2
.gitattributes
vendored
Normal file
2
.gitattributes
vendored
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
*.tsx linguist-detectable=false
|
||||||
|
*.html linguist-detectable=false
|
||||||
2
.github/FUNDING.yml
vendored
2
.github/FUNDING.yml
vendored
@@ -10,4 +10,4 @@ liberapay: # Replace with a single Liberapay username
|
|||||||
issuehunt: # Replace with a single IssueHunt username
|
issuehunt: # Replace with a single IssueHunt username
|
||||||
otechie: # Replace with a single Otechie username
|
otechie: # Replace with a single Otechie username
|
||||||
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
|
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
|
||||||
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
|
custom: ['https://paypal.me/marcofw']
|
||||||
|
|||||||
30
.github/ISSUE_TEMPLATE/bug_report.md
vendored
Normal file
30
.github/ISSUE_TEMPLATE/bug_report.md
vendored
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
---
|
||||||
|
name: Bug report
|
||||||
|
about: Create a report to help improve the project
|
||||||
|
title: ''
|
||||||
|
labels: ''
|
||||||
|
assignees: ''
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
**Version running**
|
||||||
|
Provide the docker label or release tag you're running.
|
||||||
|
|
||||||
|
**Describe the bug**
|
||||||
|
A clear and concise description of what the bug is.
|
||||||
|
|
||||||
|
**To Reproduce**
|
||||||
|
Steps to reproduce the behavior:
|
||||||
|
1. Go to '...'
|
||||||
|
2. Click on '....'
|
||||||
|
3. Scroll down to '....'
|
||||||
|
4. See error
|
||||||
|
|
||||||
|
**Expected behavior**
|
||||||
|
A clear and concise description of what you expected to happen.
|
||||||
|
|
||||||
|
**Screenshots**
|
||||||
|
If applicable, add screenshots to help explain your problem.
|
||||||
|
|
||||||
|
**Additional context**
|
||||||
|
Add any other context about the problem here.
|
||||||
2
.github/workflows/docker-publish.yml
vendored
2
.github/workflows/docker-publish.yml
vendored
@@ -25,7 +25,7 @@ jobs:
|
|||||||
# v3.1.2
|
# v3.1.2
|
||||||
uses: sigstore/cosign-installer@11086d25041f77fe8fe7b9ea4e48e3b9192b8f19
|
uses: sigstore/cosign-installer@11086d25041f77fe8fe7b9ea4e48e3b9192b8f19
|
||||||
with:
|
with:
|
||||||
cosign-release: 'v1.13.1'
|
cosign-release: 'v1.13.6'
|
||||||
|
|
||||||
- name: Set up QEMU for ARM emulation
|
- name: Set up QEMU for ARM emulation
|
||||||
# v2.2.0
|
# v2.2.0
|
||||||
|
|||||||
12
.gitignore
vendored
12
.gitignore
vendored
@@ -1,3 +1,7 @@
|
|||||||
|
.pre-commit-config.yaml
|
||||||
|
.direnv/
|
||||||
|
result/
|
||||||
|
result
|
||||||
dist
|
dist
|
||||||
.pnpm-debug.log
|
.pnpm-debug.log
|
||||||
node_modules
|
node_modules
|
||||||
@@ -14,4 +18,10 @@ session.dat
|
|||||||
config.yml
|
config.yml
|
||||||
cookies.txt
|
cookies.txt
|
||||||
__debug*
|
__debug*
|
||||||
ui/
|
ui/
|
||||||
|
.idea
|
||||||
|
frontend/.pnp.cjs
|
||||||
|
frontend/.pnp.loader.mjs
|
||||||
|
frontend/.yarn/install-state.gz
|
||||||
|
.db.lock
|
||||||
|
livestreams.dat
|
||||||
|
|||||||
@@ -27,16 +27,16 @@ RUN CGO_ENABLED=0 GOOS=linux go build -o yt-dlp-webui
|
|||||||
# dependencies ----------------------------------------------------------------
|
# dependencies ----------------------------------------------------------------
|
||||||
FROM alpine:edge
|
FROM alpine:edge
|
||||||
|
|
||||||
|
RUN apk update && \
|
||||||
|
apk add ffmpeg yt-dlp ca-certificates curl wget psmisc
|
||||||
|
|
||||||
VOLUME /downloads /config
|
VOLUME /downloads /config
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
RUN apk update && \
|
|
||||||
apk add psmisc ffmpeg yt-dlp --no-cache
|
|
||||||
|
|
||||||
COPY --from=build /usr/src/yt-dlp-webui/yt-dlp-webui /app
|
COPY --from=build /usr/src/yt-dlp-webui/yt-dlp-webui /app
|
||||||
|
|
||||||
ENV JWT_SECRET=secret
|
ENV JWT_SECRET=secret
|
||||||
|
|
||||||
EXPOSE 3033
|
EXPOSE 3033
|
||||||
ENTRYPOINT [ "./yt-dlp-webui" , "--out", "/downloads", "--conf", "/config/config.yml", "--db", "/config/local.db" ]
|
ENTRYPOINT [ "./yt-dlp-webui" , "--out", "/downloads", "--conf", "/config/config.yml", "--db", "/config/local.db" ]
|
||||||
674
LICENSE
Normal file
674
LICENSE
Normal file
@@ -0,0 +1,674 @@
|
|||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
the GNU General Public License is intended to guarantee your freedom to
|
||||||
|
share and change all versions of a program--to make sure it remains free
|
||||||
|
software for all its users. We, the Free Software Foundation, use the
|
||||||
|
GNU General Public License for most of our software; it applies also to
|
||||||
|
any other work released this way by its authors. You can apply it to
|
||||||
|
your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to prevent others from denying you
|
||||||
|
these rights or asking you to surrender the rights. Therefore, you have
|
||||||
|
certain responsibilities if you distribute copies of the software, or if
|
||||||
|
you modify it: responsibilities to respect the freedom of others.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
|
freedoms that you received. You must make sure that they, too, receive
|
||||||
|
or can get the source code. And you must show them these terms so they
|
||||||
|
know their rights.
|
||||||
|
|
||||||
|
Developers that use the GNU GPL protect your rights with two steps:
|
||||||
|
(1) assert copyright on the software, and (2) offer you this License
|
||||||
|
giving you legal permission to copy, distribute and/or modify it.
|
||||||
|
|
||||||
|
For the developers' and authors' protection, the GPL clearly explains
|
||||||
|
that there is no warranty for this free software. For both users' and
|
||||||
|
authors' sake, the GPL requires that modified versions be marked as
|
||||||
|
changed, so that their problems will not be attributed erroneously to
|
||||||
|
authors of previous versions.
|
||||||
|
|
||||||
|
Some devices are designed to deny users access to install or run
|
||||||
|
modified versions of the software inside them, although the manufacturer
|
||||||
|
can do so. This is fundamentally incompatible with the aim of
|
||||||
|
protecting users' freedom to change the software. The systematic
|
||||||
|
pattern of such abuse occurs in the area of products for individuals to
|
||||||
|
use, which is precisely where it is most unacceptable. Therefore, we
|
||||||
|
have designed this version of the GPL to prohibit the practice for those
|
||||||
|
products. If such problems arise substantially in other domains, we
|
||||||
|
stand ready to extend this provision to those domains in future versions
|
||||||
|
of the GPL, as needed to protect the freedom of users.
|
||||||
|
|
||||||
|
Finally, every program is threatened constantly by software patents.
|
||||||
|
States should not allow patents to restrict development and use of
|
||||||
|
software on general-purpose computers, but in those that do, we wish to
|
||||||
|
avoid the special danger that patents applied to a free program could
|
||||||
|
make it effectively proprietary. To prevent this, the GPL assures that
|
||||||
|
patents cannot be used to render the program non-free.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Use with the GNU Affero General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU Affero General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the special requirements of the GNU Affero General Public License,
|
||||||
|
section 13, concerning interaction through a network will apply to the
|
||||||
|
combination as such.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU General Public License from time to time. Such new versions will
|
||||||
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
state the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If the program does terminal interaction, make it output a short
|
||||||
|
notice like this when it starts in an interactive mode:
|
||||||
|
|
||||||
|
<program> Copyright (C) <year> <name of author>
|
||||||
|
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
|
parts of the General Public License. Of course, your program's commands
|
||||||
|
might be different; for a GUI interface, you would use an "about box".
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
|
For more information on this, and how to apply and follow the GNU GPL, see
|
||||||
|
<https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
The GNU General Public License does not permit incorporating your program
|
||||||
|
into proprietary programs. If your program is a subroutine library, you
|
||||||
|
may consider it more useful to permit linking proprietary applications with
|
||||||
|
the library. If this is what you want to do, use the GNU Lesser General
|
||||||
|
Public License instead of this License. But first, please read
|
||||||
|
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||||
373
LICENSE.md
373
LICENSE.md
@@ -1,373 +0,0 @@
|
|||||||
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.
|
|
||||||
19
Makefile
19
Makefile
@@ -1,16 +1,25 @@
|
|||||||
|
.PHONY : fe clean all
|
||||||
|
|
||||||
default:
|
default:
|
||||||
CGO_ENABLED=0 go build -o yt-dlp-webui main.go
|
go run main.go
|
||||||
|
|
||||||
|
fe:
|
||||||
|
cd frontend && pnpm build
|
||||||
|
|
||||||
|
dev:
|
||||||
|
cd frontend && pnpm dev
|
||||||
|
|
||||||
all:
|
all:
|
||||||
cd frontend && pnpm build && cd ..
|
$(MAKE) fe && cd ..
|
||||||
CGO_ENABLED=0 go build -o yt-dlp-webui main.go
|
CGO_ENABLED=0 go build -o yt-dlp-webui main.go
|
||||||
|
|
||||||
multiarch:
|
multiarch:
|
||||||
|
$(MAKE) fe
|
||||||
mkdir -p build
|
mkdir -p build
|
||||||
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o build/yt-dlp-webui_linux-amd64 main.go
|
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o build/yt-dlp-webui_linux-amd64 main.go
|
||||||
CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -o build/yt-dlp-webui_linux-arm64 main.go
|
CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -o build/yt-dlp-webui_linux-arm64 main.go
|
||||||
CGO_ENABLED=0 GOOS=linux GOARM=6 GOARCH=arm go build -o build/yt-dlp-webui_linux-armv7 main.go
|
CGO_ENABLED=0 GOOS=linux GOARM=6 GOARCH=arm go build -o build/yt-dlp-webui_linux-armv6 main.go
|
||||||
CGO_ENABLED=0 GOOS=linux GOARM=7 GOARCH=arm go build -o build/yt-dlp-webui_linux-armv6 main.go
|
CGO_ENABLED=0 GOOS=linux GOARM=7 GOARCH=arm go build -o build/yt-dlp-webui_linux-armv7 main.go
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf build
|
rm -rf build
|
||||||
|
|||||||
171
README.md
171
README.md
@@ -1,23 +1,10 @@
|
|||||||
> [!IMPORTANT]
|
|
||||||
> I'm looking for a co-mantainer.
|
|
||||||
> Lately I'm not feeling well both physically and mentally.
|
|
||||||
---
|
|
||||||
|
|
||||||
> [!IMPORTANT]
|
|
||||||
> Major frontend refactoring in progress.
|
|
||||||
> I won't add features or fix minor issues until completition.
|
|
||||||
---
|
|
||||||
|
|
||||||
# yt-dlp Web UI
|
# yt-dlp Web UI
|
||||||
|
|
||||||
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.
|
|
||||||
|
|
||||||
Intended to be used with docker and in standalone mode. 😎👍
|
High performance extendeable web ui and RPC server for yt-dlp with low impact on resources.
|
||||||
|
|
||||||
Developed to be as lightweight as possible (because my server is basically an intel atom sbc).
|
Created for the only purpose of *fetching* videos from my server/nas and monitor upcoming livestreams.
|
||||||
|
|
||||||
The bottleneck remains yt-dlp startup time.
|
|
||||||
|
|
||||||
**Docker images are available on [Docker Hub](https://hub.docker.com/r/marcobaobao/yt-dlp-webui) or [ghcr.io](https://github.com/marcopeocchi/yt-dlp-web-ui/pkgs/container/yt-dlp-web-ui)**.
|
**Docker images are available on [Docker Hub](https://hub.docker.com/r/marcobaobao/yt-dlp-webui) or [ghcr.io](https://github.com/marcopeocchi/yt-dlp-web-ui/pkgs/container/yt-dlp-web-ui)**.
|
||||||
|
|
||||||
@@ -28,43 +15,19 @@ docker pull marcobaobao/yt-dlp-webui
|
|||||||
# latest dev
|
# latest dev
|
||||||
docker pull ghcr.io/marcopeocchi/yt-dlp-web-ui:latest
|
docker pull ghcr.io/marcopeocchi/yt-dlp-web-ui:latest
|
||||||
```
|
```
|
||||||

|
|
||||||
|
|
||||||

|
## Donate to yt-dlp-webui development
|
||||||

|
[PayPal](https://paypal.me/marcofw)
|
||||||
|
|
||||||
### Integrated File browser
|
*Keeps the project alive!* 😃
|
||||||
Stream or download your content, easily.
|
|
||||||
|
|
||||||

|
## Some screeshots
|
||||||
|

|
||||||
|

|
||||||
|

|
||||||
|
|
||||||
## Changelog
|
## Video showcase
|
||||||
```
|
[app.webm](https://github.com/marcopeocchi/yt-dlp-web-ui/assets/35533749/91545bc4-233d-4dde-8504-27422cb26964)
|
||||||
05/03/22: Korean translation by kimpig
|
|
||||||
|
|
||||||
03/03/22: cut-down image size by switching to Alpine linux based container
|
|
||||||
|
|
||||||
01/03/22: Chinese translation by deluxghost
|
|
||||||
|
|
||||||
03/02/22: i18n enabled! I need help with the translations :/
|
|
||||||
|
|
||||||
27/01/22: Multidownload implemented!
|
|
||||||
|
|
||||||
26/01/22: Multiple downloads are being implemented. Maybe by next release they will be there.
|
|
||||||
Refactoring and JSDoc.
|
|
||||||
|
|
||||||
04/01/22: Background jobs now are retrieved!! It's still rudimentary but it leverages on yt-dlp resume feature.
|
|
||||||
|
|
||||||
05/05/22: Material UI update.
|
|
||||||
|
|
||||||
03/06/22: The most requested feature finally implemented: Format Selection!!
|
|
||||||
|
|
||||||
08/06/22: ARM builds.
|
|
||||||
|
|
||||||
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.
|
|
||||||
```
|
|
||||||
|
|
||||||
## Settings
|
## Settings
|
||||||
|
|
||||||
@@ -79,22 +42,13 @@ The currently avaible settings are:
|
|||||||
- Pass custom yt-dlp arguments safely
|
- Pass custom yt-dlp arguments safely
|
||||||
- Download queue (limit concurrent downloads)
|
- Download queue (limit concurrent downloads)
|
||||||
|
|
||||||

|
|
||||||

|
|
||||||
|
|
||||||
## Format selection
|
## Format selection
|
||||||
|
|
||||||
This feature is disabled by default as this 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 just go to the settings page and enable the **Enable video/audio formats selection** flag!
|
To enable it just go to the settings page and enable the **Enable video/audio formats selection** flag!
|
||||||
|
|
||||||
## Troubleshooting
|
## [Docker](https://github.com/marcopeocchi/yt-dlp-web-ui/pkgs/container/yt-dlp-web-ui) run
|
||||||
- **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).
|
|
||||||
- **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)
|
|
||||||
|
|
||||||
## [Docker](https://github.com/marcopeocchi/yt-dlp-web-ui/pkgs/container/yt-dlp-web-ui) installation
|
|
||||||
```sh
|
```sh
|
||||||
docker pull marcobaobao/yt-dlp-webui
|
docker pull marcobaobao/yt-dlp-webui
|
||||||
docker run -d -p 3033:3033 -v <your dir>:/downloads marcobaobao/yt-dlp-webui
|
docker run -d -p 3033:3033 -v <your dir>:/downloads marcobaobao/yt-dlp-webui
|
||||||
@@ -138,6 +92,20 @@ docker run -d \
|
|||||||
--qs 2
|
--qs 2
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### Docker Compose
|
||||||
|
```yaml
|
||||||
|
services:
|
||||||
|
yt-dlp-webui:
|
||||||
|
image: marcobaobao/yt-dlp-webui
|
||||||
|
ports:
|
||||||
|
- 3033:3033
|
||||||
|
volumes:
|
||||||
|
- <your dir>:/downloads # replace <your dir> with a directory on your host system
|
||||||
|
healthcheck:
|
||||||
|
test: curl -f http://localhost:3033 || exit 1
|
||||||
|
restart: unless-stopped
|
||||||
|
```
|
||||||
|
|
||||||
## [Prebuilt binaries](https://github.com/marcopeocchi/yt-dlp-web-ui/releases) installation
|
## [Prebuilt binaries](https://github.com/marcopeocchi/yt-dlp-web-ui/releases) installation
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
@@ -160,26 +128,35 @@ Usage yt-dlp-webui:
|
|||||||
-auth
|
-auth
|
||||||
Enable RPC authentication
|
Enable RPC authentication
|
||||||
-conf string
|
-conf string
|
||||||
Config file path
|
Config file path (default "./config.yml")
|
||||||
|
-db string
|
||||||
|
local database path (default "local.db")
|
||||||
-driver string
|
-driver string
|
||||||
yt-dlp executable path (default "yt-dlp")
|
yt-dlp executable path (default "yt-dlp")
|
||||||
-out string
|
-fl
|
||||||
Where files will be saved (default ".")
|
enable file based logging
|
||||||
-host string
|
-host string
|
||||||
Host where server will listen at (default "0.0.0.0")
|
Host where server will listen at (default "0.0.0.0")
|
||||||
|
-lf string
|
||||||
|
set log file location (default "yt-dlp-webui.log")
|
||||||
|
-out string
|
||||||
|
Where files will be saved (default ".")
|
||||||
|
-pass string
|
||||||
|
Password required for auth
|
||||||
-port int
|
-port int
|
||||||
Port where server will listen at (default 3033)
|
Port where server will listen at (default 3033)
|
||||||
-qs int
|
-qs int
|
||||||
Download queue size (default 8)
|
Queue size (concurrent downloads) (default 2)
|
||||||
|
-session string
|
||||||
|
session file path (default ".")
|
||||||
-user string
|
-user string
|
||||||
Username required for auth
|
Username required for auth
|
||||||
-pass string
|
|
||||||
Password required for auth
|
|
||||||
```
|
```
|
||||||
|
|
||||||
### Config file
|
### Config file
|
||||||
By running `yt-dlp-webui` in standalone mode you have the ability to also specify a 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**.
|
The config file **will overwrite what have been passed as cli argument**.
|
||||||
|
With Docker, inside the mounted `/conf` volume inside there must be a file named `config.yml`.
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
# Simple configuration file for yt-dlp webui
|
# Simple configuration file for yt-dlp webui
|
||||||
@@ -199,17 +176,23 @@ require_auth: true
|
|||||||
username: my_username
|
username: my_username
|
||||||
password: my_random_secret
|
password: my_random_secret
|
||||||
|
|
||||||
# [optional] The download queue size (default: 8)
|
# [optional] The download queue size (default: logical cpu cores)
|
||||||
queue_size: 4
|
queue_size: 4 # min. 2
|
||||||
|
|
||||||
# [optional] Full path to the yt-dlp (default: "yt-dlp")
|
# [optional] Full path to the yt-dlp (default: "yt-dlp")
|
||||||
downloaderPath: /usr/local/bin/yt-dlp
|
downloaderPath: /usr/local/bin/yt-dlp
|
||||||
|
|
||||||
|
# [optional] Enable file based logging with rotation (default: false)
|
||||||
|
#enable_file_logging: false
|
||||||
|
|
||||||
# [optional] Directory where the log file will be stored (default: ".")
|
# [optional] Directory where the log file will be stored (default: ".")
|
||||||
#log_path: .
|
#log_path: .
|
||||||
|
|
||||||
# [optional] Directory where the session database file will be stored (default: ".")
|
# [optional] Directory where the session database file will be stored (default: ".")
|
||||||
#session_file_path: .
|
#session_file_path: .
|
||||||
|
|
||||||
|
# [optional] Path where the sqlite database will be created/opened (default: "./local.db")
|
||||||
|
#local_database_path
|
||||||
```
|
```
|
||||||
|
|
||||||
### Systemd integration
|
### Systemd integration
|
||||||
@@ -232,17 +215,39 @@ WantedBy=multi-user.target
|
|||||||
systemctl enable yt-dlp-webui
|
systemctl enable yt-dlp-webui
|
||||||
systemctl start yt-dlp-webui
|
systemctl start yt-dlp-webui
|
||||||
```
|
```
|
||||||
|
It could be that yt-dlp-webui works correctly when started manually from the console, but with systemd, it does not see the yt-dlp executable, or has issues writing to the database file. One way to fix these issues could be as follows:
|
||||||
|
```shell
|
||||||
|
cd
|
||||||
|
mkdir yt-dlp-webui-workingdir
|
||||||
|
# optionally move the already existing database file there:
|
||||||
|
mv local.db yt-dlp-webui-workingdir
|
||||||
|
nano yt-dlp-webui-workingdir/my.conf
|
||||||
|
```
|
||||||
|
The config file format is described above; make sure to include the `downloaderPath` setting (the path can possibly be found by running `which yt-dlp`). For example, one could have:
|
||||||
|
```
|
||||||
|
downloadPath: /stuff/media
|
||||||
|
downloaderPath: /home/your_user/.local/bin/yt-dlp
|
||||||
|
log_path: /home/your_user/yt-dlp-webui-workingdir
|
||||||
|
session_file_path: /home/your_user/yt-dlp-webui-workingdir
|
||||||
|
```
|
||||||
|
Adjust the Service section in the `/etc/systemd/system/yt-dlp-webui.service` file as follows:
|
||||||
|
```
|
||||||
|
[Service]
|
||||||
|
User=your_user
|
||||||
|
Group=your_user
|
||||||
|
WorkingDirectory=/home/your_user/yt-dlp-webui-workingdir
|
||||||
|
ExecStart=/usr/local/bin/yt-dlp-webui --conf /home/your_user/yt-dlp-webui-workingdir/my.conf
|
||||||
|
```
|
||||||
|
|
||||||
## Manual installation
|
## Manual installation
|
||||||
```sh
|
```sh
|
||||||
# the dependencies are: python3, ffmpeg, nodejs, psmisc, go.
|
# the dependencies are: yt-dlp, ffmpeg, nodejs, go, make.
|
||||||
|
|
||||||
cd frontend
|
make all
|
||||||
npm i
|
|
||||||
npm run build
|
|
||||||
|
|
||||||
go build -o yt-dlp-webui main.go
|
|
||||||
```
|
```
|
||||||
|
## Open-API
|
||||||
|
Navigate to `/openapi` to see the related swagger.
|
||||||
|
|
||||||
|
|
||||||
## Extendable
|
## Extendable
|
||||||
You dont'like the Material feel?
|
You dont'like the Material feel?
|
||||||
@@ -251,17 +256,17 @@ 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
|
`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.
|
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.
|
For more information open an issue on GitHub and I will provide more info ASAP.
|
||||||
|
|
||||||
|
## Nix
|
||||||
|
This repo adds support for Nix(OS) in various ways through a `flake-parts` flake.
|
||||||
|
For more info, please refer to the [official documentation](https://nixos.org/learn/).
|
||||||
|
|
||||||
## What yt-dlp-webui is not
|
## 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.
|
`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.
|
||||||
|
|
||||||
|
## Troubleshooting
|
||||||
|
- **It says that it isn't connected.**
|
||||||
|
- In some circumstances, you must set the server ip address or hostname in the settings section (gear icon).
|
||||||
|
- **The download doesn't start.**
|
||||||
|
- Simply, yt-dlp process takes a lot of time to fire up. (yt-dlp isn't fast especially if you have a lower-end/low-power NAS/server/desktop. Furthermore some yt-dlp builds are slower than others)
|
||||||
|
|||||||
11
docker-compose.yml
Normal file
11
docker-compose.yml
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
services:
|
||||||
|
yt-dlp-webui:
|
||||||
|
image: marcobaobao/yt-dlp-webui
|
||||||
|
ports:
|
||||||
|
- 3033:3033
|
||||||
|
volumes:
|
||||||
|
- <your dir>:/downloads # replace <your dir> with a directory on your host system
|
||||||
|
- <your dir>:/config # directory where config.yml will be stored
|
||||||
|
healthcheck:
|
||||||
|
test: curl -f http://localhost:3033 || exit 1
|
||||||
|
restart: unless-stopped
|
||||||
149
flake.lock
generated
Normal file
149
flake.lock
generated
Normal file
@@ -0,0 +1,149 @@
|
|||||||
|
{
|
||||||
|
"nodes": {
|
||||||
|
"flake-compat": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1696426674,
|
||||||
|
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||||
|
"owner": "edolstra",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "edolstra",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-parts": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs-lib": "nixpkgs-lib"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1722555600,
|
||||||
|
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "flake-parts",
|
||||||
|
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "flake-parts",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"gitignore": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"pre-commit-hooks-nix",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1709087332,
|
||||||
|
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "gitignore.nix",
|
||||||
|
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "gitignore.nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1723637854,
|
||||||
|
"narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs-lib": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1722555339,
|
||||||
|
"narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=",
|
||||||
|
"type": "tarball",
|
||||||
|
"url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"type": "tarball",
|
||||||
|
"url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs-stable": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1720386169,
|
||||||
|
"narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixos-24.05",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_2": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1719082008,
|
||||||
|
"narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "9693852a2070b398ee123a329e68f0dab5526681",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixpkgs-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"pre-commit-hooks-nix": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-compat": "flake-compat",
|
||||||
|
"gitignore": "gitignore",
|
||||||
|
"nixpkgs": "nixpkgs_2",
|
||||||
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1723803910,
|
||||||
|
"narHash": "sha256-yezvUuFiEnCFbGuwj/bQcqg7RykIEqudOy/RBrId0pc=",
|
||||||
|
"owner": "cachix",
|
||||||
|
"repo": "pre-commit-hooks.nix",
|
||||||
|
"rev": "bfef0ada09e2c8ac55bbcd0831bd0c9d42e651ba",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "cachix",
|
||||||
|
"repo": "pre-commit-hooks.nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-parts": "flake-parts",
|
||||||
|
"nixpkgs": "nixpkgs",
|
||||||
|
"pre-commit-hooks-nix": "pre-commit-hooks-nix"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": "root",
|
||||||
|
"version": 7
|
||||||
|
}
|
||||||
51
flake.nix
Normal file
51
flake.nix
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
{
|
||||||
|
description = "A terrible web ui for yt-dlp. Designed to be self-hosted.";
|
||||||
|
|
||||||
|
inputs = {
|
||||||
|
flake-parts.url = "github:hercules-ci/flake-parts";
|
||||||
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
|
pre-commit-hooks-nix.url = "github:cachix/pre-commit-hooks.nix";
|
||||||
|
};
|
||||||
|
|
||||||
|
outputs = inputs@{ self, flake-parts, ... }:
|
||||||
|
flake-parts.lib.mkFlake { inherit inputs; } {
|
||||||
|
imports = [
|
||||||
|
inputs.pre-commit-hooks-nix.flakeModule
|
||||||
|
];
|
||||||
|
systems = [
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
|
perSystem = { config, self', pkgs, ... }: {
|
||||||
|
|
||||||
|
packages = {
|
||||||
|
yt-dlp-web-ui-frontend = pkgs.callPackage ./nix/frontend.nix { };
|
||||||
|
default = pkgs.callPackage ./nix/server.nix {
|
||||||
|
inherit (self'.packages) yt-dlp-web-ui-frontend;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
checks = import ./nix/tests { inherit self pkgs; };
|
||||||
|
|
||||||
|
pre-commit = {
|
||||||
|
check.enable = true;
|
||||||
|
settings = {
|
||||||
|
hooks = {
|
||||||
|
${self'.formatter.pname}.enable = true;
|
||||||
|
deadnix.enable = true;
|
||||||
|
nil.enable = true;
|
||||||
|
statix.enable = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
devShells.default = pkgs.callPackage ./nix/devShell.nix {
|
||||||
|
inputsFrom = [ config.pre-commit.devShell ];
|
||||||
|
};
|
||||||
|
|
||||||
|
formatter = pkgs.nixpkgs-fmt;
|
||||||
|
};
|
||||||
|
flake = {
|
||||||
|
nixosModules.default = import ./nix/module.nix self.packages;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "yt-dlp-webui",
|
"name": "yt-dlp-webui",
|
||||||
"version": "2.10.0",
|
"version": "3.2.1",
|
||||||
"description": "Frontend compontent of yt-dlp-webui",
|
"description": "Frontend compontent of yt-dlp-webui",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
@@ -10,29 +10,30 @@
|
|||||||
"license": "MPL-2.0",
|
"license": "MPL-2.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@emotion/react": "^11.11.3",
|
"@emotion/react": "^11.11.4",
|
||||||
"@emotion/styled": "^11.11.0",
|
"@emotion/styled": "^11.11.5",
|
||||||
"@fontsource/roboto": "^5.0.8",
|
"@fontsource/roboto": "^5.0.13",
|
||||||
"@fontsource/roboto-mono": "^5.0.16",
|
"@fontsource/roboto-mono": "^5.0.18",
|
||||||
"@mui/icons-material": "^5.15.4",
|
"@mui/icons-material": "^5.15.16",
|
||||||
"@mui/material": "^5.15.4",
|
"@mui/material": "^5.15.16",
|
||||||
"fp-ts": "^2.16.2",
|
"fp-ts": "^2.16.5",
|
||||||
"react": "^18.2.0",
|
"react": "^18.3.1",
|
||||||
"react-dom": "^18.2.0",
|
"react-dom": "^18.3.1",
|
||||||
"react-router-dom": "^6.21.2",
|
"react-router-dom": "^6.23.1",
|
||||||
|
"react-virtuoso": "^4.7.11",
|
||||||
"recoil": "^0.7.7",
|
"recoil": "^0.7.7",
|
||||||
"rxjs": "^7.8.1"
|
"rxjs": "^7.8.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@modyfi/vite-plugin-yaml": "^1.1.0",
|
"@modyfi/vite-plugin-yaml": "^1.1.0",
|
||||||
"@types/node": "^20.11.4",
|
"@types/node": "^20.14.2",
|
||||||
"@types/react": "^18.2.48",
|
"@types/react": "^18.3.3",
|
||||||
"@types/react-dom": "^18.2.18",
|
"@types/react-dom": "^18.2.18",
|
||||||
"@types/react-helmet": "^6.1.11",
|
"@types/react-helmet": "^6.1.11",
|
||||||
"@types/react-router-dom": "^5.3.3",
|
"@types/react-router-dom": "^5.3.3",
|
||||||
"@vitejs/plugin-react-swc": "^3.5.0",
|
"@vitejs/plugin-react-swc": "^3.7.0",
|
||||||
"typescript": "^5.3.3",
|
"million": "^3.1.11",
|
||||||
"vite": "^5.1.6",
|
"typescript": "^5.4.5",
|
||||||
"million": "^3.0.6"
|
"vite": "^5.2.11"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
2613
frontend/pnpm-lock.yaml
generated
2613
frontend/pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
@@ -1,10 +1,11 @@
|
|||||||
import { ThemeProvider } from '@emotion/react'
|
import { ThemeProvider } from '@emotion/react'
|
||||||
|
import ArchiveIcon from '@mui/icons-material/Archive'
|
||||||
import ChevronLeft from '@mui/icons-material/ChevronLeft'
|
import ChevronLeft from '@mui/icons-material/ChevronLeft'
|
||||||
import Dashboard from '@mui/icons-material/Dashboard'
|
import Dashboard from '@mui/icons-material/Dashboard'
|
||||||
import DownloadIcon from '@mui/icons-material/Download'
|
import LiveTvIcon from '@mui/icons-material/LiveTv'
|
||||||
import Menu from '@mui/icons-material/Menu'
|
import Menu from '@mui/icons-material/Menu'
|
||||||
import SettingsIcon from '@mui/icons-material/Settings'
|
import SettingsIcon from '@mui/icons-material/Settings'
|
||||||
import SettingsEthernet from '@mui/icons-material/SettingsEthernet'
|
import TerminalIcon from '@mui/icons-material/Terminal'
|
||||||
import { Box, createTheme } from '@mui/material'
|
import { Box, createTheme } from '@mui/material'
|
||||||
import CssBaseline from '@mui/material/CssBaseline'
|
import CssBaseline from '@mui/material/CssBaseline'
|
||||||
import Divider from '@mui/material/Divider'
|
import Divider from '@mui/material/Divider'
|
||||||
@@ -16,26 +17,23 @@ import ListItemText from '@mui/material/ListItemText'
|
|||||||
import Toolbar from '@mui/material/Toolbar'
|
import Toolbar from '@mui/material/Toolbar'
|
||||||
import Typography from '@mui/material/Typography'
|
import Typography from '@mui/material/Typography'
|
||||||
import { grey } from '@mui/material/colors'
|
import { grey } from '@mui/material/colors'
|
||||||
import { Suspense, useMemo, useState } from 'react'
|
import { useMemo, useState } from 'react'
|
||||||
import { Link, Outlet } from 'react-router-dom'
|
import { Link, Outlet } from 'react-router-dom'
|
||||||
import { useRecoilValue } from 'recoil'
|
import { useRecoilValue } from 'recoil'
|
||||||
import { settingsState } from './atoms/settings'
|
import { settingsState } from './atoms/settings'
|
||||||
import { connectedState } from './atoms/status'
|
|
||||||
import AppBar from './components/AppBar'
|
import AppBar from './components/AppBar'
|
||||||
import Drawer from './components/Drawer'
|
import Drawer from './components/Drawer'
|
||||||
import FreeSpaceIndicator from './components/FreeSpaceIndicator'
|
import Footer from './components/Footer'
|
||||||
import Logout from './components/Logout'
|
import Logout from './components/Logout'
|
||||||
import SocketSubscriber from './components/SocketSubscriber'
|
import SocketSubscriber from './components/SocketSubscriber'
|
||||||
import ThemeToggler from './components/ThemeToggler'
|
import ThemeToggler from './components/ThemeToggler'
|
||||||
import { useI18n } from './hooks/useI18n'
|
import { useI18n } from './hooks/useI18n'
|
||||||
import Toaster from './providers/ToasterProvider'
|
import Toaster from './providers/ToasterProvider'
|
||||||
import TerminalIcon from '@mui/icons-material/Terminal'
|
|
||||||
|
|
||||||
export default function Layout() {
|
export default function Layout() {
|
||||||
const [open, setOpen] = useState(false)
|
const [open, setOpen] = useState(false)
|
||||||
|
|
||||||
const settings = useRecoilValue(settingsState)
|
const settings = useRecoilValue(settingsState)
|
||||||
const isConnected = useRecoilValue(connectedState)
|
|
||||||
|
|
||||||
const mode = settings.theme
|
const mode = settings.theme
|
||||||
const theme = useMemo(() =>
|
const theme = useMemo(() =>
|
||||||
@@ -81,21 +79,6 @@ export default function Layout() {
|
|||||||
>
|
>
|
||||||
{settings.appTitle}
|
{settings.appTitle}
|
||||||
</Typography>
|
</Typography>
|
||||||
<Suspense fallback={i18n.t('loadingLabel')}>
|
|
||||||
<FreeSpaceIndicator />
|
|
||||||
</Suspense>
|
|
||||||
<div style={{
|
|
||||||
display: 'flex',
|
|
||||||
alignItems: 'center',
|
|
||||||
flexWrap: 'wrap',
|
|
||||||
marginLeft: '4px',
|
|
||||||
gap: 3,
|
|
||||||
}}>
|
|
||||||
<SettingsEthernet />
|
|
||||||
<span>
|
|
||||||
{isConnected ? settings.serverAddr : i18n.t('notConnectedText')}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</Toolbar>
|
</Toolbar>
|
||||||
</AppBar>
|
</AppBar>
|
||||||
<Drawer variant="permanent" open={open}>
|
<Drawer variant="permanent" open={open}>
|
||||||
@@ -134,7 +117,20 @@ export default function Layout() {
|
|||||||
}>
|
}>
|
||||||
<ListItemButton>
|
<ListItemButton>
|
||||||
<ListItemIcon>
|
<ListItemIcon>
|
||||||
<DownloadIcon />
|
<ArchiveIcon />
|
||||||
|
</ListItemIcon>
|
||||||
|
<ListItemText primary={i18n.t('archiveButtonLabel')} />
|
||||||
|
</ListItemButton>
|
||||||
|
</Link>
|
||||||
|
<Link to={'/monitor'} style={
|
||||||
|
{
|
||||||
|
textDecoration: 'none',
|
||||||
|
color: mode === 'dark' ? '#ffffff' : '#000000DE'
|
||||||
|
}
|
||||||
|
}>
|
||||||
|
<ListItemButton>
|
||||||
|
<ListItemIcon>
|
||||||
|
<LiveTvIcon />
|
||||||
</ListItemIcon>
|
</ListItemIcon>
|
||||||
<ListItemText primary={i18n.t('archiveButtonLabel')} />
|
<ListItemText primary={i18n.t('archiveButtonLabel')} />
|
||||||
</ListItemButton>
|
</ListItemButton>
|
||||||
@@ -181,6 +177,7 @@ export default function Layout() {
|
|||||||
<Outlet />
|
<Outlet />
|
||||||
</Box>
|
</Box>
|
||||||
</Box>
|
</Box>
|
||||||
|
<Footer />
|
||||||
<Toaster />
|
<Toaster />
|
||||||
</ThemeProvider>
|
</ThemeProvider>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
---
|
---
|
||||||
languages:
|
languages:
|
||||||
english:
|
english:
|
||||||
urlInput: Video URL
|
urlInput: Video URL (one per line)
|
||||||
statusTitle: Status
|
statusTitle: Status
|
||||||
statusReady: Ready
|
statusReady: Ready
|
||||||
selectFormatButton: Select format
|
selectFormatButton: Select format
|
||||||
@@ -24,9 +24,9 @@ languages:
|
|||||||
overridesAnchor: Overrides
|
overridesAnchor: Overrides
|
||||||
pathOverrideOption: Enable output path overriding
|
pathOverrideOption: Enable output path overriding
|
||||||
filenameOverrideOption: Enable output file name overriding
|
filenameOverrideOption: Enable output file name overriding
|
||||||
customFilename: Custom filemame (leave blank to use default)
|
customFilename: Custom filename (leave blank to use default)
|
||||||
customPath: Custom path
|
customPath: Custom path
|
||||||
customArgs: Enable custom yt-dlp args (great power = great responsabilities)
|
customArgs: Enable custom yt-dlp args (great power = great responsibilities)
|
||||||
customArgsInput: Custom yt-dlp arguments
|
customArgsInput: Custom yt-dlp arguments
|
||||||
rpcConnErr: Error while conencting to RPC server
|
rpcConnErr: Error while conencting to RPC server
|
||||||
splashText: No active downloads
|
splashText: No active downloads
|
||||||
@@ -34,7 +34,8 @@ languages:
|
|||||||
clipboardAction: Copied URL to clipboard
|
clipboardAction: Copied URL to clipboard
|
||||||
playlistCheckbox: Download playlist (it will take time, after submitting you may close this window)
|
playlistCheckbox: Download playlist (it will take time, after submitting you may close this window)
|
||||||
restartAppMessage: Needs a page reload to take effect
|
restartAppMessage: Needs a page reload to take effect
|
||||||
servedFromReverseProxyCheckbox: Is behind a reverse proxy subfolder
|
servedFromReverseProxyCheckbox: Is behind a reverse proxy
|
||||||
|
urlBase: URL base, for reverse proxy support (subdir), defaults to empty
|
||||||
newDownloadButton: New download
|
newDownloadButton: New download
|
||||||
homeButtonLabel: Home
|
homeButtonLabel: Home
|
||||||
archiveButtonLabel: Archive
|
archiveButtonLabel: Archive
|
||||||
@@ -49,6 +50,21 @@ languages:
|
|||||||
templatesEditorContentLabel: Template content
|
templatesEditorContentLabel: Template content
|
||||||
logsTitle: 'Logs'
|
logsTitle: 'Logs'
|
||||||
awaitingLogs: 'Awaiting logs...'
|
awaitingLogs: 'Awaiting logs...'
|
||||||
|
bulkDownload: 'Download files in a zip archive'
|
||||||
|
rpcPollingTimeTitle: RPC polling time
|
||||||
|
rpcPollingTimeDescription: A lower interval results in higher CPU usage (server and client side)
|
||||||
|
templatesReloadInfo: To register a new template it might need a page reload.
|
||||||
|
livestreamURLInput: Livestream URL
|
||||||
|
livestreamStatusWaiting: Waiting/Wait start
|
||||||
|
livestreamStatusDownloading: Downloading
|
||||||
|
livestreamStatusCompleted: Completed
|
||||||
|
livestreamStatusErrored: Errored
|
||||||
|
livestreamStatusUnknown: Unknown
|
||||||
|
livestreamDownloadInfo: |
|
||||||
|
This will monitor yet to start livestream. Each process will be executed with --wait-for-video 10.
|
||||||
|
If an already started livestream is provided it will be still downloaded but its progress will not be tracked.
|
||||||
|
Once started the livestream will be migrated to the downloads page.
|
||||||
|
livestreamExperimentalWarning: This feature is still experimental. Something might break!
|
||||||
german:
|
german:
|
||||||
urlInput: Video URL
|
urlInput: Video URL
|
||||||
statusTitle: Status
|
statusTitle: Status
|
||||||
@@ -73,7 +89,7 @@ languages:
|
|||||||
overridesAnchor: Überschreibungen
|
overridesAnchor: Überschreibungen
|
||||||
pathOverrideOption: Ausgabe-Pfad Überschreibung aktivieren
|
pathOverrideOption: Ausgabe-Pfad Überschreibung aktivieren
|
||||||
filenameOverrideOption: Ausgabe-Dateiname Überschreibung aktivieren
|
filenameOverrideOption: Ausgabe-Dateiname Überschreibung aktivieren
|
||||||
customFilename: Custom filemame (leave blank to use default)
|
customFilename: Custom filename (leave blank to use default)
|
||||||
customPath: Benutzerdefinierter Pfad
|
customPath: Benutzerdefinierter Pfad
|
||||||
customArgs: Benutzerdefinierte yt-dlp Argumente aktivieren (viel Macht = viel Verantwortung)
|
customArgs: Benutzerdefinierte yt-dlp Argumente aktivieren (viel Macht = viel Verantwortung)
|
||||||
customArgsInput: Benutzerdefinierte yt-dlp Argumente
|
customArgsInput: Benutzerdefinierte yt-dlp Argumente
|
||||||
@@ -98,6 +114,18 @@ languages:
|
|||||||
templatesEditorContentLabel: Vorlagen Inhalt
|
templatesEditorContentLabel: Vorlagen Inhalt
|
||||||
logsTitle: 'Logs'
|
logsTitle: 'Logs'
|
||||||
awaitingLogs: 'Awaiting logs...'
|
awaitingLogs: 'Awaiting logs...'
|
||||||
|
bulkDownload: 'Download files in a zip archive'
|
||||||
|
livestreamURLInput: Livestream URL
|
||||||
|
livestreamStatusWaiting: Waiting/Wait start
|
||||||
|
livestreamStatusDownloading: Downloading
|
||||||
|
livestreamStatusCompleted: Completed
|
||||||
|
livestreamStatusErrored: Errored
|
||||||
|
livestreamStatusUnknown: Unknown
|
||||||
|
livestreamDownloadInfo: |
|
||||||
|
This will monitor yet to start livestream. Each process will be executed with --wait-for-video 10.
|
||||||
|
If an already started livestream is provided it will be still downloaded but its progress will not be tracked.
|
||||||
|
Once started the livestream will be migrated to the downloads page.
|
||||||
|
livestreamExperimentalWarning: This feature is still experimental. Something might break!
|
||||||
french:
|
french:
|
||||||
urlInput: URL vidéo de YouTube ou d'un autre service pris en charge
|
urlInput: URL vidéo de YouTube ou d'un autre service pris en charge
|
||||||
statusTitle: Statut
|
statusTitle: Statut
|
||||||
@@ -149,8 +177,20 @@ languages:
|
|||||||
templatesEditorContentLabel: Template content
|
templatesEditorContentLabel: Template content
|
||||||
logsTitle: 'Logs'
|
logsTitle: 'Logs'
|
||||||
awaitingLogs: 'Awaiting logs...'
|
awaitingLogs: 'Awaiting logs...'
|
||||||
|
bulkDownload: 'Download files in a zip archive'
|
||||||
|
livestreamURLInput: Livestream URL
|
||||||
|
livestreamStatusWaiting: Waiting/Wait start
|
||||||
|
livestreamStatusDownloading: Downloading
|
||||||
|
livestreamStatusCompleted: Completed
|
||||||
|
livestreamStatusErrored: Errored
|
||||||
|
livestreamStatusUnknown: Unknown
|
||||||
|
livestreamDownloadInfo: |
|
||||||
|
This will monitor yet to start livestream. Each process will be executed with --wait-for-video 10.
|
||||||
|
If an already started livestream is provided it will be still downloaded but its progress will not be tracked.
|
||||||
|
Once started the livestream will be migrated to the downloads page.
|
||||||
|
livestreamExperimentalWarning: This feature is still experimental. Something might break!
|
||||||
italian:
|
italian:
|
||||||
urlInput: URL Video
|
urlInput: URL Video (uno per linea)
|
||||||
statusTitle: Stato
|
statusTitle: Stato
|
||||||
startButton: Inizia
|
startButton: Inizia
|
||||||
statusReady: Pronto
|
statusReady: Pronto
|
||||||
@@ -172,7 +212,7 @@ languages:
|
|||||||
overridesAnchor: Sovrascritture
|
overridesAnchor: Sovrascritture
|
||||||
pathOverrideOption: Abilita sovrascrittura percorso di output
|
pathOverrideOption: Abilita sovrascrittura percorso di output
|
||||||
filenameOverrideOption: Abilita sovrascrittura del nome del file di output
|
filenameOverrideOption: Abilita sovrascrittura del nome del file di output
|
||||||
customFilename: Custom filemame (leave blank to use default)
|
customFilename: Custom filename (leave blank to use default)
|
||||||
customPath: Custom path
|
customPath: Custom path
|
||||||
customArgs: Enable custom yt-dlp args (great power = great responsabilities)
|
customArgs: Enable custom yt-dlp args (great power = great responsabilities)
|
||||||
customArgsInput: Custom yt-dlp arguments
|
customArgsInput: Custom yt-dlp arguments
|
||||||
@@ -197,6 +237,18 @@ languages:
|
|||||||
templatesEditorContentLabel: Contentunto template
|
templatesEditorContentLabel: Contentunto template
|
||||||
logsTitle: 'Logs'
|
logsTitle: 'Logs'
|
||||||
awaitingLogs: 'Awaiting logs...'
|
awaitingLogs: 'Awaiting logs...'
|
||||||
|
bulkDownload: 'Download files in a zip archive'
|
||||||
|
livestreamURLInput: Livestream URL
|
||||||
|
livestreamStatusWaiting: Waiting/Wait start
|
||||||
|
livestreamStatusDownloading: Downloading
|
||||||
|
livestreamStatusCompleted: Completed
|
||||||
|
livestreamStatusErrored: Errored
|
||||||
|
livestreamStatusUnknown: Unknown
|
||||||
|
livestreamDownloadInfo: |
|
||||||
|
This will monitor yet to start livestream. Each process will be executed with --wait-for-video 10.
|
||||||
|
If an already started livestream is provided it will be still downloaded but its progress will not be tracked.
|
||||||
|
Once started the livestream will be migrated to the downloads page.
|
||||||
|
livestreamExperimentalWarning: This feature is still experimental. Something might break!
|
||||||
chinese:
|
chinese:
|
||||||
urlInput: 视频 URL
|
urlInput: 视频 URL
|
||||||
statusTitle: 状态
|
statusTitle: 状态
|
||||||
@@ -246,6 +298,18 @@ languages:
|
|||||||
templatesEditorContentLabel: 模板内容
|
templatesEditorContentLabel: 模板内容
|
||||||
logsTitle: '日志'
|
logsTitle: '日志'
|
||||||
awaitingLogs: '正在等待日志…'
|
awaitingLogs: '正在等待日志…'
|
||||||
|
bulkDownload: '下载 zip 压缩包中的文件'
|
||||||
|
livestreamURLInput: 直播 URL
|
||||||
|
livestreamStatusWaiting: 等待直播开始
|
||||||
|
livestreamStatusDownloading: 下载中
|
||||||
|
livestreamStatusCompleted: 已完成
|
||||||
|
livestreamStatusErrored: 发生错误
|
||||||
|
livestreamStatusUnknown: 未知
|
||||||
|
livestreamDownloadInfo: |
|
||||||
|
本功能将会监控即将开始的直播流,每个进程都会传入参数:--wait-for-video 10 (重试间隔10秒)
|
||||||
|
如果直播已经开始,那么依然可以下载,但是不会记录下载进度。
|
||||||
|
直播开始后,将会转移到下载页面
|
||||||
|
livestreamExperimentalWarning: 实验性功能,可能存在未知Bug,请谨慎使用
|
||||||
spanish:
|
spanish:
|
||||||
urlInput: URL de YouTube u otro servicio compatible
|
urlInput: URL de YouTube u otro servicio compatible
|
||||||
statusTitle: Estado
|
statusTitle: Estado
|
||||||
@@ -293,6 +357,18 @@ languages:
|
|||||||
templatesEditorContentLabel: Template content
|
templatesEditorContentLabel: Template content
|
||||||
logsTitle: 'Logs'
|
logsTitle: 'Logs'
|
||||||
awaitingLogs: 'Awaiting logs...'
|
awaitingLogs: 'Awaiting logs...'
|
||||||
|
bulkDownload: 'Download files in a zip archive'
|
||||||
|
livestreamURLInput: Livestream URL
|
||||||
|
livestreamStatusWaiting: Waiting/Wait start
|
||||||
|
livestreamStatusDownloading: Downloading
|
||||||
|
livestreamStatusCompleted: Completed
|
||||||
|
livestreamStatusErrored: Errored
|
||||||
|
livestreamStatusUnknown: Unknown
|
||||||
|
livestreamDownloadInfo: |
|
||||||
|
This will monitor yet to start livestream. Each process will be executed with --wait-for-video 10.
|
||||||
|
If an already started livestream is provided it will be still downloaded but its progress will not be tracked.
|
||||||
|
Once started the livestream will be migrated to the downloads page.
|
||||||
|
livestreamExperimentalWarning: This feature is still experimental. Something might break!
|
||||||
russian:
|
russian:
|
||||||
urlInput: URL-адрес YouTube или любого другого поддерживаемого сервиса
|
urlInput: URL-адрес YouTube или любого другого поддерживаемого сервиса
|
||||||
statusTitle: Статус
|
statusTitle: Статус
|
||||||
@@ -324,22 +400,34 @@ languages:
|
|||||||
splashText: Нет активных загрузок
|
splashText: Нет активных загрузок
|
||||||
archiveTitle: Архив
|
archiveTitle: Архив
|
||||||
clipboardAction: URL скопирован в буфер обмена
|
clipboardAction: URL скопирован в буфер обмена
|
||||||
playlistCheckbox: Download playlist (it will take time, after submitting you may even close this window)
|
playlistCheckbox: Скачать плейлист. Это займет время, после отправки вы сможете закрыть окно
|
||||||
servedFromReverseProxyCheckbox: Is behind a reverse proxy subfolder
|
servedFromReverseProxyCheckbox: Находится за обратным прокси
|
||||||
newDownloadButton: New download
|
newDownloadButton: Новая загрузка
|
||||||
homeButtonLabel: Home
|
homeButtonLabel: Home
|
||||||
archiveButtonLabel: Archive
|
archiveButtonLabel: Архив
|
||||||
settingsButtonLabel: Settings
|
settingsButtonLabel: Настройки
|
||||||
rpcAuthenticationLabel: RPC authentication
|
rpcAuthenticationLabel: RPC-аутентификация
|
||||||
themeTogglerLabel: Theme toggler
|
themeTogglerLabel: Переключить тему
|
||||||
loadingLabel: Loading...
|
loadingLabel: Загрузка...
|
||||||
appTitle: App title
|
appTitle: Название приложения
|
||||||
savedTemplates: Saved templates
|
savedTemplates: Сохраненные шаблоны
|
||||||
templatesEditor: Templates editor
|
templatesEditor: Редактор шаблонов
|
||||||
templatesEditorNameLabel: Template name
|
templatesEditorNameLabel: Имя шаблона
|
||||||
templatesEditorContentLabel: Template content
|
templatesEditorContentLabel: Содержание шаблона
|
||||||
logsTitle: 'Logs'
|
logsTitle: 'Логи'
|
||||||
awaitingLogs: 'Awaiting logs...'
|
awaitingLogs: 'Ожидание логов...'
|
||||||
|
bulkDownload: 'Скачать файлы в zip архиве'
|
||||||
|
livestreamURLInput: Livestream URL
|
||||||
|
livestreamStatusWaiting: Waiting/Wait start
|
||||||
|
livestreamStatusDownloading: Downloading
|
||||||
|
livestreamStatusCompleted: Completed
|
||||||
|
livestreamStatusErrored: Errored
|
||||||
|
livestreamStatusUnknown: Unknown
|
||||||
|
livestreamDownloadInfo: |
|
||||||
|
This will monitor yet to start livestream. Each process will be executed with --wait-for-video 10.
|
||||||
|
If an already started livestream is provided it will be still downloaded but its progress will not be tracked.
|
||||||
|
Once started the livestream will be migrated to the downloads page.
|
||||||
|
livestreamExperimentalWarning: This feature is still experimental. Something might break!
|
||||||
korean:
|
korean:
|
||||||
urlInput: YouTube나 다른 지원되는 사이트의 URL
|
urlInput: YouTube나 다른 지원되는 사이트의 URL
|
||||||
statusTitle: 상태
|
statusTitle: 상태
|
||||||
@@ -363,7 +451,7 @@ languages:
|
|||||||
overridesAnchor: Overrides
|
overridesAnchor: Overrides
|
||||||
pathOverrideOption: Enable output path overriding
|
pathOverrideOption: Enable output path overriding
|
||||||
filenameOverrideOption: Enable output file name overriding
|
filenameOverrideOption: Enable output file name overriding
|
||||||
customFilename: Custom filemame (leave blank to use default)
|
customFilename: Custom filename (leave blank to use default)
|
||||||
customPath: Custom path
|
customPath: Custom path
|
||||||
customArgs: Enable custom yt-dlp args (great power = great responsabilities)
|
customArgs: Enable custom yt-dlp args (great power = great responsabilities)
|
||||||
customArgsInput: Custom yt-dlp arguments
|
customArgsInput: Custom yt-dlp arguments
|
||||||
@@ -387,6 +475,18 @@ languages:
|
|||||||
templatesEditorContentLabel: Template content
|
templatesEditorContentLabel: Template content
|
||||||
logsTitle: 'Logs'
|
logsTitle: 'Logs'
|
||||||
awaitingLogs: 'Awaiting logs...'
|
awaitingLogs: 'Awaiting logs...'
|
||||||
|
bulkDownload: 'Download files in a zip archive'
|
||||||
|
livestreamURLInput: Livestream URL
|
||||||
|
livestreamStatusWaiting: Waiting/Wait start
|
||||||
|
livestreamStatusDownloading: Downloading
|
||||||
|
livestreamStatusCompleted: Completed
|
||||||
|
livestreamStatusErrored: Errored
|
||||||
|
livestreamStatusUnknown: Unknown
|
||||||
|
livestreamDownloadInfo: |
|
||||||
|
This will monitor yet to start livestream. Each process will be executed with --wait-for-video 10.
|
||||||
|
If an already started livestream is provided it will be still downloaded but its progress will not be tracked.
|
||||||
|
Once started the livestream will be migrated to the downloads page.
|
||||||
|
livestreamExperimentalWarning: This feature is still experimental. Something might break!
|
||||||
japanese:
|
japanese:
|
||||||
urlInput: YouTubeまたはサポート済み動画のURL
|
urlInput: YouTubeまたはサポート済み動画のURL
|
||||||
statusTitle: 状態
|
statusTitle: 状態
|
||||||
@@ -415,26 +515,38 @@ languages:
|
|||||||
customPath: 保存先
|
customPath: 保存先
|
||||||
customArgs: yt-dlpのオプションの有効化 (最適設定にする場合)
|
customArgs: yt-dlpのオプションの有効化 (最適設定にする場合)
|
||||||
customArgsInput: yt-dlpのオプション
|
customArgsInput: yt-dlpのオプション
|
||||||
rpcConnErr: Error while conencting to RPC server
|
rpcConnErr: RPCサーバーへの接続中にエラーが発生しました
|
||||||
splashText: No active downloads
|
splashText: アクティブなダウンロードはありません
|
||||||
archiveTitle: Archive
|
archiveTitle: アーカイブ
|
||||||
clipboardAction: Copied URL to clipboard
|
clipboardAction: URLをクリップボードにコピーしました
|
||||||
playlistCheckbox: Download playlist (it will take time, after submitting you may even close this window)
|
playlistCheckbox: プレイリストをダウンロード (これには時間がかかりますが、処理中はウィンドウを閉じることができます)
|
||||||
servedFromReverseProxyCheckbox: Is behind a reverse proxy subfolder
|
servedFromReverseProxyCheckbox: リバースプロキシのサブフォルダにあります
|
||||||
newDownloadButton: New download
|
newDownloadButton: 新しくダウンロード
|
||||||
homeButtonLabel: Home
|
homeButtonLabel: ホーム
|
||||||
archiveButtonLabel: Archive
|
archiveButtonLabel: アーカイブ
|
||||||
settingsButtonLabel: Settings
|
settingsButtonLabel: 設定
|
||||||
rpcAuthenticationLabel: RPC authentication
|
rpcAuthenticationLabel: RPC認証
|
||||||
themeTogglerLabel: Theme toggler
|
themeTogglerLabel: テーマ切り替え
|
||||||
loadingLabel: Loading...
|
loadingLabel: 読み込み中...
|
||||||
appTitle: App title
|
appTitle: アプリタイトル
|
||||||
savedTemplates: Saved templates
|
savedTemplates: 保存したテンプレート
|
||||||
templatesEditor: Templates editor
|
templatesEditor: テンプレートエディター
|
||||||
templatesEditorNameLabel: Template name
|
templatesEditorNameLabel: テンプレート名
|
||||||
templatesEditorContentLabel: Template content
|
templatesEditorContentLabel: テンプレート内容
|
||||||
logsTitle: 'Logs'
|
logsTitle: 'ログ'
|
||||||
awaitingLogs: 'Awaiting logs...'
|
awaitingLogs: 'ログを待機中...'
|
||||||
|
bulkDownload: 'ダウンロードしたファイルをZIPで保存'
|
||||||
|
livestreamURLInput: ライブストリームURL
|
||||||
|
livestreamStatusWaiting: 開始を待っています
|
||||||
|
livestreamStatusDownloading: ダウンロード中
|
||||||
|
livestreamStatusCompleted: 完了
|
||||||
|
livestreamStatusErrored: エラー
|
||||||
|
livestreamStatusUnknown: 不明
|
||||||
|
livestreamDownloadInfo: |
|
||||||
|
まだ開始されていないライブストリームを監視します。各プロセスは、--wait-for-video 10 で実行されます。
|
||||||
|
すでに開始されているライブストリームが提供された場合、ダウンロードは継続されますが進行状況は追跡されません。
|
||||||
|
ライブストリームが開始されると、ダウンロードページに移動されます。
|
||||||
|
livestreamExperimentalWarning: この機能は実験的なものです。何かが壊れるかもしれません!
|
||||||
catalan:
|
catalan:
|
||||||
urlInput: URL de YouTube o d'un altre servei compatible
|
urlInput: URL de YouTube o d'un altre servei compatible
|
||||||
statusTitle: Estat
|
statusTitle: Estat
|
||||||
@@ -482,6 +594,18 @@ languages:
|
|||||||
templatesEditorContentLabel: Template content
|
templatesEditorContentLabel: Template content
|
||||||
logsTitle: 'Logs'
|
logsTitle: 'Logs'
|
||||||
awaitingLogs: 'Awaiting logs...'
|
awaitingLogs: 'Awaiting logs...'
|
||||||
|
bulkDownload: 'Download files in a zip archive'
|
||||||
|
livestreamURLInput: Livestream URL
|
||||||
|
livestreamStatusWaiting: Waiting/Wait start
|
||||||
|
livestreamStatusDownloading: Downloading
|
||||||
|
livestreamStatusCompleted: Completed
|
||||||
|
livestreamStatusErrored: Errored
|
||||||
|
livestreamStatusUnknown: Unknown
|
||||||
|
livestreamDownloadInfo: |
|
||||||
|
This will monitor yet to start livestream. Each process will be executed with --wait-for-video 10.
|
||||||
|
If an already started livestream is provided it will be still downloaded but its progress will not be tracked.
|
||||||
|
Once started the livestream will be migrated to the downloads page.
|
||||||
|
livestreamExperimentalWarning: This feature is still experimental. Something might break!
|
||||||
ukrainian:
|
ukrainian:
|
||||||
urlInput: URL-адреса YouTube або будь-якого іншого підтримуваного сервісу
|
urlInput: URL-адреса YouTube або будь-якого іншого підтримуваного сервісу
|
||||||
statusTitle: Статус
|
statusTitle: Статус
|
||||||
@@ -529,6 +653,18 @@ languages:
|
|||||||
templatesEditorContentLabel: Template content
|
templatesEditorContentLabel: Template content
|
||||||
logsTitle: 'Logs'
|
logsTitle: 'Logs'
|
||||||
awaitingLogs: 'Awaiting logs...'
|
awaitingLogs: 'Awaiting logs...'
|
||||||
|
bulkDownload: 'Download files in a zip archive'
|
||||||
|
livestreamURLInput: Livestream URL
|
||||||
|
livestreamStatusWaiting: Waiting/Wait start
|
||||||
|
livestreamStatusDownloading: Downloading
|
||||||
|
livestreamStatusCompleted: Completed
|
||||||
|
livestreamStatusErrored: Errored
|
||||||
|
livestreamStatusUnknown: Unknown
|
||||||
|
livestreamDownloadInfo: |
|
||||||
|
This will monitor yet to start livestream. Each process will be executed with --wait-for-video 10.
|
||||||
|
If an already started livestream is provided it will be still downloaded but its progress will not be tracked.
|
||||||
|
Once started the livestream will be migrated to the downloads page.
|
||||||
|
livestreamExperimentalWarning: This feature is still experimental. Something might break!
|
||||||
polish:
|
polish:
|
||||||
urlInput: Adres URL YouTube lub innej obsługiwanej usługi
|
urlInput: Adres URL YouTube lub innej obsługiwanej usługi
|
||||||
statusTitle: Status
|
statusTitle: Status
|
||||||
@@ -576,3 +712,80 @@ languages:
|
|||||||
templatesEditorContentLabel: Template content
|
templatesEditorContentLabel: Template content
|
||||||
logsTitle: 'Logs'
|
logsTitle: 'Logs'
|
||||||
awaitingLogs: 'Awaiting logs...'
|
awaitingLogs: 'Awaiting logs...'
|
||||||
|
bulkDownload: 'Download files in a zip archive'
|
||||||
|
livestreamURLInput: Livestream URL
|
||||||
|
livestreamStatusWaiting: Waiting/Wait start
|
||||||
|
livestreamStatusDownloading: Downloading
|
||||||
|
livestreamStatusCompleted: Completed
|
||||||
|
livestreamStatusErrored: Errored
|
||||||
|
livestreamStatusUnknown: Unknown
|
||||||
|
livestreamDownloadInfo: |
|
||||||
|
This will monitor yet to start livestream. Each process will be executed with --wait-for-video 10.
|
||||||
|
If an already started livestream is provided it will be still downloaded but its progress will not be tracked.
|
||||||
|
Once started the livestream will be migrated to the downloads page.
|
||||||
|
livestreamExperimentalWarning: This feature is still experimental. Something might break!
|
||||||
|
swedish:
|
||||||
|
urlInput: Videolänk (en per rad)
|
||||||
|
statusTitle: Status
|
||||||
|
statusReady: Redo
|
||||||
|
selectFormatButton: Välj format
|
||||||
|
startButton: Start
|
||||||
|
abortAllButton: Avbryt alla
|
||||||
|
updateBinButton: Uppdatera yt-dlp
|
||||||
|
darkThemeButton: Mörkt tema
|
||||||
|
lightThemeButton: Ljust tema
|
||||||
|
settingsAnchor: Inställningar
|
||||||
|
serverAddressTitle: Serveraddress
|
||||||
|
serverPortTitle: Port
|
||||||
|
extractAudioCheckbox: Extrahera ljud
|
||||||
|
noMTimeCheckbox: Lägg inte till info om när filen senast modifierades
|
||||||
|
bgReminder: När du stänger denna sida så kommer nedladdningen att fortsätta i bakgrunden.
|
||||||
|
toastConnected: 'Ansluten till '
|
||||||
|
toastUpdated: Uppdaterade yt-dlp!
|
||||||
|
formatSelectionEnabler: Tillåt val av ljud- och bildformat
|
||||||
|
themeSelect: 'Tema'
|
||||||
|
languageSelect: 'Språk'
|
||||||
|
overridesAnchor: Överskrivningar
|
||||||
|
pathOverrideOption: Tillåt överskrivning av filsökvägen
|
||||||
|
filenameOverrideOption: Tillåt överskrivning av filnamn
|
||||||
|
customFilename: Eget filnamn (lämna blankt för standardnamn)
|
||||||
|
customPath: Egen filsökväg
|
||||||
|
customArgs: Tillåt egna yt-dlp-argument (frihet under ansvar!)
|
||||||
|
customArgsInput: Egna yt-dlp-argument
|
||||||
|
rpcConnErr: Ett fel inträffade vid anslutning till RPC-server
|
||||||
|
splashText: Inga pågående nedladdningar
|
||||||
|
archiveTitle: Arkiv
|
||||||
|
clipboardAction: Kopierade länken
|
||||||
|
playlistCheckbox: Ladda ner spellista (detta kommer ta did, efter start så kan du stänga detta fönster)
|
||||||
|
restartAppMessage: En sidomladdning behövs innan förändringen får effekt
|
||||||
|
servedFromReverseProxyCheckbox: Servern befinner sig bakom en omvänd proxy
|
||||||
|
urlBase: "URL-bas, måste anges när en omvänd proxy används. Standardinställning: lämna blank"
|
||||||
|
newDownloadButton: Ny nedladdning
|
||||||
|
homeButtonLabel: Hem
|
||||||
|
archiveButtonLabel: Arkiv
|
||||||
|
settingsButtonLabel: Inställningar
|
||||||
|
rpcAuthenticationLabel: RPC-Autentisering
|
||||||
|
themeTogglerLabel: Tema-knapp
|
||||||
|
loadingLabel: Laddar...
|
||||||
|
appTitle: Apptitel
|
||||||
|
savedTemplates: Sparade mallar
|
||||||
|
templatesEditor: Mallredigerare
|
||||||
|
templatesEditorNameLabel: Namn
|
||||||
|
templatesEditorContentLabel: Innehåll
|
||||||
|
logsTitle: 'Loggar'
|
||||||
|
awaitingLogs: 'Väntar på loggar...'
|
||||||
|
bulkDownload: 'Ladda ner filer i ett zip-arkiv'
|
||||||
|
rpcPollingTimeTitle: Frekvens av RPC-uppdateringar
|
||||||
|
rpcPollingTimeDescription: En högre frekvens kräver mer CPU-resurser för både server och klient
|
||||||
|
templatesReloadInfo: För att registrera en ny mall så kan en sidomladdning krävas.
|
||||||
|
livestreamURLInput: Livestream URL
|
||||||
|
livestreamStatusWaiting: Waiting/Wait start
|
||||||
|
livestreamStatusDownloading: Downloading
|
||||||
|
livestreamStatusCompleted: Completed
|
||||||
|
livestreamStatusErrored: Errored
|
||||||
|
livestreamStatusUnknown: Unknown
|
||||||
|
livestreamDownloadInfo: |
|
||||||
|
This will monitor yet to start livestream. Each process will be executed with --wait-for-video 10.
|
||||||
|
If an already started livestream is provided it will be still downloaded but its progress will not be tracked.
|
||||||
|
Once started the livestream will be migrated to the downloads page.
|
||||||
|
livestreamExperimentalWarning: This feature is still experimental. Something might break!
|
||||||
|
|||||||
@@ -1,16 +1,15 @@
|
|||||||
import { atom, selector } from 'recoil'
|
|
||||||
import { CustomTemplate } from '../types'
|
|
||||||
import { ffetch } from '../lib/httpClient'
|
|
||||||
import { serverURL } from './settings'
|
|
||||||
import { pipe } from 'fp-ts/lib/function'
|
|
||||||
import { getOrElse } from 'fp-ts/lib/Either'
|
import { getOrElse } from 'fp-ts/lib/Either'
|
||||||
|
import { pipe } from 'fp-ts/lib/function'
|
||||||
|
import { atom, selector } from 'recoil'
|
||||||
|
import { ffetch } from '../lib/httpClient'
|
||||||
|
import { CustomTemplate } from '../types'
|
||||||
|
import { serverSideCookiesState, serverURL } from './settings'
|
||||||
|
|
||||||
export const cookiesTemplateState = atom({
|
export const cookiesTemplateState = selector({
|
||||||
key: 'cookiesTemplateState',
|
key: 'cookiesTemplateState',
|
||||||
default: localStorage.getItem('cookiesTemplate') ?? '',
|
get: ({ get }) => get(serverSideCookiesState)
|
||||||
effects: [
|
? '--cookies=cookies.txt'
|
||||||
({ onSet }) => onSet(e => localStorage.setItem('cookiesTemplate', e))
|
: ''
|
||||||
]
|
|
||||||
})
|
})
|
||||||
|
|
||||||
export const customArgsState = atom({
|
export const customArgsState = atom({
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
import { atom } from 'recoil'
|
|
||||||
import { DLMetadata } from '../types'
|
|
||||||
|
|
||||||
export const selectedFormatState = atom<Partial<DLMetadata>>({
|
|
||||||
key: 'selectedFormatState',
|
|
||||||
default: {},
|
|
||||||
})
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { selector } from 'recoil'
|
import { atom, selector } from 'recoil'
|
||||||
import { RPCClient } from '../lib/rpcClient'
|
import { RPCClient } from '../lib/rpcClient'
|
||||||
import { rpcHTTPEndpoint, rpcWebSocketEndpoint } from './settings'
|
import { rpcHTTPEndpoint, rpcWebSocketEndpoint } from './settings'
|
||||||
|
|
||||||
@@ -12,3 +12,12 @@ export const rpcClientState = selector({
|
|||||||
),
|
),
|
||||||
dangerouslyAllowMutability: true,
|
dangerouslyAllowMutability: true,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
export const rpcPollingTimeState = atom({
|
||||||
|
key: 'rpcPollingTimeState',
|
||||||
|
default: Number(localStorage.getItem('rpc-polling-time')) || 1000,
|
||||||
|
effects: [
|
||||||
|
({ onSet }) =>
|
||||||
|
onSet(a => localStorage.setItem('rpc-polling-time', a.toString()))
|
||||||
|
]
|
||||||
|
})
|
||||||
@@ -1,16 +1,21 @@
|
|||||||
|
import { pipe } from 'fp-ts/lib/function'
|
||||||
|
import { matchW } from 'fp-ts/lib/TaskEither'
|
||||||
import { atom, selector } from 'recoil'
|
import { atom, selector } from 'recoil'
|
||||||
|
import { ffetch } from '../lib/httpClient'
|
||||||
import { prefersDarkMode } from '../utils'
|
import { prefersDarkMode } from '../utils'
|
||||||
|
|
||||||
export const languages = [
|
export const languages = [
|
||||||
'english',
|
'english',
|
||||||
'chinese',
|
'chinese',
|
||||||
'russian',
|
'russian',
|
||||||
|
'french',
|
||||||
'italian',
|
'italian',
|
||||||
'spanish',
|
'spanish',
|
||||||
'korean',
|
'korean',
|
||||||
'japanese',
|
'japanese',
|
||||||
'catalan',
|
'catalan',
|
||||||
'ukrainian',
|
'ukrainian',
|
||||||
|
'swedish',
|
||||||
'polish',
|
'polish',
|
||||||
'german'
|
'german'
|
||||||
] as const
|
] as const
|
||||||
@@ -64,8 +69,7 @@ export const serverAddressState = atom<string>({
|
|||||||
|
|
||||||
export const serverPortState = atom<number>({
|
export const serverPortState = atom<number>({
|
||||||
key: 'serverPortState',
|
key: 'serverPortState',
|
||||||
default: Number(localStorage.getItem('server-port')) ||
|
default: Number(localStorage.getItem('server-port')) || Number(window.location.port),
|
||||||
Number(window.location.port),
|
|
||||||
effects: [
|
effects: [
|
||||||
({ onSet }) =>
|
({ onSet }) =>
|
||||||
onSet(a => localStorage.setItem('server-port', a.toString()))
|
onSet(a => localStorage.setItem('server-port', a.toString()))
|
||||||
@@ -135,6 +139,15 @@ export const servedFromReverseProxyState = atom({
|
|||||||
]
|
]
|
||||||
})
|
})
|
||||||
|
|
||||||
|
export const servedFromReverseProxySubDirState = atom<string>({
|
||||||
|
key: 'servedFromReverseProxySubDirState',
|
||||||
|
default: localStorage.getItem('reverseProxySubDir') ?? '',
|
||||||
|
effects: [
|
||||||
|
({ onSet }) =>
|
||||||
|
onSet(a => localStorage.setItem('reverseProxySubDir', a))
|
||||||
|
]
|
||||||
|
})
|
||||||
|
|
||||||
export const appTitleState = atom({
|
export const appTitleState = atom({
|
||||||
key: 'appTitleState',
|
key: 'appTitleState',
|
||||||
default: localStorage.getItem('appTitle') ?? 'yt-dlp Web UI',
|
default: localStorage.getItem('appTitle') ?? 'yt-dlp Web UI',
|
||||||
@@ -146,9 +159,15 @@ export const appTitleState = atom({
|
|||||||
|
|
||||||
export const serverAddressAndPortState = selector({
|
export const serverAddressAndPortState = selector({
|
||||||
key: 'serverAddressAndPortState',
|
key: 'serverAddressAndPortState',
|
||||||
get: ({ get }) => get(servedFromReverseProxyState)
|
get: ({ get }) => {
|
||||||
? `${get(serverAddressState)}`
|
if (get(servedFromReverseProxySubDirState)) {
|
||||||
: `${get(serverAddressState)}:${get(serverPortState)}`
|
return `${get(serverAddressState)}/${get(servedFromReverseProxySubDirState)}/`
|
||||||
|
}
|
||||||
|
if (get(servedFromReverseProxyState)) {
|
||||||
|
return `${get(serverAddressState)}`
|
||||||
|
}
|
||||||
|
return `${get(serverAddressState)}:${get(serverPortState)}`
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
export const serverURL = selector({
|
export const serverURL = selector({
|
||||||
@@ -173,16 +192,18 @@ export const rpcHTTPEndpoint = selector({
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
export const cookiesState = atom({
|
export const serverSideCookiesState = selector<string>({
|
||||||
key: 'cookiesState',
|
key: 'serverSideCookiesState',
|
||||||
default: localStorage.getItem('yt-dlp-cookies') ?? '',
|
get: async ({ get }) => await pipe(
|
||||||
effects: [
|
ffetch<Readonly<{ cookies: string }>>(`${get(serverURL)}/api/v1/cookies`),
|
||||||
({ onSet }) =>
|
matchW(
|
||||||
onSet(c => localStorage.setItem('yt-dlp-cookies', c))
|
() => '',
|
||||||
]
|
(r) => r.cookies
|
||||||
|
)
|
||||||
|
)()
|
||||||
})
|
})
|
||||||
|
|
||||||
export const themeSelector = selector<ThemeNarrowed>({
|
const themeSelector = selector<ThemeNarrowed>({
|
||||||
key: 'themeSelector',
|
key: 'themeSelector',
|
||||||
get: ({ get }) => {
|
get: ({ get }) => {
|
||||||
const theme = get(themeState)
|
const theme = get(themeState)
|
||||||
|
|||||||
@@ -1,21 +1,17 @@
|
|||||||
|
import { pipe } from 'fp-ts/lib/function'
|
||||||
|
import { of } from 'fp-ts/lib/Task'
|
||||||
|
import { getOrElse } from 'fp-ts/lib/TaskEither'
|
||||||
import { atom, selector } from 'recoil'
|
import { atom, selector } from 'recoil'
|
||||||
|
import { ffetch } from '../lib/httpClient'
|
||||||
|
import { RPCVersion } from '../types'
|
||||||
import { rpcClientState } from './rpc'
|
import { rpcClientState } from './rpc'
|
||||||
|
import { serverURL } from './settings'
|
||||||
|
|
||||||
export const connectedState = atom({
|
export const connectedState = atom({
|
||||||
key: 'connectedState',
|
key: 'connectedState',
|
||||||
default: false
|
default: false
|
||||||
})
|
})
|
||||||
|
|
||||||
export const updatedBinaryState = atom({
|
|
||||||
key: 'updatedBinaryState',
|
|
||||||
default: false
|
|
||||||
})
|
|
||||||
|
|
||||||
export const isDownloadingState = atom({
|
|
||||||
key: 'isDownloadingState',
|
|
||||||
default: false
|
|
||||||
})
|
|
||||||
|
|
||||||
export const freeSpaceBytesState = selector({
|
export const freeSpaceBytesState = selector({
|
||||||
key: 'freeSpaceBytesState',
|
key: 'freeSpaceBytesState',
|
||||||
get: async ({ get }) => {
|
get: async ({ get }) => {
|
||||||
@@ -32,4 +28,18 @@ export const availableDownloadPathsState = selector({
|
|||||||
.catch(() => ({ result: [] }))
|
.catch(() => ({ result: [] }))
|
||||||
return res.result
|
return res.result
|
||||||
}
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
export const ytdlpRpcVersionState = selector<RPCVersion>({
|
||||||
|
key: 'ytdlpRpcVersionState',
|
||||||
|
get: async ({ get }) => await pipe(
|
||||||
|
ffetch<RPCVersion>(`${get(serverURL)}/api/v1/version`),
|
||||||
|
getOrElse(() => pipe(
|
||||||
|
{
|
||||||
|
rpcVersion: 'unknown version',
|
||||||
|
ytdlpVersion: 'unknown version',
|
||||||
|
},
|
||||||
|
of
|
||||||
|
)),
|
||||||
|
)()
|
||||||
})
|
})
|
||||||
@@ -1,6 +1,14 @@
|
|||||||
import { atom } from 'recoil'
|
import { atom, selector } from 'recoil'
|
||||||
|
import { activeDownloadsState } from './downloads'
|
||||||
|
|
||||||
export const loadingAtom = atom({
|
export const loadingAtom = atom({
|
||||||
key: 'loadingAtom',
|
key: 'loadingAtom',
|
||||||
default: true
|
default: true
|
||||||
|
})
|
||||||
|
|
||||||
|
export const totalDownloadSpeedState = selector<number>({
|
||||||
|
key: 'totalDownloadSpeedState',
|
||||||
|
get: ({ get }) => get(activeDownloadsState)
|
||||||
|
.map(d => d.progress.speed)
|
||||||
|
.reduce((curr, next) => curr + next, 0)
|
||||||
})
|
})
|
||||||
@@ -1,11 +1,11 @@
|
|||||||
import { styled } from '@mui/material';
|
import { styled } from '@mui/material'
|
||||||
import MuiAppBar, { AppBarProps as MuiAppBarProps } from '@mui/material/AppBar';
|
import MuiAppBar, { AppBarProps as MuiAppBarProps } from '@mui/material/AppBar'
|
||||||
|
|
||||||
interface AppBarProps extends MuiAppBarProps {
|
interface AppBarProps extends MuiAppBarProps {
|
||||||
open?: boolean
|
open?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
const drawerWidth = 240;
|
const drawerWidth = 240
|
||||||
|
|
||||||
const AppBar = styled(MuiAppBar, {
|
const AppBar = styled(MuiAppBar, {
|
||||||
shouldForwardProp: (prop) => prop !== 'open',
|
shouldForwardProp: (prop) => prop !== 'open',
|
||||||
@@ -23,6 +23,6 @@ const AppBar = styled(MuiAppBar, {
|
|||||||
duration: theme.transitions.duration.enteringScreen,
|
duration: theme.transitions.duration.enteringScreen,
|
||||||
}),
|
}),
|
||||||
}),
|
}),
|
||||||
}));
|
}))
|
||||||
|
|
||||||
export default AppBar
|
export default AppBar
|
||||||
@@ -1,22 +1,20 @@
|
|||||||
import { TextField } from '@mui/material'
|
import { Button, TextField } from '@mui/material'
|
||||||
import * as A from 'fp-ts/Array'
|
import * as A from 'fp-ts/Array'
|
||||||
import * as E from 'fp-ts/Either'
|
import * as E from 'fp-ts/Either'
|
||||||
import * as O from 'fp-ts/Option'
|
import * as O from 'fp-ts/Option'
|
||||||
|
import { matchW } from 'fp-ts/lib/TaskEither'
|
||||||
import { pipe } from 'fp-ts/lib/function'
|
import { pipe } from 'fp-ts/lib/function'
|
||||||
import { useMemo } from 'react'
|
import { useMemo } from 'react'
|
||||||
import { useRecoilState, useRecoilValue } from 'recoil'
|
import { useRecoilValue } from 'recoil'
|
||||||
import { Subject, debounceTime, distinctUntilChanged } from 'rxjs'
|
import { Subject, debounceTime, distinctUntilChanged } from 'rxjs'
|
||||||
import { cookiesTemplateState } from '../atoms/downloadTemplate'
|
import { serverSideCookiesState, serverURL } from '../atoms/settings'
|
||||||
import { cookiesState, serverURL } from '../atoms/settings'
|
|
||||||
import { useSubscription } from '../hooks/observable'
|
import { useSubscription } from '../hooks/observable'
|
||||||
import { useToast } from '../hooks/toast'
|
import { useToast } from '../hooks/toast'
|
||||||
import { ffetch } from '../lib/httpClient'
|
import { ffetch } from '../lib/httpClient'
|
||||||
|
|
||||||
const validateCookie = (cookie: string) => pipe(
|
const validateCookie = (cookie: string) => pipe(
|
||||||
cookie,
|
cookie,
|
||||||
cookie => cookie.replace(/\s\s+/g, ' '),
|
cookie => cookie.split('\t'),
|
||||||
cookie => cookie.replaceAll('\t', ' '),
|
|
||||||
cookie => cookie.split(' '),
|
|
||||||
E.of,
|
E.of,
|
||||||
E.flatMap(
|
E.flatMap(
|
||||||
E.fromPredicate(
|
E.fromPredicate(
|
||||||
@@ -68,13 +66,19 @@ const validateCookie = (cookie: string) => pipe(
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const noopValidator = (s: string): E.Either<string, string[]> => pipe(
|
||||||
|
s,
|
||||||
|
s => s.split('\t'),
|
||||||
|
E.of
|
||||||
|
)
|
||||||
|
|
||||||
|
const isCommentOrNewLine = (s: string) => s === '' || s.startsWith('\n') || s.startsWith('#')
|
||||||
|
|
||||||
const CookiesTextField: React.FC = () => {
|
const CookiesTextField: React.FC = () => {
|
||||||
const serverAddr = useRecoilValue(serverURL)
|
const serverAddr = useRecoilValue(serverURL)
|
||||||
const [, setCookies] = useRecoilState(cookiesTemplateState)
|
const savedCookies = useRecoilValue(serverSideCookiesState)
|
||||||
const [savedCookies, setSavedCookies] = useRecoilState(cookiesState)
|
|
||||||
|
|
||||||
const { pushMessage } = useToast()
|
const { pushMessage } = useToast()
|
||||||
const flag = '--cookies=cookies.txt'
|
|
||||||
|
|
||||||
const cookies$ = useMemo(() => new Subject<string>(), [])
|
const cookies$ = useMemo(() => new Subject<string>(), [])
|
||||||
|
|
||||||
@@ -86,28 +90,41 @@ const CookiesTextField: React.FC = () => {
|
|||||||
})
|
})
|
||||||
})()
|
})()
|
||||||
|
|
||||||
|
const deleteCookies = () => pipe(
|
||||||
|
ffetch(`${serverAddr}/api/v1/cookies`, {
|
||||||
|
method: 'DELETE',
|
||||||
|
}),
|
||||||
|
matchW(
|
||||||
|
(l) => pushMessage(l, 'error'),
|
||||||
|
(_) => {
|
||||||
|
pushMessage('Deleted cookies', 'success')
|
||||||
|
pushMessage(`Reload the page to apply the changes`, 'info')
|
||||||
|
}
|
||||||
|
)
|
||||||
|
)()
|
||||||
|
|
||||||
const validateNetscapeCookies = (cookies: string) => pipe(
|
const validateNetscapeCookies = (cookies: string) => pipe(
|
||||||
cookies,
|
cookies,
|
||||||
cookies => cookies.split('\n'),
|
cookies => cookies.split('\n'),
|
||||||
cookies => cookies.filter(f => !f.startsWith('\n')), // empty lines
|
A.map(c => isCommentOrNewLine(c) ? noopValidator(c) : validateCookie(c)), // validate line
|
||||||
cookies => cookies.filter(f => !f.startsWith('# ')), // comments
|
A.mapWithIndex((i, either) => pipe( // detect errors and return the either
|
||||||
cookies => cookies.filter(Boolean), // empty lines
|
|
||||||
A.map(validateCookie),
|
|
||||||
A.mapWithIndex((i, either) => pipe(
|
|
||||||
either,
|
either,
|
||||||
E.matchW(
|
E.match(
|
||||||
(l) => pushMessage(`Error in line ${i + 1}: ${l}`, 'warning'),
|
(l) => {
|
||||||
() => E.isRight(either)
|
pushMessage(`Error in line ${i + 1}: ${l}`, 'warning')
|
||||||
|
return either
|
||||||
|
},
|
||||||
|
(_) => either
|
||||||
),
|
),
|
||||||
)),
|
)),
|
||||||
A.filter(Boolean),
|
A.filter(c => E.isRight(c)), // filter the line who didn't pass the validation
|
||||||
A.match(
|
A.map(E.getOrElse(() => new Array<string>())), // cast the array of eithers to an array of tokens
|
||||||
() => false,
|
A.filter(f => f.length > 0), // filter the empty tokens
|
||||||
(c) => {
|
A.map(f => f.join('\t')), // join the tokens in a TAB separated string
|
||||||
pushMessage(`Valid ${c.length} Netscape cookies`, 'info')
|
A.reduce('', (c, n) => `${c}${n}\n`), // reduce all to a single string separated by \n
|
||||||
return true
|
parsed => parsed.length > 0 // if nothing has passed the validation return none
|
||||||
}
|
? O.some(parsed)
|
||||||
)
|
: O.none
|
||||||
)
|
)
|
||||||
|
|
||||||
useSubscription(
|
useSubscription(
|
||||||
@@ -117,22 +134,17 @@ const CookiesTextField: React.FC = () => {
|
|||||||
),
|
),
|
||||||
(cookies) => pipe(
|
(cookies) => pipe(
|
||||||
cookies,
|
cookies,
|
||||||
cookies => {
|
|
||||||
setSavedCookies(cookies)
|
|
||||||
return cookies
|
|
||||||
},
|
|
||||||
validateNetscapeCookies,
|
validateNetscapeCookies,
|
||||||
O.fromPredicate(f => f === true),
|
|
||||||
O.match(
|
O.match(
|
||||||
() => setCookies(''),
|
() => pushMessage('No valid cookies', 'warning'),
|
||||||
async () => {
|
async (some) => {
|
||||||
pipe(
|
pipe(
|
||||||
await submitCookies(cookies),
|
await submitCookies(some.trimEnd()),
|
||||||
E.match(
|
E.match(
|
||||||
(l) => pushMessage(`${l}`, 'error'),
|
(l) => pushMessage(`${l}`, 'error'),
|
||||||
() => {
|
() => {
|
||||||
pushMessage(`Saved Netscape cookies`, 'success')
|
pushMessage(`Saved ${some.split('\n').length} Netscape cookies`, 'success')
|
||||||
setCookies(flag)
|
pushMessage('Reload the page to apply the changes', 'info')
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
@@ -142,15 +154,18 @@ const CookiesTextField: React.FC = () => {
|
|||||||
)
|
)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<TextField
|
<>
|
||||||
label="Netscape Cookies"
|
<TextField
|
||||||
multiline
|
label="Netscape Cookies"
|
||||||
maxRows={20}
|
multiline
|
||||||
minRows={4}
|
maxRows={20}
|
||||||
fullWidth
|
minRows={4}
|
||||||
defaultValue={savedCookies}
|
fullWidth
|
||||||
onChange={(e) => cookies$.next(e.currentTarget.value)}
|
defaultValue={savedCookies}
|
||||||
/>
|
onChange={(e) => cookies$.next(e.currentTarget.value)}
|
||||||
|
/>
|
||||||
|
<Button onClick={deleteCookies}>Delete cookies</Button>
|
||||||
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -16,8 +16,10 @@ import {
|
|||||||
Typography
|
Typography
|
||||||
} from '@mui/material'
|
} from '@mui/material'
|
||||||
import { useCallback } from 'react'
|
import { useCallback } from 'react'
|
||||||
|
import { useRecoilValue } from 'recoil'
|
||||||
|
import { serverURL } from '../atoms/settings'
|
||||||
import { RPCResult } from '../types'
|
import { RPCResult } from '../types'
|
||||||
import { ellipsis, formatSpeedMiB, mapProcessStatus, formatSize } from '../utils'
|
import { base64URLEncode, ellipsis, formatSize, formatSpeedMiB, mapProcessStatus } from '../utils'
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
download: RPCResult
|
download: RPCResult
|
||||||
@@ -35,6 +37,8 @@ const Resolution: React.FC<{ resolution?: string }> = ({ resolution }) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const DownloadCard: React.FC<Props> = ({ download, onStop, onCopy }) => {
|
const DownloadCard: React.FC<Props> = ({ download, onStop, onCopy }) => {
|
||||||
|
const serverAddr = useRecoilValue(serverURL)
|
||||||
|
|
||||||
const isCompleted = useCallback(
|
const isCompleted = useCallback(
|
||||||
() => download.progress.percentage === '-1',
|
() => download.progress.percentage === '-1',
|
||||||
[download.progress.percentage]
|
[download.progress.percentage]
|
||||||
@@ -47,6 +51,16 @@ const DownloadCard: React.FC<Props> = ({ download, onStop, onCopy }) => {
|
|||||||
[download.progress.percentage, isCompleted]
|
[download.progress.percentage, isCompleted]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const viewFile = (path: string) => {
|
||||||
|
const encoded = base64URLEncode(path)
|
||||||
|
window.open(`${serverAddr}/archive/v/${encoded}?token=${localStorage.getItem('token')}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
const downloadFile = (path: string) => {
|
||||||
|
const encoded = base64URLEncode(path)
|
||||||
|
window.open(`${serverAddr}/archive/d/${encoded}?token=${localStorage.getItem('token')}`)
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card>
|
<Card>
|
||||||
<CardActionArea onClick={() => {
|
<CardActionArea onClick={() => {
|
||||||
@@ -61,14 +75,22 @@ const DownloadCard: React.FC<Props> = ({ download, onStop, onCopy }) => {
|
|||||||
/> :
|
/> :
|
||||||
<Skeleton variant="rectangular" height={180} />
|
<Skeleton variant="rectangular" height={180} />
|
||||||
}
|
}
|
||||||
|
{download.progress.percentage ?
|
||||||
|
<LinearProgress
|
||||||
|
variant="determinate"
|
||||||
|
value={percentageToNumber()}
|
||||||
|
color={isCompleted() ? "success" : "primary"}
|
||||||
|
/> :
|
||||||
|
null
|
||||||
|
}
|
||||||
<CardContent>
|
<CardContent>
|
||||||
{download.info.title !== '' ?
|
{download.info.title !== '' ?
|
||||||
<Typography gutterBottom variant="h6" component="div">
|
<Typography gutterBottom variant="h6" component="div">
|
||||||
{ellipsis(download.info.title, 54)}
|
{ellipsis(download.info.title, 100)}
|
||||||
</Typography> :
|
</Typography> :
|
||||||
<Skeleton />
|
<Skeleton />
|
||||||
}
|
}
|
||||||
<Stack direction="row" spacing={1} py={2}>
|
<Stack direction="row" spacing={0.5} py={1}>
|
||||||
<Chip
|
<Chip
|
||||||
label={
|
label={
|
||||||
isCompleted()
|
isCompleted()
|
||||||
@@ -90,14 +112,6 @@ const DownloadCard: React.FC<Props> = ({ download, onStop, onCopy }) => {
|
|||||||
</Typography>
|
</Typography>
|
||||||
<Resolution resolution={download.info.resolution} />
|
<Resolution resolution={download.info.resolution} />
|
||||||
</Stack>
|
</Stack>
|
||||||
{download.progress.percentage ?
|
|
||||||
<LinearProgress
|
|
||||||
variant="determinate"
|
|
||||||
value={percentageToNumber()}
|
|
||||||
color={isCompleted() ? "secondary" : "primary"}
|
|
||||||
/> :
|
|
||||||
null
|
|
||||||
}
|
|
||||||
</CardContent>
|
</CardContent>
|
||||||
</CardActionArea>
|
</CardActionArea>
|
||||||
<CardActions>
|
<CardActions>
|
||||||
@@ -109,6 +123,26 @@ const DownloadCard: React.FC<Props> = ({ download, onStop, onCopy }) => {
|
|||||||
>
|
>
|
||||||
{isCompleted() ? "Clear" : "Stop"}
|
{isCompleted() ? "Clear" : "Stop"}
|
||||||
</Button>
|
</Button>
|
||||||
|
{isCompleted() &&
|
||||||
|
<>
|
||||||
|
<Button
|
||||||
|
variant="contained"
|
||||||
|
size="small"
|
||||||
|
color="primary"
|
||||||
|
onClick={() => downloadFile(download.output.savedFilePath)}
|
||||||
|
>
|
||||||
|
Download
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
variant="contained"
|
||||||
|
size="small"
|
||||||
|
color="primary"
|
||||||
|
onClick={() => viewFile(download.output.savedFilePath)}
|
||||||
|
>
|
||||||
|
View
|
||||||
|
</Button>
|
||||||
|
</>
|
||||||
|
}
|
||||||
</CardActions>
|
</CardActions>
|
||||||
</Card>
|
</Card>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -26,21 +26,19 @@ import {
|
|||||||
Suspense,
|
Suspense,
|
||||||
forwardRef,
|
forwardRef,
|
||||||
useEffect,
|
useEffect,
|
||||||
useMemo,
|
|
||||||
useRef,
|
useRef,
|
||||||
useState,
|
useState,
|
||||||
useTransition
|
useTransition
|
||||||
} from 'react'
|
} from 'react'
|
||||||
import { useRecoilState, useRecoilValue } from 'recoil'
|
import { useRecoilState, useRecoilValue } from 'recoil'
|
||||||
import { customArgsState, downloadTemplateState, filenameTemplateState, savedTemplatesState } from '../atoms/downloadTemplate'
|
import { customArgsState, downloadTemplateState, filenameTemplateState, savedTemplatesState } from '../atoms/downloadTemplate'
|
||||||
import { latestCliArgumentsState, settingsState } from '../atoms/settings'
|
import { settingsState } from '../atoms/settings'
|
||||||
import { availableDownloadPathsState, connectedState } from '../atoms/status'
|
import { availableDownloadPathsState, connectedState } from '../atoms/status'
|
||||||
import FormatsGrid from '../components/FormatsGrid'
|
import FormatsGrid from '../components/FormatsGrid'
|
||||||
import { useI18n } from '../hooks/useI18n'
|
import { useI18n } from '../hooks/useI18n'
|
||||||
import { useRPC } from '../hooks/useRPC'
|
import { useRPC } from '../hooks/useRPC'
|
||||||
import { CliArguments } from '../lib/argsParser'
|
|
||||||
import type { DLMetadata } from '../types'
|
import type { DLMetadata } from '../types'
|
||||||
import { isValidURL, toFormatArgs } from '../utils'
|
import { toFormatArgs } from '../utils'
|
||||||
import ExtraDownloadOptions from './ExtraDownloadOptions'
|
import ExtraDownloadOptions from './ExtraDownloadOptions'
|
||||||
|
|
||||||
const Transition = forwardRef(function Transition(
|
const Transition = forwardRef(function Transition(
|
||||||
@@ -71,7 +69,6 @@ const DownloadDialog: FC<Props> = ({ open, onClose, onDownloadStart }) => {
|
|||||||
const [pickedBestFormat, setPickedBestFormat] = useState('')
|
const [pickedBestFormat, setPickedBestFormat] = useState('')
|
||||||
|
|
||||||
const [customArgs, setCustomArgs] = useRecoilState(customArgsState)
|
const [customArgs, setCustomArgs] = useRecoilState(customArgsState)
|
||||||
const [, setCliArgs] = useRecoilState(latestCliArgumentsState)
|
|
||||||
|
|
||||||
const [downloadPath, setDownloadPath] = useState('')
|
const [downloadPath, setDownloadPath] = useState('')
|
||||||
|
|
||||||
@@ -80,14 +77,9 @@ const DownloadDialog: FC<Props> = ({ open, onClose, onDownloadStart }) => {
|
|||||||
)
|
)
|
||||||
|
|
||||||
const [url, setUrl] = useState('')
|
const [url, setUrl] = useState('')
|
||||||
const [workingUrl, setWorkingUrl] = useState('')
|
|
||||||
|
|
||||||
const [isPlaylist, setIsPlaylist] = useState(false)
|
const [isPlaylist, setIsPlaylist] = useState(false)
|
||||||
|
|
||||||
const argsBuilder = useMemo(() =>
|
|
||||||
new CliArguments().fromString(settings.cliArgs), [settings.cliArgs]
|
|
||||||
)
|
|
||||||
|
|
||||||
const { i18n } = useI18n()
|
const { i18n } = useI18n()
|
||||||
const { client } = useRPC()
|
const { client } = useRPC()
|
||||||
|
|
||||||
@@ -103,36 +95,36 @@ const DownloadDialog: FC<Props> = ({ open, onClose, onDownloadStart }) => {
|
|||||||
/**
|
/**
|
||||||
* Retrive url from input, cli-arguments from checkboxes and emits via WebSocket
|
* Retrive url from input, cli-arguments from checkboxes and emits via WebSocket
|
||||||
*/
|
*/
|
||||||
const sendUrl = (immediate?: string) => {
|
const sendUrl = async (immediate?: string) => {
|
||||||
const codes = new Array<string>()
|
for (const line of url.split('\n')) {
|
||||||
if (pickedVideoFormat !== '') codes.push(pickedVideoFormat)
|
const codes = new Array<string>()
|
||||||
if (pickedAudioFormat !== '') codes.push(pickedAudioFormat)
|
if (pickedVideoFormat !== '') codes.push(pickedVideoFormat)
|
||||||
if (pickedBestFormat !== '') codes.push(pickedBestFormat)
|
if (pickedAudioFormat !== '') codes.push(pickedAudioFormat)
|
||||||
|
if (pickedBestFormat !== '') codes.push(pickedBestFormat)
|
||||||
|
|
||||||
client.download({
|
await new Promise(r => setTimeout(r, 10))
|
||||||
url: immediate || url || workingUrl,
|
client.download({
|
||||||
args: `${argsBuilder.toString()} ${toFormatArgs(codes)} ${downloadTemplate}`,
|
url: immediate || line,
|
||||||
pathOverride: downloadPath ?? '',
|
args: `${toFormatArgs(codes)} ${downloadTemplate}`,
|
||||||
renameTo: settings.fileRenaming ? filenameTemplate : '',
|
pathOverride: downloadPath ?? '',
|
||||||
playlist: isPlaylist,
|
renameTo: settings.fileRenaming ? filenameTemplate : '',
|
||||||
})
|
playlist: isPlaylist,
|
||||||
|
})
|
||||||
|
|
||||||
|
setTimeout(() => {
|
||||||
|
resetInput()
|
||||||
|
setDownloadFormats(undefined)
|
||||||
|
onDownloadStart(immediate || line)
|
||||||
|
}, 100)
|
||||||
|
}
|
||||||
|
|
||||||
setUrl('')
|
setUrl('')
|
||||||
setWorkingUrl('')
|
|
||||||
|
|
||||||
setTimeout(() => {
|
|
||||||
resetInput()
|
|
||||||
setDownloadFormats(undefined)
|
|
||||||
onDownloadStart(immediate || url || workingUrl)
|
|
||||||
}, 250)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retrive url from input and display the formats selection view
|
* Retrive url from input and display the formats selection view
|
||||||
*/
|
*/
|
||||||
const sendUrlFormatSelection = () => {
|
const sendUrlFormatSelection = () => {
|
||||||
setWorkingUrl(url)
|
|
||||||
setUrl('')
|
|
||||||
setPickedAudioFormat('')
|
setPickedAudioFormat('')
|
||||||
setPickedVideoFormat('')
|
setPickedVideoFormat('')
|
||||||
setPickedBestFormat('')
|
setPickedBestFormat('')
|
||||||
@@ -166,7 +158,6 @@ const DownloadDialog: FC<Props> = ({ open, onClose, onDownloadStart }) => {
|
|||||||
|
|
||||||
file
|
file
|
||||||
.split('\n')
|
.split('\n')
|
||||||
.filter(u => isValidURL(u))
|
|
||||||
.forEach(u => sendUrl(u))
|
.forEach(u => sendUrl(u))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -207,7 +198,7 @@ const DownloadDialog: FC<Props> = ({ open, onClose, onDownloadStart }) => {
|
|||||||
backgroundColor: (theme) => theme.palette.background.default,
|
backgroundColor: (theme) => theme.palette.background.default,
|
||||||
minHeight: (theme) => `calc(99vh - ${theme.mixins.toolbar.minHeight}px)`
|
minHeight: (theme) => `calc(99vh - ${theme.mixins.toolbar.minHeight}px)`
|
||||||
}}>
|
}}>
|
||||||
<Container sx={{ my: 4 }} >
|
<Container sx={{ my: 4 }}>
|
||||||
<Grid container spacing={2}>
|
<Grid container spacing={2}>
|
||||||
<Grid item xs={12}>
|
<Grid item xs={12}>
|
||||||
<Paper
|
<Paper
|
||||||
@@ -220,6 +211,7 @@ const DownloadDialog: FC<Props> = ({ open, onClose, onDownloadStart }) => {
|
|||||||
>
|
>
|
||||||
<Grid container>
|
<Grid container>
|
||||||
<TextField
|
<TextField
|
||||||
|
multiline
|
||||||
fullWidth
|
fullWidth
|
||||||
ref={urlInputRef}
|
ref={urlInputRef}
|
||||||
label={i18n.t('urlInput')}
|
label={i18n.t('urlInput')}
|
||||||
@@ -327,19 +319,6 @@ const DownloadDialog: FC<Props> = ({ open, onClose, onDownloadStart }) => {
|
|||||||
label={i18n.t('playlistCheckbox')}
|
label={i18n.t('playlistCheckbox')}
|
||||||
/>
|
/>
|
||||||
</Grid>
|
</Grid>
|
||||||
<Grid item>
|
|
||||||
<FormControlLabel
|
|
||||||
control={
|
|
||||||
<Checkbox
|
|
||||||
onChange={() => setCliArgs(argsBuilder.toggleExtractAudio().toString())}
|
|
||||||
/>
|
|
||||||
}
|
|
||||||
checked={argsBuilder.extractAudio}
|
|
||||||
onChange={() => setCliArgs(argsBuilder.toggleExtractAudio().toString())}
|
|
||||||
disabled={settings.formatSelection}
|
|
||||||
label={i18n.t('extractAudioCheckbox')}
|
|
||||||
/>
|
|
||||||
</Grid>
|
|
||||||
</Grid>
|
</Grid>
|
||||||
<Grid item>
|
<Grid item>
|
||||||
<Button
|
<Button
|
||||||
|
|||||||
@@ -3,32 +3,25 @@ import { useRecoilState, useRecoilValue } from 'recoil'
|
|||||||
import { loadingDownloadsState } from '../atoms/downloads'
|
import { loadingDownloadsState } from '../atoms/downloads'
|
||||||
import { listViewState } from '../atoms/settings'
|
import { listViewState } from '../atoms/settings'
|
||||||
import { loadingAtom } from '../atoms/ui'
|
import { loadingAtom } from '../atoms/ui'
|
||||||
import DownloadsCardView from './DownloadsCardView'
|
import DownloadsGridView from './DownloadsGridView'
|
||||||
import DownloadsListView from './DownloadsListView'
|
import DownloadsTableView from './DownloadsTableView'
|
||||||
|
|
||||||
const Downloads: React.FC = () => {
|
const Downloads: React.FC = () => {
|
||||||
const listView = useRecoilValue(listViewState)
|
const tableView = useRecoilValue(listViewState)
|
||||||
const loadingDownloads = useRecoilValue(loadingDownloadsState)
|
const loadingDownloads = useRecoilValue(loadingDownloadsState)
|
||||||
|
|
||||||
const [isLoading, setIsLoading] = useRecoilState(loadingAtom)
|
const [isLoading, setIsLoading] = useRecoilState(loadingAtom)
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (loadingDownloads) {
|
if (loadingDownloads) {
|
||||||
setIsLoading(true)
|
return setIsLoading(true)
|
||||||
return
|
|
||||||
}
|
}
|
||||||
setIsLoading(false)
|
setIsLoading(false)
|
||||||
}, [loadingDownloads, isLoading])
|
}, [loadingDownloads, isLoading])
|
||||||
|
|
||||||
if (listView) {
|
if (tableView) return <DownloadsTableView />
|
||||||
return (
|
|
||||||
<DownloadsListView />
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return <DownloadsGridView />
|
||||||
<DownloadsCardView />
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default Downloads
|
export default Downloads
|
||||||
@@ -4,25 +4,28 @@ import { activeDownloadsState } from '../atoms/downloads'
|
|||||||
import { useToast } from '../hooks/toast'
|
import { useToast } from '../hooks/toast'
|
||||||
import { useI18n } from '../hooks/useI18n'
|
import { useI18n } from '../hooks/useI18n'
|
||||||
import { useRPC } from '../hooks/useRPC'
|
import { useRPC } from '../hooks/useRPC'
|
||||||
|
import { ProcessStatus, RPCResult } from '../types'
|
||||||
import DownloadCard from './DownloadCard'
|
import DownloadCard from './DownloadCard'
|
||||||
|
|
||||||
const DownloadsCardView: React.FC = () => {
|
const DownloadsGridView: React.FC = () => {
|
||||||
const downloads = useRecoilValue(activeDownloadsState)
|
const downloads = useRecoilValue(activeDownloadsState)
|
||||||
|
|
||||||
const { i18n } = useI18n()
|
const { i18n } = useI18n()
|
||||||
const { client } = useRPC()
|
const { client } = useRPC()
|
||||||
const { pushMessage } = useToast()
|
const { pushMessage } = useToast()
|
||||||
|
|
||||||
const abort = (id: string) => client.kill(id)
|
const stop = (r: RPCResult) => r.progress.process_status === ProcessStatus.COMPLETED
|
||||||
|
? client.clear(r.id)
|
||||||
|
: client.kill(r.id)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Grid container spacing={{ xs: 2, md: 2 }} columns={{ xs: 4, sm: 8, md: 12 }} pt={2}>
|
<Grid container spacing={{ xs: 2, md: 2 }} columns={{ xs: 4, sm: 8, md: 12, xl: 12 }} pt={2}>
|
||||||
{
|
{
|
||||||
downloads.map(download => (
|
downloads.map(download => (
|
||||||
<Grid item xs={4} sm={8} md={6} key={download.id}>
|
<Grid item xs={4} sm={8} md={6} xl={4} key={download.id}>
|
||||||
<DownloadCard
|
<DownloadCard
|
||||||
download={download}
|
download={download}
|
||||||
onStop={() => abort(download.id)}
|
onStop={() => stop(download)}
|
||||||
onCopy={() => pushMessage(i18n.t('clipboardAction'), 'info')}
|
onCopy={() => pushMessage(i18n.t('clipboardAction'), 'info')}
|
||||||
/>
|
/>
|
||||||
</Grid>
|
</Grid>
|
||||||
@@ -32,4 +35,4 @@ const DownloadsCardView: React.FC = () => {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
export default DownloadsCardView
|
export default DownloadsGridView
|
||||||
@@ -1,98 +0,0 @@
|
|||||||
import {
|
|
||||||
Button,
|
|
||||||
Grid,
|
|
||||||
LinearProgress,
|
|
||||||
Paper,
|
|
||||||
Table,
|
|
||||||
TableBody,
|
|
||||||
TableCell,
|
|
||||||
TableContainer,
|
|
||||||
TableHead,
|
|
||||||
TableRow,
|
|
||||||
Typography
|
|
||||||
} from "@mui/material"
|
|
||||||
import { useRecoilValue } from 'recoil'
|
|
||||||
import { activeDownloadsState } from '../atoms/downloads'
|
|
||||||
import { useRPC } from '../hooks/useRPC'
|
|
||||||
import { ellipsis, formatSpeedMiB, formatSize } from "../utils"
|
|
||||||
|
|
||||||
|
|
||||||
const DownloadsListView: React.FC = () => {
|
|
||||||
const downloads = useRecoilValue(activeDownloadsState)
|
|
||||||
|
|
||||||
const { client } = useRPC()
|
|
||||||
|
|
||||||
const abort = (id: string) => client.kill(id)
|
|
||||||
|
|
||||||
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: '100%' }}
|
|
||||||
elevation={2}
|
|
||||||
hidden={downloads.length === 0}
|
|
||||||
>
|
|
||||||
<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={
|
|
||||||
download.progress.process_status === 0
|
|
||||||
? 'indeterminate'
|
|
||||||
: 'determinate'
|
|
||||||
}
|
|
||||||
color={download.progress.percentage === '-1' ? 'success' : 'primary'}
|
|
||||||
/>
|
|
||||||
</TableCell>
|
|
||||||
<TableCell>{formatSpeedMiB(download.progress.speed)}</TableCell>
|
|
||||||
<TableCell>{formatSize(download.info.filesize_approx ?? 0)}</TableCell>
|
|
||||||
<TableCell>
|
|
||||||
<Button
|
|
||||||
variant="contained"
|
|
||||||
size="small"
|
|
||||||
onClick={() => abort(download.id)}
|
|
||||||
>
|
|
||||||
{download.progress.percentage === '-1' ? 'Remove' : 'Stop'}
|
|
||||||
</Button>
|
|
||||||
</TableCell>
|
|
||||||
</TableRow>
|
|
||||||
))
|
|
||||||
}
|
|
||||||
</TableBody>
|
|
||||||
</Table>
|
|
||||||
</TableContainer>
|
|
||||||
</Grid>
|
|
||||||
</Grid>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
export default DownloadsListView
|
|
||||||
216
frontend/src/components/DownloadsTableView.tsx
Normal file
216
frontend/src/components/DownloadsTableView.tsx
Normal file
@@ -0,0 +1,216 @@
|
|||||||
|
import DeleteIcon from '@mui/icons-material/Delete'
|
||||||
|
import DownloadIcon from '@mui/icons-material/Download'
|
||||||
|
import DownloadDoneIcon from '@mui/icons-material/DownloadDone'
|
||||||
|
import FileDownloadIcon from '@mui/icons-material/FileDownload'
|
||||||
|
import SmartDisplayIcon from '@mui/icons-material/SmartDisplay'
|
||||||
|
import StopCircleIcon from '@mui/icons-material/StopCircle'
|
||||||
|
import {
|
||||||
|
Box,
|
||||||
|
ButtonGroup,
|
||||||
|
IconButton,
|
||||||
|
LinearProgress,
|
||||||
|
LinearProgressProps,
|
||||||
|
Table,
|
||||||
|
TableBody,
|
||||||
|
TableCell,
|
||||||
|
TableContainer,
|
||||||
|
TableHead,
|
||||||
|
TableRow,
|
||||||
|
Typography
|
||||||
|
} from "@mui/material"
|
||||||
|
import { forwardRef } from 'react'
|
||||||
|
import { TableComponents, TableVirtuoso } from 'react-virtuoso'
|
||||||
|
import { useRecoilValue } from 'recoil'
|
||||||
|
import { activeDownloadsState } from '../atoms/downloads'
|
||||||
|
import { serverURL } from '../atoms/settings'
|
||||||
|
import { useRPC } from '../hooks/useRPC'
|
||||||
|
import { ProcessStatus, RPCResult } from '../types'
|
||||||
|
import { base64URLEncode, formatSize, formatSpeedMiB } from "../utils"
|
||||||
|
|
||||||
|
const columns = [
|
||||||
|
{
|
||||||
|
width: 8,
|
||||||
|
label: 'Status',
|
||||||
|
dataKey: 'status',
|
||||||
|
numeric: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
width: 500,
|
||||||
|
label: 'Title',
|
||||||
|
dataKey: 'title',
|
||||||
|
numeric: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
width: 50,
|
||||||
|
label: 'Speed',
|
||||||
|
dataKey: 'speed',
|
||||||
|
numeric: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
width: 150,
|
||||||
|
label: 'Progress',
|
||||||
|
dataKey: 'progress',
|
||||||
|
numeric: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
width: 80,
|
||||||
|
label: 'Size',
|
||||||
|
dataKey: 'size',
|
||||||
|
numeric: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
width: 100,
|
||||||
|
label: 'Added on',
|
||||||
|
dataKey: 'addedon',
|
||||||
|
numeric: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
width: 80,
|
||||||
|
label: 'Actions',
|
||||||
|
dataKey: 'actions',
|
||||||
|
numeric: true,
|
||||||
|
},
|
||||||
|
] as const
|
||||||
|
|
||||||
|
function LinearProgressWithLabel(props: LinearProgressProps & { value: number }) {
|
||||||
|
return (
|
||||||
|
<Box sx={{ display: 'flex', alignItems: 'center' }}>
|
||||||
|
<Box sx={{ width: '100%', mr: 1 }}>
|
||||||
|
<LinearProgress variant="determinate" {...props} />
|
||||||
|
</Box>
|
||||||
|
<Box sx={{ minWidth: 35 }}>
|
||||||
|
<Typography variant="body2" color="text.secondary">{`${Math.round(
|
||||||
|
props.value,
|
||||||
|
)}%`}</Typography>
|
||||||
|
</Box>
|
||||||
|
</Box>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const VirtuosoTableComponents: TableComponents<RPCResult> = {
|
||||||
|
Scroller: forwardRef<HTMLDivElement>((props, ref) => (
|
||||||
|
<TableContainer {...props} ref={ref} />
|
||||||
|
)),
|
||||||
|
Table: (props) => (
|
||||||
|
<Table {...props} sx={{ borderCollapse: 'separate', tableLayout: 'fixed', mt: 2 }} size='small' />
|
||||||
|
),
|
||||||
|
TableHead,
|
||||||
|
TableRow: ({ item: _item, ...props }) => <TableRow {...props} />,
|
||||||
|
TableBody: forwardRef<HTMLTableSectionElement>((props, ref) => (
|
||||||
|
<TableBody {...props} ref={ref} />
|
||||||
|
)),
|
||||||
|
}
|
||||||
|
|
||||||
|
function fixedHeaderContent() {
|
||||||
|
return (
|
||||||
|
<TableRow>
|
||||||
|
{columns.map((column) => (
|
||||||
|
<TableCell
|
||||||
|
key={column.dataKey}
|
||||||
|
variant="head"
|
||||||
|
align={column.numeric || false ? 'right' : 'left'}
|
||||||
|
style={{ width: column.width }}
|
||||||
|
>
|
||||||
|
{column.label}
|
||||||
|
</TableCell>
|
||||||
|
))}
|
||||||
|
</TableRow>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const DownloadsTableView: React.FC = () => {
|
||||||
|
const downloads = useRecoilValue(activeDownloadsState)
|
||||||
|
const serverAddr = useRecoilValue(serverURL)
|
||||||
|
const { client } = useRPC()
|
||||||
|
|
||||||
|
const viewFile = (path: string) => {
|
||||||
|
const encoded = base64URLEncode(path)
|
||||||
|
window.open(`${serverAddr}/archive/v/${encoded}?token=${localStorage.getItem('token')}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
const downloadFile = (path: string) => {
|
||||||
|
const encoded = base64URLEncode(path)
|
||||||
|
window.open(`${serverAddr}/archive/d/${encoded}?token=${localStorage.getItem('token')}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
const stop = (r: RPCResult) => r.progress.process_status === ProcessStatus.COMPLETED
|
||||||
|
? client.clear(r.id)
|
||||||
|
: client.kill(r.id)
|
||||||
|
|
||||||
|
|
||||||
|
function rowContent(_index: number, download: RPCResult) {
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<TableCell>
|
||||||
|
{download.progress.percentage === '-1'
|
||||||
|
? <DownloadDoneIcon color="primary" />
|
||||||
|
: <DownloadIcon color="primary" />
|
||||||
|
}
|
||||||
|
</TableCell>
|
||||||
|
<TableCell>{download.info.title}</TableCell>
|
||||||
|
<TableCell align="right">{formatSpeedMiB(download.progress.speed)}</TableCell>
|
||||||
|
<TableCell align="right">
|
||||||
|
<LinearProgressWithLabel
|
||||||
|
sx={{ height: '16px' }}
|
||||||
|
value={
|
||||||
|
download.progress.percentage === '-1'
|
||||||
|
? 100
|
||||||
|
: Number(download.progress.percentage.replace('%', ''))
|
||||||
|
}
|
||||||
|
variant={
|
||||||
|
download.progress.process_status === 0
|
||||||
|
? 'indeterminate'
|
||||||
|
: 'determinate'
|
||||||
|
}
|
||||||
|
color={download.progress.percentage === '-1' ? 'primary' : 'primary'}
|
||||||
|
/>
|
||||||
|
</TableCell>
|
||||||
|
<TableCell align="right">{formatSize(download.info.filesize_approx ?? 0)}</TableCell>
|
||||||
|
<TableCell align="right">
|
||||||
|
{new Date(download.info.created_at).toLocaleString()}
|
||||||
|
</TableCell>
|
||||||
|
<TableCell align="right">
|
||||||
|
<ButtonGroup>
|
||||||
|
<IconButton
|
||||||
|
size="small"
|
||||||
|
onClick={() => stop(download)}
|
||||||
|
>
|
||||||
|
{download.progress.percentage === '-1' ? <DeleteIcon /> : <StopCircleIcon />}
|
||||||
|
|
||||||
|
</IconButton>
|
||||||
|
{download.progress.percentage === '-1' &&
|
||||||
|
<>
|
||||||
|
<IconButton
|
||||||
|
size="small"
|
||||||
|
onClick={() => viewFile(download.output.savedFilePath)}
|
||||||
|
>
|
||||||
|
<SmartDisplayIcon />
|
||||||
|
</IconButton>
|
||||||
|
<IconButton
|
||||||
|
size="small"
|
||||||
|
onClick={() => downloadFile(download.output.savedFilePath)}
|
||||||
|
>
|
||||||
|
<FileDownloadIcon />
|
||||||
|
</IconButton>
|
||||||
|
</>
|
||||||
|
}
|
||||||
|
</ButtonGroup>
|
||||||
|
</TableCell>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Box style={{ height: downloads.length === 0 ? '0vh' : '80vh', width: '100%' }}>
|
||||||
|
<TableVirtuoso
|
||||||
|
hidden={downloads.length === 0}
|
||||||
|
data={downloads}
|
||||||
|
components={VirtuosoTableComponents}
|
||||||
|
fixedHeaderContent={fixedHeaderContent}
|
||||||
|
itemContent={rowContent}
|
||||||
|
/>
|
||||||
|
</Box>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default DownloadsTableView
|
||||||
@@ -39,7 +39,7 @@ const ErrorBoundary: React.FC = () => {
|
|||||||
</Button>
|
</Button>
|
||||||
</Link>
|
</Link>
|
||||||
<Typography sx={{ mt: 2 }} color={'gray'} fontWeight={500}>
|
<Typography sx={{ mt: 2 }} color={'gray'} fontWeight={500}>
|
||||||
Or login if authentication is enabled
|
Or login if authentification is enabled
|
||||||
</Typography>
|
</Typography>
|
||||||
<Link to={'/login'} >
|
<Link to={'/login'} >
|
||||||
<Button variant='contained' sx={{ mt: 2 }}>
|
<Button variant='contained' sx={{ mt: 2 }}>
|
||||||
@@ -50,4 +50,4 @@ const ErrorBoundary: React.FC = () => {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
export default ErrorBoundary
|
export default ErrorBoundary
|
||||||
|
|||||||
@@ -15,6 +15,12 @@ const ExtraDownloadOptions: React.FC = () => {
|
|||||||
disablePortal
|
disablePortal
|
||||||
options={customTemplates.map(({ name, content }) => ({ label: name, content }))}
|
options={customTemplates.map(({ name, content }) => ({ label: name, content }))}
|
||||||
autoHighlight
|
autoHighlight
|
||||||
|
defaultValue={
|
||||||
|
customTemplates
|
||||||
|
.filter(({ id, name }) => id === "0" || name === "default")
|
||||||
|
.map(({ name, content }) => ({ label: name, content }))
|
||||||
|
.at(0)
|
||||||
|
}
|
||||||
getOptionLabel={(option) => option.label}
|
getOptionLabel={(option) => option.label}
|
||||||
onChange={(_, value) => {
|
onChange={(_, value) => {
|
||||||
setCustomArgs(value?.content!)
|
setCustomArgs(value?.content!)
|
||||||
|
|||||||
68
frontend/src/components/Footer.tsx
Normal file
68
frontend/src/components/Footer.tsx
Normal file
@@ -0,0 +1,68 @@
|
|||||||
|
import DownloadIcon from '@mui/icons-material/Download'
|
||||||
|
import SettingsEthernet from '@mui/icons-material/SettingsEthernet'
|
||||||
|
import { AppBar, CircularProgress, Divider, Toolbar } from '@mui/material'
|
||||||
|
import { Suspense } from 'react'
|
||||||
|
import { useRecoilValue } from 'recoil'
|
||||||
|
import { settingsState } from '../atoms/settings'
|
||||||
|
import { connectedState } from '../atoms/status'
|
||||||
|
import { totalDownloadSpeedState } from '../atoms/ui'
|
||||||
|
import { useI18n } from '../hooks/useI18n'
|
||||||
|
import { formatSpeedMiB } from '../utils'
|
||||||
|
import FreeSpaceIndicator from './FreeSpaceIndicator'
|
||||||
|
import VersionIndicator from './VersionIndicator'
|
||||||
|
|
||||||
|
const Footer: React.FC = () => {
|
||||||
|
const settings = useRecoilValue(settingsState)
|
||||||
|
const isConnected = useRecoilValue(connectedState)
|
||||||
|
const totalDownloadSpeed = useRecoilValue(totalDownloadSpeedState)
|
||||||
|
|
||||||
|
const mode = settings.theme
|
||||||
|
const { i18n } = useI18n()
|
||||||
|
|
||||||
|
return (
|
||||||
|
<AppBar position="fixed" color="default" sx={{
|
||||||
|
top: 'auto',
|
||||||
|
bottom: 0,
|
||||||
|
height: 48,
|
||||||
|
zIndex: 1200,
|
||||||
|
borderTop: mode === 'light'
|
||||||
|
? '1px solid rgba(0, 0, 0, 0.12)'
|
||||||
|
: '1px solid rgba(255, 255, 255, 0.12)',
|
||||||
|
}}>
|
||||||
|
<Toolbar sx={{
|
||||||
|
paddingBottom: 2,
|
||||||
|
fontSize: 14,
|
||||||
|
display: 'flex', gap: 1, justifyContent: 'space-between'
|
||||||
|
}}>
|
||||||
|
<Suspense fallback={<CircularProgress size={15} />}>
|
||||||
|
<VersionIndicator />
|
||||||
|
</Suspense>
|
||||||
|
<div style={{ display: 'flex', gap: 4, 'alignItems': 'center' }}>
|
||||||
|
<div style={{
|
||||||
|
display: 'flex',
|
||||||
|
alignItems: 'center',
|
||||||
|
flexWrap: 'wrap',
|
||||||
|
marginRight: 'px',
|
||||||
|
gap: 3,
|
||||||
|
}}>
|
||||||
|
<DownloadIcon />
|
||||||
|
<span>
|
||||||
|
{formatSpeedMiB(totalDownloadSpeed)}
|
||||||
|
</span>
|
||||||
|
<Divider orientation="vertical" flexItem />
|
||||||
|
<SettingsEthernet />
|
||||||
|
<span>
|
||||||
|
{isConnected ? settings.serverAddr : i18n.t('notConnectedText')}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<Divider orientation="vertical" flexItem />
|
||||||
|
<Suspense fallback={i18n.t('loadingLabel')}>
|
||||||
|
<FreeSpaceIndicator />
|
||||||
|
</Suspense>
|
||||||
|
</div>
|
||||||
|
</Toolbar>
|
||||||
|
</AppBar>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default Footer
|
||||||
@@ -101,6 +101,7 @@ export default function FormatsGrid({
|
|||||||
>
|
>
|
||||||
{format.format_note} - {format.vcodec === 'none' ? format.acodec : format.vcodec}
|
{format.format_note} - {format.vcodec === 'none' ? format.acodec : format.vcodec}
|
||||||
{(format.filesize_approx > 0) ? " (~" + Math.round(format.filesize_approx / 1024 / 1024) + " MiB)" : ""}
|
{(format.filesize_approx > 0) ? " (~" + Math.round(format.filesize_approx / 1024 / 1024) + " MiB)" : ""}
|
||||||
|
{format.language}
|
||||||
</Button>
|
</Button>
|
||||||
</Grid>
|
</Grid>
|
||||||
))
|
))
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ const HomeActions: React.FC = () => {
|
|||||||
setOpenDownload(false)
|
setOpenDownload(false)
|
||||||
setIsLoading(true)
|
setIsLoading(true)
|
||||||
}}
|
}}
|
||||||
|
// TODO: handle optimistic UI update
|
||||||
onDownloadStart={(url) => {
|
onDownloadStart={(url) => {
|
||||||
pushMessage(`Requested ${url}`, 'info')
|
pushMessage(`Requested ${url}`, 'info')
|
||||||
setOpenDownload(false)
|
setOpenDownload(false)
|
||||||
|
|||||||
@@ -1,14 +1,16 @@
|
|||||||
import AddCircleIcon from '@mui/icons-material/AddCircle'
|
import AddCircleIcon from '@mui/icons-material/AddCircle'
|
||||||
import BuildCircleIcon from '@mui/icons-material/BuildCircle'
|
import BuildCircleIcon from '@mui/icons-material/BuildCircle'
|
||||||
import DeleteForeverIcon from '@mui/icons-material/DeleteForever'
|
import DeleteForeverIcon from '@mui/icons-material/DeleteForever'
|
||||||
|
import FolderZipIcon from '@mui/icons-material/FolderZip'
|
||||||
import FormatListBulleted from '@mui/icons-material/FormatListBulleted'
|
import FormatListBulleted from '@mui/icons-material/FormatListBulleted'
|
||||||
|
import ViewAgendaIcon from '@mui/icons-material/ViewAgenda'
|
||||||
import {
|
import {
|
||||||
SpeedDial,
|
SpeedDial,
|
||||||
SpeedDialAction,
|
SpeedDialAction,
|
||||||
SpeedDialIcon
|
SpeedDialIcon
|
||||||
} from '@mui/material'
|
} from '@mui/material'
|
||||||
import { useRecoilState } from 'recoil'
|
import { useRecoilState, useRecoilValue } from 'recoil'
|
||||||
import { listViewState } from '../atoms/settings'
|
import { listViewState, serverURL } from '../atoms/settings'
|
||||||
import { useI18n } from '../hooks/useI18n'
|
import { useI18n } from '../hooks/useI18n'
|
||||||
import { useRPC } from '../hooks/useRPC'
|
import { useRPC } from '../hooks/useRPC'
|
||||||
|
|
||||||
@@ -18,28 +20,32 @@ type Props = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const HomeSpeedDial: React.FC<Props> = ({ onDownloadOpen, onEditorOpen }) => {
|
const HomeSpeedDial: React.FC<Props> = ({ onDownloadOpen, onEditorOpen }) => {
|
||||||
const [, setListView] = useRecoilState(listViewState)
|
const serverAddr = useRecoilValue(serverURL)
|
||||||
|
const [listView, setListView] = useRecoilState(listViewState)
|
||||||
|
|
||||||
const { i18n } = useI18n()
|
const { i18n } = useI18n()
|
||||||
const { client } = useRPC()
|
const { client } = useRPC()
|
||||||
|
|
||||||
const abort = () => client.killAll()
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<SpeedDial
|
<SpeedDial
|
||||||
ariaLabel="Home speed dial"
|
ariaLabel="Home speed dial"
|
||||||
sx={{ position: 'absolute', bottom: 32, right: 32 }}
|
sx={{ position: 'absolute', bottom: 64, right: 24 }}
|
||||||
icon={<SpeedDialIcon />}
|
icon={<SpeedDialIcon />}
|
||||||
>
|
>
|
||||||
<SpeedDialAction
|
<SpeedDialAction
|
||||||
icon={<FormatListBulleted />}
|
icon={listView ? <ViewAgendaIcon /> : <FormatListBulleted />}
|
||||||
tooltipTitle={`Table view`}
|
tooltipTitle={listView ? 'Card view' : 'Table view'}
|
||||||
onClick={() => setListView(state => !state)}
|
onClick={() => setListView(state => !state)}
|
||||||
/>
|
/>
|
||||||
|
<SpeedDialAction
|
||||||
|
icon={<FolderZipIcon />}
|
||||||
|
tooltipTitle={i18n.t('bulkDownload')}
|
||||||
|
onClick={() => window.open(`${serverAddr}/archive/bulk?token=${localStorage.getItem('token')}`)}
|
||||||
|
/>
|
||||||
<SpeedDialAction
|
<SpeedDialAction
|
||||||
icon={<DeleteForeverIcon />}
|
icon={<DeleteForeverIcon />}
|
||||||
tooltipTitle={i18n.t('abortAllButton')}
|
tooltipTitle={i18n.t('abortAllButton')}
|
||||||
onClick={abort}
|
onClick={() => client.killAll()}
|
||||||
/>
|
/>
|
||||||
<SpeedDialAction
|
<SpeedDialAction
|
||||||
icon={<BuildCircleIcon />}
|
icon={<BuildCircleIcon />}
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
import { Backdrop, CircularProgress } from '@mui/material'
|
import { Backdrop, CircularProgress } from '@mui/material'
|
||||||
import { useRecoilValue } from 'recoil'
|
|
||||||
import { loadingAtom } from '../atoms/ui'
|
|
||||||
|
|
||||||
const LoadingBackdrop: React.FC = () => {
|
type Props = {
|
||||||
const isLoading = useRecoilValue(loadingAtom)
|
isLoading: boolean
|
||||||
|
}
|
||||||
|
|
||||||
|
const LoadingBackdrop: React.FC<Props> = ({ isLoading }) => {
|
||||||
return (
|
return (
|
||||||
<Backdrop
|
<Backdrop
|
||||||
sx={{ color: '#fff', zIndex: (theme) => theme.zIndex.drawer + 1 }}
|
sx={{ color: '#fff', zIndex: (theme) => theme.zIndex.drawer + 1 }}
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import { Box, Container, Paper, Typography } from '@mui/material'
|
|
||||||
import { useEffect, useMemo, useRef, useState } from 'react'
|
import { useEffect, useMemo, useRef, useState } from 'react'
|
||||||
import { useRecoilValue } from 'recoil'
|
import { useRecoilValue } from 'recoil'
|
||||||
import { serverURL } from '../atoms/settings'
|
import { serverURL } from '../atoms/settings'
|
||||||
@@ -7,14 +6,15 @@ import { useI18n } from '../hooks/useI18n'
|
|||||||
const token = localStorage.getItem('token')
|
const token = localStorage.getItem('token')
|
||||||
|
|
||||||
const LogTerminal: React.FC = () => {
|
const LogTerminal: React.FC = () => {
|
||||||
|
const [logBuffer, setLogBuffer] = useState<string[]>([])
|
||||||
|
const [isConnecting, setIsConnecting] = useState(true)
|
||||||
|
|
||||||
|
const boxRef = useRef<HTMLDivElement>(null)
|
||||||
|
|
||||||
const serverAddr = useRecoilValue(serverURL)
|
const serverAddr = useRecoilValue(serverURL)
|
||||||
|
|
||||||
const { i18n } = useI18n()
|
const { i18n } = useI18n()
|
||||||
|
|
||||||
const [logBuffer, setLogBuffer] = useState<string[]>([])
|
|
||||||
|
|
||||||
const boxRef = useRef<HTMLDivElement>(null)
|
|
||||||
|
|
||||||
const eventSource = useMemo(
|
const eventSource = useMemo(
|
||||||
() => new EventSource(`${serverAddr}/log/sse?token=${token}`),
|
() => new EventSource(`${serverAddr}/log/sse?token=${token}`),
|
||||||
[serverAddr]
|
[serverAddr]
|
||||||
@@ -22,8 +22,8 @@ const LogTerminal: React.FC = () => {
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
eventSource.addEventListener('log', event => {
|
eventSource.addEventListener('log', event => {
|
||||||
const msg: string[] = JSON.parse(event.data)
|
const msg: string = JSON.parse(event.data)
|
||||||
setLogBuffer(buff => [...buff, ...msg].slice(-100))
|
setLogBuffer(buff => [...buff, msg].slice(-500))
|
||||||
|
|
||||||
boxRef.current?.scrollTo(0, boxRef.current.scrollHeight)
|
boxRef.current?.scrollTo(0, boxRef.current.scrollHeight)
|
||||||
})
|
})
|
||||||
@@ -32,6 +32,10 @@ const LogTerminal: React.FC = () => {
|
|||||||
return () => eventSource.close()
|
return () => eventSource.close()
|
||||||
}, [eventSource])
|
}, [eventSource])
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
eventSource.onopen = () => setIsConnecting(false)
|
||||||
|
}, [eventSource])
|
||||||
|
|
||||||
const logEntryStyle = (data: string) => {
|
const logEntryStyle = (data: string) => {
|
||||||
const sx = {}
|
const sx = {}
|
||||||
|
|
||||||
@@ -46,41 +50,33 @@ const LogTerminal: React.FC = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Container maxWidth="lg" sx={{ mt: 4, mb: 4 }}>
|
|
||||||
<Paper
|
<div
|
||||||
sx={{
|
ref={boxRef}
|
||||||
p: 2.5,
|
style={{
|
||||||
display: 'flex',
|
fontFamily: 'Roboto Mono',
|
||||||
flexDirection: 'column',
|
height: '70.5vh',
|
||||||
}}
|
overflowY: 'auto',
|
||||||
>
|
overflowX: 'auto',
|
||||||
<Typography py={1} variant="h5" color="primary">
|
fontSize: '13.5px',
|
||||||
{i18n.t('logsTitle')}
|
fontWeight: '600',
|
||||||
</Typography>
|
backgroundColor: 'black',
|
||||||
<Box
|
color: 'white',
|
||||||
ref={boxRef}
|
padding: '0.5rem',
|
||||||
sx={{
|
borderRadius: '0.25rem'
|
||||||
fontFamily: 'Roboto Mono',
|
}}
|
||||||
height: '75.5vh',
|
>
|
||||||
overflowY: 'auto',
|
{isConnecting ? <div>{'Connecting...'}</div> : <div>{'Connected!'}</div>}
|
||||||
overflowX: 'auto',
|
|
||||||
fontSize: '13.5px',
|
{logBuffer.length === 0 && <div>{i18n.t('awaitingLogs')}</div>}
|
||||||
fontWeight: '600',
|
|
||||||
backgroundColor: 'black',
|
{logBuffer.map((log, idx) => (
|
||||||
color: 'white',
|
<div key={idx} style={logEntryStyle(log)}>
|
||||||
padding: '0.5rem',
|
{log}
|
||||||
borderRadius: '0.25rem'
|
</div>
|
||||||
}}
|
))}
|
||||||
>
|
</div>
|
||||||
{logBuffer.length === 0 && <Box >{i18n.t('awaitingLogs')}</Box>}
|
|
||||||
{logBuffer.map((log, idx) => (
|
|
||||||
<Box key={idx} sx={logEntryStyle(log)}>
|
|
||||||
{log}
|
|
||||||
</Box>
|
|
||||||
))}
|
|
||||||
</Box>
|
|
||||||
</Paper>
|
|
||||||
</Container >
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,10 @@
|
|||||||
import LogoutIcon from '@mui/icons-material/Logout'
|
import LogoutIcon from '@mui/icons-material/Logout'
|
||||||
import { ListItemButton, ListItemIcon, ListItemText } from '@mui/material'
|
import { ListItemButton, ListItemIcon, ListItemText } from '@mui/material'
|
||||||
import { useNavigate } from 'react-router-dom'
|
import { useNavigate } from 'react-router-dom'
|
||||||
import { useRecoilValue } from 'recoil'
|
|
||||||
import { serverURL } from '../atoms/settings'
|
|
||||||
import { useI18n } from '../hooks/useI18n'
|
import { useI18n } from '../hooks/useI18n'
|
||||||
|
|
||||||
export default function Logout() {
|
export default function Logout() {
|
||||||
const navigate = useNavigate()
|
const navigate = useNavigate()
|
||||||
const url = useRecoilValue(serverURL)
|
|
||||||
|
|
||||||
const logout = async () => {
|
const logout = async () => {
|
||||||
localStorage.removeItem('token')
|
localStorage.removeItem('token')
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import { useNavigate } from 'react-router-dom'
|
|||||||
import { useRecoilState, useRecoilValue } from 'recoil'
|
import { useRecoilState, useRecoilValue } from 'recoil'
|
||||||
import { take, timer } from 'rxjs'
|
import { take, timer } from 'rxjs'
|
||||||
import { downloadsState } from '../atoms/downloads'
|
import { downloadsState } from '../atoms/downloads'
|
||||||
|
import { rpcPollingTimeState } from '../atoms/rpc'
|
||||||
import { serverAddressAndPortState } from '../atoms/settings'
|
import { serverAddressAndPortState } from '../atoms/settings'
|
||||||
import { connectedState } from '../atoms/status'
|
import { connectedState } from '../atoms/status'
|
||||||
import { useSubscription } from '../hooks/observable'
|
import { useSubscription } from '../hooks/observable'
|
||||||
@@ -19,6 +20,7 @@ const SocketSubscriber: React.FC<Props> = () => {
|
|||||||
const [, setDownloads] = useRecoilState(downloadsState)
|
const [, setDownloads] = useRecoilState(downloadsState)
|
||||||
|
|
||||||
const serverAddressAndPort = useRecoilValue(serverAddressAndPortState)
|
const serverAddressAndPort = useRecoilValue(serverAddressAndPortState)
|
||||||
|
const rpcPollingTime = useRecoilValue(rpcPollingTimeState)
|
||||||
|
|
||||||
const { i18n } = useI18n()
|
const { i18n } = useI18n()
|
||||||
const { client } = useRPC()
|
const { client } = useRPC()
|
||||||
@@ -52,7 +54,7 @@ const SocketSubscriber: React.FC<Props> = () => {
|
|||||||
.filter(f => !!f.info.url).sort((a, b) => datetimeCompareFunc(
|
.filter(f => !!f.info.url).sort((a, b) => datetimeCompareFunc(
|
||||||
b.info.created_at,
|
b.info.created_at,
|
||||||
a.info.created_at,
|
a.info.created_at,
|
||||||
))
|
)),
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -70,11 +72,10 @@ const SocketSubscriber: React.FC<Props> = () => {
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (connected) {
|
if (connected) {
|
||||||
const sub = timer(0, 1000).subscribe(() => client.running())
|
const sub = timer(0, rpcPollingTime).subscribe(() => client.running())
|
||||||
|
|
||||||
return () => sub.unsubscribe()
|
return () => sub.unsubscribe()
|
||||||
}
|
}
|
||||||
}, [connected, client])
|
}, [connected, client, rpcPollingTime])
|
||||||
|
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import AddIcon from '@mui/icons-material/Add'
|
|||||||
import CloseIcon from '@mui/icons-material/Close'
|
import CloseIcon from '@mui/icons-material/Close'
|
||||||
import DeleteIcon from '@mui/icons-material/Delete'
|
import DeleteIcon from '@mui/icons-material/Delete'
|
||||||
import {
|
import {
|
||||||
|
Alert,
|
||||||
AppBar,
|
AppBar,
|
||||||
Backdrop,
|
Backdrop,
|
||||||
Box,
|
Box,
|
||||||
@@ -145,7 +146,12 @@ const TemplatesEditor: React.FC<Props> = ({ open, onClose }) => {
|
|||||||
backgroundColor: (theme) => theme.palette.background.default,
|
backgroundColor: (theme) => theme.palette.background.default,
|
||||||
minHeight: (theme) => `calc(99vh - ${theme.mixins.toolbar.minHeight}px)`
|
minHeight: (theme) => `calc(99vh - ${theme.mixins.toolbar.minHeight}px)`
|
||||||
}}>
|
}}>
|
||||||
<Grid container spacing={2} sx={{ p: 4 }}>
|
<Grid container spacing={2} sx={{ px: 4, pt: 3, pb: 4 }}>
|
||||||
|
<Grid item>
|
||||||
|
<Alert severity="info">
|
||||||
|
{i18n.t('templatesReloadInfo')}
|
||||||
|
</Alert>
|
||||||
|
</Grid>
|
||||||
<Grid item xs={12}>
|
<Grid item xs={12}>
|
||||||
<Paper
|
<Paper
|
||||||
elevation={4}
|
elevation={4}
|
||||||
|
|||||||
16
frontend/src/components/VersionIndicator.tsx
Normal file
16
frontend/src/components/VersionIndicator.tsx
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
import { Chip } from '@mui/material'
|
||||||
|
import { useRecoilValue } from 'recoil'
|
||||||
|
import { ytdlpRpcVersionState } from '../atoms/status'
|
||||||
|
|
||||||
|
const VersionIndicator: React.FC = () => {
|
||||||
|
const version = useRecoilValue(ytdlpRpcVersionState)
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div style={{ display: 'flex', gap: 4, alignItems: 'center' }}>
|
||||||
|
<Chip label={`RPC v${version.rpcVersion}`} variant="outlined" size="small" />
|
||||||
|
<Chip label={`yt-dlp v${version.ytdlpVersion}`} variant="outlined" size="small" />
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default VersionIndicator
|
||||||
125
frontend/src/components/livestream/LivestreamDialog.tsx
Normal file
125
frontend/src/components/livestream/LivestreamDialog.tsx
Normal file
@@ -0,0 +1,125 @@
|
|||||||
|
import CloseIcon from '@mui/icons-material/Close'
|
||||||
|
import {
|
||||||
|
Alert,
|
||||||
|
AppBar,
|
||||||
|
Box,
|
||||||
|
Button,
|
||||||
|
Container,
|
||||||
|
Dialog,
|
||||||
|
Grid,
|
||||||
|
IconButton,
|
||||||
|
Paper,
|
||||||
|
Slide,
|
||||||
|
TextField,
|
||||||
|
Toolbar,
|
||||||
|
Typography
|
||||||
|
} from '@mui/material'
|
||||||
|
import { TransitionProps } from '@mui/material/transitions'
|
||||||
|
import { forwardRef, useState } from 'react'
|
||||||
|
import { useToast } from '../../hooks/toast'
|
||||||
|
import { useI18n } from '../../hooks/useI18n'
|
||||||
|
import { useRPC } from '../../hooks/useRPC'
|
||||||
|
|
||||||
|
type Props = {
|
||||||
|
open: boolean
|
||||||
|
onClose: () => void
|
||||||
|
}
|
||||||
|
|
||||||
|
const Transition = forwardRef(function Transition(
|
||||||
|
props: TransitionProps & {
|
||||||
|
children: React.ReactElement
|
||||||
|
},
|
||||||
|
ref: React.Ref<unknown>,
|
||||||
|
) {
|
||||||
|
return <Slide direction="up" ref={ref} {...props} />
|
||||||
|
})
|
||||||
|
|
||||||
|
const LivestreamDialog: React.FC<Props> = ({ open, onClose }) => {
|
||||||
|
const [livestreamURL, setLivestreamURL] = useState('')
|
||||||
|
|
||||||
|
const { i18n } = useI18n()
|
||||||
|
const { client } = useRPC()
|
||||||
|
const { pushMessage } = useToast()
|
||||||
|
|
||||||
|
const exec = (url: string) => client.execLivestream(url)
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Dialog
|
||||||
|
fullScreen
|
||||||
|
open={open}
|
||||||
|
onClose={onClose}
|
||||||
|
TransitionComponent={Transition}
|
||||||
|
>
|
||||||
|
<AppBar sx={{ position: 'relative' }}>
|
||||||
|
<Toolbar>
|
||||||
|
<IconButton
|
||||||
|
edge="start"
|
||||||
|
color="inherit"
|
||||||
|
onClick={onClose}
|
||||||
|
aria-label="close"
|
||||||
|
>
|
||||||
|
<CloseIcon />
|
||||||
|
</IconButton>
|
||||||
|
<Typography sx={{ ml: 2, flex: 1 }} variant="h6" component="div">
|
||||||
|
Livestream monitor
|
||||||
|
</Typography>
|
||||||
|
</Toolbar>
|
||||||
|
</AppBar>
|
||||||
|
<Box sx={{
|
||||||
|
backgroundColor: (theme) => theme.palette.background.default,
|
||||||
|
minHeight: (theme) => `calc(99vh - ${theme.mixins.toolbar.minHeight}px)`
|
||||||
|
}}>
|
||||||
|
<Container sx={{ my: 4 }}>
|
||||||
|
<Grid container spacing={2}>
|
||||||
|
<Grid item xs={12}>
|
||||||
|
<Paper
|
||||||
|
elevation={4}
|
||||||
|
sx={{
|
||||||
|
p: 2,
|
||||||
|
display: 'flex',
|
||||||
|
flexDirection: 'column',
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Grid container>
|
||||||
|
<Grid item xs={12} mb={2}>
|
||||||
|
<Alert severity="info">
|
||||||
|
{i18n.t('livestreamDownloadInfo')}
|
||||||
|
</Alert>
|
||||||
|
<Alert severity="warning" sx={{ mt: 1 }}>
|
||||||
|
{i18n.t('livestreamExperimentalWarning')}
|
||||||
|
</Alert>
|
||||||
|
</Grid>
|
||||||
|
<Grid item xs={12}>
|
||||||
|
<TextField
|
||||||
|
multiline
|
||||||
|
fullWidth
|
||||||
|
label={i18n.t('livestreamURLInput')}
|
||||||
|
variant="outlined"
|
||||||
|
onChange={(e) => setLivestreamURL(e.target.value)}
|
||||||
|
/>
|
||||||
|
</Grid>
|
||||||
|
<Grid item>
|
||||||
|
<Button
|
||||||
|
sx={{ mt: 2 }}
|
||||||
|
variant="contained"
|
||||||
|
disabled={livestreamURL === ''}
|
||||||
|
onClick={() => {
|
||||||
|
exec(livestreamURL)
|
||||||
|
onClose()
|
||||||
|
pushMessage(`Monitoring ${livestreamURL}`, 'info')
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{i18n.t('startButton')}
|
||||||
|
</Button>
|
||||||
|
</Grid>
|
||||||
|
</Grid>
|
||||||
|
</Paper>
|
||||||
|
</Grid>
|
||||||
|
</Grid>
|
||||||
|
</Container>
|
||||||
|
</Box>
|
||||||
|
</Dialog>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default LivestreamDialog
|
||||||
34
frontend/src/components/livestream/LivestreamSpeedDial.tsx
Normal file
34
frontend/src/components/livestream/LivestreamSpeedDial.tsx
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
import AddCircleIcon from '@mui/icons-material/AddCircle'
|
||||||
|
import DeleteForeverIcon from '@mui/icons-material/DeleteForever'
|
||||||
|
import { SpeedDial, SpeedDialAction, SpeedDialIcon } from '@mui/material'
|
||||||
|
import { useI18n } from '../../hooks/useI18n'
|
||||||
|
|
||||||
|
type Props = {
|
||||||
|
onOpen: () => void
|
||||||
|
onStopAll: () => void
|
||||||
|
}
|
||||||
|
|
||||||
|
const LivestreamSpeedDial: React.FC<Props> = ({ onOpen, onStopAll }) => {
|
||||||
|
const { i18n } = useI18n()
|
||||||
|
|
||||||
|
return (
|
||||||
|
<SpeedDial
|
||||||
|
ariaLabel="Home speed dial"
|
||||||
|
sx={{ position: 'absolute', bottom: 64, right: 24 }}
|
||||||
|
icon={<SpeedDialIcon />}
|
||||||
|
>
|
||||||
|
<SpeedDialAction
|
||||||
|
icon={<DeleteForeverIcon />}
|
||||||
|
tooltipTitle={i18n.t('abortAllButton')}
|
||||||
|
onClick={onStopAll}
|
||||||
|
/>
|
||||||
|
<SpeedDialAction
|
||||||
|
icon={<AddCircleIcon />}
|
||||||
|
tooltipTitle={i18n.t('newDownloadButton')}
|
||||||
|
onClick={onOpen}
|
||||||
|
/>
|
||||||
|
</SpeedDial>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default LivestreamSpeedDial
|
||||||
38
frontend/src/components/livestream/NoLivestreams.tsx
Normal file
38
frontend/src/components/livestream/NoLivestreams.tsx
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
import LiveTvIcon from '@mui/icons-material/LiveTv'
|
||||||
|
import { Container, SvgIcon, Typography, styled } from '@mui/material'
|
||||||
|
import { useI18n } from '../../hooks/useI18n'
|
||||||
|
|
||||||
|
const FlexContainer = styled(Container)({
|
||||||
|
display: 'flex',
|
||||||
|
minWidth: '100%',
|
||||||
|
minHeight: '80vh',
|
||||||
|
alignItems: 'center',
|
||||||
|
justifyContent: 'center',
|
||||||
|
flexDirection: 'column'
|
||||||
|
})
|
||||||
|
|
||||||
|
const Title = styled(Typography)({
|
||||||
|
display: 'flex',
|
||||||
|
width: '100%',
|
||||||
|
alignItems: 'center',
|
||||||
|
justifyContent: 'center',
|
||||||
|
paddingBottom: '0.5rem'
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
export default function NoLivestreams() {
|
||||||
|
const { i18n } = useI18n()
|
||||||
|
|
||||||
|
return (
|
||||||
|
<FlexContainer>
|
||||||
|
<Title fontWeight={'500'} fontSize={72} color={'gray'}>
|
||||||
|
<SvgIcon sx={{ fontSize: '200px' }}>
|
||||||
|
<LiveTvIcon />
|
||||||
|
</SvgIcon>
|
||||||
|
</Title>
|
||||||
|
<Title fontWeight={'500'} fontSize={36} color={'gray'}>
|
||||||
|
No livestreams monitored
|
||||||
|
</Title>
|
||||||
|
</FlexContainer>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -6,7 +6,6 @@ import '@fontsource/roboto/300.css'
|
|||||||
import '@fontsource/roboto/400.css'
|
import '@fontsource/roboto/400.css'
|
||||||
import '@fontsource/roboto/500.css'
|
import '@fontsource/roboto/500.css'
|
||||||
import '@fontsource/roboto/700.css'
|
import '@fontsource/roboto/700.css'
|
||||||
import '@fontsource/roboto/700.css'
|
|
||||||
|
|
||||||
import '@fontsource/roboto-mono'
|
import '@fontsource/roboto-mono'
|
||||||
|
|
||||||
|
|||||||
@@ -1,66 +0,0 @@
|
|||||||
export class CliArguments {
|
|
||||||
private _extractAudio: boolean
|
|
||||||
private _noMTime: boolean
|
|
||||||
|
|
||||||
constructor(extractAudio = false, noMTime = true) {
|
|
||||||
this._extractAudio = extractAudio
|
|
||||||
this._noMTime = noMTime
|
|
||||||
}
|
|
||||||
|
|
||||||
public get extractAudio(): boolean {
|
|
||||||
return this._extractAudio
|
|
||||||
}
|
|
||||||
|
|
||||||
public toggleExtractAudio() {
|
|
||||||
this._extractAudio = !this._extractAudio
|
|
||||||
return this
|
|
||||||
}
|
|
||||||
|
|
||||||
public disableExtractAudio() {
|
|
||||||
this._extractAudio = false
|
|
||||||
return this
|
|
||||||
}
|
|
||||||
|
|
||||||
public get noMTime(): boolean {
|
|
||||||
return this._noMTime
|
|
||||||
}
|
|
||||||
|
|
||||||
public toggleNoMTime() {
|
|
||||||
this._noMTime = !this._noMTime
|
|
||||||
return this
|
|
||||||
}
|
|
||||||
|
|
||||||
public toString(): string {
|
|
||||||
let args = ''
|
|
||||||
|
|
||||||
if (this._extractAudio) {
|
|
||||||
args += '-x '
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this._noMTime) {
|
|
||||||
args += '--no-mtime '
|
|
||||||
}
|
|
||||||
|
|
||||||
return args.trim()
|
|
||||||
}
|
|
||||||
|
|
||||||
private reset() {
|
|
||||||
this._extractAudio = false
|
|
||||||
this._noMTime = false
|
|
||||||
}
|
|
||||||
|
|
||||||
public fromString(str: string): CliArguments {
|
|
||||||
this.reset()
|
|
||||||
|
|
||||||
if (str) {
|
|
||||||
if (str.includes('-x')) {
|
|
||||||
this._extractAudio = true
|
|
||||||
}
|
|
||||||
|
|
||||||
if (str.includes('--no-mtime')) {
|
|
||||||
this._noMTime = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return this
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Observable } from 'rxjs'
|
import { Observable } from 'rxjs'
|
||||||
import type { DLMetadata, RPCRequest, RPCResponse, RPCResult } from '../types'
|
import type { DLMetadata, LiveStreamProgress, RPCRequest, RPCResponse, RPCResult } from '../types'
|
||||||
|
|
||||||
import { WebSocketSubject, webSocket } from 'rxjs/webSocket'
|
import { WebSocketSubject, webSocket } from 'rxjs/webSocket'
|
||||||
|
|
||||||
@@ -82,7 +82,9 @@ export class RPCClient {
|
|||||||
: ''
|
: ''
|
||||||
|
|
||||||
const sanitizedArgs = this.argsSanitizer(
|
const sanitizedArgs = this.argsSanitizer(
|
||||||
req.args.replace('-o', '').replace(rename, '')
|
req.args
|
||||||
|
.replace('-o', '')
|
||||||
|
.replace(rename, '')
|
||||||
)
|
)
|
||||||
|
|
||||||
if (req.playlist) {
|
if (req.playlist) {
|
||||||
@@ -132,6 +134,13 @@ export class RPCClient {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public clear(id: string) {
|
||||||
|
this.sendHTTP({
|
||||||
|
method: 'Service.Clear',
|
||||||
|
params: [id],
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
public killAll() {
|
public killAll() {
|
||||||
this.sendHTTP({
|
this.sendHTTP({
|
||||||
method: 'Service.KillAll',
|
method: 'Service.KillAll',
|
||||||
@@ -153,9 +162,32 @@ export class RPCClient {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
public updateExecutable() {
|
public execLivestream(url: string) {
|
||||||
return this.sendHTTP({
|
return this.sendHTTP({
|
||||||
method: 'Service.UpdateExecutable',
|
method: 'Service.ExecLivestream',
|
||||||
|
params: [{
|
||||||
|
URL: url
|
||||||
|
}]
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
public progressLivestream() {
|
||||||
|
return this.sendHTTP<LiveStreamProgress>({
|
||||||
|
method: 'Service.ProgressLivestream',
|
||||||
|
params: []
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
public killLivestream(url: string) {
|
||||||
|
return this.sendHTTP({
|
||||||
|
method: 'Service.KillLivestream',
|
||||||
|
params: [url]
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
public killAllLivestream() {
|
||||||
|
return this.sendHTTP({
|
||||||
|
method: 'Service.KillAllLivestream',
|
||||||
params: []
|
params: []
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ const Home = lazy(() => import('./views/Home'))
|
|||||||
const Login = lazy(() => import('./views/Login'))
|
const Login = lazy(() => import('./views/Login'))
|
||||||
const Archive = lazy(() => import('./views/Archive'))
|
const Archive = lazy(() => import('./views/Archive'))
|
||||||
const Settings = lazy(() => import('./views/Settings'))
|
const Settings = lazy(() => import('./views/Settings'))
|
||||||
|
const LiveStream = lazy(() => import('./views/Livestream'))
|
||||||
|
|
||||||
const ErrorBoundary = lazy(() => import('./components/ErrorBoundary'))
|
const ErrorBoundary = lazy(() => import('./components/ErrorBoundary'))
|
||||||
|
|
||||||
@@ -74,6 +75,14 @@ export const router = createHashRouter([
|
|||||||
</Suspense >
|
</Suspense >
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
path: '/monitor',
|
||||||
|
element: (
|
||||||
|
<Suspense fallback={<CircularProgress />}>
|
||||||
|
<LiveStream />
|
||||||
|
</Suspense >
|
||||||
|
)
|
||||||
|
},
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
])
|
])
|
||||||
@@ -9,6 +9,10 @@ export type RPCMethods =
|
|||||||
| "Service.ExecPlaylist"
|
| "Service.ExecPlaylist"
|
||||||
| "Service.DirectoryTree"
|
| "Service.DirectoryTree"
|
||||||
| "Service.UpdateExecutable"
|
| "Service.UpdateExecutable"
|
||||||
|
| "Service.ExecLivestream"
|
||||||
|
| "Service.ProgressLivestream"
|
||||||
|
| "Service.KillLivestream"
|
||||||
|
| "Service.KillAllLivestream"
|
||||||
|
|
||||||
export type RPCRequest = {
|
export type RPCRequest = {
|
||||||
method: RPCMethods
|
method: RPCMethods
|
||||||
@@ -34,17 +38,28 @@ type DownloadInfo = {
|
|||||||
created_at: string
|
created_at: string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export enum ProcessStatus {
|
||||||
|
PENDING = 0,
|
||||||
|
DOWNLOADING,
|
||||||
|
COMPLETED,
|
||||||
|
ERRORED,
|
||||||
|
LIVESTREAM,
|
||||||
|
}
|
||||||
|
|
||||||
type DownloadProgress = {
|
type DownloadProgress = {
|
||||||
speed: number
|
speed: number
|
||||||
eta: number
|
eta: number
|
||||||
percentage: string
|
percentage: string
|
||||||
process_status: number
|
process_status: ProcessStatus
|
||||||
}
|
}
|
||||||
|
|
||||||
export type RPCResult = Readonly<{
|
export type RPCResult = Readonly<{
|
||||||
id: string
|
id: string
|
||||||
progress: DownloadProgress
|
progress: DownloadProgress
|
||||||
info: DownloadInfo
|
info: DownloadInfo
|
||||||
|
output: {
|
||||||
|
savedFilePath: string
|
||||||
|
}
|
||||||
}>
|
}>
|
||||||
|
|
||||||
export type RPCParams = {
|
export type RPCParams = {
|
||||||
@@ -67,24 +82,42 @@ export type DLFormat = {
|
|||||||
vcodec: string
|
vcodec: string
|
||||||
acodec: string
|
acodec: string
|
||||||
filesize_approx: number
|
filesize_approx: number
|
||||||
|
language: string
|
||||||
}
|
}
|
||||||
|
|
||||||
export type DirectoryEntry = {
|
export type DirectoryEntry = {
|
||||||
name: string
|
name: string
|
||||||
path: string
|
path: string
|
||||||
size: number
|
size: number
|
||||||
shaSum: string
|
|
||||||
modTime: string
|
modTime: string
|
||||||
isVideo: boolean
|
isVideo: boolean
|
||||||
isDirectory: boolean
|
isDirectory: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
export type DeleteRequest = Pick<DirectoryEntry, 'path' | 'shaSum'>
|
export type DeleteRequest = Pick<DirectoryEntry, 'path'>
|
||||||
|
|
||||||
export type PlayRequest = Pick<DirectoryEntry, 'path'>
|
export type PlayRequest = DeleteRequest
|
||||||
|
|
||||||
export type CustomTemplate = {
|
export type CustomTemplate = {
|
||||||
id: string
|
id: string
|
||||||
name: string
|
name: string
|
||||||
content: string
|
content: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export enum LiveStreamStatus {
|
||||||
|
WAITING,
|
||||||
|
IN_PROGRESS,
|
||||||
|
COMPLETED,
|
||||||
|
ERRORED
|
||||||
|
}
|
||||||
|
|
||||||
|
export type LiveStreamProgress = Record<string, {
|
||||||
|
status: LiveStreamStatus
|
||||||
|
waitTime: string
|
||||||
|
liveDate: string
|
||||||
|
}>
|
||||||
|
|
||||||
|
export type RPCVersion = {
|
||||||
|
rpcVersion: string
|
||||||
|
ytdlpVersion: string
|
||||||
}
|
}
|
||||||
@@ -1,11 +1,7 @@
|
|||||||
import { pipe } from 'fp-ts/lib/function'
|
import { pipe } from 'fp-ts/lib/function'
|
||||||
import type { RPCResponse } from "./types"
|
import type { RPCResponse } from "./types"
|
||||||
|
import { ProcessStatus } from './types'
|
||||||
|
|
||||||
/**
|
|
||||||
* Validate an ip v4 via regex
|
|
||||||
* @param {string} ipAddr
|
|
||||||
* @returns ip validity test
|
|
||||||
*/
|
|
||||||
export function validateIP(ipAddr: string): boolean {
|
export function validateIP(ipAddr: string): boolean {
|
||||||
let ipRegex = /^(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}$/gm
|
let ipRegex = /^(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}$/gm
|
||||||
return ipRegex.test(ipAddr)
|
return ipRegex.test(ipAddr)
|
||||||
@@ -20,17 +16,10 @@ export function validateDomain(url: string): boolean {
|
|||||||
return urlRegex.test(url) || name === 'localhost' && slugRegex.test(slug)
|
return urlRegex.test(url) || name === 'localhost' && slugRegex.test(slug)
|
||||||
}
|
}
|
||||||
|
|
||||||
export function isValidURL(url: string): boolean {
|
export const ellipsis = (str: string, lim: number) =>
|
||||||
let urlRegex = /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()!@:%_\+.~#?&\/\/=]*)/
|
str.length > lim
|
||||||
return urlRegex.test(url)
|
? `${str.substring(0, lim)}...`
|
||||||
}
|
: str
|
||||||
|
|
||||||
export function ellipsis(str: string, lim: number): string {
|
|
||||||
if (str) {
|
|
||||||
return str.length > lim ? `${str.substring(0, lim)}...` : str
|
|
||||||
}
|
|
||||||
return ''
|
|
||||||
}
|
|
||||||
|
|
||||||
export function toFormatArgs(codes: string[]): string {
|
export function toFormatArgs(codes: string[]): string {
|
||||||
if (codes.length > 1) {
|
if (codes.length > 1) {
|
||||||
@@ -65,16 +54,18 @@ export function isRPCResponse(object: any): object is RPCResponse<any> {
|
|||||||
return 'result' in object && 'id' in object
|
return 'result' in object && 'id' in object
|
||||||
}
|
}
|
||||||
|
|
||||||
export function mapProcessStatus(status: number) {
|
export function mapProcessStatus(status: ProcessStatus) {
|
||||||
switch (status) {
|
switch (status) {
|
||||||
case 0:
|
case ProcessStatus.PENDING:
|
||||||
return 'Pending'
|
return 'Pending'
|
||||||
case 1:
|
case ProcessStatus.DOWNLOADING:
|
||||||
return 'Downloading'
|
return 'Downloading'
|
||||||
case 2:
|
case ProcessStatus.COMPLETED:
|
||||||
return 'Completed'
|
return 'Completed'
|
||||||
case 3:
|
case ProcessStatus.ERRORED:
|
||||||
return 'Error'
|
return 'Error'
|
||||||
|
case ProcessStatus.LIVESTREAM:
|
||||||
|
return 'Livestream'
|
||||||
default:
|
default:
|
||||||
return 'Pending'
|
return 'Pending'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -113,7 +113,6 @@ export default function Downloaded() {
|
|||||||
modTime: '',
|
modTime: '',
|
||||||
name: '..',
|
name: '..',
|
||||||
path: upperLevel,
|
path: upperLevel,
|
||||||
shaSum: '',
|
|
||||||
size: 0,
|
size: 0,
|
||||||
}, ...r.filter(f => f.name !== '')]
|
}, ...r.filter(f => f.name !== '')]
|
||||||
: r.filter(f => f.name !== '')
|
: r.filter(f => f.name !== '')
|
||||||
@@ -144,7 +143,6 @@ export default function Downloaded() {
|
|||||||
method: 'POST',
|
method: 'POST',
|
||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
path: entry.path,
|
path: entry.path,
|
||||||
shaSum: entry.shaSum,
|
|
||||||
})
|
})
|
||||||
}),
|
}),
|
||||||
matchW(
|
matchW(
|
||||||
@@ -182,7 +180,7 @@ export default function Downloaded() {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Container
|
<Container
|
||||||
maxWidth="lg"
|
maxWidth="xl"
|
||||||
sx={{ mt: 4, mb: 4, height: '100%' }}
|
sx={{ mt: 4, mb: 4, height: '100%' }}
|
||||||
onClick={() => setShowMenu(false)}
|
onClick={() => setShowMenu(false)}
|
||||||
>
|
>
|
||||||
@@ -274,8 +272,8 @@ export default function Downloaded() {
|
|||||||
</List>
|
</List>
|
||||||
</Paper>
|
</Paper>
|
||||||
<SpeedDial
|
<SpeedDial
|
||||||
ariaLabel="SpeedDial basic example"
|
ariaLabel='archive actions'
|
||||||
sx={{ position: 'absolute', bottom: 32, right: 32 }}
|
sx={{ position: 'absolute', bottom: 64, right: 24 }}
|
||||||
icon={<SpeedDialIcon />}
|
icon={<SpeedDialIcon />}
|
||||||
>
|
>
|
||||||
<SpeedDialAction
|
<SpeedDialAction
|
||||||
|
|||||||
@@ -1,15 +1,19 @@
|
|||||||
import {
|
import {
|
||||||
Container
|
Container
|
||||||
} from '@mui/material'
|
} from '@mui/material'
|
||||||
|
import { useRecoilValue } from 'recoil'
|
||||||
|
import { loadingAtom } from '../atoms/ui'
|
||||||
import Downloads from '../components/Downloads'
|
import Downloads from '../components/Downloads'
|
||||||
import HomeActions from '../components/HomeActions'
|
import HomeActions from '../components/HomeActions'
|
||||||
import LoadingBackdrop from '../components/LoadingBackdrop'
|
import LoadingBackdrop from '../components/LoadingBackdrop'
|
||||||
import Splash from '../components/Splash'
|
import Splash from '../components/Splash'
|
||||||
|
|
||||||
export default function Home() {
|
export default function Home() {
|
||||||
|
const isLoading = useRecoilValue(loadingAtom)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Container maxWidth="lg" sx={{ mt: 4, mb: 4 }}>
|
<Container maxWidth="xl" sx={{ mt: 2, mb: 8 }}>
|
||||||
<LoadingBackdrop />
|
<LoadingBackdrop isLoading={isLoading} />
|
||||||
<Splash />
|
<Splash />
|
||||||
<Downloads />
|
<Downloads />
|
||||||
<HomeActions />
|
<HomeActions />
|
||||||
|
|||||||
134
frontend/src/views/Livestream.tsx
Normal file
134
frontend/src/views/Livestream.tsx
Normal file
@@ -0,0 +1,134 @@
|
|||||||
|
import {
|
||||||
|
Box,
|
||||||
|
Button,
|
||||||
|
Chip,
|
||||||
|
Container,
|
||||||
|
Paper,
|
||||||
|
Table, TableBody, TableCell, TableContainer, TableHead, TableRow
|
||||||
|
} from '@mui/material'
|
||||||
|
import { useState } from 'react'
|
||||||
|
import { interval } from 'rxjs'
|
||||||
|
import LivestreamDialog from '../components/livestream/LivestreamDialog'
|
||||||
|
import LivestreamSpeedDial from '../components/livestream/LivestreamSpeedDial'
|
||||||
|
import NoLivestreams from '../components/livestream/NoLivestreams'
|
||||||
|
import LoadingBackdrop from '../components/LoadingBackdrop'
|
||||||
|
import { useSubscription } from '../hooks/observable'
|
||||||
|
import { useI18n } from '../hooks/useI18n'
|
||||||
|
import { useRPC } from '../hooks/useRPC'
|
||||||
|
import { LiveStreamProgress, LiveStreamStatus } from '../types'
|
||||||
|
|
||||||
|
const LiveStreamMonitorView: React.FC = () => {
|
||||||
|
const { i18n } = useI18n()
|
||||||
|
const { client } = useRPC()
|
||||||
|
|
||||||
|
const [progress, setProgress] = useState<LiveStreamProgress>()
|
||||||
|
const [openDialog, setOpenDialog] = useState(false)
|
||||||
|
|
||||||
|
useSubscription(interval(1000), () => {
|
||||||
|
client
|
||||||
|
.progressLivestream()
|
||||||
|
.then(r => setProgress(r.result))
|
||||||
|
})
|
||||||
|
|
||||||
|
const formatMicro = (microseconds: number) => {
|
||||||
|
const ms = microseconds / 1_000_000
|
||||||
|
let s = ms / 1000
|
||||||
|
|
||||||
|
const hr = s / 3600
|
||||||
|
s %= 3600
|
||||||
|
|
||||||
|
const mt = s / 60
|
||||||
|
s %= 60
|
||||||
|
|
||||||
|
// huh?
|
||||||
|
const ss = (Math.abs(s - 1)).toFixed(0).padStart(2, '0')
|
||||||
|
const mts = mt.toFixed(0).padStart(2, '0')
|
||||||
|
const hrs = hr.toFixed(0).padStart(2, '0')
|
||||||
|
|
||||||
|
return `${hrs}:${mts}:${ss}`
|
||||||
|
}
|
||||||
|
|
||||||
|
const mapStatusToChip = (status: LiveStreamStatus): React.ReactNode => {
|
||||||
|
switch (status) {
|
||||||
|
case LiveStreamStatus.WAITING:
|
||||||
|
return <Chip label='Waiting/Wait start' color='warning' size='small' />
|
||||||
|
case LiveStreamStatus.IN_PROGRESS:
|
||||||
|
return <Chip label='Downloading' color='primary' size='small' />
|
||||||
|
case LiveStreamStatus.COMPLETED:
|
||||||
|
return <Chip label='Completed' color='success' size='small' />
|
||||||
|
case LiveStreamStatus.ERRORED:
|
||||||
|
return <Chip label='Errored' color='error' size='small' />
|
||||||
|
default:
|
||||||
|
return <Chip label='Unknown state' color='secondary' size='small' />
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const stopAll = () => client.killAllLivestream()
|
||||||
|
const stop = (url: string) => client.killLivestream(url)
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<LoadingBackdrop isLoading={!progress} />
|
||||||
|
|
||||||
|
<LivestreamSpeedDial onOpen={() => setOpenDialog(s => !s)} onStopAll={stopAll} />
|
||||||
|
<LivestreamDialog open={openDialog} onClose={() => setOpenDialog(s => !s)} />
|
||||||
|
|
||||||
|
{!progress || Object.keys(progress).length === 0 ?
|
||||||
|
<NoLivestreams /> :
|
||||||
|
<Container maxWidth="xl" sx={{ mt: 4, mb: 8 }}>
|
||||||
|
<Paper sx={{
|
||||||
|
p: 2.5,
|
||||||
|
display: 'flex',
|
||||||
|
flexDirection: 'column',
|
||||||
|
minHeight: '80vh',
|
||||||
|
}}>
|
||||||
|
<TableContainer component={Box}>
|
||||||
|
<Table sx={{ minWidth: '100%' }}>
|
||||||
|
<TableHead>
|
||||||
|
<TableRow>
|
||||||
|
<TableCell>{i18n.t('livestreamURLInput')}</TableCell>
|
||||||
|
<TableCell align="right">Status</TableCell>
|
||||||
|
<TableCell align="right">Time to live</TableCell>
|
||||||
|
<TableCell align="right">Starts on</TableCell>
|
||||||
|
<TableCell align="right">Actions</TableCell>
|
||||||
|
</TableRow>
|
||||||
|
</TableHead>
|
||||||
|
<TableBody>
|
||||||
|
{progress && Object.keys(progress).map(k => (
|
||||||
|
<TableRow
|
||||||
|
key={k}
|
||||||
|
sx={{ '&:last-child td, &:last-child th': { border: 0 } }}
|
||||||
|
>
|
||||||
|
<TableCell>{k}</TableCell>
|
||||||
|
<TableCell align='right'>
|
||||||
|
{mapStatusToChip(progress[k].status)}
|
||||||
|
</TableCell>
|
||||||
|
<TableCell align='right'>
|
||||||
|
{progress[k].status === LiveStreamStatus.WAITING
|
||||||
|
? formatMicro(Number(progress[k].waitTime))
|
||||||
|
: "-"
|
||||||
|
}
|
||||||
|
</TableCell>
|
||||||
|
<TableCell align='right'>
|
||||||
|
{progress[k].status === LiveStreamStatus.WAITING
|
||||||
|
? new Date(progress[k].liveDate).toLocaleString()
|
||||||
|
: "-"
|
||||||
|
}
|
||||||
|
</TableCell>
|
||||||
|
<TableCell align='right'>
|
||||||
|
<Button variant='contained' size='small' onClick={() => stop(k)}>
|
||||||
|
Stop
|
||||||
|
</Button>
|
||||||
|
</TableCell>
|
||||||
|
</TableRow>
|
||||||
|
))}
|
||||||
|
</TableBody>
|
||||||
|
</Table>
|
||||||
|
</TableContainer>
|
||||||
|
</Paper>
|
||||||
|
</Container>}
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default LiveStreamMonitorView
|
||||||
@@ -6,19 +6,20 @@ import styled from '@emotion/styled'
|
|||||||
import {
|
import {
|
||||||
Button,
|
Button,
|
||||||
Container,
|
Container,
|
||||||
|
Divider,
|
||||||
Paper,
|
Paper,
|
||||||
Stack,
|
Stack,
|
||||||
TextField,
|
TextField,
|
||||||
Typography
|
Typography
|
||||||
} from '@mui/material'
|
} from '@mui/material'
|
||||||
|
import { matchW } from 'fp-ts/lib/TaskEither'
|
||||||
|
import { pipe } from 'fp-ts/lib/function'
|
||||||
import { useState } from 'react'
|
import { useState } from 'react'
|
||||||
import { useNavigate } from 'react-router-dom'
|
import { useNavigate } from 'react-router-dom'
|
||||||
import { useRecoilValue } from 'recoil'
|
import { useRecoilValue } from 'recoil'
|
||||||
import { serverURL } from '../atoms/settings'
|
import { serverURL } from '../atoms/settings'
|
||||||
import { useToast } from '../hooks/toast'
|
import { useToast } from '../hooks/toast'
|
||||||
import { ffetch } from '../lib/httpClient'
|
import { ffetch } from '../lib/httpClient'
|
||||||
import { matchW } from 'fp-ts/lib/TaskEither'
|
|
||||||
import { pipe } from 'fp-ts/lib/function'
|
|
||||||
|
|
||||||
const LoginContainer = styled(Container)({
|
const LoginContainer = styled(Container)({
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
@@ -81,6 +82,8 @@ export default function Login() {
|
|||||||
)()
|
)()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const loginWithOpenId = () => window.open(`${url}/auth/openid/login`)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<LoginContainer>
|
<LoginContainer>
|
||||||
<Paper sx={{ padding: '1.5rem', minWidth: '25%' }}>
|
<Paper sx={{ padding: '1.5rem', minWidth: '25%' }}>
|
||||||
@@ -89,12 +92,8 @@ export default function Login() {
|
|||||||
yt-dlp WebUI
|
yt-dlp WebUI
|
||||||
</Title>
|
</Title>
|
||||||
<Title fontWeight={'500'} fontSize={16} color={'gray'}>
|
<Title fontWeight={'500'} fontSize={16} color={'gray'}>
|
||||||
Authentication token will expire after 30 days.
|
To configure authentication check the
|
||||||
</Title>
|
<a href='https://github.com/marcopeocchi/yt-dlp-web-ui/wiki/Authentication-methods'>wiki</a>.
|
||||||
<Title fontWeight={'500'} fontSize={16} color={'gray'}>
|
|
||||||
In order to enable RPC authentication append the --auth,
|
|
||||||
<br />
|
|
||||||
--user [username] and --pass [password] flags.
|
|
||||||
</Title>
|
</Title>
|
||||||
<TextField
|
<TextField
|
||||||
label="Username"
|
label="Username"
|
||||||
@@ -113,6 +112,16 @@ export default function Login() {
|
|||||||
<Button variant="contained" size="large" onClick={() => login()}>
|
<Button variant="contained" size="large" onClick={() => login()}>
|
||||||
Submit
|
Submit
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
|
<Divider>
|
||||||
|
<Typography color={'gray'}>
|
||||||
|
or use your authentication provider
|
||||||
|
</Typography>
|
||||||
|
</Divider>
|
||||||
|
|
||||||
|
<Button variant="contained" size="large" onClick={loginWithOpenId}>
|
||||||
|
Login with OpenID
|
||||||
|
</Button>
|
||||||
</Stack>
|
</Stack>
|
||||||
</Paper>
|
</Paper>
|
||||||
</LoginContainer>
|
</LoginContainer>
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import {
|
|||||||
Container,
|
Container,
|
||||||
FormControl,
|
FormControl,
|
||||||
FormControlLabel,
|
FormControlLabel,
|
||||||
FormGroup,
|
|
||||||
Grid,
|
Grid,
|
||||||
InputAdornment,
|
InputAdornment,
|
||||||
InputLabel,
|
InputLabel,
|
||||||
@@ -12,13 +11,14 @@ import {
|
|||||||
Paper,
|
Paper,
|
||||||
Select,
|
Select,
|
||||||
SelectChangeEvent,
|
SelectChangeEvent,
|
||||||
|
Slider,
|
||||||
Stack,
|
Stack,
|
||||||
Switch,
|
Switch,
|
||||||
TextField,
|
TextField,
|
||||||
Typography,
|
Typography,
|
||||||
capitalize
|
capitalize
|
||||||
} from '@mui/material'
|
} from '@mui/material'
|
||||||
import { useEffect, useMemo, useState } from 'react'
|
import { Suspense, useEffect, useMemo, useState } from 'react'
|
||||||
import { useRecoilState } from 'recoil'
|
import { useRecoilState } from 'recoil'
|
||||||
import {
|
import {
|
||||||
Subject,
|
Subject,
|
||||||
@@ -27,6 +27,7 @@ import {
|
|||||||
map,
|
map,
|
||||||
takeWhile
|
takeWhile
|
||||||
} from 'rxjs'
|
} from 'rxjs'
|
||||||
|
import { rpcPollingTimeState } from '../atoms/rpc'
|
||||||
import {
|
import {
|
||||||
Language,
|
Language,
|
||||||
Theme,
|
Theme,
|
||||||
@@ -36,9 +37,9 @@ import {
|
|||||||
formatSelectionState,
|
formatSelectionState,
|
||||||
languageState,
|
languageState,
|
||||||
languages,
|
languages,
|
||||||
latestCliArgumentsState,
|
|
||||||
pathOverridingState,
|
pathOverridingState,
|
||||||
servedFromReverseProxyState,
|
servedFromReverseProxyState,
|
||||||
|
servedFromReverseProxySubDirState,
|
||||||
serverAddressState,
|
serverAddressState,
|
||||||
serverPortState,
|
serverPortState,
|
||||||
themeState
|
themeState
|
||||||
@@ -47,21 +48,25 @@ import CookiesTextField from '../components/CookiesTextField'
|
|||||||
import { useToast } from '../hooks/toast'
|
import { useToast } from '../hooks/toast'
|
||||||
import { useI18n } from '../hooks/useI18n'
|
import { useI18n } from '../hooks/useI18n'
|
||||||
import { useRPC } from '../hooks/useRPC'
|
import { useRPC } from '../hooks/useRPC'
|
||||||
import { CliArguments } from '../lib/argsParser'
|
|
||||||
import { validateDomain, validateIP } from '../utils'
|
import { validateDomain, validateIP } from '../utils'
|
||||||
|
|
||||||
// NEED ABSOLUTELY TO BE SPLIT IN MULTIPLE COMPONENTS
|
// NEED ABSOLUTELY TO BE SPLIT IN MULTIPLE COMPONENTS
|
||||||
export default function Settings() {
|
export default function Settings() {
|
||||||
const [reverseProxy, setReverseProxy] = useRecoilState(servedFromReverseProxyState)
|
const [reverseProxy, setReverseProxy] = useRecoilState(servedFromReverseProxyState)
|
||||||
|
const [baseURL, setBaseURL] = useRecoilState(servedFromReverseProxySubDirState)
|
||||||
|
|
||||||
const [formatSelection, setFormatSelection] = useRecoilState(formatSelectionState)
|
const [formatSelection, setFormatSelection] = useRecoilState(formatSelectionState)
|
||||||
const [pathOverriding, setPathOverriding] = useRecoilState(pathOverridingState)
|
const [pathOverriding, setPathOverriding] = useRecoilState(pathOverridingState)
|
||||||
const [fileRenaming, setFileRenaming] = useRecoilState(fileRenamingState)
|
const [fileRenaming, setFileRenaming] = useRecoilState(fileRenamingState)
|
||||||
const [enableArgs, setEnableArgs] = useRecoilState(enableCustomArgsState)
|
const [enableArgs, setEnableArgs] = useRecoilState(enableCustomArgsState)
|
||||||
|
|
||||||
const [serverAddr, setServerAddr] = useRecoilState(serverAddressState)
|
const [serverAddr, setServerAddr] = useRecoilState(serverAddressState)
|
||||||
const [serverPort, setServerPort] = useRecoilState(serverPortState)
|
const [serverPort, setServerPort] = useRecoilState(serverPortState)
|
||||||
|
|
||||||
|
const [pollingTime, setPollingTime] = useRecoilState(rpcPollingTimeState)
|
||||||
const [language, setLanguage] = useRecoilState(languageState)
|
const [language, setLanguage] = useRecoilState(languageState)
|
||||||
const [appTitle, setApptitle] = useRecoilState(appTitleState)
|
const [appTitle, setApptitle] = useRecoilState(appTitleState)
|
||||||
const [cliArgs, setCliArgs] = useRecoilState(latestCliArgumentsState)
|
|
||||||
const [theme, setTheme] = useRecoilState(themeState)
|
const [theme, setTheme] = useRecoilState(themeState)
|
||||||
|
|
||||||
const [invalidIP, setInvalidIP] = useState(false)
|
const [invalidIP, setInvalidIP] = useState(false)
|
||||||
@@ -71,11 +76,20 @@ export default function Settings() {
|
|||||||
|
|
||||||
const { pushMessage } = useToast()
|
const { pushMessage } = useToast()
|
||||||
|
|
||||||
const argsBuilder = useMemo(() => new CliArguments().fromString(cliArgs), [])
|
const baseURL$ = useMemo(() => new Subject<string>(), [])
|
||||||
|
|
||||||
const serverAddr$ = useMemo(() => new Subject<string>(), [])
|
const serverAddr$ = useMemo(() => new Subject<string>(), [])
|
||||||
const serverPort$ = useMemo(() => new Subject<string>(), [])
|
const serverPort$ = useMemo(() => new Subject<string>(), [])
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const sub = baseURL$
|
||||||
|
.pipe(debounceTime(500))
|
||||||
|
.subscribe(baseURL => {
|
||||||
|
setBaseURL(baseURL)
|
||||||
|
pushMessage(i18n.t('restartAppMessage'), 'info')
|
||||||
|
})
|
||||||
|
return () => sub.unsubscribe()
|
||||||
|
}, [])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const sub = serverAddr$
|
const sub = serverAddr$
|
||||||
.pipe(
|
.pipe(
|
||||||
@@ -130,196 +144,225 @@ export default function Settings() {
|
|||||||
* Updates yt-dlp binary via RPC
|
* Updates yt-dlp binary via RPC
|
||||||
*/
|
*/
|
||||||
const updateBinary = () => {
|
const updateBinary = () => {
|
||||||
client.updateExecutable().then(() => pushMessage(i18n.t('toastUpdated')))
|
client.updateExecutable().then(() => pushMessage(i18n.t('toastUpdated'), 'success'))
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Container maxWidth="lg" sx={{ mt: 4, mb: 4 }}>
|
<Container maxWidth="xl" sx={{ mt: 4, mb: 8 }}>
|
||||||
<Grid container spacing={3}>
|
<Paper
|
||||||
<Grid item xs={12} md={12} lg={12}>
|
sx={{
|
||||||
<Paper
|
p: 2.5,
|
||||||
sx={{
|
display: 'flex',
|
||||||
p: 2,
|
flexDirection: 'column',
|
||||||
display: 'flex',
|
minHeight: 240,
|
||||||
flexDirection: 'column',
|
}}
|
||||||
minHeight: 240,
|
>
|
||||||
}}
|
<Typography pb={2} variant="h6" color="primary">
|
||||||
>
|
{i18n.t('settingsAnchor')}
|
||||||
<Typography pb={3} variant="h5" color="primary">
|
</Typography>
|
||||||
{i18n.t('settingsAnchor')}
|
<Grid container spacing={2}>
|
||||||
|
<Grid item xs={12} md={11}>
|
||||||
|
<TextField
|
||||||
|
fullWidth
|
||||||
|
label={i18n.t('serverAddressTitle')}
|
||||||
|
defaultValue={serverAddr}
|
||||||
|
error={invalidIP}
|
||||||
|
onChange={(e) => serverAddr$.next(e.currentTarget.value)}
|
||||||
|
InputProps={{
|
||||||
|
startAdornment: <InputAdornment position="start">ws://</InputAdornment>,
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Grid>
|
||||||
|
<Grid item xs={12} md={1}>
|
||||||
|
<TextField
|
||||||
|
disabled={reverseProxy}
|
||||||
|
fullWidth
|
||||||
|
label={i18n.t('serverPortTitle')}
|
||||||
|
defaultValue={serverPort}
|
||||||
|
onChange={(e) => serverPort$.next(e.currentTarget.value)}
|
||||||
|
error={isNaN(Number(serverPort)) || Number(serverPort) > 65535}
|
||||||
|
/>
|
||||||
|
</Grid>
|
||||||
|
<Grid item xs={12} md={12}>
|
||||||
|
<TextField
|
||||||
|
disabled={reverseProxy}
|
||||||
|
fullWidth
|
||||||
|
label={i18n.t('appTitle')}
|
||||||
|
defaultValue={appTitle}
|
||||||
|
onChange={(e) => setApptitle(e.currentTarget.value)}
|
||||||
|
error={appTitle === ''}
|
||||||
|
/>
|
||||||
|
</Grid>
|
||||||
|
<Grid item xs={12} md={12}>
|
||||||
|
<Typography>
|
||||||
|
{i18n.t('rpcPollingTimeTitle')}
|
||||||
</Typography>
|
</Typography>
|
||||||
<FormGroup>
|
<Typography variant='caption' sx={{ mb: 0.5 }}>
|
||||||
<Grid container spacing={2}>
|
{i18n.t('rpcPollingTimeDescription')}
|
||||||
<Grid item xs={12} md={11}>
|
</Typography>
|
||||||
<TextField
|
<Slider
|
||||||
fullWidth
|
aria-label="rpc polling time"
|
||||||
label={i18n.t('serverAddressTitle')}
|
defaultValue={pollingTime}
|
||||||
defaultValue={serverAddr}
|
max={2000}
|
||||||
error={invalidIP}
|
getAriaValueText={(v: number) => `${v} ms`}
|
||||||
onChange={(e) => serverAddr$.next(e.currentTarget.value)}
|
step={null}
|
||||||
InputProps={{
|
valueLabelDisplay="off"
|
||||||
startAdornment: <InputAdornment position="start">ws://</InputAdornment>,
|
marks={[
|
||||||
}}
|
{ value: 100, label: '100 ms' },
|
||||||
/>
|
{ value: 250, label: '250 ms' },
|
||||||
</Grid>
|
{ value: 500, label: '500 ms' },
|
||||||
<Grid item xs={12} md={1}>
|
{ value: 750, label: '750 ms' },
|
||||||
<TextField
|
{ value: 1000, label: '1000 ms' },
|
||||||
disabled={reverseProxy}
|
{ value: 2000, label: '2000 ms' },
|
||||||
fullWidth
|
]}
|
||||||
label={i18n.t('serverPortTitle')}
|
onChange={(_, value) => typeof value === 'number'
|
||||||
defaultValue={serverPort}
|
? setPollingTime(value)
|
||||||
onChange={(e) => serverPort$.next(e.currentTarget.value)}
|
: setPollingTime(1000)
|
||||||
error={isNaN(Number(serverPort)) || Number(serverPort) > 65535}
|
}
|
||||||
/>
|
/>
|
||||||
</Grid>
|
</Grid>
|
||||||
<Grid item xs={12} md={12}>
|
<Grid item xs={12}>
|
||||||
<TextField
|
<Typography variant="h6" color="primary" sx={{ mb: 0.5 }}>
|
||||||
disabled={reverseProxy}
|
Reverse Proxy
|
||||||
fullWidth
|
</Typography>
|
||||||
label={i18n.t('appTitle')}
|
<FormControlLabel
|
||||||
defaultValue={appTitle}
|
control={
|
||||||
onChange={(e) => setApptitle(e.currentTarget.value)}
|
<Checkbox
|
||||||
error={appTitle === ''}
|
defaultChecked={reverseProxy}
|
||||||
/>
|
onChange={() => setReverseProxy(state => !state)}
|
||||||
</Grid>
|
/>
|
||||||
<Grid item xs={12}>
|
}
|
||||||
<FormControlLabel
|
label={i18n.t('servedFromReverseProxyCheckbox')}
|
||||||
control={
|
sx={{ mb: 1 }}
|
||||||
<Checkbox
|
/>
|
||||||
defaultChecked={reverseProxy}
|
<TextField
|
||||||
onChange={() => setReverseProxy(state => !state)}
|
fullWidth
|
||||||
/>
|
label={i18n.t('urlBase')}
|
||||||
}
|
defaultValue={baseURL}
|
||||||
label={i18n.t('servedFromReverseProxyCheckbox')}
|
onChange={(e) => {
|
||||||
sx={{ mb: 2 }}
|
let value = e.currentTarget.value
|
||||||
/>
|
if (value.startsWith('/')) {
|
||||||
</Grid>
|
value = value.substring(1)
|
||||||
</Grid>
|
|
||||||
<Grid container spacing={2}>
|
|
||||||
<Grid item xs={12} md={6}>
|
|
||||||
<FormControl fullWidth>
|
|
||||||
<InputLabel>{i18n.t('languageSelect')}</InputLabel>
|
|
||||||
<Select
|
|
||||||
defaultValue={language}
|
|
||||||
label={i18n.t('languageSelect')}
|
|
||||||
onChange={handleLanguageChange}
|
|
||||||
>
|
|
||||||
{languages.map(l => (
|
|
||||||
<MenuItem value={l} key={l}>
|
|
||||||
{capitalize(l)}
|
|
||||||
</MenuItem>
|
|
||||||
))}
|
|
||||||
</Select>
|
|
||||||
</FormControl>
|
|
||||||
</Grid>
|
|
||||||
<Grid item xs={12} md={6}>
|
|
||||||
<FormControl fullWidth>
|
|
||||||
<InputLabel>{i18n.t('themeSelect')}</InputLabel>
|
|
||||||
<Select
|
|
||||||
defaultValue={theme}
|
|
||||||
label={i18n.t('themeSelect')}
|
|
||||||
onChange={handleThemeChange}
|
|
||||||
>
|
|
||||||
<MenuItem value="light">Light</MenuItem>
|
|
||||||
<MenuItem value="dark">Dark</MenuItem>
|
|
||||||
<MenuItem value="system">System</MenuItem>
|
|
||||||
</Select>
|
|
||||||
</FormControl>
|
|
||||||
</Grid>
|
|
||||||
</Grid>
|
|
||||||
<FormControlLabel
|
|
||||||
control={
|
|
||||||
<Switch
|
|
||||||
defaultChecked={argsBuilder.noMTime}
|
|
||||||
onChange={() => setCliArgs(argsBuilder.toggleNoMTime().toString())}
|
|
||||||
/>
|
|
||||||
}
|
}
|
||||||
label={i18n.t('noMTimeCheckbox')}
|
if (value.endsWith('/')) {
|
||||||
sx={{ mt: 3 }}
|
value = value.substring(0, value.length - 1)
|
||||||
/>
|
|
||||||
<FormControlLabel
|
|
||||||
control={
|
|
||||||
<Switch
|
|
||||||
defaultChecked={argsBuilder.extractAudio}
|
|
||||||
onChange={() => setCliArgs(argsBuilder.toggleExtractAudio().toString())}
|
|
||||||
disabled={formatSelection}
|
|
||||||
/>
|
|
||||||
}
|
}
|
||||||
label={i18n.t('extractAudioCheckbox')}
|
baseURL$.next(value)
|
||||||
/>
|
}}
|
||||||
<FormControlLabel
|
sx={{ mb: 2 }}
|
||||||
control={
|
/>
|
||||||
<Switch
|
</Grid>
|
||||||
defaultChecked={formatSelection}
|
|
||||||
onChange={() => {
|
|
||||||
setCliArgs(argsBuilder.disableExtractAudio().toString())
|
|
||||||
setFormatSelection(!formatSelection)
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
}
|
|
||||||
label={i18n.t('formatSelectionEnabler')}
|
|
||||||
/>
|
|
||||||
<Grid>
|
|
||||||
<Typography variant="h6" color="primary" sx={{ mt: 2, mb: 0.5 }}>
|
|
||||||
{i18n.t('overridesAnchor')}
|
|
||||||
</Typography>
|
|
||||||
<Stack direction="column">
|
|
||||||
<FormControlLabel
|
|
||||||
control={
|
|
||||||
<Switch
|
|
||||||
defaultChecked={!!pathOverriding}
|
|
||||||
onChange={() => {
|
|
||||||
setPathOverriding(state => !state)
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
}
|
|
||||||
label={i18n.t('pathOverrideOption')}
|
|
||||||
/>
|
|
||||||
<FormControlLabel
|
|
||||||
control={
|
|
||||||
<Switch
|
|
||||||
defaultChecked={fileRenaming}
|
|
||||||
onChange={() => {
|
|
||||||
setFileRenaming(state => !state)
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
}
|
|
||||||
label={i18n.t('filenameOverrideOption')}
|
|
||||||
/>
|
|
||||||
<FormControlLabel
|
|
||||||
control={
|
|
||||||
<Switch
|
|
||||||
defaultChecked={enableArgs}
|
|
||||||
onChange={() => {
|
|
||||||
setEnableArgs(state => !state)
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
}
|
|
||||||
label={i18n.t('customArgs')}
|
|
||||||
/>
|
|
||||||
</Stack>
|
|
||||||
</Grid>
|
|
||||||
<Grid sx={{ mr: 1, mt: 3 }}>
|
|
||||||
<Typography variant="h6" color="primary" sx={{ mb: 2 }}>
|
|
||||||
Cookies
|
|
||||||
</Typography>
|
|
||||||
<CookiesTextField />
|
|
||||||
</Grid>
|
|
||||||
<Grid>
|
|
||||||
<Stack direction="row">
|
|
||||||
<Button
|
|
||||||
sx={{ mr: 1, mt: 3 }}
|
|
||||||
variant="contained"
|
|
||||||
onClick={() => updateBinary()}
|
|
||||||
>
|
|
||||||
{i18n.t('updateBinButton')}
|
|
||||||
</Button>
|
|
||||||
</Stack>
|
|
||||||
</Grid>
|
|
||||||
</FormGroup>
|
|
||||||
</Paper>
|
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
<Typography variant="h6" color="primary" sx={{ mt: 0.5, mb: 2 }}>
|
||||||
|
Appearance
|
||||||
|
</Typography>
|
||||||
|
<Grid container spacing={2}>
|
||||||
|
<Grid item xs={12} md={6}>
|
||||||
|
<FormControl fullWidth>
|
||||||
|
<InputLabel>{i18n.t('languageSelect')}</InputLabel>
|
||||||
|
<Select
|
||||||
|
defaultValue={language}
|
||||||
|
label={i18n.t('languageSelect')}
|
||||||
|
onChange={handleLanguageChange}
|
||||||
|
>
|
||||||
|
{languages.toSorted((a, b) => a.localeCompare(b)).map(l => (
|
||||||
|
<MenuItem value={l} key={l}>
|
||||||
|
{capitalize(l)}
|
||||||
|
</MenuItem>
|
||||||
|
))}
|
||||||
|
</Select>
|
||||||
|
</FormControl>
|
||||||
|
</Grid>
|
||||||
|
<Grid item xs={12} md={6}>
|
||||||
|
<FormControl fullWidth>
|
||||||
|
<InputLabel>{i18n.t('themeSelect')}</InputLabel>
|
||||||
|
<Select
|
||||||
|
defaultValue={theme}
|
||||||
|
label={i18n.t('themeSelect')}
|
||||||
|
onChange={handleThemeChange}
|
||||||
|
>
|
||||||
|
<MenuItem value="light">Light</MenuItem>
|
||||||
|
<MenuItem value="dark">Dark</MenuItem>
|
||||||
|
<MenuItem value="system">System</MenuItem>
|
||||||
|
</Select>
|
||||||
|
</FormControl>
|
||||||
|
</Grid>
|
||||||
|
</Grid>
|
||||||
|
<Typography variant="h6" color="primary" sx={{ mt: 2, mb: 0.5 }}>
|
||||||
|
General download settings
|
||||||
|
</Typography>
|
||||||
|
|
||||||
|
<FormControlLabel
|
||||||
|
control={
|
||||||
|
<Switch
|
||||||
|
defaultChecked={formatSelection}
|
||||||
|
onChange={() => {
|
||||||
|
setFormatSelection(!formatSelection)
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
label={i18n.t('formatSelectionEnabler')}
|
||||||
|
/>
|
||||||
|
<Grid>
|
||||||
|
<Typography variant="h6" color="primary" sx={{ mt: 2, mb: 0.5 }}>
|
||||||
|
{i18n.t('overridesAnchor')}
|
||||||
|
</Typography>
|
||||||
|
<Stack direction="column">
|
||||||
|
<FormControlLabel
|
||||||
|
control={
|
||||||
|
<Switch
|
||||||
|
defaultChecked={!!pathOverriding}
|
||||||
|
onChange={() => {
|
||||||
|
setPathOverriding(state => !state)
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
label={i18n.t('pathOverrideOption')}
|
||||||
|
/>
|
||||||
|
<FormControlLabel
|
||||||
|
control={
|
||||||
|
<Switch
|
||||||
|
defaultChecked={fileRenaming}
|
||||||
|
onChange={() => {
|
||||||
|
setFileRenaming(state => !state)
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
label={i18n.t('filenameOverrideOption')}
|
||||||
|
/>
|
||||||
|
<FormControlLabel
|
||||||
|
control={
|
||||||
|
<Switch
|
||||||
|
defaultChecked={enableArgs}
|
||||||
|
onChange={() => {
|
||||||
|
setEnableArgs(state => !state)
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
label={i18n.t('customArgs')}
|
||||||
|
/>
|
||||||
|
</Stack>
|
||||||
|
</Grid>
|
||||||
|
<Grid sx={{ mr: 1, mt: 2 }}>
|
||||||
|
<Typography variant="h6" color="primary" sx={{ mb: 2 }}>
|
||||||
|
Cookies
|
||||||
|
</Typography>
|
||||||
|
<Suspense>
|
||||||
|
<CookiesTextField />
|
||||||
|
</Suspense>
|
||||||
|
</Grid>
|
||||||
|
<Grid>
|
||||||
|
<Stack direction="row">
|
||||||
|
<Button
|
||||||
|
sx={{ mr: 1, mt: 3 }}
|
||||||
|
variant="contained"
|
||||||
|
onClick={() => updateBinary()}
|
||||||
|
>
|
||||||
|
{i18n.t('updateBinButton')}
|
||||||
|
</Button>
|
||||||
|
</Stack>
|
||||||
|
</Grid>
|
||||||
|
</Paper>
|
||||||
</Container>
|
</Container>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,25 @@
|
|||||||
|
import { Container, Paper, Typography } from '@mui/material'
|
||||||
import LogTerminal from '../components/LogTerminal'
|
import LogTerminal from '../components/LogTerminal'
|
||||||
|
import { useI18n } from '../hooks/useI18n'
|
||||||
|
|
||||||
const Terminal: React.FC = () => {
|
const Terminal: React.FC = () => {
|
||||||
|
const { i18n } = useI18n()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<LogTerminal />
|
<Container maxWidth="xl" sx={{ mt: 4, mb: 4 }}>
|
||||||
|
<Paper
|
||||||
|
sx={{
|
||||||
|
p: 2.5,
|
||||||
|
display: 'flex',
|
||||||
|
flexDirection: 'column',
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Typography pb={2} variant="h5" color="primary">
|
||||||
|
{i18n.t('logsTitle')}
|
||||||
|
</Typography>
|
||||||
|
<LogTerminal />
|
||||||
|
</Paper>
|
||||||
|
</Container >
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
48
go.mod
48
go.mod
@@ -1,43 +1,37 @@
|
|||||||
module github.com/marcopeocchi/yt-dlp-web-ui
|
module github.com/marcopeocchi/yt-dlp-web-ui
|
||||||
|
|
||||||
go 1.20
|
go 1.23
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/go-chi/chi/v5 v5.0.11
|
github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef
|
||||||
|
github.com/coreos/go-oidc/v3 v3.11.0
|
||||||
|
github.com/go-chi/chi/v5 v5.1.0
|
||||||
github.com/go-chi/cors v1.2.1
|
github.com/go-chi/cors v1.2.1
|
||||||
github.com/golang-jwt/jwt/v5 v5.2.0
|
github.com/golang-jwt/jwt/v5 v5.2.1
|
||||||
github.com/google/uuid v1.5.0
|
github.com/google/uuid v1.6.0
|
||||||
github.com/gorilla/websocket v1.5.1
|
github.com/gorilla/websocket v1.5.3
|
||||||
github.com/marcopeocchi/fazzoletti v0.0.0-20230308161120-c545580f79fa
|
golang.org/x/oauth2 v0.23.0
|
||||||
github.com/reactivex/rxgo/v2 v2.5.0
|
golang.org/x/sync v0.8.0
|
||||||
golang.org/x/sys v0.15.0
|
golang.org/x/sys v0.25.0
|
||||||
gopkg.in/yaml.v3 v3.0.1
|
gopkg.in/yaml.v3 v3.0.1
|
||||||
modernc.org/sqlite v1.28.0
|
modernc.org/sqlite v1.33.1
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/cenkalti/backoff/v4 v4.0.0 // indirect
|
|
||||||
github.com/davecgh/go-spew v1.1.0 // indirect
|
|
||||||
github.com/dustin/go-humanize v1.0.1 // indirect
|
github.com/dustin/go-humanize v1.0.1 // indirect
|
||||||
github.com/emirpasic/gods v1.12.0 // indirect
|
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
|
||||||
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
|
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
|
||||||
|
github.com/kr/pretty v0.1.0 // indirect
|
||||||
github.com/mattn/go-isatty v0.0.20 // indirect
|
github.com/mattn/go-isatty v0.0.20 // indirect
|
||||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
github.com/ncruces/go-strftime v0.1.9 // indirect
|
||||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
|
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
|
||||||
github.com/stretchr/objx v0.1.0 // indirect
|
golang.org/x/crypto v0.27.0 // indirect
|
||||||
github.com/stretchr/testify v1.4.0 // indirect
|
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
|
||||||
github.com/teivah/onecontext v0.0.0-20200513185103-40f981bfd775 // indirect
|
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
|
||||||
golang.org/x/mod v0.14.0 // indirect
|
modernc.org/gc/v3 v3.0.0-20240801135723-a856999a2e4a // indirect
|
||||||
golang.org/x/net v0.19.0 // indirect
|
modernc.org/libc v1.61.0 // indirect
|
||||||
golang.org/x/tools v0.16.1 // indirect
|
|
||||||
gopkg.in/yaml.v2 v2.2.2 // indirect
|
|
||||||
lukechampine.com/uint128 v1.3.0 // indirect
|
|
||||||
modernc.org/cc/v3 v3.41.0 // indirect
|
|
||||||
modernc.org/ccgo/v3 v3.16.15 // indirect
|
|
||||||
modernc.org/libc v1.38.0 // indirect
|
|
||||||
modernc.org/mathutil v1.6.0 // indirect
|
modernc.org/mathutil v1.6.0 // indirect
|
||||||
modernc.org/memory v1.7.2 // indirect
|
modernc.org/memory v1.8.0 // indirect
|
||||||
modernc.org/opt v0.1.3 // indirect
|
|
||||||
modernc.org/strutil v1.2.0 // indirect
|
modernc.org/strutil v1.2.0 // indirect
|
||||||
modernc.org/token v1.1.0 // indirect
|
modernc.org/token v1.1.0 // indirect
|
||||||
)
|
)
|
||||||
|
|||||||
129
go.sum
129
go.sum
@@ -1,100 +1,87 @@
|
|||||||
github.com/cenkalti/backoff/v4 v4.0.0 h1:6VeaLF9aI+MAUQ95106HwWzYZgJJpZ4stumjj6RFYAU=
|
github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef h1:2JGTg6JapxP9/R33ZaagQtAM4EkkSYnIAlOG5EI8gkM=
|
||||||
github.com/cenkalti/backoff/v4 v4.0.0/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg=
|
github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef/go.mod h1:JS7hed4L1fj0hXcyEejnW57/7LCetXggd+vwrRnYeII=
|
||||||
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
|
github.com/coreos/go-oidc/v3 v3.11.0 h1:Ia3MxdwpSw702YW0xgfmP1GVCMA9aEFWu12XUZ3/OtI=
|
||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/coreos/go-oidc/v3 v3.11.0/go.mod h1:gE3LgjOgFoHi9a4ce4/tJczr0Ai2/BoDhf0r5lltWI0=
|
||||||
|
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
|
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
|
||||||
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
|
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
|
||||||
github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
|
github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw=
|
||||||
github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
|
github.com/go-chi/chi/v5 v5.1.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
|
||||||
github.com/go-chi/chi/v5 v5.0.11 h1:BnpYbFZ3T3S1WMpD79r7R5ThWX40TaFB7L31Y8xqSwA=
|
|
||||||
github.com/go-chi/chi/v5 v5.0.11/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
|
|
||||||
github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
|
github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
|
||||||
github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
|
github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
|
||||||
github.com/golang-jwt/jwt/v5 v5.2.0 h1:d/ix8ftRUorsN+5eMIlF4T6J8CAt9rch3My2winC1Jw=
|
github.com/go-jose/go-jose/v4 v4.0.4 h1:VsjPI33J0SB9vQM6PLmNjoHqMQNGPiZ0rHL7Ni7Q6/E=
|
||||||
github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
|
github.com/go-jose/go-jose/v4 v4.0.4/go.mod h1:NKb5HO1EZccyMpiZNbdUw/14tiXNyUJh188dfnMCAfc=
|
||||||
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
|
github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
|
||||||
github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
|
github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
|
||||||
github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
|
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
||||||
github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||||
github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
|
github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd h1:gbpYu9NMq8jhDVbvlGkMFWCjLFlqqEZjEmObmhUy6Vo=
|
||||||
github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
|
github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw=
|
||||||
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
|
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||||
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
|
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||||
|
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
|
||||||
|
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
|
||||||
|
github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
|
||||||
|
github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
|
||||||
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
|
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
|
||||||
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
|
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
|
||||||
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
||||||
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
|
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
|
||||||
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
||||||
github.com/marcopeocchi/fazzoletti v0.0.0-20230308161120-c545580f79fa h1:uaAQLGhN4SesB9inOQ1Q6EH+BwTWHQOvwhR0TIJvnYc=
|
|
||||||
github.com/marcopeocchi/fazzoletti v0.0.0-20230308161120-c545580f79fa/go.mod h1:RvfVo/6Sbnfra9kkvIxDW8NYOOaYsHjF0DdtMCs9cdo=
|
|
||||||
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
|
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
|
||||||
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
||||||
github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
|
github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
|
||||||
|
github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
|
||||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
github.com/reactivex/rxgo/v2 v2.5.0 h1:FhPgHwX9vKdNQB2gq9EPt+EKk9QrrzoeztGbEEnZam4=
|
|
||||||
github.com/reactivex/rxgo/v2 v2.5.0/go.mod h1:bs4fVZxcb5ZckLIOeIeVH942yunJLWDABWGbrHAW+qU=
|
|
||||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
|
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
|
||||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
|
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
|
||||||
github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
|
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
|
||||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
|
||||||
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
|
golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
|
||||||
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk=
|
||||||
github.com/teivah/onecontext v0.0.0-20200513185103-40f981bfd775 h1:BLNsFR8l/hj/oGjnJXkd4Vi3s4kQD3/3x8HSAE4bzN0=
|
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY=
|
||||||
github.com/teivah/onecontext v0.0.0-20200513185103-40f981bfd775/go.mod h1:XUZ4x3oGhWfiOnUvTslnKKs39AWUct3g3yJvXTQSJOQ=
|
golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
|
||||||
go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0=
|
golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
|
||||||
go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
|
golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
|
||||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
|
||||||
golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs=
|
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
|
||||||
golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
|
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||||
golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
|
|
||||||
golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
|
|
||||||
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
|
||||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
|
||||||
golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
|
|
||||||
golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
|
|
||||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
||||||
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
||||||
golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
|
|
||||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
|
||||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
|
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
|
||||||
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE=
|
||||||
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg=
|
||||||
golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
|
||||||
golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA=
|
|
||||||
golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
|
|
||||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
|
||||||
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/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
|
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
|
||||||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
|
|
||||||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
|
||||||
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=
|
||||||
lukechampine.com/uint128 v1.3.0 h1:cDdUVfRwDUDovz610ABgFD17nXD4/uDgVHl2sC3+sbo=
|
modernc.org/cc/v4 v4.21.4 h1:3Be/Rdo1fpr8GrQ7IVw9OHtplU4gWbb+wNgeoBMmGLQ=
|
||||||
lukechampine.com/uint128 v1.3.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
|
modernc.org/cc/v4 v4.21.4/go.mod h1:HM7VJTZbUCR3rV8EYBi9wxnJ0ZBRiGE5OeGXNA0IsLQ=
|
||||||
modernc.org/cc/v3 v3.41.0 h1:QoR1Sn3YWlmA1T4vLaKZfawdVtSiGx8H+cEojbC7v1Q=
|
modernc.org/ccgo/v4 v4.21.0 h1:kKPI3dF7RIag8YcToh5ZwDcVMIv6VGa0ED5cvh0LMW4=
|
||||||
modernc.org/cc/v3 v3.41.0/go.mod h1:Ni4zjJYJ04CDOhG7dn640WGfwBzfE0ecX8TyMB0Fv0Y=
|
modernc.org/ccgo/v4 v4.21.0/go.mod h1:h6kt6H/A2+ew/3MW/p6KEoQmrq/i3pr0J/SiwiaF/g0=
|
||||||
modernc.org/ccgo/v3 v3.16.15 h1:KbDR3ZAVU+wiLyMESPtbtE/Add4elztFyfsWoNTgxS0=
|
modernc.org/fileutil v1.3.0 h1:gQ5SIzK3H9kdfai/5x41oQiKValumqNTDXMvKo62HvE=
|
||||||
modernc.org/ccgo/v3 v3.16.15/go.mod h1:yT7B+/E2m43tmMOT51GMoM98/MtHIcQQSleGnddkUNI=
|
modernc.org/fileutil v1.3.0/go.mod h1:XatxS8fZi3pS8/hKG2GH/ArUogfxjpEKs3Ku3aK4JyQ=
|
||||||
modernc.org/ccorpus v1.11.6 h1:J16RXiiqiCgua6+ZvQot4yUuUy8zxgqbqEEUuGPlISk=
|
modernc.org/gc/v2 v2.5.0 h1:bJ9ChznK1L1mUtAQtxi0wi5AtAs5jQuw4PrPHO5pb6M=
|
||||||
modernc.org/httpfs v1.0.6 h1:AAgIpFZRXuYnkjftxTAZwMIiwEqAfk8aVB2/oA6nAeM=
|
modernc.org/gc/v2 v2.5.0/go.mod h1:wzN5dK1AzVGoH6XOzc3YZ+ey/jPgYHLuVckd62P0GYU=
|
||||||
modernc.org/libc v1.38.0 h1:o4Lpk0zNDSdsjfEXnF1FGXWQ9PDi1NOdWcLP5n13FGo=
|
modernc.org/gc/v3 v3.0.0-20240801135723-a856999a2e4a h1:CfbpOLEo2IwNzJdMvE8aiRbPMxoTpgAJeyePh0SmO8M=
|
||||||
modernc.org/libc v1.38.0/go.mod h1:YAXkAZ8ktnkCKaN9sw/UDeUVkGYJ/YquGO4FTi5nmHE=
|
modernc.org/gc/v3 v3.0.0-20240801135723-a856999a2e4a/go.mod h1:Qz0X07sNOR1jWYCrJMEnbW/X55x206Q7Vt4mz6/wHp4=
|
||||||
|
modernc.org/libc v1.61.0 h1:eGFcvWpqlnoGwzZeZe3PWJkkKbM/3SUGyk1DVZQ0TpE=
|
||||||
|
modernc.org/libc v1.61.0/go.mod h1:DvxVX89wtGTu+r72MLGhygpfi3aUGgZRdAYGCAVVud0=
|
||||||
modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
|
modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
|
||||||
modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
|
modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
|
||||||
modernc.org/memory v1.7.2 h1:Klh90S215mmH8c9gO98QxQFsY+W451E8AnzjoE2ee1E=
|
modernc.org/memory v1.8.0 h1:IqGTL6eFMaDZZhEWwcREgeMXYwmW83LYW8cROZYkg+E=
|
||||||
modernc.org/memory v1.7.2/go.mod h1:NO4NVCQy0N7ln+T9ngWqOQfi7ley4vpwvARR+Hjw95E=
|
modernc.org/memory v1.8.0/go.mod h1:XPZ936zp5OMKGWPqbD3JShgd/ZoQ7899TUuQqxY+peU=
|
||||||
modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
|
modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
|
||||||
modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
|
modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
|
||||||
modernc.org/sqlite v1.28.0 h1:Zx+LyDDmXczNnEQdvPuEfcFVA2ZPyaD7UCZDjef3BHQ=
|
modernc.org/sortutil v1.2.0 h1:jQiD3PfS2REGJNzNCMMaLSp/wdMNieTbKX920Cqdgqc=
|
||||||
modernc.org/sqlite v1.28.0/go.mod h1:Qxpazz0zH8Z1xCFyi5GSL3FzbtZ3fvbjmywNogldEW0=
|
modernc.org/sortutil v1.2.0/go.mod h1:TKU2s7kJMf1AE84OoiGppNHJwvB753OYfNl2WRb++Ss=
|
||||||
|
modernc.org/sqlite v1.33.1 h1:trb6Z3YYoeM9eDL1O8do81kP+0ejv+YzgyFo+Gwy0nM=
|
||||||
|
modernc.org/sqlite v1.33.1/go.mod h1:pXV2xHxhzXZsgT/RtTFAPY6JJDEvOTcTdwADQCCWD4k=
|
||||||
modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA=
|
modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA=
|
||||||
modernc.org/strutil v1.2.0/go.mod h1:/mdcBmfOibveCTBxUl5B5l6W+TTH1FXPLHZE6bTosX0=
|
modernc.org/strutil v1.2.0/go.mod h1:/mdcBmfOibveCTBxUl5B5l6W+TTH1FXPLHZE6bTosX0=
|
||||||
modernc.org/tcl v1.15.2 h1:C4ybAYCGJw968e+Me18oW55kD/FexcHbqH2xak1ROSY=
|
|
||||||
modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
|
modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
|
||||||
modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
|
modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
|
||||||
modernc.org/z v1.7.3 h1:zDJf6iHjrnB+WRD88stbXokugjyc0/pB91ri1gO6LZY=
|
|
||||||
|
|||||||
54
main.go
54
main.go
@@ -11,6 +11,7 @@ import (
|
|||||||
"github.com/marcopeocchi/yt-dlp-web-ui/server"
|
"github.com/marcopeocchi/yt-dlp-web-ui/server"
|
||||||
"github.com/marcopeocchi/yt-dlp-web-ui/server/cli"
|
"github.com/marcopeocchi/yt-dlp-web-ui/server/cli"
|
||||||
"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
|
"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
|
||||||
|
"github.com/marcopeocchi/yt-dlp-web-ui/server/openid"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@@ -30,16 +31,21 @@ var (
|
|||||||
userFromEnv = os.Getenv("USERNAME")
|
userFromEnv = os.Getenv("USERNAME")
|
||||||
passFromEnv = os.Getenv("PASSWORD")
|
passFromEnv = os.Getenv("PASSWORD")
|
||||||
|
|
||||||
|
logFile string
|
||||||
|
enableFileLogging bool
|
||||||
|
|
||||||
//go:embed frontend/dist/index.html
|
//go:embed frontend/dist/index.html
|
||||||
//go:embed frontend/dist/assets/*
|
//go:embed frontend/dist/assets/*
|
||||||
frontend embed.FS
|
frontend embed.FS
|
||||||
|
|
||||||
|
//go:embed openapi/*
|
||||||
|
swagger embed.FS
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
|
|
||||||
flag.StringVar(&host, "host", "0.0.0.0", "Host where server will listen at")
|
flag.StringVar(&host, "host", "0.0.0.0", "Host where server will listen at")
|
||||||
flag.IntVar(&port, "port", 3033, "Port where server will listen at")
|
flag.IntVar(&port, "port", 3033, "Port where server will listen at")
|
||||||
flag.IntVar(&queueSize, "qs", runtime.NumCPU(), "Download queue size")
|
flag.IntVar(&queueSize, "qs", 2, "Queue size (concurrent downloads)")
|
||||||
|
|
||||||
flag.StringVar(&configFile, "conf", "./config.yml", "Config file path")
|
flag.StringVar(&configFile, "conf", "./config.yml", "Config file path")
|
||||||
flag.StringVar(&downloadPath, "out", ".", "Where files will be saved")
|
flag.StringVar(&downloadPath, "out", ".", "Where files will be saved")
|
||||||
@@ -47,6 +53,9 @@ func init() {
|
|||||||
flag.StringVar(&sessionFilePath, "session", ".", "session file path")
|
flag.StringVar(&sessionFilePath, "session", ".", "session file path")
|
||||||
flag.StringVar(&localDatabasePath, "db", "local.db", "local database path")
|
flag.StringVar(&localDatabasePath, "db", "local.db", "local database path")
|
||||||
|
|
||||||
|
flag.BoolVar(&enableFileLogging, "fl", false, "enable outputting logs to a file")
|
||||||
|
flag.StringVar(&logFile, "lf", "yt-dlp-webui.log", "set log file location")
|
||||||
|
|
||||||
flag.BoolVar(&requireAuth, "auth", false, "Enable RPC authentication")
|
flag.BoolVar(&requireAuth, "auth", false, "Enable RPC authentication")
|
||||||
flag.StringVar(&username, "user", userFromEnv, "Username required for auth")
|
flag.StringVar(&username, "user", userFromEnv, "Username required for auth")
|
||||||
flag.StringVar(&password, "pass", passFromEnv, "Password required for auth")
|
flag.StringVar(&password, "pass", passFromEnv, "Password required for auth")
|
||||||
@@ -56,28 +65,47 @@ func init() {
|
|||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
frontend, err := fs.Sub(frontend, "frontend/dist")
|
frontend, err := fs.Sub(frontend, "frontend/dist")
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalln(err)
|
log.Fatalln(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
c := config.Instance()
|
c := config.Instance()
|
||||||
|
|
||||||
c.Host = host
|
{
|
||||||
c.Port = port
|
// init the config struct with the values from flags
|
||||||
c.QueueSize = queueSize
|
// TODO: find an alternative way to populate the config struct from flags or config file
|
||||||
c.DownloadPath = downloadPath
|
c.Host = host
|
||||||
c.DownloaderPath = downloaderPath
|
c.Port = port
|
||||||
c.SessionFilePath = sessionFilePath
|
|
||||||
|
|
||||||
c.RequireAuth = requireAuth
|
c.QueueSize = queueSize
|
||||||
c.Username = username
|
|
||||||
c.Password = password
|
c.DownloadPath = downloadPath
|
||||||
|
c.DownloaderPath = downloaderPath
|
||||||
|
c.SessionFilePath = sessionFilePath
|
||||||
|
c.LocalDatabasePath = localDatabasePath
|
||||||
|
|
||||||
|
c.LogPath = logFile
|
||||||
|
c.EnableFileLogging = enableFileLogging
|
||||||
|
|
||||||
|
c.RequireAuth = requireAuth
|
||||||
|
c.Username = username
|
||||||
|
c.Password = password
|
||||||
|
}
|
||||||
|
|
||||||
|
// limit concurrent downloads for systems with 2 or less logical cores
|
||||||
|
if runtime.NumCPU() <= 2 {
|
||||||
|
c.QueueSize = 1
|
||||||
|
}
|
||||||
|
|
||||||
// if config file is found it will be merged with the current config struct
|
// if config file is found it will be merged with the current config struct
|
||||||
if err := c.LoadFile(configFile); err != nil {
|
if err := c.LoadFile(configFile); err != nil {
|
||||||
log.Println(cli.BgRed, "config", cli.Reset, err)
|
log.Println(cli.BgRed, "config", cli.Reset, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
server.RunBlocking(c.Host, c.Port, frontend, localDatabasePath)
|
openid.Configure()
|
||||||
|
|
||||||
|
server.RunBlocking(&server.RunConfig{
|
||||||
|
App: frontend,
|
||||||
|
Swagger: swagger,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
9
nix/common.nix
Normal file
9
nix/common.nix
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
{ lib }: {
|
||||||
|
version = "v3.1.2";
|
||||||
|
meta = {
|
||||||
|
description = "A terrible web ui for yt-dlp. Designed to be self-hosted.";
|
||||||
|
homepage = "https://github.com/marcopeocchi/yt-dlp-web-ui";
|
||||||
|
license = lib.licenses.mpl20;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
9
nix/devShell.nix
Normal file
9
nix/devShell.nix
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
{ inputsFrom ? [ ], mkShell, yt-dlp, nodejs, go }:
|
||||||
|
mkShell {
|
||||||
|
inherit inputsFrom;
|
||||||
|
packages = [
|
||||||
|
yt-dlp
|
||||||
|
nodejs
|
||||||
|
go
|
||||||
|
];
|
||||||
|
}
|
||||||
37
nix/frontend.nix
Normal file
37
nix/frontend.nix
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, nodejs
|
||||||
|
, pnpm
|
||||||
|
}:
|
||||||
|
let common = import ./common.nix { inherit lib; }; in
|
||||||
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
|
pname = "yt-dlp-web-ui-frontend";
|
||||||
|
|
||||||
|
inherit (common) version;
|
||||||
|
|
||||||
|
src = lib.fileset.toSource {
|
||||||
|
root = ../frontend;
|
||||||
|
fileset = ../frontend;
|
||||||
|
};
|
||||||
|
|
||||||
|
buildPhase = ''
|
||||||
|
npm run build
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p $out/dist
|
||||||
|
cp -r dist/* $out/dist
|
||||||
|
'';
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
nodejs
|
||||||
|
pnpm.configHook
|
||||||
|
];
|
||||||
|
|
||||||
|
pnpmDeps = pnpm.fetchDeps {
|
||||||
|
inherit (finalAttrs) pname version src;
|
||||||
|
hash = "sha256-NvXNDXkuoJ4vGeQA3bOhhc+KLBfke593qK0edcvzWTo=";
|
||||||
|
};
|
||||||
|
|
||||||
|
inherit (common) meta;
|
||||||
|
})
|
||||||
215
nix/module.nix
Normal file
215
nix/module.nix
Normal file
@@ -0,0 +1,215 @@
|
|||||||
|
packages: { config, lib, pkgs, ... }:
|
||||||
|
let
|
||||||
|
cfg = config.services.yt-dlp-web-ui;
|
||||||
|
inherit (pkgs.stdenv.hostPlatform) system;
|
||||||
|
pkg = packages.${system}.default;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
Some notes on the module design:
|
||||||
|
- Usually, you don't map out all of the options like this in attrsets,
|
||||||
|
but due to the software's nonstandard "config file overrides CLI" behavior,
|
||||||
|
we don't want to expose a config file catchall, and as such don't use '-conf'.
|
||||||
|
|
||||||
|
- Notably, '-driver' is missing as a configuration option.
|
||||||
|
This should instead be customized with idiomatic Nix, overriding 'cfg.package' with
|
||||||
|
the desired yt-dlp package.
|
||||||
|
|
||||||
|
- The systemd service has been sandboxed as much as possible. This restricts configuration of
|
||||||
|
data and logs dir. If you really need a custom data and logs dir, use BindPaths (man systemd.exec)
|
||||||
|
*/
|
||||||
|
options.services.yt-dlp-web-ui = {
|
||||||
|
enable = lib.mkEnableOption "yt-dlp-web-ui";
|
||||||
|
package = lib.mkOption {
|
||||||
|
type = lib.types.package;
|
||||||
|
default = pkg;
|
||||||
|
defaultText = lib.literalMD "`packages.default` from the yt-dlp-web-ui flake.";
|
||||||
|
description = ''
|
||||||
|
The yt-dlp-web-ui package to use.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
user = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
default = "yt-dlp-web-ui";
|
||||||
|
description = lib.mdDoc ''
|
||||||
|
User under which yt-dlp-web-ui runs.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
group = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
default = "yt-dlp-web-ui";
|
||||||
|
description = lib.mdDoc ''
|
||||||
|
Group under which yt-dlp-web-ui runs.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
openFirewall = lib.mkOption {
|
||||||
|
type = lib.types.bool;
|
||||||
|
default = false;
|
||||||
|
description = lib.mdDoc ''
|
||||||
|
Whether to open the TCP port in the firewall.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
host = lib.mkOption {
|
||||||
|
default = "0.0.0.0";
|
||||||
|
type = lib.types.str;
|
||||||
|
description = lib.mdDoc ''
|
||||||
|
Host where yt-dlp-web-ui will listen at.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
port = lib.mkOption {
|
||||||
|
default = 3033;
|
||||||
|
type = lib.types.port;
|
||||||
|
description = lib.mdDoc ''
|
||||||
|
Port where yt-dlp-web-ui will listen at.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
downloadDir = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
description = lib.mdDoc ''
|
||||||
|
The directory where yt-dlp-web-ui stores downloads.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
queueSize = lib.mkOption {
|
||||||
|
default = 2;
|
||||||
|
type = lib.types.ints.unsigned; # >= 0
|
||||||
|
description = lib.mdDoc ''
|
||||||
|
Queue size (concurrent downloads).
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
logging = lib.mkEnableOption "logging";
|
||||||
|
|
||||||
|
rpcAuth = lib.mkOption {
|
||||||
|
description = lib.mdDoc ''
|
||||||
|
RPC Authentication settings.
|
||||||
|
'';
|
||||||
|
default = { };
|
||||||
|
type = lib.types.submodule {
|
||||||
|
options = {
|
||||||
|
enable = lib.mkEnableOption "RPC authentication";
|
||||||
|
user = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
description = lib.mdDoc ''
|
||||||
|
Username required for auth.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
passwordFile = lib.mkOption {
|
||||||
|
type = with lib.types; nullOr str;
|
||||||
|
default = null;
|
||||||
|
description = lib.mdDoc ''
|
||||||
|
Path to the file containing the password required for auth.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
insecurePasswordText = lib.mkOption {
|
||||||
|
type = with lib.types; nullOr str;
|
||||||
|
default = null;
|
||||||
|
description = lib.mdDoc ''
|
||||||
|
Raw password required for auth.
|
||||||
|
|
||||||
|
It's strongly recommended to use 'passwordFile' instead of this option.
|
||||||
|
|
||||||
|
**Don't use this option unless you know what you're doing!**.
|
||||||
|
It writes the password to the world-readable Nix store, which is a big security risk.
|
||||||
|
More info: https://wiki.nixos.org/wiki/Comparison_of_secret_managing_schemes
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
assertions = [
|
||||||
|
(lib.mkIf cfg.rpcAuth.enable {
|
||||||
|
assertion = lib.xor (cfg.rpcAuth.passwordFile == null) (cfg.rpcAuth.insecurePasswordText == null);
|
||||||
|
message = ''
|
||||||
|
RPC Auth is enabled for yt-dlp-web-ui! Exactly one RPC auth password source must be set!
|
||||||
|
|
||||||
|
Tip: You should set 'services.yt-dlp-web-ui.rpcAuth.passwordfile'!
|
||||||
|
'';
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.port ];
|
||||||
|
|
||||||
|
users.users = lib.mkIf (cfg.user == "yt-dlp-web-ui") {
|
||||||
|
yt-dlp-web-ui = {
|
||||||
|
inherit (cfg) group;
|
||||||
|
isSystemUser = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
users.groups = lib.mkIf (cfg.group == "yt-dlp-web-ui") { yt-dlp-web-ui = { }; };
|
||||||
|
|
||||||
|
systemd.services.yt-dlp-web-ui = {
|
||||||
|
description = "yt-dlp-web-ui system service";
|
||||||
|
after = [ "network.target" ];
|
||||||
|
path = [ cfg.package pkgs.tree ];
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
serviceConfig =
|
||||||
|
rec {
|
||||||
|
ExecStart =
|
||||||
|
let
|
||||||
|
password =
|
||||||
|
if cfg.rpcAuth.passwordFile == null
|
||||||
|
then cfg.rpcAuth.insecurePasswordText
|
||||||
|
else "$(cat ${cfg.rpcAuth.passwordFile})";
|
||||||
|
args = [
|
||||||
|
"-host ${cfg.host}"
|
||||||
|
"-port ${builtins.toString cfg.port}"
|
||||||
|
''-out "${cfg.downloadDir}"''
|
||||||
|
"-qs ${builtins.toString cfg.queueSize}"
|
||||||
|
] ++ (lib.optionals cfg.logging [
|
||||||
|
"-fl"
|
||||||
|
''-lf "/var/log/${LogsDirectory}/yt-dlp-web-ui.log"''
|
||||||
|
]) ++ (lib.optionals cfg.rpcAuth.enable [
|
||||||
|
"-auth"
|
||||||
|
"-user ${cfg.rpcAuth.user}"
|
||||||
|
"-pass ${password}"
|
||||||
|
]);
|
||||||
|
in
|
||||||
|
"${lib.getExe cfg.package} ${lib.concatStringsSep " " args}";
|
||||||
|
User = cfg.user;
|
||||||
|
Group = cfg.group;
|
||||||
|
ProtectSystem = "strict";
|
||||||
|
ProtectHome = "read-only";
|
||||||
|
StateDirectory = "yt-dlp-web-ui";
|
||||||
|
WorkingDirectory = "/var/lib/${StateDirectory}"; # equivalent to the dir above
|
||||||
|
LogsDirectory = "yt-dlp-web-ui";
|
||||||
|
ReadWritePaths = [
|
||||||
|
cfg.downloadDir
|
||||||
|
];
|
||||||
|
BindReadOnlyPaths = [
|
||||||
|
builtins.storeDir
|
||||||
|
# required for youtube DNS lookup
|
||||||
|
"${config.environment.etc."ssl/certs/ca-certificates.crt".source}:/etc/ssl/certs/ca-certificates.crt"
|
||||||
|
] ++ lib.optionals (cfg.rpcAuth.enable && cfg.rpcAuth.passwordFile != null) [
|
||||||
|
cfg.rpcAuth.passwordFile
|
||||||
|
];
|
||||||
|
CapabilityBoundingSet = "";
|
||||||
|
RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ];
|
||||||
|
RestrictNamespaces = true;
|
||||||
|
PrivateDevices = true;
|
||||||
|
PrivateUsers = true;
|
||||||
|
ProtectClock = true;
|
||||||
|
ProtectControlGroups = true;
|
||||||
|
ProtectKernelLogs = true;
|
||||||
|
ProtectKernelModules = true;
|
||||||
|
ProtectKernelTunables = true;
|
||||||
|
SystemCallArchitectures = "native";
|
||||||
|
SystemCallFilter = [ "@system-service" "~@privileged" ];
|
||||||
|
RestrictRealtime = true;
|
||||||
|
LockPersonality = true;
|
||||||
|
MemoryDenyWriteExecute = true;
|
||||||
|
ProtectHostname = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
52
nix/server.nix
Normal file
52
nix/server.nix
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
{ yt-dlp-web-ui-frontend, buildGo123Module, lib, makeWrapper, yt-dlp, ... }:
|
||||||
|
let
|
||||||
|
fs = lib.fileset;
|
||||||
|
common = import ./common.nix { inherit lib; };
|
||||||
|
in
|
||||||
|
buildGo123Module {
|
||||||
|
pname = "yt-dlp-web-ui";
|
||||||
|
inherit (common) version;
|
||||||
|
src = fs.toSource rec {
|
||||||
|
root = ../.;
|
||||||
|
fileset = fs.difference root (fs.unions [
|
||||||
|
### LIST OF FILES TO IGNORE ###
|
||||||
|
# frontend (this is included by the frontend.nix drv instead)
|
||||||
|
../frontend
|
||||||
|
# documentation
|
||||||
|
../examples
|
||||||
|
# docker
|
||||||
|
../Dockerfile
|
||||||
|
../docker-compose.yml
|
||||||
|
# nix
|
||||||
|
./devShell.nix
|
||||||
|
../.envrc
|
||||||
|
./tests
|
||||||
|
# make
|
||||||
|
../Makefile # this derivation does not use the project Makefile
|
||||||
|
# repo commons
|
||||||
|
../.github
|
||||||
|
../README.md
|
||||||
|
../LICENSE
|
||||||
|
../.gitignore
|
||||||
|
../.vscode
|
||||||
|
]);
|
||||||
|
};
|
||||||
|
|
||||||
|
# https://github.com/golang/go/issues/44507
|
||||||
|
preBuild = ''
|
||||||
|
cp -r ${yt-dlp-web-ui-frontend} frontend
|
||||||
|
'';
|
||||||
|
|
||||||
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
wrapProgram $out/bin/yt-dlp-web-ui \
|
||||||
|
--prefix PATH : ${lib.makeBinPath [ yt-dlp ]}
|
||||||
|
'';
|
||||||
|
|
||||||
|
vendorHash = "sha256-c7IdCmYJEn5qJn3K8wt0qz3t0Nq9rbgWp1eONlCJOwM=";
|
||||||
|
|
||||||
|
meta = common.meta // {
|
||||||
|
mainProgram = "yt-dlp-web-ui";
|
||||||
|
};
|
||||||
|
}
|
||||||
20
nix/tests/default.nix
Normal file
20
nix/tests/default.nix
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
{ self, pkgs }: {
|
||||||
|
testServiceStarts = pkgs.testers.runNixOSTest (_: {
|
||||||
|
name = "service-starts";
|
||||||
|
nodes = {
|
||||||
|
machine = _: {
|
||||||
|
imports = [
|
||||||
|
self.nixosModules.default
|
||||||
|
];
|
||||||
|
|
||||||
|
services.yt-dlp-web-ui = {
|
||||||
|
enable = true;
|
||||||
|
downloadDir = "/var/lib/yt-dlp-web-ui";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
testScript = ''
|
||||||
|
machine.wait_for_unit("yt-dlp-web-ui")
|
||||||
|
'';
|
||||||
|
});
|
||||||
|
}
|
||||||
25
openapi/index.html
Normal file
25
openapi/index.html
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8" />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||||
|
<meta name="description" content="SwaggerUI" />
|
||||||
|
<title>SwaggerUI</title>
|
||||||
|
<link rel="stylesheet" href="https://unpkg.com/swagger-ui-dist@5.17.2/swagger-ui.css" />
|
||||||
|
</head>
|
||||||
|
|
||||||
|
<body>
|
||||||
|
<div id="swagger-ui"></div>
|
||||||
|
<script src="https://unpkg.com/swagger-ui-dist@5.17.2/swagger-ui-bundle.js" crossorigin></script>
|
||||||
|
<script>
|
||||||
|
window.onload = () => {
|
||||||
|
window.ui = SwaggerUIBundle({
|
||||||
|
url: './openapi.json',
|
||||||
|
dom_id: '#swagger-ui',
|
||||||
|
});
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
</body>
|
||||||
|
|
||||||
|
</html>
|
||||||
273
openapi/openapi.json
Normal file
273
openapi/openapi.json
Normal file
@@ -0,0 +1,273 @@
|
|||||||
|
{
|
||||||
|
"openapi": "3.1.0",
|
||||||
|
"info": {
|
||||||
|
"title": "Swagger yt-dlp-webui - OpenAPI 3.1",
|
||||||
|
"description": "yt-dlp-webui api based on the OpenAPI 3.1 specification. You can find out more about\nSwagger at [https://swagger.io](https://swagger.io). \n\nSome useful links:\n- [yt-dlp-webui repository](https://github.com/marcopeocchi/yt-dlp-web-ui)",
|
||||||
|
"termsOfService": "http://swagger.io/terms/",
|
||||||
|
"contact": {
|
||||||
|
"email": "apiteam@swagger.io"
|
||||||
|
},
|
||||||
|
"license": {
|
||||||
|
"name": "Apache 2.0",
|
||||||
|
"url": "http://www.apache.org/licenses/LICENSE-2.0.html"
|
||||||
|
},
|
||||||
|
"version": "1.0.11"
|
||||||
|
},
|
||||||
|
"externalDocs": {
|
||||||
|
"description": "Find out more about Swagger",
|
||||||
|
"url": "http://swagger.io"
|
||||||
|
},
|
||||||
|
"servers": [
|
||||||
|
{
|
||||||
|
"url": "/api/v1"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"tags": [
|
||||||
|
{
|
||||||
|
"name": "download",
|
||||||
|
"description": "Everything about your Pets",
|
||||||
|
"externalDocs": {
|
||||||
|
"description": "Find out more",
|
||||||
|
"url": "https://github.com/marcopeocchi/yt-dlp-web-ui"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"paths": {
|
||||||
|
"/exec": {
|
||||||
|
"post": {
|
||||||
|
"tags": [
|
||||||
|
"download"
|
||||||
|
],
|
||||||
|
"summary": "Add a new download in the pending state ready to be processed",
|
||||||
|
"description": "Add a new download in the pending state ready to be processed",
|
||||||
|
"operationId": "addDownload",
|
||||||
|
"requestBody": {
|
||||||
|
"description": "Create a new download",
|
||||||
|
"content": {
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/DownloadRequest"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"required": true
|
||||||
|
},
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "Successful operation",
|
||||||
|
"content": {
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"type": "string",
|
||||||
|
"description": "Process uuid"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"400": {
|
||||||
|
"description": "Invalid input"
|
||||||
|
},
|
||||||
|
"422": {
|
||||||
|
"description": "Validation exception"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"security": [
|
||||||
|
{
|
||||||
|
"api_key": [
|
||||||
|
"write:download",
|
||||||
|
"read:download"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"/running": {
|
||||||
|
"get": {
|
||||||
|
"tags": [
|
||||||
|
"download"
|
||||||
|
],
|
||||||
|
"summary": "Returns all running and pending process",
|
||||||
|
"description": "Returns all running and pending process",
|
||||||
|
"operationId": "running",
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "Successful operation",
|
||||||
|
"content": {
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/ProcessResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"400": {
|
||||||
|
"description": "Invalid input"
|
||||||
|
},
|
||||||
|
"422": {
|
||||||
|
"description": "Validation exception"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"security": [
|
||||||
|
{
|
||||||
|
"api_key": [
|
||||||
|
"write:download",
|
||||||
|
"read:download"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"components": {
|
||||||
|
"schemas": {
|
||||||
|
"DownloadRequest": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"url": {
|
||||||
|
"type": "string",
|
||||||
|
"examples": [
|
||||||
|
"https://..."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"params": {
|
||||||
|
"type": "array",
|
||||||
|
"format": "string",
|
||||||
|
"examples": [
|
||||||
|
"-N",
|
||||||
|
"4",
|
||||||
|
"-R",
|
||||||
|
"infinite"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"DownloadResponse": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"url": {
|
||||||
|
"type": "string",
|
||||||
|
"examples": [
|
||||||
|
"https://..."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"params": {
|
||||||
|
"type": "array",
|
||||||
|
"format": "string",
|
||||||
|
"examples": [
|
||||||
|
"-N",
|
||||||
|
"4",
|
||||||
|
"-R",
|
||||||
|
"infinite"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"DownloadProgress": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"process_status": {
|
||||||
|
"type": "integer",
|
||||||
|
"examples": [
|
||||||
|
0,
|
||||||
|
1,
|
||||||
|
2,
|
||||||
|
3
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"percentage": {
|
||||||
|
"type": "string",
|
||||||
|
"examples": [
|
||||||
|
"50%"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"speed": {
|
||||||
|
"type": "integer",
|
||||||
|
"examples": [
|
||||||
|
7289347
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"eta": {
|
||||||
|
"type": "integer",
|
||||||
|
"examples": [
|
||||||
|
3600
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"DownloadInfo": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"url": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"title": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"thumbnail": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"resolution": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"size": {
|
||||||
|
"type": "integer"
|
||||||
|
},
|
||||||
|
"vcodec": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"acodec": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"extension": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"original_url": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"created_at": {
|
||||||
|
"type": "object"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"DownloadOutput": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"path": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"filename": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"saveFilePath": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"ProcessResponse": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"progress": {
|
||||||
|
"$ref": "#/components/schemas/DownloadProgress"
|
||||||
|
},
|
||||||
|
"info": {
|
||||||
|
"$ref": "#/components/schemas/DownloadInfo"
|
||||||
|
},
|
||||||
|
"output": {
|
||||||
|
"$ref": "#/components/schemas/DownloadOutput"
|
||||||
|
},
|
||||||
|
"params": {
|
||||||
|
"type": "array",
|
||||||
|
"format": "string"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"securitySchemes": {
|
||||||
|
"api_key": {
|
||||||
|
"type": "apiKey",
|
||||||
|
"name": "api_key",
|
||||||
|
"in": "header"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
65
proto/yt-dlp.proto
Normal file
65
proto/yt-dlp.proto
Normal file
@@ -0,0 +1,65 @@
|
|||||||
|
syntax = "proto3";
|
||||||
|
|
||||||
|
message Empty {}
|
||||||
|
|
||||||
|
message BaseRequest {
|
||||||
|
string id = 1;
|
||||||
|
string url = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
message DownloadRequest {
|
||||||
|
string id = 1;
|
||||||
|
string url = 2;
|
||||||
|
string path = 3;
|
||||||
|
string rename = 4;
|
||||||
|
repeated string params = 5;
|
||||||
|
}
|
||||||
|
|
||||||
|
message ExecResponse {
|
||||||
|
string id = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
message DownloadProgress {
|
||||||
|
int32 status = 1;
|
||||||
|
string percentage = 2;
|
||||||
|
float speed = 3;
|
||||||
|
float eta = 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
message DownloadInfo {
|
||||||
|
string url = 1;
|
||||||
|
string title = 2;
|
||||||
|
string thumbnail = 3;
|
||||||
|
string resolution = 4;
|
||||||
|
int32 size = 5;
|
||||||
|
string vcodec = 6;
|
||||||
|
string acodec = 7;
|
||||||
|
string extension = 8;
|
||||||
|
string originalURL = 9;
|
||||||
|
string createdAt = 10;
|
||||||
|
}
|
||||||
|
|
||||||
|
message DownloadOutput {
|
||||||
|
string path = 1;
|
||||||
|
string filename = 2;
|
||||||
|
string savedFilePath = 3;
|
||||||
|
}
|
||||||
|
|
||||||
|
message ProcessResponse {
|
||||||
|
string id = 1;
|
||||||
|
DownloadProgress progress = 2;
|
||||||
|
DownloadInfo info = 3;
|
||||||
|
DownloadOutput output = 4;
|
||||||
|
repeated string params = 5;
|
||||||
|
}
|
||||||
|
|
||||||
|
service Ytdlp {
|
||||||
|
rpc Exec (DownloadRequest) returns (ExecResponse);
|
||||||
|
rpc ExecPlaylist (DownloadRequest) returns (ExecResponse);
|
||||||
|
|
||||||
|
rpc Progress (BaseRequest) returns (DownloadProgress);
|
||||||
|
rpc Running (Empty) returns (stream ProcessResponse);
|
||||||
|
|
||||||
|
rpc Kill (BaseRequest) returns (ExecResponse);
|
||||||
|
rpc KillAll (Empty) returns (stream ExecResponse);
|
||||||
|
}
|
||||||
68
server/config/config.go
Normal file
68
server/config/config.go
Normal file
@@ -0,0 +1,68 @@
|
|||||||
|
package config
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"sync"
|
||||||
|
|
||||||
|
"gopkg.in/yaml.v3"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Config struct {
|
||||||
|
LogPath string `yaml:"log_path"`
|
||||||
|
EnableFileLogging bool `yaml:"enable_file_logging"`
|
||||||
|
BaseURL string `yaml:"base_url"`
|
||||||
|
Host string `yaml:"host"`
|
||||||
|
Port int `yaml:"port"`
|
||||||
|
DownloadPath string `yaml:"downloadPath"`
|
||||||
|
DownloaderPath string `yaml:"downloaderPath"`
|
||||||
|
RequireAuth bool `yaml:"require_auth"`
|
||||||
|
Username string `yaml:"username"`
|
||||||
|
Password string `yaml:"password"`
|
||||||
|
QueueSize int `yaml:"queue_size"`
|
||||||
|
LocalDatabasePath string `yaml:"local_database_path"`
|
||||||
|
SessionFilePath string `yaml:"session_file_path"`
|
||||||
|
path string
|
||||||
|
|
||||||
|
UseOpenId bool `yaml:"use_openid"`
|
||||||
|
OpenIdProviderURL string `yaml:"openid_provider_url"`
|
||||||
|
OpenIdClientId string `yaml:"openid_client_id"`
|
||||||
|
OpenIdClientSecret string `yaml:"openid_client_secret"`
|
||||||
|
OpenIdRedirectURL string `yaml:"openid_redirect_url"`
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
instance *Config
|
||||||
|
instanceOnce sync.Once
|
||||||
|
)
|
||||||
|
|
||||||
|
func Instance() *Config {
|
||||||
|
if instance == nil {
|
||||||
|
instanceOnce.Do(func() {
|
||||||
|
instance = &Config{}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return instance
|
||||||
|
}
|
||||||
|
|
||||||
|
// Initialises the Config struct given its config file
|
||||||
|
func (c *Config) LoadFile(filename string) error {
|
||||||
|
fd, err := os.Open(filename)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
c.path = filename
|
||||||
|
|
||||||
|
if err := yaml.NewDecoder(fd).Decode(c); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Path of the directory containing the config file
|
||||||
|
func (c *Config) Dir() string { return filepath.Dir(c.path) }
|
||||||
|
|
||||||
|
// Absolute path of the config file
|
||||||
|
func (c *Config) Path() string { return c.path }
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
package config
|
|
||||||
|
|
||||||
import (
|
|
||||||
"os"
|
|
||||||
"sync"
|
|
||||||
|
|
||||||
"gopkg.in/yaml.v3"
|
|
||||||
)
|
|
||||||
|
|
||||||
type Config struct {
|
|
||||||
CurrentLogFile string
|
|
||||||
LogPath string `yaml:"log_path"`
|
|
||||||
Host string `yaml:"host"`
|
|
||||||
Port int `yaml:"port"`
|
|
||||||
DownloadPath string `yaml:"downloadPath"`
|
|
||||||
DownloaderPath string `yaml:"downloaderPath"`
|
|
||||||
RequireAuth bool `yaml:"require_auth"`
|
|
||||||
Username string `yaml:"username"`
|
|
||||||
Password string `yaml:"password"`
|
|
||||||
QueueSize int `yaml:"queue_size"`
|
|
||||||
SessionFilePath string `yaml:"session_file_path"`
|
|
||||||
}
|
|
||||||
|
|
||||||
var (
|
|
||||||
instance *Config
|
|
||||||
instanceOnce sync.Once
|
|
||||||
)
|
|
||||||
|
|
||||||
func Instance() *Config {
|
|
||||||
if instance == nil {
|
|
||||||
instanceOnce.Do(func() {
|
|
||||||
instance = &Config{}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
return instance
|
|
||||||
}
|
|
||||||
|
|
||||||
// Initialises the Config struct given its config file
|
|
||||||
func (c *Config) LoadFile(filename string) error {
|
|
||||||
fd, err := os.Open(filename)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := yaml.NewDecoder(fd).Decode(c); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
58
server/dbutil/migrate.go
Normal file
58
server/dbutil/migrate.go
Normal file
@@ -0,0 +1,58 @@
|
|||||||
|
package dbutil
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"database/sql"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
|
||||||
|
"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
|
||||||
|
)
|
||||||
|
|
||||||
|
var lockFilePath = filepath.Join(config.Instance().Dir(), ".db.lock")
|
||||||
|
|
||||||
|
// Run the table migration
|
||||||
|
func Migrate(ctx context.Context, db *sql.DB) error {
|
||||||
|
conn, err := db.Conn(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
defer func() {
|
||||||
|
conn.Close()
|
||||||
|
createLockFile()
|
||||||
|
}()
|
||||||
|
|
||||||
|
if _, err := db.ExecContext(
|
||||||
|
ctx,
|
||||||
|
`CREATE TABLE IF NOT EXISTS templates (
|
||||||
|
id CHAR(36) PRIMARY KEY,
|
||||||
|
name VARCHAR(255) NOT NULL,
|
||||||
|
content TEXT NOT NULL
|
||||||
|
)`,
|
||||||
|
); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if lockFileExists() {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
db.ExecContext(
|
||||||
|
ctx,
|
||||||
|
`INSERT INTO templates (id, name, content) VALUES
|
||||||
|
($1, $2, $3),
|
||||||
|
($4, $5, $6);`,
|
||||||
|
"0", "default", "--no-mtime",
|
||||||
|
"1", "audio only", "-x",
|
||||||
|
)
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func createLockFile() { os.Create(lockFilePath) }
|
||||||
|
|
||||||
|
func lockFileExists() bool {
|
||||||
|
_, err := os.Stat(lockFilePath)
|
||||||
|
return os.IsExist(err)
|
||||||
|
}
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
package dbutils
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"database/sql"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Run the table migration
|
|
||||||
func AutoMigrate(ctx context.Context, db *sql.DB) error {
|
|
||||||
conn, err := db.Conn(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
defer conn.Close()
|
|
||||||
|
|
||||||
_, err = db.ExecContext(
|
|
||||||
ctx,
|
|
||||||
`CREATE TABLE IF NOT EXISTS templates (
|
|
||||||
id CHAR(36) PRIMARY KEY,
|
|
||||||
name VARCHAR(255) NOT NULL,
|
|
||||||
content TEXT NOT NULL
|
|
||||||
)`,
|
|
||||||
)
|
|
||||||
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
@@ -1,20 +1,24 @@
|
|||||||
package handlers
|
package handlers
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"archive/zip"
|
||||||
"encoding/base64"
|
"encoding/base64"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"io"
|
"io"
|
||||||
|
"io/fs"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"regexp"
|
||||||
|
"slices"
|
||||||
"sort"
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/go-chi/chi/v5"
|
"github.com/go-chi/chi/v5"
|
||||||
"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
|
"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
|
||||||
"github.com/marcopeocchi/yt-dlp-web-ui/server/utils"
|
"github.com/marcopeocchi/yt-dlp-web-ui/server/internal"
|
||||||
)
|
)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -22,6 +26,20 @@ import (
|
|||||||
a entirely self-contained package
|
a entirely self-contained package
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
var (
|
||||||
|
videoRe = regexp.MustCompile(`(?i)/\.mov|\.mp4|\.webm|\.mvk|/gmi`)
|
||||||
|
)
|
||||||
|
|
||||||
|
func isVideo(d fs.DirEntry) bool {
|
||||||
|
return videoRe.MatchString(d.Name())
|
||||||
|
}
|
||||||
|
|
||||||
|
func isValidEntry(d fs.DirEntry) bool {
|
||||||
|
return !strings.HasPrefix(d.Name(), ".") &&
|
||||||
|
!strings.HasSuffix(d.Name(), ".part") &&
|
||||||
|
!strings.HasSuffix(d.Name(), ".ytdl")
|
||||||
|
}
|
||||||
|
|
||||||
type DirectoryEntry struct {
|
type DirectoryEntry struct {
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Path string `json:"path"`
|
Path string `json:"path"`
|
||||||
@@ -40,7 +58,7 @@ func walkDir(root string) (*[]DirectoryEntry, error) {
|
|||||||
var files []DirectoryEntry
|
var files []DirectoryEntry
|
||||||
|
|
||||||
for _, d := range dirs {
|
for _, d := range dirs {
|
||||||
if !utils.IsValidEntry(d) {
|
if !isValidEntry(d) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -55,7 +73,7 @@ func walkDir(root string) (*[]DirectoryEntry, error) {
|
|||||||
Path: path,
|
Path: path,
|
||||||
Name: d.Name(),
|
Name: d.Name(),
|
||||||
Size: info.Size(),
|
Size: info.Size(),
|
||||||
IsVideo: utils.IsVideo(d),
|
IsVideo: isVideo(d),
|
||||||
IsDirectory: d.IsDir(),
|
IsDirectory: d.IsDir(),
|
||||||
ModTime: info.ModTime(),
|
ModTime: info.ModTime(),
|
||||||
})
|
})
|
||||||
@@ -140,8 +158,7 @@ func SendFile(w http.ResponseWriter, r *http.Request) {
|
|||||||
|
|
||||||
root := config.Instance().DownloadPath
|
root := config.Instance().DownloadPath
|
||||||
|
|
||||||
// TODO: further path / file validations
|
if strings.Contains(filepath.Dir(filepath.Clean(filename)), filepath.Clean(root)) {
|
||||||
if strings.Contains(filepath.Dir(filename), root) {
|
|
||||||
http.ServeFile(w, r, filename)
|
http.ServeFile(w, r, filename)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -173,15 +190,9 @@ func DownloadFile(w http.ResponseWriter, r *http.Request) {
|
|||||||
|
|
||||||
root := config.Instance().DownloadPath
|
root := config.Instance().DownloadPath
|
||||||
|
|
||||||
if strings.Contains(filepath.Dir(filename), root) {
|
if strings.Contains(filepath.Dir(filepath.Clean(filename)), filepath.Clean(root)) {
|
||||||
w.Header().Add(
|
w.Header().Add("Content-Disposition", "inline; filename=\""+filepath.Base(filename)+"\"")
|
||||||
"Content-Disposition",
|
w.Header().Set("Content-Type", "application/octet-stream")
|
||||||
"inline; filename="+filepath.Base(filename),
|
|
||||||
)
|
|
||||||
w.Header().Set(
|
|
||||||
"Content-Type",
|
|
||||||
"application/octet-stream",
|
|
||||||
)
|
|
||||||
|
|
||||||
fd, err := os.Open(filename)
|
fd, err := os.Open(filename)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -190,7 +201,52 @@ func DownloadFile(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
io.Copy(w, fd)
|
io.Copy(w, fd)
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
w.WriteHeader(http.StatusUnauthorized)
|
w.WriteHeader(http.StatusUnauthorized)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func BulkDownload(mdb *internal.MemoryDB) http.HandlerFunc {
|
||||||
|
return func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
ps := slices.DeleteFunc(*mdb.All(), func(e internal.ProcessResponse) bool {
|
||||||
|
return e.Progress.Status != internal.StatusCompleted
|
||||||
|
})
|
||||||
|
|
||||||
|
if len(ps) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
zipWriter := zip.NewWriter(w)
|
||||||
|
|
||||||
|
w.Header().Add(
|
||||||
|
"Content-Disposition",
|
||||||
|
"inline; filename=download-archive-"+time.Now().Format(time.RFC3339)+".zip",
|
||||||
|
)
|
||||||
|
w.Header().Set("Content-Type", "application/zip")
|
||||||
|
|
||||||
|
for _, p := range ps {
|
||||||
|
wr, err := zipWriter.Create(filepath.Base(p.Output.SavedFilePath))
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
fd, err := os.Open(p.Output.SavedFilePath)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := io.Copy(wr, fd); err != nil {
|
||||||
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := zipWriter.Close(); err != nil {
|
||||||
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -8,18 +8,19 @@ import (
|
|||||||
|
|
||||||
"github.com/golang-jwt/jwt/v5"
|
"github.com/golang-jwt/jwt/v5"
|
||||||
"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
|
"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
|
||||||
"github.com/marcopeocchi/yt-dlp-web-ui/server/utils"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const TOKEN_COOKIE_NAME = "jwt-yt-dlp-webui"
|
||||||
|
|
||||||
type LoginRequest struct {
|
type LoginRequest struct {
|
||||||
Username string `json:"username"`
|
Username string `json:"username"`
|
||||||
Password string `json:"password"`
|
Password string `json:"password"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func Login(w http.ResponseWriter, r *http.Request) {
|
func Login(w http.ResponseWriter, r *http.Request) {
|
||||||
req := new(LoginRequest)
|
var req LoginRequest
|
||||||
err := json.NewDecoder(r.Body).Decode(req)
|
|
||||||
if err != nil {
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -55,7 +56,7 @@ func Login(w http.ResponseWriter, r *http.Request) {
|
|||||||
|
|
||||||
func Logout(w http.ResponseWriter, r *http.Request) {
|
func Logout(w http.ResponseWriter, r *http.Request) {
|
||||||
cookie := &http.Cookie{
|
cookie := &http.Cookie{
|
||||||
Name: utils.TOKEN_COOKIE_NAME,
|
Name: TOKEN_COOKIE_NAME,
|
||||||
HttpOnly: true,
|
HttpOnly: true,
|
||||||
Secure: false,
|
Secure: false,
|
||||||
Expires: time.Now(),
|
Expires: time.Now(),
|
||||||
|
|||||||
34
server/internal/balancer.go
Normal file
34
server/internal/balancer.go
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
package internal
|
||||||
|
|
||||||
|
import (
|
||||||
|
"container/heap"
|
||||||
|
)
|
||||||
|
|
||||||
|
type LoadBalancer struct {
|
||||||
|
pool Pool
|
||||||
|
done chan *Worker
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *LoadBalancer) Balance(work chan Process) {
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case req := <-work:
|
||||||
|
b.dispatch(req)
|
||||||
|
case w := <-b.done:
|
||||||
|
b.completed(w)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *LoadBalancer) dispatch(req Process) {
|
||||||
|
w := heap.Pop(&b.pool).(*Worker)
|
||||||
|
w.requests <- req
|
||||||
|
w.pending++
|
||||||
|
heap.Push(&b.pool, w)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *LoadBalancer) completed(w *Worker) {
|
||||||
|
w.pending--
|
||||||
|
heap.Remove(&b.pool, w.index)
|
||||||
|
heap.Push(&b.pool, w)
|
||||||
|
}
|
||||||
@@ -2,6 +2,26 @@ package internal
|
|||||||
|
|
||||||
import "time"
|
import "time"
|
||||||
|
|
||||||
|
// Used to unmarshall yt-dlp progress
|
||||||
|
type ProgressTemplate struct {
|
||||||
|
Percentage string `json:"percentage"`
|
||||||
|
Speed float32 `json:"speed"`
|
||||||
|
Size string `json:"size"`
|
||||||
|
Eta float32 `json:"eta"`
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
type PostprocessTemplate struct {
|
||||||
|
FilePath string `json:"filepath"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Defines where and how the download needs to be saved
|
||||||
|
type DownloadOutput struct {
|
||||||
|
Path string
|
||||||
|
Filename string
|
||||||
|
SavedFilePath string `json:"savedFilePath"`
|
||||||
|
}
|
||||||
|
|
||||||
// Progress for the Running call
|
// Progress for the Running call
|
||||||
type DownloadProgress struct {
|
type DownloadProgress struct {
|
||||||
Status int `json:"process_status"`
|
Status int `json:"process_status"`
|
||||||
@@ -21,6 +41,7 @@ type DownloadInfo struct {
|
|||||||
ACodec string `json:"acodec"`
|
ACodec string `json:"acodec"`
|
||||||
Extension string `json:"ext"`
|
Extension string `json:"ext"`
|
||||||
OriginalURL string `json:"original_url"`
|
OriginalURL string `json:"original_url"`
|
||||||
|
FileName string `json:"filename"`
|
||||||
CreatedAt time.Time `json:"created_at"`
|
CreatedAt time.Time `json:"created_at"`
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -42,6 +63,7 @@ type Format struct {
|
|||||||
VCodec string `json:"vcodec"`
|
VCodec string `json:"vcodec"`
|
||||||
ACodec string `json:"acodec"`
|
ACodec string `json:"acodec"`
|
||||||
Size float32 `json:"filesize_approx"`
|
Size float32 `json:"filesize_approx"`
|
||||||
|
Language string `json:"language"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// struct representing the response sent to the client
|
// struct representing the response sent to the client
|
||||||
@@ -79,6 +101,7 @@ type SetCookiesRequest struct {
|
|||||||
Cookies string `json:"cookies"`
|
Cookies string `json:"cookies"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// represents a user defined collection of yt-dlp arguments
|
||||||
type CustomTemplate struct {
|
type CustomTemplate struct {
|
||||||
Id string `json:"id"`
|
Id string `json:"id"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
215
server/internal/livestream/livestream.go
Normal file
215
server/internal/livestream/livestream.go
Normal file
@@ -0,0 +1,215 @@
|
|||||||
|
package livestream
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"errors"
|
||||||
|
"io"
|
||||||
|
"os"
|
||||||
|
"os/exec"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
|
||||||
|
"github.com/marcopeocchi/yt-dlp-web-ui/server/internal"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
waiting = iota
|
||||||
|
inProgress
|
||||||
|
completed
|
||||||
|
errored
|
||||||
|
)
|
||||||
|
|
||||||
|
// Defines a generic livestream.
|
||||||
|
// A livestream is identified by its url.
|
||||||
|
type LiveStream struct {
|
||||||
|
url string
|
||||||
|
proc *os.Process // used to manually kill the yt-dlp process
|
||||||
|
status int // whether is monitoring or completed
|
||||||
|
done chan *LiveStream // where to signal the completition
|
||||||
|
waitTimeChan chan time.Duration // time to livestream start
|
||||||
|
waitTime time.Duration
|
||||||
|
liveDate time.Time
|
||||||
|
|
||||||
|
mq *internal.MessageQueue
|
||||||
|
db *internal.MemoryDB
|
||||||
|
}
|
||||||
|
|
||||||
|
func New(url string, done chan *LiveStream, mq *internal.MessageQueue, db *internal.MemoryDB) *LiveStream {
|
||||||
|
return &LiveStream{
|
||||||
|
url: url,
|
||||||
|
done: done,
|
||||||
|
status: waiting,
|
||||||
|
waitTime: time.Second * 0,
|
||||||
|
waitTimeChan: make(chan time.Duration),
|
||||||
|
mq: mq,
|
||||||
|
db: db,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Start the livestream monitoring process, once completion signals on the done channel
|
||||||
|
func (l *LiveStream) Start() error {
|
||||||
|
cmd := exec.Command(
|
||||||
|
config.Instance().DownloaderPath,
|
||||||
|
l.url,
|
||||||
|
"--wait-for-video", "30", // wait for the stream to be live and recheck every 10 secs
|
||||||
|
"--no-colors", // no ansi color fuzz
|
||||||
|
"--simulate",
|
||||||
|
"--newline",
|
||||||
|
"--paths", config.Instance().DownloadPath,
|
||||||
|
)
|
||||||
|
|
||||||
|
stdout, err := cmd.StdoutPipe()
|
||||||
|
if err != nil {
|
||||||
|
l.status = errored
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer stdout.Close()
|
||||||
|
|
||||||
|
if err := cmd.Start(); err != nil {
|
||||||
|
l.status = errored
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
l.proc = cmd.Process
|
||||||
|
l.status = waiting
|
||||||
|
|
||||||
|
// Start monitoring when the livestream is goin to be live.
|
||||||
|
// If already live do nothing.
|
||||||
|
go l.monitorStartTime(stdout)
|
||||||
|
|
||||||
|
// Wait to the simulated download process to finish.
|
||||||
|
cmd.Wait()
|
||||||
|
|
||||||
|
// Set the job as completed and notify the parent the completion.
|
||||||
|
l.status = completed
|
||||||
|
l.done <- l
|
||||||
|
|
||||||
|
// Send the started livestream to the message queue! :D
|
||||||
|
p := &internal.Process{
|
||||||
|
Url: l.url,
|
||||||
|
Livestream: true,
|
||||||
|
Params: []string{"--downloader", "ffmpeg", "--no-part"},
|
||||||
|
}
|
||||||
|
l.db.Set(p)
|
||||||
|
l.mq.Publish(p)
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (l *LiveStream) monitorStartTime(r io.Reader) {
|
||||||
|
// yt-dlp shows the time in the stdout
|
||||||
|
scanner := bufio.NewScanner(r)
|
||||||
|
|
||||||
|
defer func() {
|
||||||
|
l.status = inProgress
|
||||||
|
close(l.waitTimeChan)
|
||||||
|
}()
|
||||||
|
|
||||||
|
// however the time to live is not shown in a new line (and atm there's nothing to do about)
|
||||||
|
// use a custom split funciton to set the line separator to \r instead of \r\n or \n
|
||||||
|
scanner.Split(stdoutSplitFunc)
|
||||||
|
|
||||||
|
waitTimeScanner := func() {
|
||||||
|
for scanner.Scan() {
|
||||||
|
// l.log <- scanner.Bytes()
|
||||||
|
|
||||||
|
// if this substring is in the current line the download is starting,
|
||||||
|
// no need to monitor the time to live.
|
||||||
|
//TODO: silly
|
||||||
|
if !strings.Contains(scanner.Text(), "Remaining time until next attempt") {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
parts := strings.Split(scanner.Text(), ": ")
|
||||||
|
if len(parts) < 2 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
startsIn := parts[1]
|
||||||
|
parsed, err := parseTimeSpan(startsIn)
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
l.liveDate = parsed
|
||||||
|
|
||||||
|
//TODO: check if using channels is stupid or not
|
||||||
|
// l.waitTimeChan <- time.Until(start)
|
||||||
|
l.waitTime = time.Until(parsed)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const TRIES = 5
|
||||||
|
/*
|
||||||
|
if it's waiting a livestream the 5th line will indicate the time to live
|
||||||
|
its a dumb and not robust method.
|
||||||
|
|
||||||
|
example:
|
||||||
|
[youtube] Extracting URL: https://www.youtube.com/watch?v=IQVbGfVVjgY
|
||||||
|
[youtube] IQVbGfVVjgY: Downloading webpage
|
||||||
|
[youtube] IQVbGfVVjgY: Downloading ios player API JSON
|
||||||
|
[youtube] IQVbGfVVjgY: Downloading web creator player API JSON
|
||||||
|
WARNING: [youtube] This live event will begin in 27 minutes. <- STDERR, ignore
|
||||||
|
[wait] Waiting for 00:27:15 - Press Ctrl+C to try now <- 5th line
|
||||||
|
*/
|
||||||
|
for range TRIES {
|
||||||
|
scanner.Scan()
|
||||||
|
|
||||||
|
if strings.Contains(scanner.Text(), "Waiting for") {
|
||||||
|
waitTimeScanner()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (l *LiveStream) WaitTime() <-chan time.Duration {
|
||||||
|
return l.waitTimeChan
|
||||||
|
}
|
||||||
|
|
||||||
|
// Kills a livestream process and signal its completition
|
||||||
|
func (l *LiveStream) Kill() error {
|
||||||
|
l.done <- l
|
||||||
|
|
||||||
|
if l.proc != nil {
|
||||||
|
return l.proc.Kill()
|
||||||
|
}
|
||||||
|
|
||||||
|
return errors.New("nil yt-dlp process")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse the timespan returned from yt-dlp (time to live)
|
||||||
|
//
|
||||||
|
// parsed := parseTimeSpan("76:12:15")
|
||||||
|
// fmt.Println(parsed) // 2024-07-21 13:59:59.634781 +0200 CEST
|
||||||
|
func parseTimeSpan(timeStr string) (time.Time, error) {
|
||||||
|
parts := strings.Split(timeStr, ":")
|
||||||
|
|
||||||
|
hh, err := strconv.Atoi(parts[0])
|
||||||
|
if err != nil {
|
||||||
|
return time.Time{}, err
|
||||||
|
}
|
||||||
|
mm, err := strconv.Atoi(parts[1])
|
||||||
|
if err != nil {
|
||||||
|
return time.Time{}, err
|
||||||
|
}
|
||||||
|
ss, err := strconv.Atoi(parts[2])
|
||||||
|
if err != nil {
|
||||||
|
return time.Time{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
dd := 0
|
||||||
|
|
||||||
|
if hh > 24 {
|
||||||
|
dd = hh / 24
|
||||||
|
hh = hh % 24
|
||||||
|
}
|
||||||
|
|
||||||
|
start := time.Now()
|
||||||
|
start = start.AddDate(0, 0, dd)
|
||||||
|
start = start.Add(time.Duration(hh) * time.Hour)
|
||||||
|
start = start.Add(time.Duration(mm) * time.Minute)
|
||||||
|
start = start.Add(time.Duration(ss) * time.Second)
|
||||||
|
|
||||||
|
return start, nil
|
||||||
|
}
|
||||||
36
server/internal/livestream/livestream_test.go
Normal file
36
server/internal/livestream/livestream_test.go
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
package livestream
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
|
||||||
|
"github.com/marcopeocchi/yt-dlp-web-ui/server/internal"
|
||||||
|
)
|
||||||
|
|
||||||
|
func setupTest() {
|
||||||
|
config.Instance().DownloaderPath = "yt-dlp"
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestLivestream(t *testing.T) {
|
||||||
|
setupTest()
|
||||||
|
|
||||||
|
done := make(chan *LiveStream)
|
||||||
|
|
||||||
|
ls := New("https://www.youtube.com/watch?v=LSm1daKezcE", done, &internal.MessageQueue{}, &internal.MemoryDB{})
|
||||||
|
go ls.Start()
|
||||||
|
|
||||||
|
time.AfterFunc(time.Second*20, func() {
|
||||||
|
ls.Kill()
|
||||||
|
})
|
||||||
|
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case wt := <-ls.WaitTime():
|
||||||
|
t.Log(wt)
|
||||||
|
case <-done:
|
||||||
|
t.Log("done")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
118
server/internal/livestream/monitor.go
Normal file
118
server/internal/livestream/monitor.go
Normal file
@@ -0,0 +1,118 @@
|
|||||||
|
package livestream
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/gob"
|
||||||
|
"log/slog"
|
||||||
|
"maps"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
|
||||||
|
"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
|
||||||
|
"github.com/marcopeocchi/yt-dlp-web-ui/server/internal"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Monitor struct {
|
||||||
|
db *internal.MemoryDB // where the just started livestream will be published
|
||||||
|
mq *internal.MessageQueue // where the just started livestream will be published
|
||||||
|
streams map[string]*LiveStream // keeps track of the livestreams
|
||||||
|
done chan *LiveStream // to signal individual processes completition
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewMonitor(mq *internal.MessageQueue, db *internal.MemoryDB) *Monitor {
|
||||||
|
return &Monitor{
|
||||||
|
mq: mq,
|
||||||
|
db: db,
|
||||||
|
streams: make(map[string]*LiveStream),
|
||||||
|
done: make(chan *LiveStream),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Detect each livestream completition, if done detach it from the monitor.
|
||||||
|
func (m *Monitor) Schedule() {
|
||||||
|
for l := range m.done {
|
||||||
|
delete(m.streams, l.url)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *Monitor) Add(url string) {
|
||||||
|
ls := New(url, m.done, m.mq, m.db)
|
||||||
|
|
||||||
|
go ls.Start()
|
||||||
|
m.streams[url] = ls
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *Monitor) Remove(url string) error {
|
||||||
|
return m.streams[url].Kill()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *Monitor) RemoveAll() error {
|
||||||
|
for _, v := range m.streams {
|
||||||
|
if err := v.Kill(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *Monitor) Status() LiveStreamStatus {
|
||||||
|
status := make(LiveStreamStatus)
|
||||||
|
|
||||||
|
for k, v := range m.streams {
|
||||||
|
// wt, ok := <-v.WaitTime()
|
||||||
|
// if !ok {
|
||||||
|
// continue
|
||||||
|
// }
|
||||||
|
|
||||||
|
status[k] = Status{
|
||||||
|
Status: v.status,
|
||||||
|
WaitTime: v.waitTime,
|
||||||
|
LiveDate: v.liveDate,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return status
|
||||||
|
}
|
||||||
|
|
||||||
|
// Persist the monitor current state to a file.
|
||||||
|
// The file is located in the configured config directory
|
||||||
|
func (m *Monitor) Persist() error {
|
||||||
|
fd, err := os.Create(filepath.Join(config.Instance().Dir(), "livestreams.dat"))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
defer fd.Close()
|
||||||
|
|
||||||
|
slog.Debug("persisting livestream monitor state")
|
||||||
|
|
||||||
|
var toPersist []string
|
||||||
|
for url := range maps.Keys(m.streams) {
|
||||||
|
toPersist = append(toPersist, url)
|
||||||
|
}
|
||||||
|
|
||||||
|
return gob.NewEncoder(fd).Encode(toPersist)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Restore a saved state and resume the monitored livestreams
|
||||||
|
func (m *Monitor) Restore() error {
|
||||||
|
fd, err := os.Open(filepath.Join(config.Instance().Dir(), "livestreams.dat"))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
defer fd.Close()
|
||||||
|
|
||||||
|
var toRestore []string
|
||||||
|
|
||||||
|
if err := gob.NewDecoder(fd).Decode(&toRestore); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, url := range toRestore {
|
||||||
|
m.Add(url)
|
||||||
|
}
|
||||||
|
|
||||||
|
slog.Debug("restored livestream monitor state")
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
1
server/internal/livestream/monitor_test.go
Normal file
1
server/internal/livestream/monitor_test.go
Normal file
@@ -0,0 +1 @@
|
|||||||
|
package livestream
|
||||||
11
server/internal/livestream/status.go
Normal file
11
server/internal/livestream/status.go
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
package livestream
|
||||||
|
|
||||||
|
import "time"
|
||||||
|
|
||||||
|
type LiveStreamStatus = map[string]Status
|
||||||
|
|
||||||
|
type Status = struct {
|
||||||
|
Status int `json:"status"`
|
||||||
|
WaitTime time.Duration `json:"waitTime"`
|
||||||
|
LiveDate time.Time `json:"liveDate"`
|
||||||
|
}
|
||||||
16
server/internal/livestream/utils.go
Normal file
16
server/internal/livestream/utils.go
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
package livestream
|
||||||
|
|
||||||
|
import "bufio"
|
||||||
|
|
||||||
|
var stdoutSplitFunc = func(data []byte, atEOF bool) (advance int, token []byte, err error) {
|
||||||
|
for i := 0; i < len(data); i++ {
|
||||||
|
if data[i] == '\r' || data[i] == '\n' {
|
||||||
|
return i + 1, data[:i], nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !atEOF {
|
||||||
|
return 0, nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0, data, bufio.ErrFinalToken
|
||||||
|
}
|
||||||
@@ -3,8 +3,6 @@ package internal
|
|||||||
import (
|
import (
|
||||||
"encoding/gob"
|
"encoding/gob"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
|
||||||
"log/slog"
|
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"sync"
|
"sync"
|
||||||
@@ -15,84 +13,81 @@ import (
|
|||||||
|
|
||||||
// In-Memory Thread-Safe Key-Value Storage with optional persistence
|
// In-Memory Thread-Safe Key-Value Storage with optional persistence
|
||||||
type MemoryDB struct {
|
type MemoryDB struct {
|
||||||
table sync.Map
|
table map[string]*Process
|
||||||
|
mu sync.RWMutex
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewMemoryDB() *MemoryDB {
|
||||||
|
return &MemoryDB{
|
||||||
|
table: make(map[string]*Process),
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get a process pointer given its id
|
// Get a process pointer given its id
|
||||||
func (m *MemoryDB) Get(id string) (*Process, error) {
|
func (m *MemoryDB) Get(id string) (*Process, error) {
|
||||||
entry, ok := m.table.Load(id)
|
m.mu.RLock()
|
||||||
|
defer m.mu.RUnlock()
|
||||||
|
|
||||||
|
entry, ok := m.table[id]
|
||||||
if !ok {
|
if !ok {
|
||||||
return nil, errors.New("no process found for the given key")
|
return nil, errors.New("no process found for the given key")
|
||||||
}
|
}
|
||||||
return entry.(*Process), nil
|
|
||||||
|
return entry, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Store a pointer of a process and return its id
|
// Store a pointer of a process and return its id
|
||||||
func (m *MemoryDB) Set(process *Process) string {
|
func (m *MemoryDB) Set(process *Process) string {
|
||||||
id := uuid.NewString()
|
id := uuid.NewString()
|
||||||
m.table.Store(id, process)
|
|
||||||
|
m.mu.Lock()
|
||||||
process.Id = id
|
process.Id = id
|
||||||
|
m.table[id] = process
|
||||||
|
m.mu.Unlock()
|
||||||
|
|
||||||
return id
|
return id
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update a process info/metadata, given the process id
|
|
||||||
//
|
|
||||||
// Deprecated: will be removed anytime soon.
|
|
||||||
func (m *MemoryDB) UpdateInfo(id string, info DownloadInfo) error {
|
|
||||||
entry, ok := m.table.Load(id)
|
|
||||||
if ok {
|
|
||||||
entry.(*Process).Info = info
|
|
||||||
m.table.Store(id, entry)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return fmt.Errorf("can't update row with id %s", id)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update a process progress data, given the process id
|
|
||||||
// Used for updating completition percentage or ETA.
|
|
||||||
//
|
|
||||||
// Deprecated: will be removed anytime soon.
|
|
||||||
func (m *MemoryDB) UpdateProgress(id string, progress DownloadProgress) error {
|
|
||||||
entry, ok := m.table.Load(id)
|
|
||||||
if ok {
|
|
||||||
entry.(*Process).Progress = progress
|
|
||||||
m.table.Store(id, entry)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return fmt.Errorf("can't update row with id %s", id)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Removes a process progress, given the process id
|
// Removes a process progress, given the process id
|
||||||
func (m *MemoryDB) Delete(id string) {
|
func (m *MemoryDB) Delete(id string) {
|
||||||
m.table.Delete(id)
|
m.mu.Lock()
|
||||||
|
delete(m.table, id)
|
||||||
|
m.mu.Unlock()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *MemoryDB) Keys() *[]string {
|
func (m *MemoryDB) Keys() *[]string {
|
||||||
running := []string{}
|
var running []string
|
||||||
m.table.Range(func(key, value any) bool {
|
|
||||||
running = append(running, key.(string))
|
m.mu.RLock()
|
||||||
return true
|
defer m.mu.RUnlock()
|
||||||
})
|
|
||||||
|
for id := range m.table {
|
||||||
|
running = append(running, id)
|
||||||
|
}
|
||||||
|
|
||||||
return &running
|
return &running
|
||||||
}
|
}
|
||||||
|
|
||||||
// Returns a slice of all currently stored processes progess
|
// Returns a slice of all currently stored processes progess
|
||||||
func (m *MemoryDB) All() *[]ProcessResponse {
|
func (m *MemoryDB) All() *[]ProcessResponse {
|
||||||
running := []ProcessResponse{}
|
running := []ProcessResponse{}
|
||||||
m.table.Range(func(key, value any) bool {
|
|
||||||
|
m.mu.RLock()
|
||||||
|
for k, v := range m.table {
|
||||||
running = append(running, ProcessResponse{
|
running = append(running, ProcessResponse{
|
||||||
Id: key.(string),
|
Id: k,
|
||||||
Info: value.(*Process).Info,
|
Info: v.Info,
|
||||||
Progress: value.(*Process).Progress,
|
Progress: v.Progress,
|
||||||
Output: value.(*Process).Output,
|
Output: v.Output,
|
||||||
Params: value.(*Process).Params,
|
Params: v.Params,
|
||||||
})
|
})
|
||||||
return true
|
}
|
||||||
})
|
m.mu.RUnlock()
|
||||||
|
|
||||||
return &running
|
return &running
|
||||||
}
|
}
|
||||||
|
|
||||||
// WIP: Persist the database in a single file named "session.dat"
|
// Persist the database in a single file named "session.dat"
|
||||||
func (m *MemoryDB) Persist() error {
|
func (m *MemoryDB) Persist() error {
|
||||||
running := m.All()
|
running := m.All()
|
||||||
|
|
||||||
@@ -103,32 +98,35 @@ func (m *MemoryDB) Persist() error {
|
|||||||
return errors.Join(errors.New("failed to persist session"), err)
|
return errors.Join(errors.New("failed to persist session"), err)
|
||||||
}
|
}
|
||||||
|
|
||||||
session := Session{
|
m.mu.RLock()
|
||||||
Processes: *running,
|
defer m.mu.RUnlock()
|
||||||
}
|
session := Session{Processes: *running}
|
||||||
|
|
||||||
err = gob.NewEncoder(fd).Encode(session)
|
if err := gob.NewEncoder(fd).Encode(session); err != nil {
|
||||||
if err != nil {
|
|
||||||
return errors.Join(errors.New("failed to persist session"), err)
|
return errors.Join(errors.New("failed to persist session"), err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// WIP: Restore a persisted state
|
// Restore a persisted state
|
||||||
func (m *MemoryDB) Restore(logger *slog.Logger) {
|
func (m *MemoryDB) Restore(mq *MessageQueue) {
|
||||||
fd, err := os.Open("session.dat")
|
sf := filepath.Join(config.Instance().SessionFilePath, "session.dat")
|
||||||
|
|
||||||
|
fd, err := os.Open(sf)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
session := Session{}
|
var session Session
|
||||||
|
|
||||||
err = gob.NewDecoder(fd).Decode(&session)
|
if err := gob.NewDecoder(fd).Decode(&session); err != nil {
|
||||||
if err != nil {
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m.mu.Lock()
|
||||||
|
defer m.mu.Unlock()
|
||||||
|
|
||||||
for _, proc := range session.Processes {
|
for _, proc := range session.Processes {
|
||||||
restored := &Process{
|
restored := &Process{
|
||||||
Id: proc.Id,
|
Id: proc.Id,
|
||||||
@@ -137,13 +135,12 @@ func (m *MemoryDB) Restore(logger *slog.Logger) {
|
|||||||
Progress: proc.Progress,
|
Progress: proc.Progress,
|
||||||
Output: proc.Output,
|
Output: proc.Output,
|
||||||
Params: proc.Params,
|
Params: proc.Params,
|
||||||
Logger: logger,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
m.table.Store(proc.Id, restored)
|
m.table[proc.Id] = restored
|
||||||
|
|
||||||
if restored.Progress.Percentage != "-1" {
|
if restored.Progress.Status != StatusCompleted {
|
||||||
go restored.Start()
|
mq.Publish(restored)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,63 +1,112 @@
|
|||||||
package internal
|
package internal
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"log/slog"
|
||||||
|
|
||||||
|
evbus "github.com/asaskevich/EventBus"
|
||||||
"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
|
"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
|
||||||
|
"golang.org/x/sync/semaphore"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const queueName = "process:pending"
|
||||||
|
|
||||||
type MessageQueue struct {
|
type MessageQueue struct {
|
||||||
producerCh chan *Process
|
concurrency int
|
||||||
consumerCh chan struct{}
|
eventBus evbus.Bus
|
||||||
}
|
}
|
||||||
|
|
||||||
// Creates a new message queue.
|
// Creates a new message queue.
|
||||||
// By default it will be created with a size equals to nthe number of logical
|
// By default it will be created with a size equals to nthe number of logical
|
||||||
// CPU cores.
|
// CPU cores -1.
|
||||||
// The queue size can be set via the qs flag.
|
// The queue size can be set via the qs flag.
|
||||||
func NewMessageQueue() *MessageQueue {
|
func NewMessageQueue() (*MessageQueue, error) {
|
||||||
size := config.Instance().QueueSize
|
qs := config.Instance().QueueSize
|
||||||
|
|
||||||
if size <= 0 {
|
if qs <= 0 {
|
||||||
panic("invalid queue size")
|
return nil, errors.New("invalid queue size")
|
||||||
}
|
}
|
||||||
|
|
||||||
return &MessageQueue{
|
return &MessageQueue{
|
||||||
producerCh: make(chan *Process, size),
|
concurrency: qs,
|
||||||
consumerCh: make(chan struct{}, size),
|
eventBus: evbus.New(),
|
||||||
}
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Publish a message to the queue and set the task to a peding state.
|
// Publish a message to the queue and set the task to a peding state.
|
||||||
func (m *MessageQueue) Publish(p *Process) {
|
func (m *MessageQueue) Publish(p *Process) {
|
||||||
|
// needs to have an id set before
|
||||||
p.SetPending()
|
p.SetPending()
|
||||||
go p.SetMetadata()
|
|
||||||
m.producerCh <- p
|
m.eventBus.Publish(queueName, p)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Publish a message to the queue and set the task to a peding state.
|
func (m *MessageQueue) SetupConsumers() {
|
||||||
// ENSURE P IS PART OF A PLAYLIST
|
go m.downloadConsumer()
|
||||||
// Needs a further review
|
go m.metadataSubscriber()
|
||||||
func (m *MessageQueue) PublishPlaylistEntry(p *Process) {
|
|
||||||
m.producerCh <- p
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Setup the consumer listener which subscribes to the changes to the producer
|
// Setup the consumer listener which subscribes to the changes to the producer
|
||||||
// channel and triggers the "download" action.
|
// channel and triggers the "download" action.
|
||||||
func (m *MessageQueue) Subscriber() {
|
func (m *MessageQueue) downloadConsumer() {
|
||||||
for msg := range m.producerCh {
|
sem := semaphore.NewWeighted(int64(m.concurrency))
|
||||||
m.consumerCh <- struct{}{}
|
|
||||||
go func(p *Process) {
|
m.eventBus.SubscribeAsync(queueName, func(p *Process) {
|
||||||
p.Start()
|
sem.Acquire(context.Background(), 1)
|
||||||
<-m.consumerCh
|
defer sem.Release(1)
|
||||||
}(msg)
|
|
||||||
}
|
slog.Info("received process from event bus",
|
||||||
|
slog.String("bus", queueName),
|
||||||
|
slog.String("consumer", "downloadConsumer"),
|
||||||
|
slog.String("id", p.getShortId()),
|
||||||
|
)
|
||||||
|
|
||||||
|
if p.Progress.Status != StatusCompleted {
|
||||||
|
slog.Info("started process",
|
||||||
|
slog.String("bus", queueName),
|
||||||
|
slog.String("id", p.getShortId()),
|
||||||
|
)
|
||||||
|
if p.Livestream {
|
||||||
|
// livestreams have higher priorty and they ignore the semaphore
|
||||||
|
go p.Start()
|
||||||
|
} else {
|
||||||
|
p.Start()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, false)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Empties the message queue
|
// Setup the metadata consumer listener which subscribes to the changes to the
|
||||||
func (m *MessageQueue) Empty() {
|
// producer channel and adds metadata to each download.
|
||||||
for range m.producerCh {
|
func (m *MessageQueue) metadataSubscriber() {
|
||||||
<-m.producerCh
|
// How many concurrent metadata fetcher jobs are spawned
|
||||||
}
|
// Since there's ongoing downloads, 1 job at time seems a good compromise
|
||||||
for range m.consumerCh {
|
sem := semaphore.NewWeighted(1)
|
||||||
<-m.consumerCh
|
|
||||||
}
|
m.eventBus.SubscribeAsync(queueName, func(p *Process) {
|
||||||
|
sem.Acquire(context.Background(), 1)
|
||||||
|
defer sem.Release(1)
|
||||||
|
|
||||||
|
slog.Info("received process from event bus",
|
||||||
|
slog.String("bus", queueName),
|
||||||
|
slog.String("consumer", "metadataConsumer"),
|
||||||
|
slog.String("id", p.getShortId()),
|
||||||
|
)
|
||||||
|
|
||||||
|
if p.Progress.Status == StatusCompleted {
|
||||||
|
slog.Warn("proccess has an illegal state",
|
||||||
|
slog.String("id", p.getShortId()),
|
||||||
|
slog.Int("status", p.Progress.Status),
|
||||||
|
)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := p.SetMetadata(); err != nil {
|
||||||
|
slog.Error("failed to retrieve metadata",
|
||||||
|
slog.String("id", p.getShortId()),
|
||||||
|
slog.String("err", err.Error()),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}, false)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
|
"slices"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@@ -18,10 +19,10 @@ type metadata struct {
|
|||||||
Type string `json:"_type"`
|
Type string `json:"_type"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func PlaylistDetect(req DownloadRequest, mq *MessageQueue, db *MemoryDB, logger *slog.Logger) error {
|
func PlaylistDetect(req DownloadRequest, mq *MessageQueue, db *MemoryDB) error {
|
||||||
var (
|
var (
|
||||||
downloader = config.Instance().DownloaderPath
|
downloader = config.Instance().DownloaderPath
|
||||||
cmd = exec.Command(downloader, req.URL, "-J")
|
cmd = exec.Command(downloader, req.URL, "--flat-playlist", "-J")
|
||||||
)
|
)
|
||||||
|
|
||||||
stdout, err := cmd.StdoutPipe()
|
stdout, err := cmd.StdoutPipe()
|
||||||
@@ -29,37 +30,36 @@ func PlaylistDetect(req DownloadRequest, mq *MessageQueue, db *MemoryDB, logger
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
m := metadata{}
|
var m metadata
|
||||||
|
|
||||||
err = cmd.Start()
|
if err := cmd.Start(); err != nil {
|
||||||
if err != nil {
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.Info("decoding metadata", slog.String("url", req.URL))
|
slog.Info("decoding playlist metadata", slog.String("url", req.URL))
|
||||||
|
|
||||||
err = json.NewDecoder(stdout).Decode(&m)
|
if err := json.NewDecoder(stdout).Decode(&m); err != nil {
|
||||||
if err != nil {
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.Info("decoded metadata", slog.String("url", req.URL))
|
if err := cmd.Wait(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
slog.Info("decoded playlist metadata", slog.String("url", req.URL))
|
||||||
|
|
||||||
if m.Type == "" {
|
if m.Type == "" {
|
||||||
cmd.Wait()
|
|
||||||
return errors.New("probably not a valid URL")
|
return errors.New("probably not a valid URL")
|
||||||
}
|
}
|
||||||
|
|
||||||
if m.Type == "playlist" {
|
if m.Type == "playlist" {
|
||||||
logger.Info(
|
entries := slices.CompactFunc(slices.Compact(m.Entries), func(a DownloadInfo, b DownloadInfo) bool {
|
||||||
"playlist detected",
|
return a.URL == b.URL
|
||||||
slog.String("url", req.URL),
|
})
|
||||||
slog.Int("count", m.Count),
|
|
||||||
)
|
|
||||||
|
|
||||||
for i, meta := range m.Entries {
|
slog.Info("playlist detected", slog.String("url", req.URL), slog.Int("count", len(entries)))
|
||||||
delta := time.Second.Microseconds() * int64(i+1)
|
|
||||||
|
|
||||||
|
for i, meta := range entries {
|
||||||
// detect playlist title from metadata since each playlist entry will be
|
// detect playlist title from metadata since each playlist entry will be
|
||||||
// treated as an individual download
|
// treated as an individual download
|
||||||
req.Rename = strings.Replace(
|
req.Rename = strings.Replace(
|
||||||
@@ -69,36 +69,34 @@ func PlaylistDetect(req DownloadRequest, mq *MessageQueue, db *MemoryDB, logger
|
|||||||
1,
|
1,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
//XXX: it's idiotic but it works: virtually delay the creation time
|
||||||
|
meta.CreatedAt = time.Now().Add(time.Millisecond * time.Duration(i*10))
|
||||||
|
|
||||||
proc := &Process{
|
proc := &Process{
|
||||||
Url: meta.OriginalURL,
|
Url: meta.URL,
|
||||||
Progress: DownloadProgress{},
|
Progress: DownloadProgress{},
|
||||||
Output: DownloadOutput{
|
Output: DownloadOutput{Filename: req.Rename},
|
||||||
Filename: req.Rename,
|
Info: meta,
|
||||||
},
|
Params: req.Params,
|
||||||
Info: meta,
|
|
||||||
Params: req.Params,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
proc.Info.URL = meta.OriginalURL
|
proc.Info.URL = meta.URL
|
||||||
proc.Info.CreatedAt = time.Now().Add(time.Duration(delta))
|
|
||||||
|
time.Sleep(time.Millisecond)
|
||||||
|
|
||||||
db.Set(proc)
|
db.Set(proc)
|
||||||
proc.SetPending()
|
mq.Publish(proc)
|
||||||
mq.PublishPlaylistEntry(proc)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
err = cmd.Wait()
|
|
||||||
return err
|
|
||||||
}
|
}
|
||||||
|
|
||||||
proc := &Process{
|
proc := &Process{
|
||||||
Url: req.URL,
|
Url: req.URL,
|
||||||
Params: req.Params,
|
Params: req.Params,
|
||||||
Logger: logger,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
db.Set(proc)
|
||||||
mq.Publish(proc)
|
mq.Publish(proc)
|
||||||
logger.Info("sending new process to message queue", slog.String("url", proc.Url))
|
slog.Info("sending new process to message queue", slog.String("url", proc.Url))
|
||||||
|
|
||||||
return cmd.Wait()
|
return cmd.Wait()
|
||||||
}
|
}
|
||||||
|
|||||||
16
server/internal/pool.go
Normal file
16
server/internal/pool.go
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
package internal
|
||||||
|
|
||||||
|
type Pool []*Worker
|
||||||
|
|
||||||
|
func (h Pool) Len() int { return len(h) }
|
||||||
|
func (h Pool) Less(i, j int) bool { return h[i].index < h[j].index }
|
||||||
|
func (h Pool) Swap(i, j int) { h[i], h[j] = h[j], h[i] }
|
||||||
|
func (h *Pool) Push(x any) { *h = append(*h, x.(*Worker)) }
|
||||||
|
|
||||||
|
func (h *Pool) Pop() any {
|
||||||
|
old := *h
|
||||||
|
n := len(old)
|
||||||
|
x := old[n-1]
|
||||||
|
*h = old[0 : n-1]
|
||||||
|
return x
|
||||||
|
}
|
||||||
@@ -2,32 +2,40 @@ package internal
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"bufio"
|
"bufio"
|
||||||
|
"bytes"
|
||||||
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"io"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
"regexp"
|
"regexp"
|
||||||
|
"slices"
|
||||||
"sync"
|
"sync"
|
||||||
"syscall"
|
"syscall"
|
||||||
|
|
||||||
"log"
|
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/marcopeocchi/fazzoletti/slices"
|
|
||||||
"github.com/marcopeocchi/yt-dlp-web-ui/server/cli"
|
|
||||||
"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
|
"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
|
||||||
"github.com/marcopeocchi/yt-dlp-web-ui/server/rx"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const template = `download:
|
const downloadTemplate = `download:
|
||||||
{
|
{
|
||||||
"eta":%(progress.eta)s,
|
"eta":%(progress.eta)s,
|
||||||
"percentage":"%(progress._percent_str)s",
|
"percentage":"%(progress._percent_str)s",
|
||||||
"speed":%(progress.speed)s
|
"speed":%(progress.speed)s
|
||||||
}`
|
}`
|
||||||
|
|
||||||
|
// filename not returning the correct extension after postprocess
|
||||||
|
const postprocessTemplate = `postprocess:
|
||||||
|
{
|
||||||
|
"filepath":"%(info.filepath)s"
|
||||||
|
}
|
||||||
|
`
|
||||||
|
|
||||||
const (
|
const (
|
||||||
StatusPending = iota
|
StatusPending = iota
|
||||||
StatusDownloading
|
StatusDownloading
|
||||||
@@ -35,28 +43,16 @@ const (
|
|||||||
StatusErrored
|
StatusErrored
|
||||||
)
|
)
|
||||||
|
|
||||||
type ProgressTemplate struct {
|
|
||||||
Percentage string `json:"percentage"`
|
|
||||||
Speed float32 `json:"speed"`
|
|
||||||
Size string `json:"size"`
|
|
||||||
Eta float32 `json:"eta"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// Process descriptor
|
// Process descriptor
|
||||||
type Process struct {
|
type Process struct {
|
||||||
Id string
|
Id string
|
||||||
Url string
|
Url string
|
||||||
Params []string
|
Livestream bool
|
||||||
Info DownloadInfo
|
Params []string
|
||||||
Progress DownloadProgress
|
Info DownloadInfo
|
||||||
Output DownloadOutput
|
Progress DownloadProgress
|
||||||
proc *os.Process
|
Output DownloadOutput
|
||||||
Logger *slog.Logger
|
proc *os.Process
|
||||||
}
|
|
||||||
|
|
||||||
type DownloadOutput struct {
|
|
||||||
Path string
|
|
||||||
Filename string
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Starts spawns/forks a new yt-dlp process and parse its stdout.
|
// Starts spawns/forks a new yt-dlp process and parse its stdout.
|
||||||
@@ -67,13 +63,13 @@ type DownloadOutput struct {
|
|||||||
func (p *Process) Start() {
|
func (p *Process) Start() {
|
||||||
// escape bash variable escaping and command piping, you'll never know
|
// escape bash variable escaping and command piping, you'll never know
|
||||||
// what they might come with...
|
// what they might come with...
|
||||||
p.Params = slices.Filter(p.Params, func(e string) bool {
|
p.Params = slices.DeleteFunc(p.Params, func(e string) bool {
|
||||||
match, _ := regexp.MatchString(`(\$\{)|(\&\&)`, e)
|
match, _ := regexp.MatchString(`(\$\{)|(\&\&)`, e)
|
||||||
return !match
|
return match
|
||||||
})
|
})
|
||||||
|
|
||||||
p.Params = slices.Filter(p.Params, func(e string) bool {
|
p.Params = slices.DeleteFunc(p.Params, func(e string) bool {
|
||||||
return e != ""
|
return e == ""
|
||||||
})
|
})
|
||||||
|
|
||||||
out := DownloadOutput{
|
out := DownloadOutput{
|
||||||
@@ -91,93 +87,132 @@ func (p *Process) Start() {
|
|||||||
|
|
||||||
buildFilename(&p.Output)
|
buildFilename(&p.Output)
|
||||||
|
|
||||||
params := []string{
|
templateReplacer := strings.NewReplacer("\n", "", "\t", "", " ", "")
|
||||||
|
baseParams := []string{
|
||||||
strings.Split(p.Url, "?list")[0], //no playlist
|
strings.Split(p.Url, "?list")[0], //no playlist
|
||||||
"--newline",
|
"--newline",
|
||||||
"--no-colors",
|
"--no-colors",
|
||||||
"--no-playlist",
|
"--no-playlist",
|
||||||
"--progress-template",
|
"--progress-template",
|
||||||
strings.NewReplacer("\n", "", "\t", "", " ", "").Replace(template),
|
templateReplacer.Replace(downloadTemplate),
|
||||||
|
"--progress-template",
|
||||||
|
templateReplacer.Replace(postprocessTemplate),
|
||||||
}
|
}
|
||||||
|
|
||||||
// if user asked to manually override the output path...
|
// if user asked to manually override the output path...
|
||||||
if !(slices.Includes(params, "-P") || slices.Includes(params, "--paths")) {
|
if !(slices.Contains(p.Params, "-P") || slices.Contains(p.Params, "--paths")) {
|
||||||
params = append(params, "-o")
|
p.Params = append(p.Params, "-o")
|
||||||
params = append(params, fmt.Sprintf("%s/%s", out.Path, out.Filename))
|
p.Params = append(p.Params, fmt.Sprintf("%s/%s", out.Path, out.Filename))
|
||||||
}
|
}
|
||||||
|
|
||||||
params = append(params, p.Params...)
|
params := append(baseParams, p.Params...)
|
||||||
|
|
||||||
|
slog.Info("requesting download", slog.String("url", p.Url), slog.Any("params", params))
|
||||||
|
|
||||||
// ----------------- main block ----------------- //
|
|
||||||
cmd := exec.Command(config.Instance().DownloaderPath, params...)
|
cmd := exec.Command(config.Instance().DownloaderPath, params...)
|
||||||
cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
|
cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
|
||||||
|
|
||||||
r, err := cmd.StdoutPipe()
|
stdout, err := cmd.StdoutPipe()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
p.Logger.Error(
|
slog.Error("failed to get a stdout pipe", slog.Any("err", err))
|
||||||
"failed to connect to stdout",
|
|
||||||
slog.String("err", err.Error()),
|
|
||||||
)
|
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
scan := bufio.NewScanner(r)
|
|
||||||
|
|
||||||
err = cmd.Start()
|
stderr, err := cmd.StderrPipe()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
p.Logger.Error(
|
slog.Error("failed to get a stderr pipe", slog.Any("err", err))
|
||||||
"failed to start yt-dlp process",
|
panic(err)
|
||||||
slog.String("err", err.Error()),
|
}
|
||||||
)
|
|
||||||
|
if err := cmd.Start(); err != nil {
|
||||||
|
slog.Error("failed to start yt-dlp process", slog.Any("err", err))
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
p.proc = cmd.Process
|
p.proc = cmd.Process
|
||||||
|
|
||||||
// --------------- progress block --------------- //
|
ctx, cancel := context.WithCancel(context.Background())
|
||||||
var (
|
defer func() {
|
||||||
sourceChan = make(chan []byte)
|
stdout.Close()
|
||||||
doneChan = make(chan struct{})
|
p.Complete()
|
||||||
)
|
cancel()
|
||||||
|
}()
|
||||||
|
|
||||||
// spawn a goroutine that does the dirty job of parsing the stdout
|
logs := make(chan []byte)
|
||||||
// filling the channel with as many stdout line as yt-dlp produces (producer)
|
go produceLogs(stdout, logs)
|
||||||
|
go p.consumeLogs(ctx, logs)
|
||||||
|
|
||||||
|
go p.detectYtDlpErrors(stderr)
|
||||||
|
|
||||||
|
cmd.Wait()
|
||||||
|
}
|
||||||
|
|
||||||
|
func produceLogs(r io.Reader, logs chan<- []byte) {
|
||||||
go func() {
|
go func() {
|
||||||
defer func() {
|
scanner := bufio.NewScanner(r)
|
||||||
r.Close()
|
|
||||||
p.Complete()
|
|
||||||
doneChan <- struct{}{}
|
|
||||||
close(sourceChan)
|
|
||||||
close(doneChan)
|
|
||||||
}()
|
|
||||||
|
|
||||||
for scan.Scan() {
|
for scanner.Scan() {
|
||||||
sourceChan <- scan.Bytes()
|
logs <- scanner.Bytes()
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
// Slows down the unmarshal operation to every 500ms
|
func (p *Process) consumeLogs(ctx context.Context, logs <-chan []byte) {
|
||||||
go func() {
|
for {
|
||||||
rx.Sample(time.Millisecond*500, sourceChan, doneChan, func(event []byte) {
|
select {
|
||||||
stdout := ProgressTemplate{}
|
case <-ctx.Done():
|
||||||
err := json.Unmarshal(event, &stdout)
|
slog.Info("detaching from yt-dlp stdout",
|
||||||
if err == nil {
|
slog.String("id", p.getShortId()),
|
||||||
p.Progress = DownloadProgress{
|
slog.String("url", p.Url),
|
||||||
Status: StatusDownloading,
|
)
|
||||||
Percentage: stdout.Percentage,
|
return
|
||||||
Speed: stdout.Speed,
|
case entry := <-logs:
|
||||||
ETA: stdout.Eta,
|
p.parseLogEntry(entry)
|
||||||
}
|
}
|
||||||
p.Logger.Info("progress",
|
}
|
||||||
slog.String("id", p.getShortId()),
|
}
|
||||||
slog.String("url", p.Url),
|
|
||||||
slog.String("percentege", stdout.Percentage),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}()
|
|
||||||
|
|
||||||
// ------------- end progress block ------------- //
|
func (p *Process) parseLogEntry(entry []byte) {
|
||||||
cmd.Wait()
|
var progress ProgressTemplate
|
||||||
|
var postprocess PostprocessTemplate
|
||||||
|
|
||||||
|
if err := json.Unmarshal(entry, &progress); err == nil {
|
||||||
|
p.Progress = DownloadProgress{
|
||||||
|
Status: StatusDownloading,
|
||||||
|
Percentage: progress.Percentage,
|
||||||
|
Speed: progress.Speed,
|
||||||
|
ETA: progress.Eta,
|
||||||
|
}
|
||||||
|
|
||||||
|
slog.Info("progress",
|
||||||
|
slog.String("id", p.getShortId()),
|
||||||
|
slog.String("url", p.Url),
|
||||||
|
slog.String("percentage", progress.Percentage),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := json.Unmarshal(entry, &postprocess); err == nil {
|
||||||
|
p.Output.SavedFilePath = postprocess.FilePath
|
||||||
|
|
||||||
|
slog.Info("postprocess",
|
||||||
|
slog.String("id", p.getShortId()),
|
||||||
|
slog.String("url", p.Url),
|
||||||
|
slog.String("filepath", postprocess.FilePath),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *Process) detectYtDlpErrors(r io.Reader) {
|
||||||
|
scanner := bufio.NewScanner(r)
|
||||||
|
|
||||||
|
for scanner.Scan() {
|
||||||
|
slog.Error("yt-dlp process error",
|
||||||
|
slog.String("id", p.getShortId()),
|
||||||
|
slog.String("url", p.Url),
|
||||||
|
slog.String("err", scanner.Text()),
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Keep process in the memoryDB but marks it as complete
|
// Keep process in the memoryDB but marks it as complete
|
||||||
@@ -190,8 +225,13 @@ func (p *Process) Complete() {
|
|||||||
Speed: 0,
|
Speed: 0,
|
||||||
ETA: 0,
|
ETA: 0,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// for safety, if the filename is not set, set it with original function
|
||||||
|
if p.Output.SavedFilePath == "" {
|
||||||
|
p.GetFileName(&p.Output)
|
||||||
|
}
|
||||||
|
|
||||||
p.Logger.Info("finished",
|
slog.Info("finished",
|
||||||
slog.String("id", p.getShortId()),
|
slog.String("id", p.getShortId()),
|
||||||
slog.String("url", p.Url),
|
slog.String("url", p.Url),
|
||||||
)
|
)
|
||||||
@@ -199,18 +239,22 @@ func (p *Process) Complete() {
|
|||||||
|
|
||||||
// Kill a process and remove it from the memory
|
// Kill a process and remove it from the memory
|
||||||
func (p *Process) Kill() error {
|
func (p *Process) Kill() error {
|
||||||
|
defer func() {
|
||||||
|
p.Progress.Status = StatusCompleted
|
||||||
|
}()
|
||||||
// yt-dlp uses multiple child process the parent process
|
// yt-dlp uses multiple child process the parent process
|
||||||
// has been spawned with setPgid = true. To properly kill
|
// has been spawned with setPgid = true. To properly kill
|
||||||
// all subprocesses a SIGTERM need to be sent to the correct
|
// all subprocesses a SIGTERM need to be sent to the correct
|
||||||
// process group
|
// process group
|
||||||
if p.proc != nil {
|
if p.proc == nil {
|
||||||
pgid, err := syscall.Getpgid(p.proc.Pid)
|
return errors.New("*os.Process not set")
|
||||||
if err != nil {
|
}
|
||||||
return err
|
|
||||||
}
|
|
||||||
err = syscall.Kill(-pgid, syscall.SIGTERM)
|
|
||||||
|
|
||||||
p.Logger.Info("killed process", slog.String("id", p.Id))
|
pgid, err := syscall.Getpgid(p.proc.Pid)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := syscall.Kill(-pgid, syscall.SIGTERM); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -218,14 +262,23 @@ func (p *Process) Kill() error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Returns the available format for this URL
|
// Returns the available format for this URL
|
||||||
func (p *Process) GetFormatsSync() (DownloadFormats, error) {
|
//
|
||||||
|
// TODO: Move out from process.go
|
||||||
|
func (p *Process) GetFormats() (DownloadFormats, error) {
|
||||||
cmd := exec.Command(config.Instance().DownloaderPath, p.Url, "-J")
|
cmd := exec.Command(config.Instance().DownloaderPath, p.Url, "-J")
|
||||||
stdout, err := cmd.Output()
|
|
||||||
|
|
||||||
|
stdout, err := cmd.Output()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
slog.Error("failed to retrieve metadata", slog.String("err", err.Error()))
|
||||||
return DownloadFormats{}, err
|
return DownloadFormats{}, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
slog.Info(
|
||||||
|
"retrieving metadata",
|
||||||
|
slog.String("caller", "getFormats"),
|
||||||
|
slog.String("url", p.Url),
|
||||||
|
)
|
||||||
|
|
||||||
info := DownloadFormats{URL: p.Url}
|
info := DownloadFormats{URL: p.Url}
|
||||||
best := Format{}
|
best := Format{}
|
||||||
|
|
||||||
@@ -236,23 +289,10 @@ func (p *Process) GetFormatsSync() (DownloadFormats, error) {
|
|||||||
|
|
||||||
wg.Add(2)
|
wg.Add(2)
|
||||||
|
|
||||||
log.Println(
|
|
||||||
cli.BgRed, "Metadata", cli.Reset,
|
|
||||||
cli.BgBlue, "Formats", cli.Reset,
|
|
||||||
p.Url,
|
|
||||||
)
|
|
||||||
|
|
||||||
p.Logger.Info(
|
|
||||||
"retrieving metadata",
|
|
||||||
slog.String("caller", "getFormats"),
|
|
||||||
slog.String("url", p.Url),
|
|
||||||
)
|
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
decodingError = json.Unmarshal(stdout, &info)
|
decodingError = json.Unmarshal(stdout, &info)
|
||||||
wg.Done()
|
wg.Done()
|
||||||
}()
|
}()
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
decodingError = json.Unmarshal(stdout, &best)
|
decodingError = json.Unmarshal(stdout, &best)
|
||||||
wg.Done()
|
wg.Done()
|
||||||
@@ -269,7 +309,31 @@ func (p *Process) GetFormatsSync() (DownloadFormats, error) {
|
|||||||
return info, nil
|
return info, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (p *Process) GetFileName(o *DownloadOutput) error {
|
||||||
|
cmd := exec.Command(
|
||||||
|
config.Instance().DownloaderPath,
|
||||||
|
"--print", "filename",
|
||||||
|
"-o", fmt.Sprintf("%s/%s", o.Path, o.Filename),
|
||||||
|
p.Url,
|
||||||
|
)
|
||||||
|
cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
|
||||||
|
|
||||||
|
out, err := cmd.Output()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
p.Output.SavedFilePath = strings.Trim(string(out), "\n")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func (p *Process) SetPending() {
|
func (p *Process) SetPending() {
|
||||||
|
// Since video's title isn't available yet, fill in with the URL.
|
||||||
|
p.Info = DownloadInfo{
|
||||||
|
URL: p.Url,
|
||||||
|
Title: p.Url,
|
||||||
|
CreatedAt: time.Now(),
|
||||||
|
}
|
||||||
p.Progress.Status = StatusPending
|
p.Progress.Status = StatusPending
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -279,7 +343,17 @@ func (p *Process) SetMetadata() error {
|
|||||||
|
|
||||||
stdout, err := cmd.StdoutPipe()
|
stdout, err := cmd.StdoutPipe()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
p.Logger.Error("failed retrieving info",
|
slog.Error("failed to connect to stdout",
|
||||||
|
slog.String("id", p.getShortId()),
|
||||||
|
slog.String("url", p.Url),
|
||||||
|
slog.String("err", err.Error()),
|
||||||
|
)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
stderr, err := cmd.StderrPipe()
|
||||||
|
if err != nil {
|
||||||
|
slog.Error("failed to connect to stderr",
|
||||||
slog.String("id", p.getShortId()),
|
slog.String("id", p.getShortId()),
|
||||||
slog.String("url", p.Url),
|
slog.String("url", p.Url),
|
||||||
slog.String("err", err.Error()),
|
slog.String("err", err.Error()),
|
||||||
@@ -292,32 +366,36 @@ func (p *Process) SetMetadata() error {
|
|||||||
CreatedAt: time.Now(),
|
CreatedAt: time.Now(),
|
||||||
}
|
}
|
||||||
|
|
||||||
err = cmd.Start()
|
if err := cmd.Start(); err != nil {
|
||||||
if err != nil {
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
p.Logger.Info("retrieving metadata",
|
var bufferedStderr bytes.Buffer
|
||||||
|
|
||||||
|
go func() {
|
||||||
|
io.Copy(&bufferedStderr, stderr)
|
||||||
|
}()
|
||||||
|
|
||||||
|
slog.Info("retrieving metadata",
|
||||||
slog.String("id", p.getShortId()),
|
slog.String("id", p.getShortId()),
|
||||||
slog.String("url", p.Url),
|
slog.String("url", p.Url),
|
||||||
)
|
)
|
||||||
|
|
||||||
err = json.NewDecoder(stdout).Decode(&info)
|
if err := json.NewDecoder(stdout).Decode(&info); err != nil {
|
||||||
if err != nil {
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
p.Info = info
|
p.Info = info
|
||||||
p.Progress.Status = StatusPending
|
p.Progress.Status = StatusPending
|
||||||
|
|
||||||
err = cmd.Wait()
|
if err := cmd.Wait(); err != nil {
|
||||||
|
return errors.New(bufferedStderr.String())
|
||||||
|
}
|
||||||
|
|
||||||
return err
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *Process) getShortId() string {
|
func (p *Process) getShortId() string { return strings.Split(p.Id, "-")[0] }
|
||||||
return strings.Split(p.Id, "-")[0]
|
|
||||||
}
|
|
||||||
|
|
||||||
func buildFilename(o *DownloadOutput) {
|
func buildFilename(o *DownloadOutput) {
|
||||||
if o.Filename != "" && strings.Contains(o.Filename, ".%(ext)s") {
|
if o.Filename != "" && strings.Contains(o.Filename, ".%(ext)s") {
|
||||||
|
|||||||
15
server/internal/worker.go
Normal file
15
server/internal/worker.go
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
package internal
|
||||||
|
|
||||||
|
type Worker struct {
|
||||||
|
requests chan Process // downloads to do
|
||||||
|
pending int // downloads pending
|
||||||
|
index int // index in the heap
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *Worker) Work(done chan *Worker) {
|
||||||
|
for {
|
||||||
|
req := <-w.requests
|
||||||
|
req.Start()
|
||||||
|
done <- w
|
||||||
|
}
|
||||||
|
}
|
||||||
82
server/logging/file_logger.go
Normal file
82
server/logging/file_logger.go
Normal file
@@ -0,0 +1,82 @@
|
|||||||
|
package logging
|
||||||
|
|
||||||
|
import (
|
||||||
|
"compress/gzip"
|
||||||
|
"io"
|
||||||
|
"log/slog"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
/*
|
||||||
|
implements io.Writer interface
|
||||||
|
|
||||||
|
File base logger with log-rotate capabilities.
|
||||||
|
The rotate process must be initiated from an external goroutine.
|
||||||
|
|
||||||
|
After rotation the previous logs file are compressed with gzip algorithm.
|
||||||
|
|
||||||
|
The rotated log follows this naming: [filename].UTC time.gz
|
||||||
|
*/
|
||||||
|
type LogRotateWriter struct {
|
||||||
|
mu sync.Mutex
|
||||||
|
fd *os.File
|
||||||
|
filename string
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewRotableLogger(filename string) (*LogRotateWriter, error) {
|
||||||
|
fd, err := os.Create(filename)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
w := &LogRotateWriter{filename: filename, fd: fd}
|
||||||
|
return w, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *LogRotateWriter) Write(b []byte) (int, error) {
|
||||||
|
w.mu.Lock()
|
||||||
|
defer w.mu.Unlock()
|
||||||
|
return w.fd.Write(b)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *LogRotateWriter) Rotate() error {
|
||||||
|
slog.Info("started log rotation")
|
||||||
|
|
||||||
|
w.mu.Lock()
|
||||||
|
|
||||||
|
gzFile, err := os.Create(strings.TrimSuffix(w.filename, ".log") + "-" + time.Now().Format(time.RFC3339) + ".log.gz")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
zw := gzip.NewWriter(gzFile)
|
||||||
|
|
||||||
|
defer func() {
|
||||||
|
zw.Close()
|
||||||
|
zw.Flush()
|
||||||
|
gzFile.Close()
|
||||||
|
}()
|
||||||
|
|
||||||
|
if _, err := os.Stat(w.filename); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
fd, _ := os.Open(w.filename)
|
||||||
|
io.Copy(zw, fd)
|
||||||
|
fd.Close()
|
||||||
|
|
||||||
|
w.fd.Close()
|
||||||
|
|
||||||
|
if err := os.Remove(w.filename); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
w.fd, _ = os.Create(w.filename)
|
||||||
|
|
||||||
|
w.mu.Unlock()
|
||||||
|
slog.Info("ended log rotation")
|
||||||
|
|
||||||
|
return err
|
||||||
|
}
|
||||||
@@ -3,14 +3,15 @@ package logging
|
|||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"io"
|
||||||
|
"log/slog"
|
||||||
"net/http"
|
"net/http"
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/go-chi/chi/v5"
|
"github.com/go-chi/chi/v5"
|
||||||
"github.com/gorilla/websocket"
|
"github.com/gorilla/websocket"
|
||||||
"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
|
"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
|
||||||
middlewares "github.com/marcopeocchi/yt-dlp-web-ui/server/middleware"
|
middlewares "github.com/marcopeocchi/yt-dlp-web-ui/server/middleware"
|
||||||
|
"github.com/marcopeocchi/yt-dlp-web-ui/server/openid"
|
||||||
)
|
)
|
||||||
|
|
||||||
var upgrader = websocket.Upgrader{
|
var upgrader = websocket.Upgrader{
|
||||||
@@ -21,60 +22,82 @@ var upgrader = websocket.Upgrader{
|
|||||||
WriteBufferSize: 1000,
|
WriteBufferSize: 1000,
|
||||||
}
|
}
|
||||||
|
|
||||||
func webSocket(w http.ResponseWriter, r *http.Request) {
|
func webSocket(logger *ObservableLogger) http.HandlerFunc {
|
||||||
c, err := upgrader.Upgrade(w, r, nil)
|
return func(w http.ResponseWriter, r *http.Request) {
|
||||||
if err != nil {
|
c, err := upgrader.Upgrade(w, r, nil)
|
||||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
if err != nil {
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
for msg := range logsObservable.Observe() {
|
|
||||||
c.WriteJSON(msg.V)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func sse(w http.ResponseWriter, r *http.Request) {
|
|
||||||
w.Header().Set("Content-Type", "text/event-stream")
|
|
||||||
w.Header().Set("Cache-Control", "no-cache")
|
|
||||||
w.Header().Set("Connection", "keep-alive")
|
|
||||||
|
|
||||||
flusher, ok := w.(http.Flusher)
|
|
||||||
if !ok {
|
|
||||||
http.Error(w, "SSE not supported", http.StatusInternalServerError)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
for msg := range logsObservable.Observe() {
|
|
||||||
if msg.E != nil {
|
|
||||||
http.Error(w, msg.E.Error(), http.StatusInternalServerError)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
var (
|
|
||||||
b bytes.Buffer
|
|
||||||
sb strings.Builder
|
|
||||||
)
|
|
||||||
|
|
||||||
if err := json.NewEncoder(&b).Encode(msg.V); err != nil {
|
|
||||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
sb.WriteString("event: log\n")
|
logs := logger.Observe(r.Context())
|
||||||
sb.WriteString("data: " + b.String() + "\n\n")
|
|
||||||
|
|
||||||
fmt.Fprint(w, sb.String())
|
for {
|
||||||
|
select {
|
||||||
flusher.Flush()
|
case <-r.Context().Done():
|
||||||
|
return
|
||||||
|
case msg := <-logs:
|
||||||
|
c.WriteJSON(msg)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func ApplyRouter() func(chi.Router) {
|
func sse(logger *ObservableLogger) http.HandlerFunc {
|
||||||
|
return func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.Header().Set("Content-Type", "text/event-stream")
|
||||||
|
w.Header().Set("Cache-Control", "no-cache")
|
||||||
|
w.Header().Set("Connection", "keep-alive")
|
||||||
|
|
||||||
|
flusher, ok := w.(http.Flusher)
|
||||||
|
if !ok {
|
||||||
|
http.Error(w, "SSE not supported", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
logs := logger.Observe(r.Context())
|
||||||
|
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-r.Context().Done():
|
||||||
|
slog.Info("detaching from logger")
|
||||||
|
return
|
||||||
|
case msg, ok := <-logs:
|
||||||
|
if !ok {
|
||||||
|
http.Error(w, "closed logs channel", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var b bytes.Buffer
|
||||||
|
|
||||||
|
b.WriteString("event: log\n")
|
||||||
|
b.WriteString("data: ")
|
||||||
|
|
||||||
|
if err := json.NewEncoder(&b).Encode(msg); err != nil {
|
||||||
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
b.WriteRune('\n')
|
||||||
|
b.WriteRune('\n')
|
||||||
|
|
||||||
|
io.Copy(w, &b)
|
||||||
|
|
||||||
|
flusher.Flush()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func ApplyRouter(logger *ObservableLogger) func(chi.Router) {
|
||||||
return func(r chi.Router) {
|
return func(r chi.Router) {
|
||||||
if config.Instance().RequireAuth {
|
if config.Instance().RequireAuth {
|
||||||
r.Use(middlewares.Authenticated)
|
r.Use(middlewares.Authenticated)
|
||||||
}
|
}
|
||||||
r.Get("/ws", webSocket)
|
if config.Instance().UseOpenId {
|
||||||
r.Get("/sse", sse)
|
r.Use(openid.Middleware)
|
||||||
|
}
|
||||||
|
r.Get("/ws", webSocket(logger))
|
||||||
|
r.Get("/sse", sse(logger))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,31 +1,53 @@
|
|||||||
package logging
|
package logging
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"time"
|
"context"
|
||||||
|
|
||||||
"github.com/reactivex/rxgo/v2"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
/*
|
||||||
logsChan = make(chan rxgo.Item, 100)
|
Logger implementation using the observable pattern.
|
||||||
logsObservable = rxgo.
|
Implements io.Writer interface.
|
||||||
FromChannel(logsChan, rxgo.WithBackPressureStrategy(rxgo.Drop)).
|
|
||||||
BufferWithTime(rxgo.WithDuration(time.Millisecond * 500))
|
|
||||||
)
|
|
||||||
|
|
||||||
type ObservableLogger struct{}
|
The observable is an event source which drops everythigng unless there's
|
||||||
|
a subscriber connected.
|
||||||
|
|
||||||
|
The observer implementatios are a http ServerSentEvents handler and a
|
||||||
|
websocket one in handler.go
|
||||||
|
*/
|
||||||
|
type ObservableLogger struct {
|
||||||
|
logsChan chan []byte
|
||||||
|
}
|
||||||
|
|
||||||
func NewObservableLogger() *ObservableLogger {
|
func NewObservableLogger() *ObservableLogger {
|
||||||
return &ObservableLogger{}
|
return &ObservableLogger{
|
||||||
|
logsChan: make(chan []byte, 100),
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (o *ObservableLogger) Write(p []byte) (n int, err error) {
|
func (o *ObservableLogger) Write(p []byte) (n int, err error) {
|
||||||
|
select {
|
||||||
|
case o.logsChan <- p:
|
||||||
|
n = len(p)
|
||||||
|
err = nil
|
||||||
|
return
|
||||||
|
default:
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (o *ObservableLogger) Observe(ctx context.Context) <-chan string {
|
||||||
|
logs := make(chan string)
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
logsChan <- rxgo.Of(string(p))
|
for {
|
||||||
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
return
|
||||||
|
case logLine := <-o.logsChan:
|
||||||
|
logs <- string(logLine)
|
||||||
|
}
|
||||||
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
n = len(p)
|
return logs
|
||||||
err = nil
|
|
||||||
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,20 +11,18 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func validateToken(tokenValue string) error {
|
func validateToken(tokenValue string) error {
|
||||||
if tokenValue == "" {
|
token, err := jwt.Parse(tokenValue, func(t *jwt.Token) (interface{}, error) {
|
||||||
return errors.New("invalid token")
|
|
||||||
}
|
|
||||||
|
|
||||||
token, _ := jwt.Parse(tokenValue, func(t *jwt.Token) (interface{}, error) {
|
|
||||||
if _, ok := t.Method.(*jwt.SigningMethodHMAC); !ok {
|
if _, ok := t.Method.(*jwt.SigningMethodHMAC); !ok {
|
||||||
return nil, fmt.Errorf("unexpected signing method: %v", t.Header["alg"])
|
return nil, fmt.Errorf("unexpected signing method: %v", t.Header["alg"])
|
||||||
}
|
}
|
||||||
return []byte(os.Getenv("JWT_SECRET")), nil
|
return []byte(os.Getenv("JWT_SECRET")), nil
|
||||||
})
|
})
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
if claims, ok := token.Claims.(jwt.MapClaims); ok && token.Valid {
|
if claims, ok := token.Claims.(jwt.MapClaims); ok && token.Valid {
|
||||||
expiresAt, err := time.Parse(time.RFC3339, claims["expiresAt"].(string))
|
expiresAt, err := time.Parse(time.RFC3339, claims["expiresAt"].(string))
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
37
server/openid/config.go
Normal file
37
server/openid/config.go
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
package openid
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
|
||||||
|
"github.com/coreos/go-oidc/v3/oidc"
|
||||||
|
"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
|
||||||
|
"golang.org/x/oauth2"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
oauth2Config oauth2.Config
|
||||||
|
verifier *oidc.IDTokenVerifier
|
||||||
|
)
|
||||||
|
|
||||||
|
func Configure() {
|
||||||
|
if !config.Instance().UseOpenId {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
provider, err := oidc.NewProvider(context.Background(), config.Instance().OpenIdProviderURL)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
oauth2Config = oauth2.Config{
|
||||||
|
ClientID: config.Instance().OpenIdClientId,
|
||||||
|
ClientSecret: config.Instance().OpenIdClientSecret,
|
||||||
|
RedirectURL: config.Instance().OpenIdRedirectURL,
|
||||||
|
Endpoint: provider.Endpoint(),
|
||||||
|
Scopes: []string{oidc.ScopeOpenID, "profile", "email"},
|
||||||
|
}
|
||||||
|
|
||||||
|
verifier = provider.Verifier(&oidc.Config{
|
||||||
|
ClientID: config.Instance().OpenIdClientId,
|
||||||
|
})
|
||||||
|
}
|
||||||
178
server/openid/handler.go
Normal file
178
server/openid/handler.go
Normal file
@@ -0,0 +1,178 @@
|
|||||||
|
package openid
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/rand"
|
||||||
|
"encoding/hex"
|
||||||
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
|
"net/http"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/coreos/go-oidc/v3/oidc"
|
||||||
|
"github.com/google/uuid"
|
||||||
|
"golang.org/x/oauth2"
|
||||||
|
)
|
||||||
|
|
||||||
|
type OAuth2SuccessResponse struct {
|
||||||
|
OAuth2Token *oauth2.Token
|
||||||
|
IDTokenClaims *json.RawMessage
|
||||||
|
}
|
||||||
|
|
||||||
|
// var cookieMaxAge = int(time.Hour * 24 * 30) XXX: overflows on 32 bit architectures.
|
||||||
|
|
||||||
|
func Login(w http.ResponseWriter, r *http.Request) {
|
||||||
|
state := uuid.NewString()
|
||||||
|
|
||||||
|
nonceBytes := make([]byte, 16)
|
||||||
|
rand.Read(nonceBytes)
|
||||||
|
|
||||||
|
nonce := hex.EncodeToString(nonceBytes)
|
||||||
|
|
||||||
|
http.SetCookie(w, &http.Cookie{
|
||||||
|
Name: "state",
|
||||||
|
Value: state,
|
||||||
|
HttpOnly: true,
|
||||||
|
Path: "/",
|
||||||
|
Secure: r.TLS != nil,
|
||||||
|
// MaxAge: cookieMaxAge,
|
||||||
|
Expires: time.Now().Add(time.Hour * 24 * 30), // XXX: change to MaxAge
|
||||||
|
})
|
||||||
|
|
||||||
|
http.SetCookie(w, &http.Cookie{
|
||||||
|
Name: "nonce",
|
||||||
|
Value: nonce,
|
||||||
|
HttpOnly: true,
|
||||||
|
Path: "/",
|
||||||
|
Secure: r.TLS != nil,
|
||||||
|
// MaxAge: cookieMaxAge,
|
||||||
|
Expires: time.Now().Add(time.Hour * 24 * 30), // XXX: change to MaxAge
|
||||||
|
})
|
||||||
|
|
||||||
|
http.Redirect(w, r, oauth2Config.AuthCodeURL(state, oidc.Nonce(nonce)), http.StatusFound)
|
||||||
|
}
|
||||||
|
|
||||||
|
func doAuthentification(r *http.Request, setCookieCallback func(t *oauth2.Token)) (*OAuth2SuccessResponse, error) {
|
||||||
|
state, err := r.Cookie("state")
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if r.URL.Query().Get("state") != state.Value {
|
||||||
|
return nil, errors.New("auth state does not match")
|
||||||
|
}
|
||||||
|
|
||||||
|
oauth2Token, err := oauth2Config.Exchange(r.Context(), r.URL.Query().Get("code"))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
rawToken, ok := oauth2Token.Extra("id_token").(string)
|
||||||
|
if !ok {
|
||||||
|
return nil, errors.New("openid field \"id_token\" not found in oauth2 token")
|
||||||
|
}
|
||||||
|
|
||||||
|
idToken, err := verifier.Verify(r.Context(), rawToken)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
nonce, err := r.Cookie("nonce")
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if idToken.Nonce != nonce.Value {
|
||||||
|
return nil, errors.New("auth nonce does not match")
|
||||||
|
}
|
||||||
|
|
||||||
|
setCookieCallback(oauth2Token)
|
||||||
|
|
||||||
|
// redact
|
||||||
|
oauth2Token.AccessToken = "*REDACTED*"
|
||||||
|
|
||||||
|
res := OAuth2SuccessResponse{
|
||||||
|
oauth2Token,
|
||||||
|
&json.RawMessage{},
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := idToken.Claims(&res.IDTokenClaims); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &res, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func SingIn(w http.ResponseWriter, r *http.Request) {
|
||||||
|
_, err := doAuthentification(r, func(t *oauth2.Token) {
|
||||||
|
idToken, _ := t.Extra("id_token").(string)
|
||||||
|
|
||||||
|
http.SetCookie(w, &http.Cookie{
|
||||||
|
Name: "oid-token",
|
||||||
|
Value: idToken,
|
||||||
|
HttpOnly: true,
|
||||||
|
Path: "/",
|
||||||
|
Secure: r.TLS != nil,
|
||||||
|
// MaxAge: int(time.Hour * 24 * 30), XXX: overflows on 32 bit architectures.
|
||||||
|
})
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
w.Write([]byte("Login succesfully, you may now close this window and refresh yt-dlp-webui."))
|
||||||
|
}
|
||||||
|
|
||||||
|
func Refresh(w http.ResponseWriter, r *http.Request) {
|
||||||
|
refreshToken := r.URL.Query().Get("refresh-token")
|
||||||
|
|
||||||
|
ts := oauth2Config.TokenSource(r.Context(), &oauth2.Token{RefreshToken: refreshToken})
|
||||||
|
|
||||||
|
token, err := ts.Token()
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
http.SetCookie(w, &http.Cookie{
|
||||||
|
Name: "oid-token",
|
||||||
|
Value: token.AccessToken,
|
||||||
|
HttpOnly: true,
|
||||||
|
Path: "/",
|
||||||
|
Secure: r.TLS != nil,
|
||||||
|
// MaxAge: int(time.Hour * 24 * 30), XXX: overflows on 32 bit architectures.
|
||||||
|
})
|
||||||
|
|
||||||
|
token.AccessToken = "*redacted*"
|
||||||
|
|
||||||
|
if err := json.NewEncoder(w).Encode(token); err != nil {
|
||||||
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func Logout(w http.ResponseWriter, r *http.Request) {
|
||||||
|
http.SetCookie(w, &http.Cookie{
|
||||||
|
Name: "oid-token",
|
||||||
|
HttpOnly: true,
|
||||||
|
Path: "/",
|
||||||
|
Secure: r.TLS != nil,
|
||||||
|
MaxAge: -1,
|
||||||
|
})
|
||||||
|
|
||||||
|
http.SetCookie(w, &http.Cookie{
|
||||||
|
Name: "state",
|
||||||
|
HttpOnly: true,
|
||||||
|
Path: "/",
|
||||||
|
Secure: r.TLS != nil,
|
||||||
|
MaxAge: -1,
|
||||||
|
})
|
||||||
|
|
||||||
|
http.SetCookie(w, &http.Cookie{
|
||||||
|
Name: "nonce",
|
||||||
|
HttpOnly: true,
|
||||||
|
Path: "/",
|
||||||
|
Secure: r.TLS != nil,
|
||||||
|
MaxAge: -1,
|
||||||
|
})
|
||||||
|
}
|
||||||
20
server/openid/middleware.go
Normal file
20
server/openid/middleware.go
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
package openid
|
||||||
|
|
||||||
|
import "net/http"
|
||||||
|
|
||||||
|
func Middleware(next http.Handler) http.Handler {
|
||||||
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
token, err := r.Cookie("oid-token")
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := verifier.Verify(r.Context(), token.Value); err != nil {
|
||||||
|
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
next.ServeHTTP(w, r)
|
||||||
|
})
|
||||||
|
}
|
||||||
13
server/rest/common.go
Normal file
13
server/rest/common.go
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
package rest
|
||||||
|
|
||||||
|
import (
|
||||||
|
"database/sql"
|
||||||
|
|
||||||
|
"github.com/marcopeocchi/yt-dlp-web-ui/server/internal"
|
||||||
|
)
|
||||||
|
|
||||||
|
type ContainerArgs struct {
|
||||||
|
DB *sql.DB
|
||||||
|
MDB *internal.MemoryDB
|
||||||
|
MQ *internal.MessageQueue
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user