Compare commits
No commits in common. "2ef439d1620c8ef30b8f00150595bb5011420873" and "cd7d09218a8fad07a2a773b856d25485eae1ef45" have entirely different histories.
2ef439d162
...
cd7d09218a
|
@ -0,0 +1,22 @@
|
|||
Copyright (c) 2008-2011, Kenneth Bell
|
||||
Copyright (c) 2014, Quamotion
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a
|
||||
copy of this software and associated documentation files (the "Software"),
|
||||
to deal in the Software without restriction, including without limitation
|
||||
the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
and/or sell copies of the Software, and to permit persons to whom the
|
||||
Software is furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
DEALINGS IN THE SOFTWARE.
|
||||
|
||||
DiscUtils: https://github.com/DiscUtils/DiscUtils
|
|
@ -0,0 +1,26 @@
|
|||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) Darko Jurić
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||
this software and associated documentation files (the "Software"), to deal in
|
||||
the Software without restriction, including without limitation the rights to
|
||||
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
||||
the Software, and to permit persons to whom the Software is furnished to do so,
|
||||
subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
|
||||
Licensing for JSON.NET dependency also applies: https://www.newtonsoft.com/json
|
||||
Licensing for SimpleHttp also applies: https://github.com/dajuric/simple-http
|
||||
|
||||
I Used same license hince I used some of dajurics code in Tesses.WebServer
|
|
@ -0,0 +1,25 @@
|
|||
Copyright (c) 2017-2022, Alexandre Mutel
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without modification
|
||||
, are permitted provided that the following conditions are met:
|
||||
|
||||
1. Redistributions of source code must retain the above copyright notice, this
|
||||
list of conditions and the following disclaimer.
|
||||
|
||||
2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
this list of conditions and the following disclaimer in the documentation
|
||||
and/or other materials provided with the distribution.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
||||
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
Zio: https://github.com/xoofx/zio
|
675
LICENSE.md
675
LICENSE.md
|
@ -1,26 +1,209 @@
|
|||
### GNU GENERAL PUBLIC LICENSE
|
||||
YoutubeExplode
|
||||
Copyright (C) 2016-2022 Oleksii Holub
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
======================================================================
|
||||
|
||||
GNU LESSER GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc.
|
||||
<https://fsf.org/>
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Everyone is permitted to copy and distribute verbatim copies of this
|
||||
license document, but changing it is not allowed.
|
||||
|
||||
### Preamble
|
||||
This version of the GNU Lesser General Public License incorporates
|
||||
the terms and conditions of version 3 of the GNU General Public
|
||||
License, supplemented by the additional permissions listed below.
|
||||
|
||||
0. Additional Definitions.
|
||||
|
||||
As used herein, "this License" refers to version 3 of the GNU Lesser
|
||||
General Public License, and the "GNU GPL" refers to version 3 of the GNU
|
||||
General Public License.
|
||||
|
||||
"The Library" refers to a covered work governed by this License,
|
||||
other than an Application or a Combined Work as defined below.
|
||||
|
||||
An "Application" is any work that makes use of an interface provided
|
||||
by the Library, but which is not otherwise based on the Library.
|
||||
Defining a subclass of a class defined by the Library is deemed a mode
|
||||
of using an interface provided by the Library.
|
||||
|
||||
A "Combined Work" is a work produced by combining or linking an
|
||||
Application with the Library. The particular version of the Library
|
||||
with which the Combined Work was made is also called the "Linked
|
||||
Version".
|
||||
|
||||
The "Minimal Corresponding Source" for a Combined Work means the
|
||||
Corresponding Source for the Combined Work, excluding any source code
|
||||
for portions of the Combined Work that, considered in isolation, are
|
||||
based on the Application, and not on the Linked Version.
|
||||
|
||||
The "Corresponding Application Code" for a Combined Work means the
|
||||
object code and/or source code for the Application, including any data
|
||||
and utility programs needed for reproducing the Combined Work from the
|
||||
Application, but excluding the System Libraries of the Combined Work.
|
||||
|
||||
1. Exception to Section 3 of the GNU GPL.
|
||||
|
||||
You may convey a covered work under sections 3 and 4 of this License
|
||||
without being bound by section 3 of the GNU GPL.
|
||||
|
||||
2. Conveying Modified Versions.
|
||||
|
||||
If you modify a copy of the Library, and, in your modifications, a
|
||||
facility refers to a function or data to be supplied by an Application
|
||||
that uses the facility (other than as an argument passed when the
|
||||
facility is invoked), then you may convey a copy of the modified
|
||||
version:
|
||||
|
||||
a) under this License, provided that you make a good faith effort to
|
||||
ensure that, in the event an Application does not supply the
|
||||
function or data, the facility still operates, and performs
|
||||
whatever part of its purpose remains meaningful, or
|
||||
|
||||
b) under the GNU GPL, with none of the additional permissions of
|
||||
this License applicable to that copy.
|
||||
|
||||
3. Object Code Incorporating Material from Library Header Files.
|
||||
|
||||
The object code form of an Application may incorporate material from
|
||||
a header file that is part of the Library. You may convey such object
|
||||
code under terms of your choice, provided that, if the incorporated
|
||||
material is not limited to numerical parameters, data structure
|
||||
layouts and accessors, or small macros, inline functions and templates
|
||||
(ten or fewer lines in length), you do both of the following:
|
||||
|
||||
a) Give prominent notice with each copy of the object code that the
|
||||
Library is used in it and that the Library and its use are
|
||||
covered by this License.
|
||||
|
||||
b) Accompany the object code with a copy of the GNU GPL and this license
|
||||
document.
|
||||
|
||||
4. Combined Works.
|
||||
|
||||
You may convey a Combined Work under terms of your choice that,
|
||||
taken together, effectively do not restrict modification of the
|
||||
portions of the Library contained in the Combined Work and reverse
|
||||
engineering for debugging such modifications, if you also do each of
|
||||
the following:
|
||||
|
||||
a) Give prominent notice with each copy of the Combined Work that
|
||||
the Library is used in it and that the Library and its use are
|
||||
covered by this License.
|
||||
|
||||
b) Accompany the Combined Work with a copy of the GNU GPL and this license
|
||||
document.
|
||||
|
||||
c) For a Combined Work that displays copyright notices during
|
||||
execution, include the copyright notice for the Library among
|
||||
these notices, as well as a reference directing the user to the
|
||||
copies of the GNU GPL and this license document.
|
||||
|
||||
d) Do one of the following:
|
||||
|
||||
0) Convey the Minimal Corresponding Source under the terms of this
|
||||
License, and the Corresponding Application Code in a form
|
||||
suitable for, and under terms that permit, the user to
|
||||
recombine or relink the Application with a modified version of
|
||||
the Linked Version to produce a modified Combined Work, in the
|
||||
manner specified by section 6 of the GNU GPL for conveying
|
||||
Corresponding Source.
|
||||
|
||||
1) Use a suitable shared library mechanism for linking with the
|
||||
Library. A suitable mechanism is one that (a) uses at run time
|
||||
a copy of the Library already present on the user's computer
|
||||
system, and (b) will operate properly with a modified version
|
||||
of the Library that is interface-compatible with the Linked
|
||||
Version.
|
||||
|
||||
e) Provide Installation Information, but only if you would otherwise
|
||||
be required to provide such information under section 6 of the
|
||||
GNU GPL, and only to the extent that such information is
|
||||
necessary to install and execute a modified version of the
|
||||
Combined Work produced by recombining or relinking the
|
||||
Application with a modified version of the Linked Version. (If
|
||||
you use option 4d0, the Installation Information must accompany
|
||||
the Minimal Corresponding Source and Corresponding Application
|
||||
Code. If you use option 4d1, you must provide the Installation
|
||||
Information in the manner specified by section 6 of the GNU GPL
|
||||
for conveying Corresponding Source.)
|
||||
|
||||
5. Combined Libraries.
|
||||
|
||||
You may place library facilities that are a work based on the
|
||||
Library side by side in a single library together with other library
|
||||
facilities that are not Applications and are not covered by this
|
||||
License, and convey such a combined library under terms of your
|
||||
choice, if you do both of the following:
|
||||
|
||||
a) Accompany the combined library with a copy of the same work based
|
||||
on the Library, uncombined with any other library facilities,
|
||||
conveyed under the terms of this License.
|
||||
|
||||
b) Give prominent notice with the combined library that part of it
|
||||
is a work based on the Library, and explaining where to find the
|
||||
accompanying uncombined form of the same work.
|
||||
|
||||
6. Revised Versions of the GNU Lesser General Public License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions
|
||||
of the GNU Lesser 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
|
||||
Library as you received it specifies that a certain numbered version
|
||||
of the GNU Lesser General Public License "or any later version"
|
||||
applies to it, you have the option of following the terms and
|
||||
conditions either of that published version or of any later version
|
||||
published by the Free Software Foundation. If the Library as you
|
||||
received it does not specify a version number of the GNU Lesser
|
||||
General Public License, you may choose any version of the GNU Lesser
|
||||
General Public License ever published by the Free Software Foundation.
|
||||
|
||||
If the Library as you received it specifies that a proxy can decide
|
||||
whether future versions of the GNU Lesser General Public License shall
|
||||
apply, that proxy's public statement of acceptance of any version is
|
||||
permanent authorization for you to choose that version for the
|
||||
Library.
|
||||
|
||||
======================================================================
|
||||
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://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.
|
||||
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
|
||||
|
@ -30,10 +213,9 @@ 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.
|
||||
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
|
||||
|
@ -52,44 +234,43 @@ 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.
|
||||
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.
|
||||
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
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
#### 0. Definitions.
|
||||
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.
|
||||
"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.
|
||||
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.
|
||||
|
@ -102,12 +283,11 @@ 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.
|
||||
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
|
||||
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
|
||||
|
@ -115,11 +295,11 @@ 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.
|
||||
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.
|
||||
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
|
||||
|
@ -150,13 +330,14 @@ 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 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.
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
#### 2. Basic Permissions.
|
||||
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
|
||||
|
@ -166,22 +347,22 @@ 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.
|
||||
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.
|
||||
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.
|
||||
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
|
||||
|
@ -190,14 +371,14 @@ 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.
|
||||
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.
|
||||
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
|
||||
|
@ -210,27 +391,29 @@ 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.
|
||||
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:
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
- a) The work must carry prominent notices stating that you modified
|
||||
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
|
||||
|
||||
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
|
||||
|
||||
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.
|
||||
|
@ -245,18 +428,19 @@ 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.
|
||||
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:
|
||||
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
|
||||
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
|
||||
|
||||
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
|
||||
|
@ -265,14 +449,16 @@ ways:
|
|||
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
|
||||
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
|
||||
|
||||
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
|
||||
|
@ -284,36 +470,36 @@ ways:
|
|||
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.
|
||||
|
||||
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.
|
||||
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.
|
||||
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
|
||||
|
@ -327,13 +513,12 @@ 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.
|
||||
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
|
||||
|
@ -341,7 +526,7 @@ 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.
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
|
@ -360,26 +545,31 @@ 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:
|
||||
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
|
||||
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
|
||||
|
||||
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
|
||||
|
||||
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
|
||||
|
||||
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.
|
||||
|
||||
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
|
||||
|
@ -397,10 +587,10 @@ 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.
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
#### 8. Termination.
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
|
@ -408,12 +598,12 @@ 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.
|
||||
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
|
||||
|
@ -428,10 +618,10 @@ 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.
|
||||
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
|
||||
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
|
||||
|
@ -439,7 +629,7 @@ 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.
|
||||
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
|
||||
|
@ -464,14 +654,14 @@ rights granted under this License, and you may not initiate litigation
|
|||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
#### 11. Patents.
|
||||
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
|
||||
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
|
||||
|
@ -514,39 +704,38 @@ 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.
|
||||
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.
|
||||
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.
|
||||
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.
|
||||
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
|
||||
|
@ -557,57 +746,56 @@ 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.
|
||||
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.
|
||||
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.
|
||||
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.
|
||||
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.
|
||||
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.
|
||||
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.
|
||||
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.
|
||||
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.
|
||||
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,
|
||||
|
@ -618,17 +806,16 @@ copy of the Program in return for a fee.
|
|||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
### How to Apply These Terms to Your New Programs
|
||||
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.
|
||||
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.
|
||||
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>
|
||||
|
@ -644,10 +831,9 @@ the exclusion of warranty; and each file should have at least 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/>.
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper
|
||||
mail.
|
||||
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:
|
||||
|
@ -657,29 +843,30 @@ notice like this when it starts in an interactive mode:
|
|||
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".
|
||||
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/>.
|
||||
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
|
||||
<http://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>.
|
||||
<br>
|
||||
Libraries:
|
||||
[YouTubeExplode](https://github.com/tyrzz/YouTubeExplode)<br>
|
||||
[DiscUtils](https://github.com/DiscUtils/DiscUtils)<br>
|
||||
[Tesses.WebServer](https://gitlab.tesses.cf/tesses50/tesses.webserver)<br>
|
||||
[Zio](https://github.com/xoofx/zio)<br>
|
||||
[SSH.NET](https://github.com/sshnet/SSH.NET/)<br>
|
||||
[Tesses.WebServer.Swagme](https://gitlab.tesses.net/tesses50/tesses-webserver-extras)<br>
|
||||
[JSON.NET](https://www.newtonsoft.com/json)<br>
|
||||
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
|
||||
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
|
||||
|
||||
https://github.com/Tyrzz/YoutubeExplode
|
||||
|
||||
This is also the License to this Project due to YouTubeExplode
|
||||
<br><br>
|
||||
|
||||
Other Licenses:<br>
|
||||
[DiscUtils](LICENSE.DiskUtils)<br>
|
||||
[Tesses.WebServer](LICENSE.Tesses.WebServer)<br>
|
||||
[Zio](LICENSE.Zio)<br>
|
||||
|
||||
I also use HttpStream which is MIT according to github repo
|
|
@ -1,298 +0,0 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using YoutubeExplode.Channels;
|
||||
using YoutubeExplode.Playlists;
|
||||
using YoutubeExplode.Videos;
|
||||
using MailKit.Net.Smtp;
|
||||
using MimeKit;
|
||||
using MailKit;
|
||||
using MailKit.Net.Imap;
|
||||
using System.IO;
|
||||
using System.Threading;
|
||||
|
||||
namespace Tesses.YouTubeDownloader.MailKit
|
||||
{
|
||||
public sealed class SMTPDownloader : IDownloader
|
||||
{
|
||||
string fromEmail;
|
||||
string toEmail;
|
||||
Func<Task<SmtpClient>> new_client;
|
||||
public SMTPDownloader(Func<Task<SmtpClient>> client,string fromEmail,string toEmail)
|
||||
{
|
||||
this.new_client = client;
|
||||
this.fromEmail=fromEmail;
|
||||
this.toEmail=toEmail;
|
||||
}
|
||||
|
||||
public SMTPDownloader(string smtpServer,string fromEmail,string toEmail,string username,string password,int port=587,global::MailKit.Security.SecureSocketOptions options=global::MailKit.Security.SecureSocketOptions.StartTls)
|
||||
{
|
||||
this.new_client = async ()=>{
|
||||
var clt= new SmtpClient();
|
||||
await clt.ConnectAsync(smtpServer,port,options);
|
||||
await clt.AuthenticateAsync(username,password);
|
||||
return clt;
|
||||
};
|
||||
this.fromEmail=fromEmail;
|
||||
this.toEmail = toEmail;
|
||||
}
|
||||
|
||||
public event EventHandler<VideoStartedEventArgs> VideoStarted;
|
||||
public event EventHandler<VideoProgressEventArgs> VideoProgress;
|
||||
public event EventHandler<VideoFinishedEventArgs> VideoFinished;
|
||||
public event EventHandler<TYTDErrorEventArgs> Error;
|
||||
public event EventHandler<BellEventArgs> Bell;
|
||||
|
||||
private async Task AddItemToAsync(string url)
|
||||
{
|
||||
using(var clt = await new_client())
|
||||
{
|
||||
var messageToSend = new MimeMessage();
|
||||
messageToSend.From.Add(MailboxAddress.Parse(fromEmail));
|
||||
messageToSend.To.Add(MailboxAddress.Parse(toEmail));
|
||||
messageToSend.Body = new TextPart(MimeKit.Text.TextFormat.Plain){Text=url};
|
||||
messageToSend.Subject="Sent By Tesses.YouTubeDownloader.MailKit";
|
||||
await clt.SendAsync(messageToSend);
|
||||
await clt.DisconnectAsync(true);
|
||||
}
|
||||
}
|
||||
|
||||
public async Task AddChannelAsync(ChannelId id, Resolution resolution = Resolution.PreMuxed)
|
||||
{
|
||||
await AddItemToAsync($"https://www.youtube.com/channel/{id.Value}");
|
||||
}
|
||||
|
||||
public async Task AddFileAsync(string url, bool download = true)
|
||||
{
|
||||
await Task.CompletedTask;
|
||||
}
|
||||
|
||||
public async Task AddPlaylistAsync(PlaylistId id, Resolution resolution = Resolution.PreMuxed)
|
||||
{
|
||||
await AddItemToAsync($"https://www.youtube.com/playlist?list={id.Value}");
|
||||
}
|
||||
|
||||
public async Task AddToPersonalPlaylistAsync(string name, IEnumerable<ListContentItem> items)
|
||||
{
|
||||
await Task.CompletedTask;
|
||||
}
|
||||
|
||||
public async Task AddUserAsync(UserName userName, Resolution resolution = Resolution.PreMuxed)
|
||||
{
|
||||
await AddItemToAsync($"https://www.youtube.com/user/{userName.Value}");
|
||||
}
|
||||
|
||||
public async Task AddVideoAsync(VideoId id, Resolution resolution = Resolution.PreMuxed)
|
||||
{
|
||||
await AddItemToAsync($"https://www.youtube.com/watch?v={id.Value}");
|
||||
}
|
||||
public async Task AddSlugAsync(ChannelSlug slug,Resolution resolution=Resolution.PreMuxed)
|
||||
{
|
||||
await AddItemToAsync($"https://www.youtube.com/c/{slug.Value}");
|
||||
}
|
||||
public async Task AddHandleAsync(ChannelHandle handle,Resolution resolution =Resolution.PreMuxed)
|
||||
{
|
||||
await AddItemToAsync($"https://www.youtube.com/@{handle.Value}");
|
||||
}
|
||||
public void CancelDownload(bool restart = false)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public void DeletePersonalPlaylist(string name)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public ExtraData GetExtraData()
|
||||
{
|
||||
|
||||
return new ExtraData();
|
||||
}
|
||||
|
||||
public async IAsyncEnumerable<ListContentItem> GetPersonalPlaylistContentsAsync(string name)
|
||||
{
|
||||
await Task.CompletedTask;
|
||||
yield break;
|
||||
}
|
||||
|
||||
public SavedVideoProgress GetProgress()
|
||||
{
|
||||
return new SavedVideoProgress();
|
||||
}
|
||||
|
||||
public IReadOnlyList<(SavedVideo Video, Resolution Resolution)> GetQueueList()
|
||||
{
|
||||
return new List<(SavedVideo Video,Resolution Resolution)>();
|
||||
}
|
||||
|
||||
public async IAsyncEnumerable<Subscription> GetSubscriptionsAsync()
|
||||
{
|
||||
await Task.CompletedTask;
|
||||
yield break;
|
||||
}
|
||||
|
||||
public bool PersonalPlaylistExists(string name)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
public async Task RemoveItemFromPersonalPlaylistAsync(string name, VideoId id)
|
||||
{
|
||||
await Task.CompletedTask;
|
||||
}
|
||||
|
||||
public async Task ReplacePersonalPlaylistAsync(string name, IEnumerable<ListContentItem> items)
|
||||
{
|
||||
await Task.CompletedTask;
|
||||
}
|
||||
|
||||
public async Task ResubscribeAsync(ChannelId id, ChannelBellInfo info = ChannelBellInfo.NotifyAndDownload)
|
||||
{
|
||||
await Task.CompletedTask;
|
||||
}
|
||||
|
||||
public async Task SetResolutionForItemInPersonalPlaylistAsync(string name, VideoId id, Resolution resolution)
|
||||
{
|
||||
await Task.CompletedTask;
|
||||
}
|
||||
|
||||
public async Task SubscribeAsync(ChannelId id, ChannelBellInfo bellInfo = ChannelBellInfo.NotifyAndDownload)
|
||||
{
|
||||
await Task.CompletedTask;
|
||||
}
|
||||
|
||||
public async Task SubscribeAsync(UserName name, ChannelBellInfo info = ChannelBellInfo.NotifyAndDownload)
|
||||
{
|
||||
await Task.CompletedTask;
|
||||
}
|
||||
|
||||
public async Task UnsubscribeAsync(ChannelId id)
|
||||
{
|
||||
await Task.CompletedTask;
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class IMAPDownloader
|
||||
{
|
||||
IDownloader downloader;
|
||||
string imapServer;
|
||||
int imapPort;
|
||||
bool ssl;
|
||||
string username;
|
||||
string password;
|
||||
string[] folders;
|
||||
public IMAPDownloader(IDownloader downloader,string imapServer,int imapPort,bool ssl,string username,string password,params string[] folders)
|
||||
{
|
||||
this.downloader=downloader;
|
||||
this.imapServer =imapServer;
|
||||
this.imapPort = imapPort;
|
||||
this.ssl = ssl;
|
||||
this.username = username;
|
||||
this.password = password;
|
||||
this.folders = folders;
|
||||
}
|
||||
|
||||
public void Scan()
|
||||
{
|
||||
using (var client = new ImapClient())
|
||||
{
|
||||
client.Connect(imapServer, imapPort,ssl);
|
||||
client.Authenticate(username,password);
|
||||
foreach (var folder_name in folders)
|
||||
{
|
||||
var folder = client.GetFolder(folder_name);
|
||||
folder.Open(FolderAccess.ReadOnly);
|
||||
foreach(var item in folder)
|
||||
{
|
||||
using (var ms = new MemoryStream())
|
||||
{
|
||||
item.Body.WriteTo(ms);
|
||||
ms.Position = 0;
|
||||
using (var sr = new StreamReader(ms))
|
||||
{
|
||||
string line;
|
||||
while((line=sr.ReadLine()) != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
Task.Run(async () => await downloader.AddItemAsync(line)).Wait();
|
||||
}
|
||||
catch(Exception ex)
|
||||
{
|
||||
_ = ex;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
client.Disconnect(true);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
public async Task ScanAsync(CancellationToken token=default)
|
||||
{
|
||||
using (var client = new ImapClient())
|
||||
{
|
||||
await client.ConnectAsync(imapServer, imapPort,ssl,token);
|
||||
await client.AuthenticateAsync(username,password,token);
|
||||
foreach (var folder_name in folders)
|
||||
{
|
||||
if(token.IsCancellationRequested) break;
|
||||
var folder = await client.GetFolderAsync(folder_name,token);
|
||||
await folder.OpenAsync(FolderAccess.ReadOnly,token);
|
||||
foreach(var item in folder)
|
||||
{
|
||||
if(token.IsCancellationRequested) break;
|
||||
using (var ms = new MemoryStream())
|
||||
{
|
||||
item.Body.WriteTo(ms);
|
||||
ms.Position = 0;
|
||||
using (var sr = new StreamReader(ms))
|
||||
{
|
||||
string line;
|
||||
while((line=await sr.ReadLineAsync()) != null)
|
||||
{
|
||||
if(token.IsCancellationRequested) break;
|
||||
try
|
||||
{
|
||||
await downloader.AddItemAsync(line);
|
||||
}
|
||||
catch(Exception ex)
|
||||
{
|
||||
_ = ex;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
await client.DisconnectAsync(true,token);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
public void ScanLoop(TimeSpan interval,CancellationToken token=default)
|
||||
{
|
||||
Thread t = new Thread(async()=>{
|
||||
try{
|
||||
while(!token.IsCancellationRequested)
|
||||
{
|
||||
await ScanAsync(token);
|
||||
await Task.Delay(interval.Milliseconds,token);
|
||||
}
|
||||
}catch(Exception ex)
|
||||
{
|
||||
_=ex;
|
||||
}
|
||||
});
|
||||
t.Start();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
|
@ -1,28 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\Tesses.YouTubeDownloader\Tesses.YouTubeDownloader.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="MailKit" Version="3.4.3" />
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<LangVersion>8.0</LangVersion>
|
||||
<IsPackable>true</IsPackable>
|
||||
<PackageId>Tesses.YouTubeDownloader.MailKit</PackageId>
|
||||
<Author>Mike Nolan</Author>
|
||||
<Company>Tesses</Company>
|
||||
<Version>1.0.0</Version>
|
||||
<AssemblyVersion>1.0.0</AssemblyVersion>
|
||||
<FileVersion>1.0.0</FileVersion>
|
||||
<Description>A YouTube Downloader</Description>
|
||||
<PackageLicenseExpression>LGPL-3.0-only</PackageLicenseExpression>
|
||||
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
|
||||
<PackageTags>YoutubeExplode, YouTube, YouTubeDownloader</PackageTags>
|
||||
<RepositoryUrl>https://gitlab.tesses.cf/tesses50/tytd</RepositoryUrl>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
|
@ -6,14 +6,11 @@ public class TYTDConfiguration
|
|||
{
|
||||
Url = "http://127.0.0.1:3252/";
|
||||
LocalFiles=Environment.CurrentDirectory;
|
||||
AddComplete = true;
|
||||
}
|
||||
public string Url {get;set;}
|
||||
|
||||
public string LocalFiles {get;set;}
|
||||
|
||||
public bool AddComplete {get;set;}
|
||||
|
||||
public static TYTDConfiguration Load()
|
||||
{
|
||||
if(!File.Exists("proxy.json")) return new TYTDConfiguration();
|
||||
|
|
|
@ -12,7 +12,6 @@ TYTDClient client=new TYTDClient(c,config.Url);
|
|||
TYTDDownloaderStorageProxy proxy=new TYTDDownloaderStorageProxy();
|
||||
proxy.Storage = currentDirectory;
|
||||
proxy.Downloader=client;
|
||||
proxy.AddIfCompletedInStorage = config.AddComplete;
|
||||
|
||||
TYTDServer server=new TYTDServer(proxy);
|
||||
server.RootServer.Server=new StaticServer("WebSite");
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
{
|
||||
"Url": "http://192.168.0.142:3252/",
|
||||
"LocalFiles": "/media/mike/BackupPlus4/Videos/TYTD_working",
|
||||
"AddComplete": false,
|
||||
"AddPlaylistsToStorage": true
|
||||
"Url": "http://10.137.42.142:3252/",
|
||||
"LocalFiles": "/media/mike/PhotoDrive/wii-vids/working"
|
||||
}
|
|
@ -17,11 +17,9 @@ namespace Tesses.YouTubeDownloader.Net6
|
|||
server.RootServer.Server=new StaticServer("WebSite");
|
||||
currentDirectory.CanDownload=true;
|
||||
HttpServerListener listener=new HttpServerListener(new System.Net.IPEndPoint(System.Net.IPAddress.Any,3252),server.InnerServer);
|
||||
|
||||
currentDirectory.StartLoop();
|
||||
TYTDStorage.FFmpeg ="/usr/bin/ffmpeg";
|
||||
Console.WriteLine("Almost Ready to Listen");
|
||||
|
||||
await listener.ListenAsync(CancellationToken.None);
|
||||
|
||||
}
|
||||
|
|
|
@ -16,7 +16,6 @@ using Tesses.WebServer.Swagme;
|
|||
|
||||
namespace Tesses.Extensions
|
||||
{
|
||||
|
||||
public static class Extensions
|
||||
{
|
||||
public static string Substring(this string value,string str)
|
||||
|
@ -32,37 +31,8 @@ namespace Tesses.Extensions
|
|||
|
||||
namespace Tesses.YouTubeDownloader.Server
|
||||
{
|
||||
|
||||
using Tesses.YouTubeDownloader;
|
||||
|
||||
internal class EventSender
|
||||
{
|
||||
DateTime lastScan = DateTime.Now;
|
||||
TimeSpan ts;
|
||||
public EventSender(TimeSpan interval)
|
||||
{
|
||||
this.ts = interval;
|
||||
}
|
||||
public bool CanScan
|
||||
{
|
||||
get{
|
||||
return DateTime.Now - lastScan >= ts;
|
||||
}
|
||||
}
|
||||
|
||||
public void SendEvent(Action action)
|
||||
{
|
||||
if(CanScan)
|
||||
{
|
||||
lastScan = DateTime.Now;
|
||||
action();
|
||||
}
|
||||
}
|
||||
public void Sent()
|
||||
{
|
||||
lastScan = DateTime.Now;
|
||||
}
|
||||
}
|
||||
|
||||
internal static class B64
|
||||
{
|
||||
|
@ -435,20 +405,7 @@ internal static class B64
|
|||
await ctx.SendJsonAsync(data2.ToLegacy());
|
||||
}
|
||||
else*/
|
||||
if(path.StartsWith("/File/DownloadsInfo/"))
|
||||
{
|
||||
string file = Path.GetFileNameWithoutExtension(WebUtility.UrlDecode(path.Substring("/File/DownloadsInfo/")));
|
||||
string url = B64.Base64UrlDecodes(file);
|
||||
if(baseCtl.DownloadExists(url))
|
||||
{
|
||||
var obj=await baseCtl.GetDownloadInfoAsync(url);
|
||||
await ctx.SendJsonAsync(obj);
|
||||
}else{
|
||||
ctx.StatusCode = 404;
|
||||
ctx.NetworkStream.Close();
|
||||
}
|
||||
}
|
||||
else if(path.StartsWith("/File/FileInfo/"))
|
||||
if(path.StartsWith("/File/FileInfo/"))
|
||||
{
|
||||
string file = Path.GetFileNameWithoutExtension(WebUtility.UrlDecode(path.Substring("/File/FileInfo/")));
|
||||
string url = B64.Base64UrlDecodes(file);
|
||||
|
@ -536,15 +493,6 @@ internal static class B64
|
|||
await ctx.SendStreamAsync(s);
|
||||
}
|
||||
}*/
|
||||
if(path.StartsWith("/GetFiles/DownloadsInfo") || path.StartsWith("/GetFiles/DownloadsInfo/"))
|
||||
{
|
||||
List<string> urls=new List<string>();
|
||||
await foreach(var url in baseCtl.GetDownloadUrlsAsync())
|
||||
{
|
||||
urls.Add($"{TYTDBase.HashDownloadUrl(url)}.json");
|
||||
}
|
||||
await ctx.SendJsonAsync(urls);
|
||||
}
|
||||
else if(path.StartsWith("/GetFiles/FileInfo") || path.StartsWith("/GetFiles/FileInfo/"))
|
||||
{
|
||||
List<string> urls=new List<string>();
|
||||
|
@ -604,23 +552,9 @@ internal static class B64
|
|||
await ctx.SendTextAsync( "false","text/plain");
|
||||
}
|
||||
}
|
||||
else if(path.StartsWith("/FileExists/DownloadsInfo/"))
|
||||
{
|
||||
string file = Path.GetFileNameWithoutExtension(WebUtility.UrlDecode(path.Substring("/FileExists/DownloadsInfo/")));
|
||||
await foreach(var item in baseCtl.GetDownloadUrlsAsync())
|
||||
{
|
||||
if(TYTDBase.HashDownloadUrl(item) == file)
|
||||
{
|
||||
await ctx.SendTextAsync( "true","text/plain");
|
||||
return;
|
||||
}
|
||||
}
|
||||
await ctx.SendTextAsync( "false","text/plain");
|
||||
|
||||
}
|
||||
else if(path.StartsWith("/FileExists/FileInfo/"))
|
||||
{
|
||||
string file = Path.GetFileNameWithoutExtension(WebUtility.UrlDecode(path.Substring("/FileExists/FileInfo/")));
|
||||
string file = Path.GetFileNameWithoutExtension(WebUtility.UrlDecode(path.Substring("/FileExists/StreamInfo/")));
|
||||
string url = B64.Base64Decodes(file);
|
||||
|
||||
if(baseCtl.DownloadExists(url))
|
||||
|
@ -927,9 +861,6 @@ internal static class B64
|
|||
AddBoth("/AddPlaylist",AddPlaylist,new SwagmeDocumentation("/AddPlaylist?id=PLgXAgLm6Kre7M3c8G2OlQTG-PETLHs4Vd&res=PreMuxed","Add youtube playlist","id: Playlist Id Or encodeUriComponent Url<br>res: NoDownload=Do not download clip but just info, Mux=Requires conversion, PreMuxed=Does not require conversion, AudioOnly=Best audio only, VideoOnly=Best video only"),"Adding items");
|
||||
AddBoth("/AddChannel",AddChannel,new SwagmeDocumentation("/AddChannel?id=UC4QobU6STFB0P71PMvOGN5A&res=PreMuxed","Add youtube channel","id: YouTube Channel Id Or encodeUriComponent Url<br>res: NoDownload=Do not download clip but just info, Mux=Requires conversion, PreMuxed=Does not require conversion, AudioOnly=Best audio only, VideoOnly=Best video only"),"Adding items");
|
||||
AddBoth("/AddUser",AddUser,new SwagmeDocumentation("/AddUser?id=jawed&res=PreMuxed","Add youtube user","id: YouTube Channel Name Or encodeUriComponent Url<br>res: NoDownload=Do not download clip but just info, Mux=Requires conversion, PreMuxed=Does not require conversion, AudioOnly=Best audio only, VideoOnly=Best video only"),"Adding items");
|
||||
AddBoth("/AddSlug",AddSlug,new SwagmeDocumentation("/AddSlug?id=https%3A%2F%2Fwww.youtube.com%2Fc%2FLinusTechTips&res=PreMuxed","Add youtube channel by slug","id: YouTube Channel with slug Or encodeUriComponent Url<br>res: NoDownload=Do not download clip but just info, Mux=Requires conversion, PreMuxed=Does not require conversion, AudioOnly=Best audio only, VideoOnly=Best video only"),"Adding items");
|
||||
AddBoth("/AddHandle",AddHandle,new SwagmeDocumentation("/AddHandle?id=@tesses50&res=PreMuxed","Add youtube channel by handle","id: YouTube Channel with handle Or encodeUriComponent Url<br>res: NoDownload=Do not download clip but just info, Mux=Requires conversion, PreMuxed=Does not require conversion, AudioOnly=Best audio only, VideoOnly=Best video only"),"Adding items");
|
||||
|
||||
AddBoth("/AddItem",AddItem,new SwagmeDocumentation("/AddItem?v=jNQXAC9IVRw&res=PreMuxed","Add any type of item","v: Media Id Or encodeUriComponent Url<br>res: NoDownload=Do not download clip but just info, Mux=Requires conversion, PreMuxed=Does not require conversion, AudioOnly=Best audio only, VideoOnly=Best video only"),"Adding items");
|
||||
AddBoth("/AddFile",AddFile,new SwagmeDocumentation("/AddFile?url=https%3A%2F%2Ftesses.cf%2Fimages%2Frvl.jpg&download=true","Add normal file download","url: Url to file<br>download: whether to download file"),"Adding items");
|
||||
/*Getting status*/
|
||||
|
@ -970,7 +901,7 @@ internal static class B64
|
|||
AddBoth("/extra_data.json",ExtraData,new SwagmeDocumentation("Get extra info about downloader","Get extra data such as TYTD Tag, item count in queue and tytd version"));
|
||||
|
||||
AddBoth("/CancelDownload",Cancel,new SwagmeDocumentation("/CancelDownload?restart=true","Cancel or Restart download","restart:<br> true: Restart download<br> false: Cancel Download"));
|
||||
AddBoth("/Thumbnail",Thumbnail,new SwagmeDocumentation("/Thumbnail?v=PzUKeGZiEl0&res=maxresdefault","Get Thumbnail for video","v: Video Id<br>res: YouTube Thumbnail Resolution <a href=\"https://www.binarymoon.co.uk/2014/03/using-youtube-thumbnails/\">List of resolutions</a>"),"Other");
|
||||
|
||||
/*
|
||||
public async Task AddToPersonalPlaylistAsync(string name, IEnumerable<(VideoId Id, Resolution Resolution)> items)
|
||||
{
|
||||
|
@ -991,20 +922,6 @@ internal static class B64
|
|||
{
|
||||
throw new NotImplementedException();
|
||||
}*/
|
||||
}
|
||||
public async Task Thumbnail(ServerContext ctx)
|
||||
{
|
||||
string v="";
|
||||
string res="";
|
||||
VideoId? id=null;
|
||||
ITYTDBase baseCtl = Downloader as ITYTDBase;
|
||||
if(ctx.QueryParams.TryGetFirst("v",out v) && ctx.QueryParams.TryGetFirst("res",out res) && (id=VideoId.TryParse(v)).HasValue && baseCtl != null)
|
||||
{
|
||||
await ctx.SendBytesAsync(await baseCtl.ReadThumbnailAsync(id.Value,res),"image/jpg");
|
||||
}else{
|
||||
await ctx.SendTextAsync("Expected v=YouTubeVideoId\r\nres=a youtube thumbnail resolution\r\nAnd Downloader must implement ITYTDBase","text/plain");
|
||||
}
|
||||
|
||||
}
|
||||
public async Task ExtraData(ServerContext ctx)
|
||||
{
|
||||
|
@ -1018,13 +935,6 @@ internal static class B64
|
|||
}
|
||||
public async Task Event(ServerContext ctx)
|
||||
{
|
||||
double interval=0;
|
||||
string intervalStr;
|
||||
if(ctx.QueryParams.TryGetFirst("interval",out intervalStr))
|
||||
{
|
||||
if(!double.TryParse(intervalStr,out interval)) interval=0;
|
||||
}
|
||||
|
||||
IStorage storage=Downloader as IStorage;
|
||||
if(storage != null){
|
||||
|
||||
|
@ -1047,10 +957,7 @@ internal static class B64
|
|||
p.Video=e.VideoInfo;
|
||||
evts.SendEvent(p);
|
||||
};
|
||||
|
||||
EventSender s = new EventSender(TimeSpan.FromSeconds(interval));
|
||||
storage.VideoProgress += (sender,e)=>{
|
||||
bool wasFirst= first;
|
||||
ProgressItem p=new ProgressItem();
|
||||
p.StartEvent=false;
|
||||
p.StopEvent=false;
|
||||
|
@ -1062,13 +969,7 @@ internal static class B64
|
|||
p.Video=e.VideoInfo;
|
||||
|
||||
first=false;
|
||||
if(wasFirst || s.CanScan)
|
||||
{
|
||||
s.Sent();
|
||||
evts.SendEvent(p);
|
||||
}
|
||||
|
||||
|
||||
};
|
||||
storage.VideoFinished +=(sender,e)=>{
|
||||
ProgressItem p=new ProgressItem();
|
||||
|
@ -1174,7 +1075,7 @@ internal static class B64
|
|||
}
|
||||
public async Task ReplaceList(ServerContext ctx)
|
||||
{
|
||||
ctx.ParseBody();
|
||||
|
||||
//this is for personal playlists
|
||||
string name;
|
||||
if(ctx.QueryParams.TryGetFirst("name",out name)){
|
||||
|
@ -1595,51 +1496,7 @@ internal static class B64
|
|||
}
|
||||
await ctx.RedirectBackAsync();
|
||||
}
|
||||
public async Task AddHandle(ServerContext ctx)
|
||||
{
|
||||
string id;
|
||||
if(ctx.QueryParams.TryGetFirst("id",out id))
|
||||
{
|
||||
Resolution resolution=Resolution.PreMuxed;
|
||||
string res;
|
||||
if(ctx.QueryParams.TryGetFirst("res",out res))
|
||||
{
|
||||
if(!Enum.TryParse<Resolution>(res,out resolution))
|
||||
{
|
||||
resolution=Resolution.PreMuxed;
|
||||
}
|
||||
}
|
||||
ChannelHandle? id1=ChannelHandle.TryParse(id);
|
||||
if(id1.HasValue)
|
||||
{
|
||||
await Downloader.AddHandleAsync(id1.Value,resolution);
|
||||
}
|
||||
}
|
||||
await ctx.RedirectBackAsync();
|
||||
}
|
||||
|
||||
public async Task AddSlug(ServerContext ctx)
|
||||
{
|
||||
string id;
|
||||
if(ctx.QueryParams.TryGetFirst("id",out id))
|
||||
{
|
||||
Resolution resolution=Resolution.PreMuxed;
|
||||
string res;
|
||||
if(ctx.QueryParams.TryGetFirst("res",out res))
|
||||
{
|
||||
if(!Enum.TryParse<Resolution>(res,out resolution))
|
||||
{
|
||||
resolution=Resolution.PreMuxed;
|
||||
}
|
||||
}
|
||||
ChannelSlug? id1=ChannelSlug.TryParse(id);
|
||||
if(id1.HasValue)
|
||||
{
|
||||
await Downloader.AddSlugAsync(id1.Value,resolution);
|
||||
}
|
||||
}
|
||||
await ctx.RedirectBackAsync();
|
||||
}
|
||||
public async Task AddChannel(ServerContext ctx)
|
||||
{
|
||||
string id;
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Tesses.WebServer" Version="1.0.3.8" />
|
||||
<PackageReference Include="Tesses.WebServer.Swagme" Version="1.0.2" />
|
||||
<PackageReference Include="Tesses.WebServer.Swagme" Version="1.0.1" />
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
@ -16,11 +16,11 @@
|
|||
<PackageId>Tesses.YouTubeDownloader.Server</PackageId>
|
||||
<Author>Mike Nolan</Author>
|
||||
<Company>Tesses</Company>
|
||||
<Version>2.0.1.2</Version>
|
||||
<AssemblyVersion>2.0.1.2</AssemblyVersion>
|
||||
<FileVersion>2.0.1.2</FileVersion>
|
||||
<Version>1.1.8</Version>
|
||||
<AssemblyVersion>1.1.8</AssemblyVersion>
|
||||
<FileVersion>1.1.8</FileVersion>
|
||||
<Description>Adds WebServer to TYTD</Description>
|
||||
<PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
|
||||
<PackageLicenseExpression>LGPL-3.0-only</PackageLicenseExpression>
|
||||
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
|
||||
<PackageTags>YoutubeExplode, YouTube, YouTubeDownloader</PackageTags>
|
||||
<RepositoryUrl>https://gitlab.tesses.cf/tesses50/tytd</RepositoryUrl>
|
||||
|
|
|
@ -64,7 +64,7 @@ namespace Tesses.YouTubeDownloader
|
|||
//Console.WriteLine("IN FUNC");
|
||||
|
||||
//Console.WriteLine("DIR");
|
||||
if(await storage.BestStreamInfoExistsAsync(id))
|
||||
if(storage.BestStreamInfoExists(id))
|
||||
{
|
||||
//Console.WriteLine("STREAMS");
|
||||
BestStreamsSerialized serialization=await storage.GetBestStreamInfoAsync(id);
|
||||
|
@ -83,7 +83,7 @@ namespace Tesses.YouTubeDownloader
|
|||
{
|
||||
|
||||
|
||||
if(await storage.BestStreamInfoExistsAsync(id))
|
||||
if(storage.BestStreamInfoExists(id))
|
||||
{
|
||||
BestStreamsSerialized serialization=await storage.GetBestStreamInfoAsync(id);
|
||||
if(DateTime.Now < serialization.Expires || !expire_check)
|
||||
|
@ -99,7 +99,7 @@ namespace Tesses.YouTubeDownloader
|
|||
|
||||
DateTime expires=DateTime.Now.AddHours(6);
|
||||
try{
|
||||
if(await storage.VideoInfoExistsAsync(id))
|
||||
if(storage.VideoInfoExists(id))
|
||||
{
|
||||
var video = await storage.GetVideoInfoAsync(id);
|
||||
if(video.VideoFrozen)
|
||||
|
|
|
@ -131,11 +131,10 @@ namespace Tesses.YouTubeDownloader
|
|||
{
|
||||
|
||||
begin_download:
|
||||
//await Task.Delay(this.GetLoggerProperties().DownloadMediaDelay);
|
||||
|
||||
try{
|
||||
if(video.DownloadFrom == "YouTube")
|
||||
{
|
||||
|
||||
switch (resolution)
|
||||
{
|
||||
case Resolution.Mux:
|
||||
|
@ -185,8 +184,8 @@ namespace Tesses.YouTubeDownloader
|
|||
|
||||
private async Task DownloadFileAsync(SavedVideo video, CancellationToken token, IProgress<double> progress, bool report)
|
||||
{
|
||||
string incomplete_file_path = $"Downloads/{HashDownloadUrl(video.Id)}-incomplete.part";
|
||||
string file_path = $"Downloads/{HashDownloadUrl(video.Id)}.bin";
|
||||
string incomplete_file_path = $"Download/{B64.Base64UrlEncodes(video.Id)}-incomplete.part";
|
||||
string file_path = $"Download/{B64.Base64UrlEncodes(video.Id)}.bin";
|
||||
string url = video.Id;
|
||||
bool canSeek=false;
|
||||
long length=0;
|
||||
|
|
|
@ -23,12 +23,10 @@ namespace Tesses.YouTubeDownloader
|
|||
event EventHandler<BellEventArgs> Bell;
|
||||
|
||||
void CancelDownload(bool restart=false);
|
||||
|
||||
Task AddVideoAsync(VideoId id,Resolution resolution=Resolution.PreMuxed);
|
||||
Task AddPlaylistAsync(PlaylistId id,Resolution resolution=Resolution.PreMuxed);
|
||||
Task AddChannelAsync(ChannelId id,Resolution resolution=Resolution.PreMuxed);
|
||||
Task AddHandleAsync(ChannelHandle handle,Resolution resolution=Resolution.PreMuxed);
|
||||
Task AddSlugAsync(ChannelSlug handle,Resolution resolution=Resolution.PreMuxed);
|
||||
|
||||
Task AddUserAsync(UserName userName,Resolution resolution=Resolution.PreMuxed);
|
||||
Task AddFileAsync(string url,bool download=true);
|
||||
IReadOnlyList<(SavedVideo Video,Resolution Resolution)> GetQueueList();
|
||||
|
|
|
@ -15,7 +15,6 @@ namespace Tesses.YouTubeDownloader
|
|||
{
|
||||
public interface IStorage : IWritable, IDownloader, ITYTDBase
|
||||
{
|
||||
Task WriteThumbnailAsync(VideoId videoId,string res,byte[] data,CancellationToken token=default);
|
||||
void WaitTillMediaContentQueueEmpty();
|
||||
|
||||
Task WriteBestStreamInfoAsync(VideoId id,BestStreamInfo.BestStreamsSerialized serialized);
|
||||
|
|
|
@ -15,13 +15,7 @@ namespace Tesses.YouTubeDownloader
|
|||
{
|
||||
public interface ITYTDBase : IPersonalPlaylistGet
|
||||
{
|
||||
Task<bool> BestStreamInfoExistsAsync(VideoId id);
|
||||
Task<bool> VideoInfoExistsAsync(VideoId id);
|
||||
Task<bool> PlaylistInfoExistsAsync(PlaylistId id);
|
||||
Task<bool> ChannelInfoExistsAsync(ChannelId id);
|
||||
Task<bool> ThumbnailExistsAsync(VideoId videoId,string res);
|
||||
bool ThumbnailExists(VideoId videoId,string res);
|
||||
Task<byte[]> ReadThumbnailAsync(VideoId videoId,string res,CancellationToken token=default);
|
||||
|
||||
IAsyncEnumerable<string> GetDownloadUrlsAsync();
|
||||
IAsyncEnumerable<SavedVideo> GetDownloadsAsync();
|
||||
Task<SavedVideo> GetDownloadInfoAsync(string url);
|
||||
|
|
|
@ -111,16 +111,11 @@ namespace Tesses.YouTubeDownloader
|
|||
|
||||
public bool AddDateInLog {get;set;}
|
||||
|
||||
public bool LogEntriesRightWhenAdded {get;set;}=true;
|
||||
|
||||
//public TimeSpan DownloadMediaDelay {get;set;}=new TimeSpan(0,0,5);
|
||||
|
||||
//public TimeSpan GetInfoDelay {get;set;}=new TimeSpan(0,0,5);
|
||||
|
||||
}
|
||||
public class Logger
|
||||
{
|
||||
private string _video_log_file;
|
||||
|
||||
private string _filename;
|
||||
private TYTDStorage _storage;
|
||||
|
||||
|
@ -131,9 +126,8 @@ namespace Tesses.YouTubeDownloader
|
|||
|
||||
_storage=storage;
|
||||
|
||||
string dateTime = DateTime.Now.ToString("yyyyMMdd_HHmmss");
|
||||
string dateTime = DateTime.Now.ToString("yyyyMMdd_hhmmss");
|
||||
_filename = $"config/logs/{dateTime}.log";
|
||||
_video_log_file = $"config/addlog/{dateTime}.log";
|
||||
}
|
||||
private void WriteStdErr(string message)
|
||||
{
|
||||
|
@ -168,30 +162,6 @@ namespace Tesses.YouTubeDownloader
|
|||
Write(message,writeToConsole,isError,log);
|
||||
});
|
||||
}
|
||||
public void WriteVideoLog(string url)
|
||||
{
|
||||
if(!_storage.GetLoggerProperties().LogEntriesRightWhenAdded) return;
|
||||
lock(TYTDStorage.o){
|
||||
try{
|
||||
using(var strm = _storage.OpenOrCreateAsync(_video_log_file).GetAwaiter().GetResult())
|
||||
{
|
||||
if(!strm.CanSeek) return;
|
||||
|
||||
strm.Seek(0,SeekOrigin.End);
|
||||
using(var sw = new StreamWriter(strm))
|
||||
{
|
||||
DateTime dat=DateTime.Now;
|
||||
|
||||
sw.WriteLine($"[{dat.ToShortDateString()} at {dat.ToLongTimeString()}]: {url}");
|
||||
}
|
||||
} }
|
||||
catch(Exception ex)
|
||||
{
|
||||
_=ex;
|
||||
}
|
||||
//mtx.ReleaseMutex();
|
||||
}
|
||||
}
|
||||
public void Write(string message,bool writeToConsole=false, bool isError=false,bool log=true)
|
||||
{
|
||||
|
||||
|
|
|
@ -18,16 +18,6 @@ namespace Tesses.YouTubeDownloader
|
|||
|
||||
internal class ChannelMediaContext : IMediaContext
|
||||
{
|
||||
public ChannelMediaContext(ChannelSlug slug,Resolution resolution)
|
||||
{
|
||||
this.slug=slug;
|
||||
this.Resolution = resolution;
|
||||
}
|
||||
public ChannelMediaContext(ChannelHandle handle,Resolution resolution)
|
||||
{
|
||||
this.handle=handle;
|
||||
this.Resolution = resolution;
|
||||
}
|
||||
public ChannelMediaContext(ChannelId id,Resolution resolution)
|
||||
{
|
||||
Id=id;
|
||||
|
@ -39,12 +29,9 @@ namespace Tesses.YouTubeDownloader
|
|||
Resolution=resolution;
|
||||
}
|
||||
Resolution Resolution;
|
||||
UserName? name1;
|
||||
UserName name1;
|
||||
ChannelId? Id; //made me nullable
|
||||
|
||||
ChannelHandle handle;
|
||||
ChannelSlug? slug;
|
||||
|
||||
public async Task<SavedChannel> GetChannel(TYTDStorage storage)
|
||||
{
|
||||
SavedChannel channel;
|
||||
|
@ -67,8 +54,8 @@ namespace Tesses.YouTubeDownloader
|
|||
var j=await storage.GetChannelInfoAsync(Id.Value);
|
||||
return j;
|
||||
}
|
||||
}else if(name1.HasValue){
|
||||
var c=await storage.YoutubeClient.Channels.GetByUserAsync(name1.Value);
|
||||
}else{
|
||||
var c=await storage.YoutubeClient.Channels.GetByUserAsync(name1);
|
||||
channel=await DownloadThumbnails(storage,c);
|
||||
//string path=$"Channel/{c.Id.Value}.json";
|
||||
if(!storage.ChannelInfoExists(c.Id.Value))
|
||||
|
@ -77,24 +64,6 @@ namespace Tesses.YouTubeDownloader
|
|||
|
||||
}
|
||||
return channel;
|
||||
}else if(slug.HasValue)
|
||||
{
|
||||
var c = await storage.YoutubeClient.Channels.GetBySlugAsync(slug.Value);
|
||||
channel = await DownloadThumbnails(storage,c);
|
||||
if(!storage.ChannelInfoExists(c.Id.Value))
|
||||
{
|
||||
await storage.WriteChannelInfoAsync(channel);
|
||||
}
|
||||
return channel;
|
||||
}
|
||||
else{
|
||||
var c = await storage.YoutubeClient.Channels.GetByHandleAsync(handle);
|
||||
channel = await DownloadThumbnails(storage,c);
|
||||
if(!storage.ChannelInfoExists(c.Id.Value))
|
||||
{
|
||||
await storage.WriteChannelInfoAsync(channel);
|
||||
}
|
||||
return channel;
|
||||
}
|
||||
}
|
||||
private async Task<SavedChannel> DownloadThumbnails(TYTDStorage storage,YoutubeExplode.Channels.Channel channel)
|
||||
|
|
|
@ -310,8 +310,7 @@ namespace Tesses.YouTubeDownloader
|
|||
{
|
||||
foreach(var item in Videos)
|
||||
{
|
||||
VideoId? id = VideoId.TryParse(item);
|
||||
if(id.HasValue && await baseCls.VideoExistsAsync(id.Value))
|
||||
if(await baseCls.FileExistsAsync($"Info/{item}.json"))
|
||||
{
|
||||
yield return await baseCls.GetVideoInfoAsync(item);
|
||||
}
|
||||
|
|
|
@ -17,23 +17,6 @@ namespace Tesses.YouTubeDownloader
|
|||
|
||||
public abstract partial class TYTDStorage : TYTDBase, IStorage
|
||||
{
|
||||
public new virtual async Task<byte[]> ReadThumbnailAsync(VideoId videoId,string res,CancellationToken token=default)
|
||||
{
|
||||
CreateDirectoryIfNotExist($"Thumbnails/{videoId.Value}");
|
||||
if(await ThumbnailExistsAsync(videoId,res))
|
||||
{
|
||||
return await ReadAllBytesAsync($"Thumbnails/{videoId.Value}/{res}.jpg",token);
|
||||
}else{
|
||||
var result= await HttpClient.GetByteArrayAsync($"https://s.ytimg.com/vi/{videoId.Value}/{res}.jpg");
|
||||
await WriteThumbnailAsync(videoId,res,result,token);
|
||||
return result;
|
||||
}
|
||||
}
|
||||
public virtual async Task WriteThumbnailAsync(VideoId videoId,string res,byte[] data,CancellationToken token=default)
|
||||
{
|
||||
CreateDirectoryIfNotExist($"Thumbnails/{videoId.Value}");
|
||||
await WriteAllBytesAsync($"Thumbnails/{videoId.Value}/{res}.jpg",data,token);
|
||||
}
|
||||
public override ExtraData GetExtraData()
|
||||
{
|
||||
ExtraData data=new ExtraData();
|
||||
|
@ -89,10 +72,9 @@ namespace Tesses.YouTubeDownloader
|
|||
}
|
||||
public async Task WriteAllBytesAsync(string path,byte[] data,CancellationToken token=default(CancellationToken))
|
||||
{
|
||||
MemoryStream ms = new MemoryStream(data);
|
||||
using(var s=await CreateAsync(path))
|
||||
{
|
||||
await ms.CopyToAsync(s,4096,token);
|
||||
await s.WriteAsync(data,0,data.Length,token);
|
||||
}
|
||||
}
|
||||
public EventHandler<ConsoleWriteEventArgs> ConsoleWrite;
|
||||
|
@ -128,8 +110,8 @@ namespace Tesses.YouTubeDownloader
|
|||
public virtual async Task WriteVideoInfoAsync(SavedVideo info)
|
||||
{
|
||||
|
||||
string file = info.DownloadFrom.StartsWith("NormalDownload,Length=") ? $"DownloadsInfo/{HashDownloadUrl(info.Id)}.json" : $"Info/{info.Id}.json";
|
||||
if(!await FileExistsAsync(file))
|
||||
string file = info.DownloadFrom.StartsWith("NormalDownload,Length=") ? $"FileInfo/{B64.Base64UrlEncodes(info.Id)}.json" : $"Info/{info.Id}.json";
|
||||
if(!FileExists(file))
|
||||
{
|
||||
await WriteAllTextAsync(file,JsonConvert.SerializeObject(info));
|
||||
}
|
||||
|
@ -145,7 +127,7 @@ namespace Tesses.YouTubeDownloader
|
|||
public virtual async Task WriteChannelInfoAsync(SavedChannel info)
|
||||
{
|
||||
string file = $"Channel/{info.Id}.json";
|
||||
if(!await FileExistsAsync(file))
|
||||
if(!FileExists(file))
|
||||
{
|
||||
await WriteAllTextAsync(file,JsonConvert.SerializeObject(info));
|
||||
}
|
||||
|
@ -154,7 +136,6 @@ namespace Tesses.YouTubeDownloader
|
|||
{
|
||||
lock(Temporary)
|
||||
{
|
||||
GetLogger().WriteVideoLog($"https://www.youtube.com/playlist?list={id.Value}");
|
||||
Temporary.Add( new PlaylistMediaContext(id,resolution));
|
||||
}
|
||||
|
||||
|
@ -165,35 +146,14 @@ namespace Tesses.YouTubeDownloader
|
|||
{
|
||||
lock(Temporary)
|
||||
{
|
||||
GetLogger().WriteVideoLog($"https://www.youtube.com/channel/{id.Value}");
|
||||
Temporary.Add(new ChannelMediaContext(id,resolution));
|
||||
}
|
||||
await Task.FromResult(0);
|
||||
}
|
||||
public async Task AddSlugAsync(ChannelSlug slug,Resolution resolution=Resolution.PreMuxed)
|
||||
{
|
||||
lock(Temporary)
|
||||
{
|
||||
GetLogger().WriteVideoLog($"https://www.youtube.com/c/{slug.Value}");
|
||||
|
||||
Temporary.Add(new ChannelMediaContext(slug,resolution));
|
||||
}
|
||||
await Task.FromResult(0);
|
||||
}
|
||||
public async Task AddHandleAsync(ChannelHandle handle,Resolution resolution=Resolution.PreMuxed)
|
||||
{
|
||||
lock(Temporary)
|
||||
{
|
||||
GetLogger().WriteVideoLog($"https://www.youtube.com/@{handle.Value}");
|
||||
Temporary.Add(new ChannelMediaContext(handle,resolution));
|
||||
}
|
||||
await Task.FromResult(0);
|
||||
}
|
||||
public async Task AddUserAsync(UserName name,Resolution resolution=Resolution.PreMuxed)
|
||||
{
|
||||
lock(Temporary)
|
||||
{
|
||||
GetLogger().WriteVideoLog($"https://www.youtube.com/user/{name.Value}");
|
||||
Temporary.Add(new ChannelMediaContext(name,resolution));
|
||||
}
|
||||
await Task.FromResult(0);
|
||||
|
@ -203,7 +163,6 @@ namespace Tesses.YouTubeDownloader
|
|||
{
|
||||
lock(Temporary)
|
||||
{
|
||||
GetLogger().WriteVideoLog($"https://www.youtube.com/watch?v={videoId.Value}");
|
||||
Temporary.Add(new VideoMediaContext(videoId,res));
|
||||
}
|
||||
await Task.FromResult(0);
|
||||
|
@ -212,7 +171,6 @@ namespace Tesses.YouTubeDownloader
|
|||
{
|
||||
lock(Temporary)
|
||||
{
|
||||
GetLogger().WriteVideoLog(url);
|
||||
Temporary.Add(new NormalDownloadMediaContext(url,download));
|
||||
}
|
||||
await Task.FromResult(0);
|
||||
|
@ -257,19 +215,14 @@ namespace Tesses.YouTubeDownloader
|
|||
CreateDirectoryIfNotExist("Thumbnails");
|
||||
CreateDirectoryIfNotExist("config");
|
||||
CreateDirectoryIfNotExist("config/logs");
|
||||
CreateDirectoryIfNotExist("config/addlog");
|
||||
CreateDirectoryIfNotExist("DownloadsInfo");
|
||||
CreateDirectoryIfNotExist("Downloads");
|
||||
CreateDirectoryIfNotExist("FileInfo");
|
||||
CreateDirectoryIfNotExist("Download");
|
||||
CreateDirectoryIfNotExist("StreamInfo");
|
||||
CreateDirectoryIfNotExist("PersonalPlaylist");
|
||||
}
|
||||
|
||||
public void StartLoop(CancellationToken token = default(CancellationToken))
|
||||
{
|
||||
|
||||
CreateDirectories();
|
||||
if(DirectoryExists("Download") && DirectoryExists("FileInfo"))
|
||||
Task.Run(MigrateDownloads).Wait();
|
||||
Thread thread0=new Thread(()=>{
|
||||
DownloadLoop(token).Wait();
|
||||
});
|
||||
|
@ -279,113 +232,6 @@ namespace Tesses.YouTubeDownloader
|
|||
});
|
||||
thread1.Start();
|
||||
}
|
||||
private async IAsyncEnumerable<SavedVideo> GetDownloadsLegacyAsync()
|
||||
{
|
||||
await foreach(var item in EnumerateFilesAsync("FileInfo"))
|
||||
{
|
||||
if(Path.GetExtension(item).Equals(".json",StringComparison.Ordinal))
|
||||
{
|
||||
var res= JsonConvert.DeserializeObject<SavedVideo>(await ReadAllTextAsync(item));
|
||||
DeleteFile(item);
|
||||
yield return res;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
private async Task MigrateDownloads()
|
||||
{
|
||||
await GetLogger().WriteAsync("Migrating File Downloads (Please Don't close TYTD)",true);
|
||||
|
||||
await foreach(var dl in GetDownloadsLegacyAsync())
|
||||
{
|
||||
await MoveLegacyDownload(dl);
|
||||
}
|
||||
int files=0;
|
||||
await foreach(var f in EnumerateDirectoriesAsync("FileInfo"))
|
||||
{
|
||||
files++;
|
||||
break;
|
||||
}
|
||||
if(files==0)
|
||||
{
|
||||
await foreach(var f in EnumerateFilesAsync("FileInfo"))
|
||||
{
|
||||
files++;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(files>0)
|
||||
{
|
||||
MoveDirectory("FileInfo","DownloadsInfoLegacy");
|
||||
await GetLogger().WriteAsync("WARNING: there were still files/folders in FileInfo so they are stored in DownloadsInfoLegacy",true);
|
||||
}else{
|
||||
DeleteDirectory("FileInfo");
|
||||
}
|
||||
files=0;
|
||||
await foreach(var f in EnumerateDirectoriesAsync("Download"))
|
||||
{
|
||||
files++;
|
||||
break;
|
||||
}
|
||||
if(files==0)
|
||||
{
|
||||
await foreach(var f in EnumerateFilesAsync("Download"))
|
||||
{
|
||||
files++;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(files>0)
|
||||
{
|
||||
MoveDirectory("Download","DownloadsLegacy");
|
||||
await GetLogger().WriteAsync("WARNING: there were still files/folders in Download so they are stored in DownloadsLegacy",true);
|
||||
}else{
|
||||
DeleteDirectory("Download");
|
||||
}
|
||||
|
||||
|
||||
await GetLogger().WriteAsync("Migrating Downloads Complete",true);
|
||||
}
|
||||
private async Task MoveLegacyDownload(SavedVideo dl)
|
||||
{
|
||||
await WriteVideoInfoAsync(dl);
|
||||
string old_incomplete_file_path = $"Download/{B64.Base64UrlEncodes(dl.Id)}-incomplete.part";
|
||||
string old_file_path = $"Download/{B64.Base64UrlEncodes(dl.Id)}.bin";
|
||||
|
||||
string incomplete_file_path = $"Downloads/{HashDownloadUrl(dl.Id)}-incomplete.part";
|
||||
string file_path = $"Downloads/{HashDownloadUrl(dl.Id)}.bin";
|
||||
|
||||
bool complete = FileExists(old_file_path);
|
||||
bool missing = !complete && !FileExists(old_incomplete_file_path);
|
||||
string alreadyStr ="";
|
||||
if(!missing)
|
||||
{
|
||||
if(complete)
|
||||
{
|
||||
//migrate complete
|
||||
if(!FileExists(file_path))
|
||||
{
|
||||
RenameFile(old_file_path,file_path);
|
||||
}else{
|
||||
alreadyStr="Already ";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
//migrate incomplete
|
||||
if(!FileExists(incomplete_file_path))
|
||||
{
|
||||
RenameFile(old_incomplete_file_path,incomplete_file_path);
|
||||
}else{
|
||||
alreadyStr="Already ";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
await GetLogger().WriteAsync($"{alreadyStr}Migrated {(missing? "missing" : (complete ? "complete" : "incomplete"))} download: {dl.Title} with Url: {dl.Id}",true);
|
||||
|
||||
}
|
||||
internal void ThrowError(TYTDErrorEventArgs e)
|
||||
{
|
||||
Error?.Invoke(this,e);
|
||||
|
|
|
@ -12,41 +12,20 @@ using System.IO;
|
|||
using YoutubeExplode.Playlists;
|
||||
using YoutubeExplode.Channels;
|
||||
using YoutubeExplode.Search;
|
||||
using System.Security.Cryptography;
|
||||
using System.Text;
|
||||
|
||||
namespace Tesses.YouTubeDownloader
|
||||
{
|
||||
|
||||
public abstract class TYTDBase : ITYTDBase
|
||||
{
|
||||
public virtual async Task<bool> ThumbnailExistsAsync(VideoId videoId,string res)
|
||||
{
|
||||
return await FileExistsAsync($"Thumbnails/{videoId.Value}/{res}.jpg");
|
||||
}
|
||||
public virtual bool ThumbnailExists(VideoId videoId,string res)
|
||||
{
|
||||
return FileExists($"Thumbnails/{videoId.Value}/{res}.jpg");
|
||||
}
|
||||
public virtual async Task<byte[]> ReadThumbnailAsync(VideoId videoId,string res,CancellationToken token=default)
|
||||
{
|
||||
if(await ThumbnailExistsAsync(videoId,res))
|
||||
{
|
||||
return await ReadAllBytesAsync($"Thumbnails/{videoId.Value}/{res}.jpg",token);
|
||||
}
|
||||
return new byte[0];
|
||||
}
|
||||
|
||||
public virtual bool PersonalPlaylistExists(string name)
|
||||
{
|
||||
return FileExists($"PersonalPlaylist/{name}.json");
|
||||
}
|
||||
public virtual async Task<bool> PersonalPlaylistExistsAsync(string name)
|
||||
{
|
||||
return await FileExistsAsync($"PersonalPlaylist/{name}.json");
|
||||
}
|
||||
public virtual async IAsyncEnumerable<ListContentItem> GetPersonalPlaylistContentsAsync(string playlist)
|
||||
{
|
||||
if(!await PersonalPlaylistExistsAsync(playlist)) yield break;
|
||||
if(!PersonalPlaylistExists(playlist)) yield break;
|
||||
var ls=JsonConvert.DeserializeObject<List<ListContentItem>>(await ReadAllTextAsync($"PersonalPlaylist/{playlist}.json"));
|
||||
foreach(var item in ls)
|
||||
{
|
||||
|
@ -141,14 +120,17 @@ namespace Tesses.YouTubeDownloader
|
|||
}
|
||||
|
||||
public async Task<byte[]> ReadAllBytesAsync(string path,CancellationToken token=default(CancellationToken))
|
||||
{using(var strm = await OpenReadAsync(path))
|
||||
{
|
||||
MemoryStream memoryStream=new MemoryStream();
|
||||
using(var strm = await OpenReadAsync(path))
|
||||
{
|
||||
await strm.CopyToAsync(memoryStream,4096,token);
|
||||
byte[] data=new byte[strm.Length];
|
||||
|
||||
await strm.ReadAsync(data,0,data.Length,token);
|
||||
if(token.IsCancellationRequested)
|
||||
{
|
||||
return new byte[0];
|
||||
}
|
||||
return data;
|
||||
}
|
||||
return memoryStream.ToArray();
|
||||
|
||||
}
|
||||
public virtual async IAsyncEnumerable<string> GetPlaylistIdsAsync()
|
||||
|
@ -197,23 +179,21 @@ namespace Tesses.YouTubeDownloader
|
|||
|
||||
public virtual async IAsyncEnumerable<SavedVideo> GetDownloadsAsync()
|
||||
{
|
||||
await foreach(var item in EnumerateFilesAsync("DownloadsInfo"))
|
||||
await foreach(var item in GetDownloadUrlsAsync())
|
||||
{
|
||||
if(Path.GetExtension(item).Equals(".json",StringComparison.Ordinal))
|
||||
{
|
||||
yield return JsonConvert.DeserializeObject<SavedVideo>(await ReadAllTextAsync(item));
|
||||
|
||||
}
|
||||
yield return await GetDownloadInfoAsync(item);
|
||||
}
|
||||
}
|
||||
public virtual async IAsyncEnumerable<string> GetDownloadUrlsAsync()
|
||||
{
|
||||
await foreach(var item in GetDownloadsAsync())
|
||||
await foreach(var item in EnumerateFilesAsync("FileInfo"))
|
||||
{
|
||||
yield return item.Id;
|
||||
if(Path.GetExtension(item).Equals(".json",StringComparison.Ordinal))
|
||||
{
|
||||
yield return B64.Base64UrlDecodes(Path.GetFileNameWithoutExtension(item));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public virtual async Task<BestStreamInfo.BestStreamsSerialized> GetBestStreamInfoAsync(VideoId id)
|
||||
{
|
||||
return JsonConvert.DeserializeObject<BestStreamInfo.BestStreamsSerialized>(await ReadAllTextAsync($"StreamInfo/{id.Value}.json"));
|
||||
|
@ -221,35 +201,18 @@ namespace Tesses.YouTubeDownloader
|
|||
public virtual bool BestStreamInfoExists(VideoId id)
|
||||
{
|
||||
return FileExists($"StreamInfo/{id.Value}.json");
|
||||
}
|
||||
public virtual async Task<bool> BestStreamInfoExistsAsync(VideoId id)
|
||||
{
|
||||
return await FileExistsAsync($"StreamInfo/{id.Value}.json");
|
||||
}
|
||||
public virtual async Task<SavedVideo> GetDownloadInfoAsync(string url)
|
||||
{
|
||||
//string enc=$"FileInfo/{B64.Base64UrlEncodes(url)}.json";
|
||||
string enc=$"DownloadsInfo/{HashDownloadUrl(url)}.json";
|
||||
string enc=$"FileInfo/{B64.Base64UrlEncodes(url)}.json";
|
||||
return JsonConvert.DeserializeObject<SavedVideo>(await ReadAllTextAsync(enc));
|
||||
|
||||
}
|
||||
|
||||
public static string HashDownloadUrl(string url)
|
||||
{
|
||||
using(var sha1=SHA1.Create()){
|
||||
|
||||
return B64.Base64UrlEncode(sha1.ComputeHash(Encoding.UTF8.GetBytes(url)));
|
||||
}
|
||||
}
|
||||
public virtual async Task<bool> DownloadExistsAsync(string url)
|
||||
{
|
||||
string enc=$"DownloadsInfo/{HashDownloadUrl(url)}.json";
|
||||
|
||||
return await FileExistsAsync(enc);
|
||||
}
|
||||
public virtual bool DownloadExists(string url)
|
||||
{
|
||||
string enc=$"DownloadsInfo/{HashDownloadUrl(url)}.json";
|
||||
string enc=$"FileInfo/{B64.Base64UrlEncodes(url)}.json";
|
||||
|
||||
return FileExists(enc);
|
||||
}
|
||||
|
@ -257,26 +220,14 @@ namespace Tesses.YouTubeDownloader
|
|||
{
|
||||
return FileExists($"Playlist/{id}.json");
|
||||
}
|
||||
public virtual async Task<bool> PlaylistInfoExistsAsync(PlaylistId id)
|
||||
{
|
||||
return await FileExistsAsync($"Playlist/{id}.json");
|
||||
}
|
||||
public virtual bool VideoInfoExists(VideoId id)
|
||||
{
|
||||
return FileExists($"Info/{id}.json");
|
||||
}
|
||||
public virtual async Task<bool> VideoInfoExistsAsync(VideoId id)
|
||||
{
|
||||
return await FileExistsAsync($"Info/{id}.json");
|
||||
}
|
||||
public virtual bool ChannelInfoExists(ChannelId id)
|
||||
{
|
||||
return FileExists($"Channel/{id}.json");
|
||||
}
|
||||
public virtual async Task<bool> ChannelInfoExistsAsync(ChannelId id)
|
||||
{
|
||||
return await FileExistsAsync($"Channel/{id}.json");
|
||||
}
|
||||
public virtual async Task<SavedPlaylist> GetPlaylistInfoAsync(PlaylistId id)
|
||||
{
|
||||
return JsonConvert.DeserializeObject<SavedPlaylist>(await ReadAllTextAsync($"Playlist/{id}.json"));
|
||||
|
@ -331,8 +282,6 @@ namespace Tesses.YouTubeDownloader
|
|||
return data;
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
public class ListContentItem
|
||||
|
@ -448,20 +397,6 @@ namespace Tesses.YouTubeDownloader
|
|||
}
|
||||
public static class TYTDManager
|
||||
{
|
||||
|
||||
public static async Task<bool> VideoExistsAsync(this ITYTDBase baseCtl,VideoId id,Resolution resolution=Resolution.PreMuxed)
|
||||
{
|
||||
return (await GetVideoPathAsync(baseCtl,id,resolution)).Exists;
|
||||
}
|
||||
public static async Task<(bool Exists,string Path)> GetVideoPathAsync(this ITYTDBase baseCtl,VideoId id,Resolution resolution=Resolution.PreMuxed)
|
||||
{
|
||||
if(!baseCtl.VideoInfoExists(id) || !baseCtl.BestStreamInfoExists(id)) return (false,"");
|
||||
var video=await baseCtl.GetVideoInfoAsync(id);
|
||||
var name = await BestStreams.GetPathResolution(baseCtl,video,resolution);
|
||||
if(string.IsNullOrWhiteSpace(name)) return (false,"");
|
||||
|
||||
return (await baseCtl.FileExistsAsync(name),name);
|
||||
}
|
||||
public static async IAsyncEnumerable<SearchResult> SearchYouTubeAsync(this IStorage storage, string query,bool getMediaInfo=true)
|
||||
{
|
||||
await foreach(var vid in storage.YoutubeClient.Search.GetResultsAsync(query))
|
||||
|
@ -484,8 +419,7 @@ namespace Tesses.YouTubeDownloader
|
|||
}
|
||||
public static string GetDownloadFile(string url)
|
||||
{
|
||||
string file_path = $"Downloads/{TYTDBase.HashDownloadUrl(url)}.bin";
|
||||
return file_path;
|
||||
return $"Download/{B64.Base64UrlEncodes(url)}.bin";
|
||||
}
|
||||
/// <summary>
|
||||
/// Add Video, Playlist, Channel Or Username
|
||||
|
@ -507,11 +441,8 @@ namespace Tesses.YouTubeDownloader
|
|||
VideoId? vid = VideoId.TryParse(url);
|
||||
PlaylistId? pid = PlaylistId.TryParse(url);
|
||||
ChannelId? cid = ChannelId.TryParse(url);
|
||||
ChannelSlug? slug = ChannelSlug.TryParse(url);
|
||||
ChannelHandle? handle = ChannelHandle.TryParse(url);
|
||||
UserName? user = UserName.TryParse(url);
|
||||
|
||||
|
||||
if (url.Length == 11)
|
||||
{
|
||||
if (vid.HasValue)
|
||||
|
@ -534,13 +465,6 @@ namespace Tesses.YouTubeDownloader
|
|||
{
|
||||
await downloader.AddChannelAsync(cid.Value, resolution);
|
||||
}
|
||||
else if(handle.HasValue)
|
||||
{
|
||||
await downloader.AddHandleAsync(handle.Value, resolution);
|
||||
}else if(slug.HasValue)
|
||||
{
|
||||
await downloader.AddSlugAsync(slug.Value,resolution);
|
||||
}
|
||||
else if (user.HasValue)
|
||||
{
|
||||
await downloader.AddUserAsync(user.Value, resolution);
|
||||
|
@ -942,7 +866,6 @@ namespace Tesses.YouTubeDownloader
|
|||
ExtraData GetExtraData();
|
||||
IAsyncEnumerable<ListContentItem> GetPersonalPlaylistContentsAsync(string name);
|
||||
bool PersonalPlaylistExists(string name);
|
||||
Task<bool> PersonalPlaylistExistsAsync(string name);
|
||||
}
|
||||
public interface IPersonalPlaylistSet : IPersonalPlaylistGet
|
||||
{
|
||||
|
|
|
@ -16,7 +16,6 @@ using System.Net;
|
|||
using System.Diagnostics.CodeAnalysis;
|
||||
using YoutubeExplode.Utils.Extensions;
|
||||
using System.Net.Http.Headers;
|
||||
using System.Web;
|
||||
|
||||
namespace Tesses.YouTubeDownloader
|
||||
{
|
||||
|
@ -195,23 +194,7 @@ internal class SegmentedHttpStream : Stream
|
|||
}
|
||||
public class TYTDClient : TYTDBase,IDownloader
|
||||
{
|
||||
ExtraData data=null;
|
||||
public override async Task<byte[]> ReadThumbnailAsync(VideoId videoId, string res, CancellationToken token = default)
|
||||
{
|
||||
if(CanReadThumbnailFromUrl())
|
||||
{
|
||||
return await client.GetByteArrayAsync($"{url}api/v2/Thumbnail?v={videoId.Value}&res={res}");
|
||||
}
|
||||
return await base.ReadThumbnailAsync(videoId,res,token);
|
||||
}
|
||||
private bool CanReadThumbnailFromUrl()
|
||||
{
|
||||
var data=GetExtraDataOnce();
|
||||
Version v=new Version(data.TYTDServerVersion);
|
||||
return v.Major >= 2;
|
||||
}
|
||||
string url;
|
||||
public string Url {get{return url;}}
|
||||
public TYTDClient(string url)
|
||||
{
|
||||
client=new HttpClient();
|
||||
|
@ -257,7 +240,7 @@ internal class SegmentedHttpStream : Stream
|
|||
public async Task AddUserAsync(UserName userName, Resolution resolution = Resolution.PreMuxed)
|
||||
{
|
||||
try{
|
||||
await client.GetStringAsync($"{url}api/v2/AddUser?id={userName.Value}&res={resolution.ToString()}");
|
||||
await client.GetStringAsync($"{url}api/v2/AddUser?v={userName.Value}&res={resolution.ToString()}");
|
||||
}catch(Exception ex)
|
||||
{
|
||||
_error.Invoke(this,new TYTDErrorEventArgs("jNQXAC9IVRw",ex));
|
||||
|
@ -315,16 +298,11 @@ internal class SegmentedHttpStream : Stream
|
|||
}
|
||||
}
|
||||
}
|
||||
public override async Task<(string Path,bool Delete)> GetRealUrlOrPathAsync(string path)
|
||||
{
|
||||
return await Task.FromResult(($"{url}api/Storage/File/{path.TrimStart('/')}",false));
|
||||
}
|
||||
public async IAsyncEnumerable<Subscription> GetSubscriptionsAsync()
|
||||
{
|
||||
|
||||
string v="[]";
|
||||
try{
|
||||
v=await client.GetStringAsync($"{url}api/v2/subscriptions");
|
||||
v=await client.GetStringAsync("{url}api/v2/subscriptions");
|
||||
}catch(Exception ex)
|
||||
{
|
||||
_error.Invoke(this,new TYTDErrorEventArgs("jNQXAC9IVRw",ex));
|
||||
|
@ -414,7 +392,7 @@ internal class SegmentedHttpStream : Stream
|
|||
}
|
||||
return false;
|
||||
}
|
||||
public async Task<IReadOnlyList<(SavedVideo Video, Resolution Resolution)>> GetQueueListAsync()
|
||||
private async Task<IReadOnlyList<(SavedVideo Video, Resolution Resolution)>> GetQueueListAsync()
|
||||
{
|
||||
|
||||
try{
|
||||
|
@ -427,7 +405,7 @@ internal class SegmentedHttpStream : Stream
|
|||
|
||||
return new List<(SavedVideo video,Resolution resolution)>();
|
||||
}
|
||||
public async Task<SavedVideoProgress> GetProgressAsync()
|
||||
private async Task<SavedVideoProgress> GetProgressAsync()
|
||||
{
|
||||
|
||||
try{
|
||||
|
@ -474,18 +452,27 @@ internal class SegmentedHttpStream : Stream
|
|||
|
||||
public async Task AddToPersonalPlaylistAsync(string name, IEnumerable<ListContentItem> items)
|
||||
{
|
||||
foreach(var item in items)
|
||||
Dictionary<string,string> values=new Dictionary<string, string>
|
||||
{
|
||||
var response = await client.GetStringAsync($"{url}api/v2/AddToList?name={WebUtility.UrlEncode(name)}&v={item.Id}&res={item.Resolution.ToString()}");
|
||||
}
|
||||
{ "name", name},
|
||||
{ "data", JsonConvert.SerializeObject(items.ToArray())}
|
||||
};
|
||||
var content = new FormUrlEncodedContent(values);
|
||||
var response = await client.PostAsync($"{url}api/v2/AddToList",content);
|
||||
var resposeStr = await response.Content.ReadAsStringAsync();
|
||||
}
|
||||
|
||||
public async Task ReplacePersonalPlaylistAsync(string name, IEnumerable<ListContentItem> items)
|
||||
{
|
||||
var content = new MultipartFormDataContent();
|
||||
content.Add(new StringContent(name), "name");
|
||||
content.Add(new StringContent(JsonConvert.SerializeObject(items.ToList())), "data");
|
||||
await client.PostAsync($"{url}api/v2/ReplaceList",content);
|
||||
//ReplaceList
|
||||
Dictionary<string,string> values=new Dictionary<string, string>
|
||||
{
|
||||
{ "name", name},
|
||||
{ "data", JsonConvert.SerializeObject(items.ToArray())}
|
||||
};
|
||||
var content = new FormUrlEncodedContent(values);
|
||||
var response = await client.PostAsync($"{url}api/v2/ReplaceList",content);
|
||||
var resposeStr = await response.Content.ReadAsStringAsync();
|
||||
}
|
||||
|
||||
public async Task RemoveItemFromPersonalPlaylistAsync(string name, VideoId id)
|
||||
|
@ -518,7 +505,7 @@ internal class SegmentedHttpStream : Stream
|
|||
try{
|
||||
|
||||
|
||||
Task.Run(()=>client.GetStringAsync($"{url}api/v2/DeleteList?name={WebUtility.UrlEncode(name)}")).GetAwaiter().GetResult();
|
||||
client.GetStringAsync($"{url}api/v2/DeleteList?name={WebUtility.UrlEncode(name)}").GetAwaiter().GetResult();
|
||||
|
||||
}catch(Exception ex)
|
||||
{
|
||||
|
@ -560,7 +547,6 @@ internal class SegmentedHttpStream : Stream
|
|||
if(src != null) {
|
||||
src.Cancel();
|
||||
src.Dispose();
|
||||
|
||||
}
|
||||
|
||||
if(hadBeenListeningToEvents)
|
||||
|
@ -670,7 +656,7 @@ internal class SegmentedHttpStream : Stream
|
|||
}
|
||||
if(item.BellEvent)
|
||||
{
|
||||
bell=true;
|
||||
|
||||
}
|
||||
progress.Length = item.Length;
|
||||
progress.ProgressRaw=item.Percent;
|
||||
|
@ -717,59 +703,15 @@ internal class SegmentedHttpStream : Stream
|
|||
{
|
||||
|
||||
Task.Run(_startEventStreamAsync).Wait(0);
|
||||
}
|
||||
|
||||
}
|
||||
public ExtraData GetExtraDataOnce()
|
||||
{
|
||||
if(data ==null){
|
||||
data= Task.Run<ExtraData>(async()=>{
|
||||
string text= await client.GetStringAsync($"{url}api/v2/extra_data.json");
|
||||
return JsonConvert.DeserializeObject<ExtraData>(text);
|
||||
}).GetAwaiter().GetResult();
|
||||
}
|
||||
return data;
|
||||
}
|
||||
public async Task<ExtraData> GetExtraDataOnceAsync()
|
||||
{
|
||||
if(data ==null)
|
||||
{
|
||||
string text= await client.GetStringAsync($"{url}api/v2/extra_data.json");
|
||||
data = JsonConvert.DeserializeObject<ExtraData>(text);
|
||||
}
|
||||
return data;
|
||||
}
|
||||
public async Task<ExtraData> GetExtraDataAsync()
|
||||
{
|
||||
string text= await client.GetStringAsync($"{url}api/v2/extra_data.json");
|
||||
return JsonConvert.DeserializeObject<ExtraData>(text);
|
||||
}
|
||||
public override ExtraData GetExtraData()
|
||||
{
|
||||
return Task.Run<ExtraData>(async()=>{
|
||||
string text= await client.GetStringAsync($"{url}api/v2/extra_data.json");
|
||||
return JsonConvert.DeserializeObject<ExtraData>(text);
|
||||
}).GetAwaiter().GetResult();
|
||||
|
||||
|
||||
}
|
||||
|
||||
public async Task AddHandleAsync(ChannelHandle handle, Resolution resolution = Resolution.PreMuxed)
|
||||
{
|
||||
try{
|
||||
await client.GetStringAsync($"{url}api/v2/AddHandle?id={handle.Value}&res={resolution.ToString()}");
|
||||
}catch(Exception ex)
|
||||
{
|
||||
_error.Invoke(this,new TYTDErrorEventArgs("jNQXAC9IVRw",ex));
|
||||
}
|
||||
}
|
||||
public async Task AddSlugAsync(ChannelSlug handle, Resolution resolution = Resolution.PreMuxed)
|
||||
{
|
||||
try{
|
||||
await client.GetStringAsync($"{url}api/v2/AddSlug?id={handle.Value}&res={resolution.ToString()}");
|
||||
}catch(Exception ex)
|
||||
{
|
||||
_error.Invoke(this,new TYTDErrorEventArgs("jNQXAC9IVRw",ex));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -15,8 +15,6 @@ namespace Tesses.YouTubeDownloader
|
|||
{
|
||||
public class TYTDDownloaderStorageProxy : IStorage
|
||||
{
|
||||
public bool AddIfCompletedInStorage {get;set;}=true;
|
||||
public bool ThumbnailsFromDownloader {get;set;}=true;
|
||||
public IDownloader Downloader {get{return _downloader;} set
|
||||
{
|
||||
SetDownloader(value);
|
||||
|
@ -484,22 +482,12 @@ namespace Tesses.YouTubeDownloader
|
|||
yield return await Task.FromResult(item);
|
||||
}
|
||||
}
|
||||
private async Task<bool> SkipVideoAsync(VideoId id,Resolution resolution)
|
||||
{
|
||||
if(AddIfCompletedInStorage) return false;
|
||||
if(await this.VideoExistsAsync(id,resolution))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public async Task AddVideoAsync(VideoId id, Resolution resolution = Resolution.PreMuxed)
|
||||
{
|
||||
if(await SkipVideoAsync(id,resolution)) return;
|
||||
if(Downloader != null)
|
||||
await Downloader.AddVideoAsync(id,resolution);
|
||||
}
|
||||
|
||||
public async Task AddFileAsync(string url,bool download=true)
|
||||
{
|
||||
if(Downloader != null)
|
||||
|
@ -523,16 +511,7 @@ namespace Tesses.YouTubeDownloader
|
|||
if(Downloader != null)
|
||||
await Downloader.AddUserAsync(userName,resolution);
|
||||
}
|
||||
public async Task AddHandleAsync(ChannelHandle handle, Resolution resolution = Resolution.PreMuxed)
|
||||
{
|
||||
if(Downloader != null)
|
||||
await Downloader.AddHandleAsync(handle,resolution);
|
||||
}
|
||||
public async Task AddSlugAsync(ChannelSlug slug, Resolution resolution = Resolution.PreMuxed)
|
||||
{
|
||||
if(Downloader != null)
|
||||
await Downloader.AddSlugAsync(slug,resolution);
|
||||
}
|
||||
|
||||
public IReadOnlyList<(SavedVideo Video, Resolution Resolution)> GetQueueList()
|
||||
{
|
||||
if(Downloader == null) return new List<(SavedVideo Video,Resolution Resolution)>();
|
||||
|
@ -889,91 +868,7 @@ namespace Tesses.YouTubeDownloader
|
|||
|
||||
public ExtraData GetExtraData()
|
||||
{
|
||||
return Downloader.GetExtraData();
|
||||
}
|
||||
|
||||
public bool ThumbnailExists(VideoId videoId, string res)
|
||||
{
|
||||
bool exists=false;
|
||||
if(ThumbnailsFromDownloader)
|
||||
{
|
||||
DownloaderAsITYTDBase((s)=>{
|
||||
exists = s.ThumbnailExists(videoId,res);
|
||||
});
|
||||
}else{
|
||||
StorageAsStorage((s)=>{
|
||||
exists = s.ThumbnailExists(videoId,res);
|
||||
});
|
||||
}
|
||||
return exists;
|
||||
}
|
||||
|
||||
public async Task<byte[]> ReadThumbnailAsync(VideoId videoId, string res,CancellationToken token=default)
|
||||
{
|
||||
byte[] data=new byte[0];
|
||||
if(ThumbnailsFromDownloader)
|
||||
{
|
||||
await DownloaderAsITYTDBaseAsync(async (s)=>{
|
||||
data = await s.ReadThumbnailAsync(videoId,res,token);
|
||||
});
|
||||
}else{
|
||||
await StorageAsStorageAsync(async(s)=>{
|
||||
data = await s.ReadThumbnailAsync(videoId,res,token);
|
||||
});
|
||||
}
|
||||
return data;
|
||||
}
|
||||
|
||||
public async Task WriteThumbnailAsync(VideoId videoId, string res, byte[] data, CancellationToken token = default)
|
||||
{
|
||||
await StorageAsStorageAsync(async(s)=>{
|
||||
await s.WriteThumbnailAsync(videoId,res,data,token);
|
||||
});
|
||||
}
|
||||
|
||||
public async Task<bool> ThumbnailExistsAsync(VideoId videoId, string res)
|
||||
{
|
||||
bool exists=false;
|
||||
if(ThumbnailsFromDownloader)
|
||||
{
|
||||
await DownloaderAsITYTDBaseAsync(async(s)=>{
|
||||
exists = await s.ThumbnailExistsAsync(videoId,res);
|
||||
});
|
||||
}else{
|
||||
await StorageAsStorageAsync(async(s)=>{
|
||||
exists = await s.ThumbnailExistsAsync(videoId,res);
|
||||
});
|
||||
}
|
||||
return exists;
|
||||
}
|
||||
|
||||
public async Task<bool> VideoInfoExistsAsync(VideoId id)
|
||||
{
|
||||
if(Storage ==null) return await Task.FromResult(false);
|
||||
return await Storage.VideoInfoExistsAsync(id);
|
||||
}
|
||||
|
||||
public async Task<bool> PlaylistInfoExistsAsync(PlaylistId id)
|
||||
{
|
||||
if(Storage ==null) return await Task.FromResult(false);
|
||||
return await Storage.PlaylistInfoExistsAsync(id);
|
||||
}
|
||||
|
||||
public async Task<bool> ChannelInfoExistsAsync(ChannelId id)
|
||||
{
|
||||
if(Storage ==null) return await Task.FromResult(false);
|
||||
return await Storage.ChannelInfoExistsAsync(id);
|
||||
}
|
||||
|
||||
public async Task<bool> PersonalPlaylistExistsAsync(string name)
|
||||
{
|
||||
if(Storage ==null) return await Task.FromResult(false);
|
||||
return await Storage.PersonalPlaylistExistsAsync(name);
|
||||
}
|
||||
public async Task<bool> BestStreamInfoExistsAsync(VideoId id)
|
||||
{
|
||||
if(Storage ==null) return await Task.FromResult(false);
|
||||
return await Storage.BestStreamInfoExistsAsync(id);
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -7,11 +7,11 @@
|
|||
<PackageId>Tesses.YouTubeDownloader</PackageId>
|
||||
<Author>Mike Nolan</Author>
|
||||
<Company>Tesses</Company>
|
||||
<Version>2.0.2.4</Version>
|
||||
<AssemblyVersion>2.0.2.4</AssemblyVersion>
|
||||
<FileVersion>2.0.2.4</FileVersion>
|
||||
<Version>1.2.5</Version>
|
||||
<AssemblyVersion>1.2.5</AssemblyVersion>
|
||||
<FileVersion>1.2.5</FileVersion>
|
||||
<Description>A YouTube Downloader</Description>
|
||||
<PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
|
||||
<PackageLicenseExpression>LGPL-3.0-only</PackageLicenseExpression>
|
||||
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
|
||||
<PackageTags>YoutubeExplode, YouTube, YouTubeDownloader</PackageTags>
|
||||
<RepositoryUrl>https://gitlab.tesses.cf/tesses50/tytd</RepositoryUrl>
|
||||
|
@ -20,7 +20,7 @@
|
|||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
|
||||
<PackageReference Include="YouTubeExplode" Version="6.2.5" />
|
||||
<PackageReference Include="YouTubeExplode" Version="6.1.2" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
Loading…
Reference in New Issue