mirror of https://github.com/yutto-dev/yutto
♻️ refactor: integrate `biliass` as a sub package (#301)
This commit is contained in:
parent
0283600930
commit
81d11c1a01
7
justfile
7
justfile
|
@ -10,7 +10,7 @@ install:
|
||||||
uv sync
|
uv sync
|
||||||
|
|
||||||
test:
|
test:
|
||||||
uv run pytest -m '(api or e2e or processor) and not (ci_only or ignore)'
|
uv run pytest -m '(api or e2e or processor or biliass) and not (ci_only or ignore)'
|
||||||
just clean
|
just clean
|
||||||
|
|
||||||
fmt:
|
fmt:
|
||||||
|
@ -72,7 +72,7 @@ ci-lint:
|
||||||
just lint
|
just lint
|
||||||
|
|
||||||
ci-test:
|
ci-test:
|
||||||
uv run pytest -m "(api or processor) and not (ci_skip or ignore)" --reruns 3 --reruns-delay 1
|
uv run pytest -m "(api or processor or biliass) and not (ci_skip or ignore)" --reruns 3 --reruns-delay 1
|
||||||
just clean
|
just clean
|
||||||
|
|
||||||
ci-e2e-test:
|
ci-e2e-test:
|
||||||
|
@ -87,3 +87,6 @@ docker-build:
|
||||||
|
|
||||||
docker-publish:
|
docker-publish:
|
||||||
docker buildx build --no-cache --platform=linux/amd64,linux/arm64 -t "{{DOCKER_NAME}}:{{VERSION}}" -t "{{DOCKER_NAME}}:latest" . --push
|
docker buildx build --no-cache --platform=linux/amd64,linux/arm64 -t "{{DOCKER_NAME}}:{{VERSION}}" -t "{{DOCKER_NAME}}:latest" . --push
|
||||||
|
|
||||||
|
compile-protobuf:
|
||||||
|
cd packages/biliass; protoc protobuf/danmaku.proto --python_out=src/biliass --pyi_out=src/biliass
|
||||||
|
|
|
@ -0,0 +1,674 @@
|
||||||
|
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.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to prevent others from denying you
|
||||||
|
these rights or asking you to surrender the rights. Therefore, you have
|
||||||
|
certain responsibilities if you distribute copies of the software, or if
|
||||||
|
you modify it: responsibilities to respect the freedom of others.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
|
freedoms that you received. You must make sure that they, too, receive
|
||||||
|
or can get the source code. And you must show them these terms so they
|
||||||
|
know their rights.
|
||||||
|
|
||||||
|
Developers that use the GNU GPL protect your rights with two steps:
|
||||||
|
(1) assert copyright on the software, and (2) offer you this License
|
||||||
|
giving you legal permission to copy, distribute and/or modify it.
|
||||||
|
|
||||||
|
For the developers' and authors' protection, the GPL clearly explains
|
||||||
|
that there is no warranty for this free software. For both users' and
|
||||||
|
authors' sake, the GPL requires that modified versions be marked as
|
||||||
|
changed, so that their problems will not be attributed erroneously to
|
||||||
|
authors of previous versions.
|
||||||
|
|
||||||
|
Some devices are designed to deny users access to install or run
|
||||||
|
modified versions of the software inside them, although the manufacturer
|
||||||
|
can do so. This is fundamentally incompatible with the aim of
|
||||||
|
protecting users' freedom to change the software. The systematic
|
||||||
|
pattern of such abuse occurs in the area of products for individuals to
|
||||||
|
use, which is precisely where it is most unacceptable. Therefore, we
|
||||||
|
have designed this version of the GPL to prohibit the practice for those
|
||||||
|
products. If such problems arise substantially in other domains, we
|
||||||
|
stand ready to extend this provision to those domains in future versions
|
||||||
|
of the GPL, as needed to protect the freedom of users.
|
||||||
|
|
||||||
|
Finally, every program is threatened constantly by software patents.
|
||||||
|
States should not allow patents to restrict development and use of
|
||||||
|
software on general-purpose computers, but in those that do, we wish to
|
||||||
|
avoid the special danger that patents applied to a free program could
|
||||||
|
make it effectively proprietary. To prevent this, the GPL assures that
|
||||||
|
patents cannot be used to render the program non-free.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Use with the GNU Affero General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU Affero General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the special requirements of the GNU Affero General Public License,
|
||||||
|
section 13, concerning interaction through a network will apply to the
|
||||||
|
combination as such.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU General Public License from time to time. Such new versions will
|
||||||
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
state the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
biliass, convert bilibili XML and protobuf danmaku into ASS
|
||||||
|
Copyright (C) 2024 Nyakku Shigure
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If the program does terminal interaction, make it output a short
|
||||||
|
notice like this when it starts in an interactive mode:
|
||||||
|
|
||||||
|
biliass Copyright (C) 2024 Nyakku Shigure
|
||||||
|
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
|
parts of the General Public License. Of course, your program's commands
|
||||||
|
might be different; for a GUI interface, you would use an "about box".
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
|
For more information on this, and how to apply and follow the GNU GPL, see
|
||||||
|
<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
|
||||||
|
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
|
|
@ -0,0 +1,73 @@
|
||||||
|
# biliass
|
||||||
|
|
||||||
|
<p align="center">
|
||||||
|
<a href="https://python.org/" target="_blank"><img alt="PyPI - Python Version" src="https://img.shields.io/pypi/pyversions/biliass?logo=python&style=flat-square"></a>
|
||||||
|
<a href="https://pypi.org/project/biliass/" target="_blank"><img src="https://img.shields.io/pypi/v/biliass?style=flat-square" alt="pypi"></a>
|
||||||
|
<a href="https://pypi.org/project/biliass/" target="_blank"><img alt="PyPI - Downloads" src="https://img.shields.io/pypi/dm/biliass?style=flat-square"></a>
|
||||||
|
<a href="https://actions-badge.atrox.dev/yutto-dev/biliass/goto?ref=main"><img alt="Build Status" src="https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2Fyutto-dev%2Fbiliass%2Fbadge%3Fref%3Dmain&style=flat-square&label=Test" /></a>
|
||||||
|
<a href="LICENSE"><img alt="LICENSE" src="https://img.shields.io/github/license/yutto-dev/biliass?style=flat-square"></a>
|
||||||
|
<a href="https://gitmoji.dev"><img src="https://img.shields.io/badge/gitmoji-%20😜%20😍-FFDD67?style=flat-square" alt="Gitmoji"></a>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
biliass,只是 Danmaku2ASS 的 bilili 与 yutto 适配版
|
||||||
|
|
||||||
|
原版:<https://github.com/m13253/danmaku2ass>
|
||||||
|
|
||||||
|
仅支持 bilibili 弹幕,支持 XML 弹幕和 Protobuf 弹幕
|
||||||
|
|
||||||
|
## Install
|
||||||
|
|
||||||
|
```bash
|
||||||
|
pip install biliass
|
||||||
|
```
|
||||||
|
|
||||||
|
## Usage
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# XML 弹幕
|
||||||
|
biliass danmaku.xml -s 1920x1080 -o danmaku.ass
|
||||||
|
# protobuf 弹幕
|
||||||
|
biliass danmaku.pb -s 1920x1080 -f protobuf -o danmaku.ass
|
||||||
|
```
|
||||||
|
|
||||||
|
```python
|
||||||
|
from biliass import Danmaku2ASS
|
||||||
|
|
||||||
|
# xml
|
||||||
|
Danmaku2ASS(
|
||||||
|
xml_text_or_bytes,
|
||||||
|
width,
|
||||||
|
height,
|
||||||
|
input_format="xml",
|
||||||
|
reserve_blank=0,
|
||||||
|
font_face="sans-serif",
|
||||||
|
font_size=width / 40,
|
||||||
|
text_opacity=0.8,
|
||||||
|
duration_marquee=15.0,
|
||||||
|
duration_still=10.0,
|
||||||
|
comment_filter=None,
|
||||||
|
is_reduce_comments=False,
|
||||||
|
progress_callback=None,
|
||||||
|
)
|
||||||
|
|
||||||
|
# protobuf
|
||||||
|
Danmaku2ASS(
|
||||||
|
protobuf_bytes, # only bytes
|
||||||
|
width,
|
||||||
|
height,
|
||||||
|
input_format="protobuf",
|
||||||
|
reserve_blank=0,
|
||||||
|
font_face="sans-serif",
|
||||||
|
font_size=width / 40,
|
||||||
|
text_opacity=0.8,
|
||||||
|
duration_marquee=15.0,
|
||||||
|
duration_still=10.0,
|
||||||
|
comment_filter=None,
|
||||||
|
is_reduce_comments=False,
|
||||||
|
progress_callback=None,
|
||||||
|
)
|
||||||
|
```
|
||||||
|
|
||||||
|
## TODO
|
||||||
|
|
||||||
|
- 导出 bilibili 网页上的弹幕设置,并导入到 biliass
|
|
@ -0,0 +1,33 @@
|
||||||
|
// From: https://github.com/SocialSisterYi/bilibili-API-collect/issues/133
|
||||||
|
|
||||||
|
syntax = "proto3";
|
||||||
|
|
||||||
|
// DanmakuElem .
|
||||||
|
message DanmakuElem {
|
||||||
|
// 弹幕id
|
||||||
|
int64 id = 1;
|
||||||
|
// 弹幕位置
|
||||||
|
int32 progress = 2;
|
||||||
|
// 弹幕类型
|
||||||
|
int32 mode = 3;
|
||||||
|
// 弹幕字体
|
||||||
|
int32 fontsize = 4;
|
||||||
|
// 弹幕颜色
|
||||||
|
uint32 color = 5;
|
||||||
|
// 弹幕发送者md5哈希
|
||||||
|
string mid_hash = 6;
|
||||||
|
// 弹幕文本内容
|
||||||
|
string content = 7;
|
||||||
|
// 弹幕发送时间 时间戳
|
||||||
|
int64 ctime = 8;
|
||||||
|
// 弹幕动作
|
||||||
|
string action = 9;
|
||||||
|
// 弹幕池
|
||||||
|
int32 pool = 10;
|
||||||
|
// 弹幕id_str
|
||||||
|
string id_str = 11;
|
||||||
|
}
|
||||||
|
|
||||||
|
message DanmakuEvent {
|
||||||
|
repeated DanmakuElem elems = 1;
|
||||||
|
}
|
|
@ -0,0 +1,49 @@
|
||||||
|
[project]
|
||||||
|
name = "biliass"
|
||||||
|
version = "1.3.12"
|
||||||
|
description = "将 B 站弹幕转换为 ASS 弹幕"
|
||||||
|
readme = "README.md"
|
||||||
|
requires-python = ">=3.9"
|
||||||
|
authors = [
|
||||||
|
{ name = "m13253" },
|
||||||
|
{ name = "Nyakku Shigure", email = "sigure.qaq@gmail.com" },
|
||||||
|
]
|
||||||
|
keywords = ["bilibili", "yutto", "Danmaku2ASS"]
|
||||||
|
license = { text = "GPLv3" }
|
||||||
|
classifiers = [
|
||||||
|
"Operating System :: OS Independent",
|
||||||
|
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
|
||||||
|
"Programming Language :: Python",
|
||||||
|
"Programming Language :: Python :: 3",
|
||||||
|
"Programming Language :: Python :: 3.9",
|
||||||
|
"Programming Language :: Python :: 3.10",
|
||||||
|
"Programming Language :: Python :: 3.11",
|
||||||
|
"Programming Language :: Python :: 3.12",
|
||||||
|
"Programming Language :: Python :: 3.13",
|
||||||
|
"Programming Language :: Python :: Implementation :: CPython",
|
||||||
|
]
|
||||||
|
dependencies = ["protobuf>=5.28.0"]
|
||||||
|
|
||||||
|
[project.urls]
|
||||||
|
Homepage = "https://github.com/yutto-dev/biliass"
|
||||||
|
Documentation = "https://github.com/yutto-dev/biliass"
|
||||||
|
Repository = "https://github.com/yutto-dev/biliass"
|
||||||
|
Issues = "https://github.com/yutto-dev/biliass/issues"
|
||||||
|
|
||||||
|
[project.scripts]
|
||||||
|
biliass = "biliass.__main__:main"
|
||||||
|
|
||||||
|
[tool.pyright]
|
||||||
|
include = ["src/biliass"]
|
||||||
|
pythonVersion = "3.9"
|
||||||
|
typeCheckingMode = "basic"
|
||||||
|
|
||||||
|
[tool.ruff]
|
||||||
|
exclude = ["*_pb2.py"]
|
||||||
|
|
||||||
|
[tool.ruff.lint.isort]
|
||||||
|
known-first-party = ["biliass"]
|
||||||
|
|
||||||
|
[build-system]
|
||||||
|
requires = ["hatchling"]
|
||||||
|
build-backend = "hatchling.build"
|
|
@ -0,0 +1,9 @@
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from .biliass import (
|
||||||
|
Danmaku2ASS as Danmaku2ASS,
|
||||||
|
ReadCommentsBilibiliProtobuf as ReadCommentsBilibiliProtobuf,
|
||||||
|
ReadCommentsBilibiliXml as ReadCommentsBilibiliXml,
|
||||||
|
)
|
||||||
|
|
||||||
|
__version__ = "1.3.12"
|
|
@ -0,0 +1,137 @@
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import argparse
|
||||||
|
import logging
|
||||||
|
import sys
|
||||||
|
|
||||||
|
from biliass import Danmaku2ASS
|
||||||
|
from biliass import __version__ as biliass_version
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
logging.basicConfig(format="%(levelname)s: %(message)s")
|
||||||
|
if len(sys.argv) == 1:
|
||||||
|
sys.argv.append("--help")
|
||||||
|
parser = argparse.ArgumentParser(
|
||||||
|
description="bilibili ASS Danmaku converter", prog="biliass"
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"-v", "--version", action="version", version=f"%(prog)s {biliass_version}"
|
||||||
|
)
|
||||||
|
parser.add_argument("-o", "--output", metavar="OUTPUT", help="Output file")
|
||||||
|
parser.add_argument(
|
||||||
|
"-s",
|
||||||
|
"--size",
|
||||||
|
metavar="WIDTHxHEIGHT",
|
||||||
|
required=True,
|
||||||
|
help="Stage size in pixels",
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"-fn",
|
||||||
|
"--font",
|
||||||
|
metavar="FONT",
|
||||||
|
help="Specify font face [default: sans-serif]",
|
||||||
|
default="sans-serif",
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"-fs",
|
||||||
|
"--fontsize",
|
||||||
|
metavar="SIZE",
|
||||||
|
help="Default font size [default: 25]",
|
||||||
|
type=float,
|
||||||
|
default=25.0,
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"-a", "--alpha", metavar="ALPHA", help="Text opacity", type=float, default=1.0
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"-dm",
|
||||||
|
"--duration-marquee",
|
||||||
|
metavar="SECONDS",
|
||||||
|
help="Duration of scrolling comment display [default: 5]",
|
||||||
|
type=float,
|
||||||
|
default=5.0,
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"-ds",
|
||||||
|
"--duration-still",
|
||||||
|
metavar="SECONDS",
|
||||||
|
help="Duration of still comment display [default: 5]",
|
||||||
|
type=float,
|
||||||
|
default=5.0,
|
||||||
|
)
|
||||||
|
parser.add_argument("-fl", "--filter", help="Regular expression to filter comments")
|
||||||
|
parser.add_argument(
|
||||||
|
"-flf",
|
||||||
|
"--filter-file",
|
||||||
|
help="Regular expressions from file (one line one regex) to filter comments",
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"-p",
|
||||||
|
"--protect",
|
||||||
|
metavar="HEIGHT",
|
||||||
|
help="Reserve blank on the bottom of the stage",
|
||||||
|
type=int,
|
||||||
|
default=0,
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"-r",
|
||||||
|
"--reduce",
|
||||||
|
action="store_true",
|
||||||
|
help="Reduce the amount of comments if stage is full",
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"-f",
|
||||||
|
"--format",
|
||||||
|
choices=["xml", "protobuf"],
|
||||||
|
default="xml",
|
||||||
|
help="Input danmaku format (xml or protobuf)",
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"file", metavar="FILE", nargs="+", help="Comment file to be processed"
|
||||||
|
)
|
||||||
|
args = parser.parse_args()
|
||||||
|
try:
|
||||||
|
width, height = str(args.size).split("x", 1)
|
||||||
|
width = int(width)
|
||||||
|
height = int(height)
|
||||||
|
except ValueError:
|
||||||
|
raise ValueError(f"Invalid stage size: {args.size!r}")
|
||||||
|
|
||||||
|
inputs: list[str | bytes] = []
|
||||||
|
for file in args.file:
|
||||||
|
try:
|
||||||
|
with open(file, "r" if args.format == "xml" else "rb") as f:
|
||||||
|
inputs.append(f.read())
|
||||||
|
except UnicodeDecodeError:
|
||||||
|
logging.error(
|
||||||
|
f"Failed to decode file {file}, if it is a protobuf file, please use `-f protobuf`"
|
||||||
|
)
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
if args.output:
|
||||||
|
fout = open(
|
||||||
|
args.output, "w", encoding="utf-8-sig", errors="replace", newline="\r\n"
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
fout = sys.stdout
|
||||||
|
output = Danmaku2ASS(
|
||||||
|
inputs,
|
||||||
|
width,
|
||||||
|
height,
|
||||||
|
args.format,
|
||||||
|
args.protect,
|
||||||
|
args.font,
|
||||||
|
args.fontsize,
|
||||||
|
args.alpha,
|
||||||
|
args.duration_marquee,
|
||||||
|
args.duration_still,
|
||||||
|
args.filter,
|
||||||
|
args.reduce,
|
||||||
|
)
|
||||||
|
fout.write(output)
|
||||||
|
fout.close()
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
main()
|
|
@ -0,0 +1,763 @@
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import json
|
||||||
|
import logging
|
||||||
|
import math
|
||||||
|
import random
|
||||||
|
import re
|
||||||
|
import xml.dom.minidom
|
||||||
|
from collections.abc import Callable, Generator
|
||||||
|
from typing import TypeVar, Union
|
||||||
|
|
||||||
|
from biliass.protobuf.danmaku_pb2 import DanmakuEvent
|
||||||
|
|
||||||
|
#
|
||||||
|
# ReadComments**** protocol
|
||||||
|
#
|
||||||
|
# Input:
|
||||||
|
# text: Input XML string
|
||||||
|
# fontsize: Default font size
|
||||||
|
#
|
||||||
|
# Output:
|
||||||
|
# yield a tuple:
|
||||||
|
# (timeline, timestamp, no, comment, pos, color, size, height, width)
|
||||||
|
# timeline: The position when the comment is replayed
|
||||||
|
# timestamp: The UNIX timestamp when the comment is submitted
|
||||||
|
# no: A sequence of 1, 2, 3, ..., used for sorting
|
||||||
|
# comment: The content of the comment
|
||||||
|
# pos: 0 for regular moving comment,
|
||||||
|
# 1 for bottom centered comment,
|
||||||
|
# 2 for top centered comment,
|
||||||
|
# 3 for reversed moving comment
|
||||||
|
# color: Font color represented in 0xRRGGBB,
|
||||||
|
# e.g. 0xffffff for white
|
||||||
|
# size: Font size
|
||||||
|
# height: The estimated height in pixels
|
||||||
|
# i.e. (comment.count('\n')+1)*size
|
||||||
|
# width: The estimated width in pixels
|
||||||
|
# i.e. CalculateLength(comment)*size
|
||||||
|
#
|
||||||
|
|
||||||
|
|
||||||
|
T = TypeVar("T")
|
||||||
|
Comment = tuple[float, float, int, str, Union[int, str], int, float, float, float]
|
||||||
|
|
||||||
|
|
||||||
|
def ReadCommentsBilibiliXml(
|
||||||
|
text: str | bytes, fontsize: float
|
||||||
|
) -> Generator[Comment, None, None]:
|
||||||
|
if isinstance(text, bytes):
|
||||||
|
text = text.decode()
|
||||||
|
text = FilterBadChars(text)
|
||||||
|
dom = xml.dom.minidom.parseString(text)
|
||||||
|
version = dom.version
|
||||||
|
assert version in ["1.0", "2.0"], f"未知的 XML 版本号 {version}"
|
||||||
|
if version == "1.0":
|
||||||
|
return ReadCommentsBilibiliXmlV1(text, fontsize)
|
||||||
|
else:
|
||||||
|
return ReadCommentsBilibiliXmlV2(text, fontsize)
|
||||||
|
|
||||||
|
|
||||||
|
def ReadCommentsBilibiliXmlV1(
|
||||||
|
text: str, fontsize: float
|
||||||
|
) -> Generator[Comment, None, None]:
|
||||||
|
dom = xml.dom.minidom.parseString(text)
|
||||||
|
comment_element = dom.getElementsByTagName("d")
|
||||||
|
for i, comment in enumerate(comment_element):
|
||||||
|
try:
|
||||||
|
p = str(comment.getAttribute("p")).split(",")
|
||||||
|
assert len(p) >= 5
|
||||||
|
assert p[1] in ("1", "4", "5", "6", "7", "8")
|
||||||
|
if comment.childNodes.length > 0:
|
||||||
|
if p[1] in ("1", "4", "5", "6"):
|
||||||
|
c = str(comment.childNodes[0].wholeText).replace("/n", "\n")
|
||||||
|
size = int(p[2]) * fontsize / 25.0
|
||||||
|
yield (
|
||||||
|
float(p[0]),
|
||||||
|
int(p[4]),
|
||||||
|
i,
|
||||||
|
c,
|
||||||
|
{"1": 0, "4": 2, "5": 1, "6": 3}[p[1]],
|
||||||
|
int(p[3]),
|
||||||
|
size,
|
||||||
|
(c.count("\n") + 1) * size,
|
||||||
|
CalculateLength(c) * size,
|
||||||
|
)
|
||||||
|
elif p[1] == "7": # positioned comment
|
||||||
|
c = str(comment.childNodes[0].wholeText)
|
||||||
|
yield (
|
||||||
|
float(p[0]),
|
||||||
|
int(p[4]),
|
||||||
|
i,
|
||||||
|
c,
|
||||||
|
"bilipos",
|
||||||
|
int(p[3]),
|
||||||
|
int(p[2]),
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
)
|
||||||
|
elif p[1] == "8":
|
||||||
|
pass # ignore scripted comment
|
||||||
|
except (AssertionError, AttributeError, IndexError, TypeError, ValueError):
|
||||||
|
logging.warning(f"Invalid comment: {comment.toxml()}")
|
||||||
|
continue
|
||||||
|
|
||||||
|
|
||||||
|
def ReadCommentsBilibiliXmlV2(
|
||||||
|
text: str, fontsize: float
|
||||||
|
) -> Generator[Comment, None, None]:
|
||||||
|
dom = xml.dom.minidom.parseString(text)
|
||||||
|
comment_element = dom.getElementsByTagName("d")
|
||||||
|
for i, comment in enumerate(comment_element):
|
||||||
|
try:
|
||||||
|
p = str(comment.getAttribute("p")).split(",")
|
||||||
|
assert len(p) >= 7
|
||||||
|
assert p[3] in ("1", "4", "5", "6", "7", "8")
|
||||||
|
if comment.childNodes.length > 0:
|
||||||
|
time = float(p[2]) / 1000.0
|
||||||
|
if p[3] in ("1", "4", "5", "6"):
|
||||||
|
c = str(comment.childNodes[0].wholeText).replace("/n", "\n")
|
||||||
|
size = int(p[4]) * fontsize / 25.0
|
||||||
|
yield (
|
||||||
|
time,
|
||||||
|
int(p[6]),
|
||||||
|
i,
|
||||||
|
c,
|
||||||
|
{"1": 0, "4": 2, "5": 1, "6": 3}[p[3]],
|
||||||
|
int(p[5]),
|
||||||
|
size,
|
||||||
|
(c.count("\n") + 1) * size,
|
||||||
|
CalculateLength(c) * size,
|
||||||
|
)
|
||||||
|
elif p[3] == "7": # positioned comment
|
||||||
|
c = str(comment.childNodes[0].wholeText)
|
||||||
|
yield (time, int(p[6]), i, c, "bilipos", int(p[5]), int(p[4]), 0, 0)
|
||||||
|
elif p[3] == "8":
|
||||||
|
pass # ignore scripted comment
|
||||||
|
except (AssertionError, AttributeError, IndexError, TypeError, ValueError):
|
||||||
|
logging.warning(f"Invalid comment: {comment.toxml()}")
|
||||||
|
continue
|
||||||
|
|
||||||
|
|
||||||
|
def ReadCommentsBilibiliProtobuf(
|
||||||
|
protobuf: bytes | str, fontsize: float
|
||||||
|
) -> Generator[Comment, None, None]:
|
||||||
|
assert isinstance(protobuf, bytes), "protobuf 仅支持使用 bytes 转换"
|
||||||
|
target = DanmakuEvent()
|
||||||
|
target.ParseFromString(protobuf)
|
||||||
|
for i, elem in enumerate(target.elems):
|
||||||
|
try:
|
||||||
|
assert elem.mode in (1, 4, 5, 6, 7, 8)
|
||||||
|
if elem.mode in (1, 4, 5, 6):
|
||||||
|
c = elem.content.replace("/n", "\n")
|
||||||
|
size = int(elem.fontsize) * fontsize / 25.0
|
||||||
|
yield (
|
||||||
|
elem.progress / 1000, # 视频内出现的时间
|
||||||
|
elem.ctime, # 弹幕的发送时间(时间戳)
|
||||||
|
i,
|
||||||
|
c,
|
||||||
|
{1: 0, 4: 2, 5: 1, 6: 3}[elem.mode],
|
||||||
|
elem.color,
|
||||||
|
size,
|
||||||
|
(c.count("\n") + 1) * size,
|
||||||
|
CalculateLength(c) * size,
|
||||||
|
)
|
||||||
|
elif elem.mode == 7: # positioned comment
|
||||||
|
c = elem.content
|
||||||
|
yield (
|
||||||
|
elem.progress / 1000,
|
||||||
|
elem.ctime,
|
||||||
|
i,
|
||||||
|
c,
|
||||||
|
"bilipos",
|
||||||
|
elem.color,
|
||||||
|
elem.fontsize,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
)
|
||||||
|
elif elem.mode == 8:
|
||||||
|
pass # ignore scripted comment
|
||||||
|
except (AssertionError, AttributeError, IndexError, TypeError, ValueError):
|
||||||
|
logging.warning(f"Invalid comment: {elem.content}")
|
||||||
|
continue
|
||||||
|
|
||||||
|
|
||||||
|
class AssText:
|
||||||
|
def __init__(self):
|
||||||
|
self._text = ""
|
||||||
|
|
||||||
|
def WriteCommentBilibiliPositioned(self, c, width, height, styleid):
|
||||||
|
# BiliPlayerSize = (512, 384) # Bilibili player version 2010
|
||||||
|
# BiliPlayerSize = (540, 384) # Bilibili player version 2012
|
||||||
|
# BiliPlayerSize = (672, 438) # Bilibili player version 2014
|
||||||
|
BiliPlayerSize = (891, 589) # Bilibili player version 2021 (flex)
|
||||||
|
ZoomFactor = GetZoomFactor(BiliPlayerSize, (width, height))
|
||||||
|
|
||||||
|
def GetPosition(InputPos, isHeight):
|
||||||
|
isHeight = int(isHeight) # True -> 1
|
||||||
|
if isinstance(InputPos, int):
|
||||||
|
return ZoomFactor[0] * InputPos + ZoomFactor[isHeight + 1]
|
||||||
|
elif isinstance(InputPos, float):
|
||||||
|
if InputPos > 1:
|
||||||
|
return ZoomFactor[0] * InputPos + ZoomFactor[isHeight + 1]
|
||||||
|
else:
|
||||||
|
return (
|
||||||
|
BiliPlayerSize[isHeight] * ZoomFactor[0] * InputPos
|
||||||
|
+ ZoomFactor[isHeight + 1]
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
try:
|
||||||
|
InputPos = int(InputPos)
|
||||||
|
except ValueError:
|
||||||
|
InputPos = float(InputPos)
|
||||||
|
return GetPosition(InputPos, isHeight)
|
||||||
|
|
||||||
|
try:
|
||||||
|
comment_args = safe_list(json.loads(c[3]))
|
||||||
|
text = ASSEscape(str(comment_args[4]).replace("/n", "\n"))
|
||||||
|
from_x = comment_args.get(0, 0)
|
||||||
|
from_y = comment_args.get(1, 0)
|
||||||
|
to_x = comment_args.get(7, from_x)
|
||||||
|
to_y = comment_args.get(8, from_y)
|
||||||
|
from_x = GetPosition(from_x, False)
|
||||||
|
from_y = GetPosition(from_y, True)
|
||||||
|
to_x = GetPosition(to_x, False)
|
||||||
|
to_y = GetPosition(to_y, True)
|
||||||
|
alpha = safe_list(str(comment_args.get(2, "1")).split("-"))
|
||||||
|
from_alpha = float(alpha.get(0, 1))
|
||||||
|
to_alpha = float(alpha.get(1, from_alpha))
|
||||||
|
from_alpha = 255 - round(from_alpha * 255)
|
||||||
|
to_alpha = 255 - round(to_alpha * 255)
|
||||||
|
rotate_z = int(comment_args.get(5, 0))
|
||||||
|
rotate_y = int(comment_args.get(6, 0))
|
||||||
|
lifetime = float(wrap_default(comment_args.get(3, 4500), 4500))
|
||||||
|
duration = int(comment_args.get(9, lifetime * 1000))
|
||||||
|
delay = int(comment_args.get(10, 0))
|
||||||
|
fontface = comment_args.get(12)
|
||||||
|
isborder = comment_args.get(11, "true")
|
||||||
|
from_rotarg = ConvertFlashRotation(
|
||||||
|
rotate_y, rotate_z, from_x, from_y, width, height
|
||||||
|
)
|
||||||
|
to_rotarg = ConvertFlashRotation(
|
||||||
|
rotate_y, rotate_z, to_x, to_y, width, height
|
||||||
|
)
|
||||||
|
styles = ["\\org(%d, %d)" % (width / 2, height / 2)]
|
||||||
|
if from_rotarg[0:2] == to_rotarg[0:2]:
|
||||||
|
styles.append("\\pos({:.0f}, {:.0f})".format(*from_rotarg[0:2]))
|
||||||
|
else:
|
||||||
|
styles.append(
|
||||||
|
"\\move({:.0f}, {:.0f}, {:.0f}, {:.0f}, {:.0f}, {:.0f})".format(
|
||||||
|
*(from_rotarg[0:2] + to_rotarg[0:2] + (delay, delay + duration))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
styles.append(
|
||||||
|
"\\frx{:.0f}\\fry{:.0f}\\frz{:.0f}\\fscx{:.0f}\\fscy{:.0f}".format(
|
||||||
|
*from_rotarg[2:7]
|
||||||
|
)
|
||||||
|
)
|
||||||
|
if (from_x, from_y) != (to_x, to_y):
|
||||||
|
styles.append(f"\\t({delay:d}, {delay + duration:d}, ")
|
||||||
|
styles.append(
|
||||||
|
"\\frx{:.0f}\\fry{:.0f}\\frz{:.0f}\\fscx{:.0f}\\fscy{:.0f}".format(
|
||||||
|
*to_rotarg[2:7]
|
||||||
|
)
|
||||||
|
)
|
||||||
|
styles.append(")")
|
||||||
|
if fontface:
|
||||||
|
styles.append(f"\\fn{ASSEscape(fontface)}")
|
||||||
|
styles.append("\\fs%.0f" % (c[6] * ZoomFactor[0]))
|
||||||
|
if c[5] != 0xFFFFFF:
|
||||||
|
styles.append(f"\\c&H{ConvertColor(c[5])}&")
|
||||||
|
if c[5] == 0x000000:
|
||||||
|
styles.append("\\3c&HFFFFFF&")
|
||||||
|
if from_alpha == to_alpha:
|
||||||
|
styles.append(f"\\alpha&H{from_alpha:02X}")
|
||||||
|
elif (from_alpha, to_alpha) == (255, 0):
|
||||||
|
styles.append(f"\\fad({lifetime * 1000:.0f},0)")
|
||||||
|
elif (from_alpha, to_alpha) == (0, 255):
|
||||||
|
styles.append(f"\\fad(0, {lifetime * 1000:.0f})")
|
||||||
|
else:
|
||||||
|
styles.append(
|
||||||
|
f"\\fade({from_alpha:d}, {to_alpha:d}, {to_alpha:d}, 0, {lifetime * 1000:.0f}, {lifetime * 1000:.0f}, {lifetime * 1000:.0f})"
|
||||||
|
)
|
||||||
|
if isborder == "false":
|
||||||
|
styles.append("\\bord0")
|
||||||
|
self._text += "Dialogue: -1,{start},{end},{styleid},,0,0,0,,{{{styles}}}{text}\n".format(
|
||||||
|
start=ConvertTimestamp(c[0]),
|
||||||
|
end=ConvertTimestamp(c[0] + lifetime),
|
||||||
|
styles="".join(styles),
|
||||||
|
text=text,
|
||||||
|
styleid=styleid,
|
||||||
|
)
|
||||||
|
except (IndexError, ValueError):
|
||||||
|
try:
|
||||||
|
logging.warning(f"Invalid comment: {c[3]!r}")
|
||||||
|
except IndexError:
|
||||||
|
logging.warning(f"Invalid comment: {c!r}")
|
||||||
|
|
||||||
|
def WriteASSHead(self, width, height, fontface, fontsize, alpha, styleid):
|
||||||
|
self._text += """[Script Info]
|
||||||
|
; Script generated by biliass (based on Danmaku2ASS)
|
||||||
|
; https://github.com/yutto-dev/biliass
|
||||||
|
Script Updated By: biliass (https://github.com/yutto-dev/biliass)
|
||||||
|
ScriptType: v4.00+
|
||||||
|
PlayResX: %(width)d
|
||||||
|
PlayResY: %(height)d
|
||||||
|
Aspect Ratio: %(width)d:%(height)d
|
||||||
|
Collisions: Normal
|
||||||
|
WrapStyle: 2
|
||||||
|
ScaledBorderAndShadow: yes
|
||||||
|
YCbCr Matrix: TV.601
|
||||||
|
|
||||||
|
[V4+ Styles]
|
||||||
|
Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding
|
||||||
|
Style: %(styleid)s, %(fontface)s, %(fontsize).0f, &H%(alpha)02XFFFFFF, &H%(alpha)02XFFFFFF, &H%(alpha)02X000000, &H%(alpha)02X000000, 0, 0, 0, 0, 100, 100, 0.00, 0.00, 1, %(outline).0f, 0, 7, 0, 0, 0, 0
|
||||||
|
|
||||||
|
[Events]
|
||||||
|
Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
|
||||||
|
""" % {
|
||||||
|
"width": width,
|
||||||
|
"height": height,
|
||||||
|
"fontface": fontface,
|
||||||
|
"fontsize": fontsize,
|
||||||
|
"alpha": 255 - round(alpha * 255),
|
||||||
|
"outline": max(fontsize / 25.0, 1),
|
||||||
|
"styleid": styleid,
|
||||||
|
}
|
||||||
|
|
||||||
|
def WriteComment(
|
||||||
|
self,
|
||||||
|
c,
|
||||||
|
row,
|
||||||
|
width,
|
||||||
|
height,
|
||||||
|
bottomReserved,
|
||||||
|
fontsize,
|
||||||
|
duration_marquee,
|
||||||
|
duration_still,
|
||||||
|
styleid,
|
||||||
|
):
|
||||||
|
text = ASSEscape(c[3])
|
||||||
|
styles = []
|
||||||
|
if c[4] == 1:
|
||||||
|
styles.append(
|
||||||
|
"\\an8\\pos(%(halfwidth)d, %(row)d)"
|
||||||
|
% {"halfwidth": width / 2, "row": row}
|
||||||
|
)
|
||||||
|
duration = duration_still
|
||||||
|
elif c[4] == 2:
|
||||||
|
styles.append(
|
||||||
|
"\\an2\\pos(%(halfwidth)d, %(row)d)"
|
||||||
|
% {
|
||||||
|
"halfwidth": width / 2,
|
||||||
|
"row": ConvertType2(row, height, bottomReserved),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
duration = duration_still
|
||||||
|
elif c[4] == 3:
|
||||||
|
styles.append(
|
||||||
|
"\\move(%(neglen)d, %(row)d, %(width)d, %(row)d)"
|
||||||
|
% {"width": width, "row": row, "neglen": -math.ceil(c[8])}
|
||||||
|
)
|
||||||
|
duration = duration_marquee
|
||||||
|
else:
|
||||||
|
styles.append(
|
||||||
|
"\\move(%(width)d, %(row)d, %(neglen)d, %(row)d)"
|
||||||
|
% {"width": width, "row": row, "neglen": -math.ceil(c[8])}
|
||||||
|
)
|
||||||
|
duration = duration_marquee
|
||||||
|
if not (-1 < c[6] - fontsize < 1):
|
||||||
|
styles.append(f"\\fs{c[6]:.0f}")
|
||||||
|
if c[5] != 0xFFFFFF:
|
||||||
|
styles.append(f"\\c&H{ConvertColor(c[5])}&")
|
||||||
|
if c[5] == 0x000000:
|
||||||
|
styles.append("\\3c&HFFFFFF&")
|
||||||
|
self._text += "Dialogue: 2,{start},{end},{styleid},,0000,0000,0000,,{{{styles}}}{text}\n".format(
|
||||||
|
start=ConvertTimestamp(c[0]),
|
||||||
|
end=ConvertTimestamp(c[0] + duration),
|
||||||
|
styles="".join(styles),
|
||||||
|
text=text,
|
||||||
|
styleid=styleid,
|
||||||
|
)
|
||||||
|
|
||||||
|
def to_file(self, f):
|
||||||
|
f.write(self._text)
|
||||||
|
|
||||||
|
def to_string(self):
|
||||||
|
return self._text
|
||||||
|
|
||||||
|
|
||||||
|
# Result: (f, dx, dy)
|
||||||
|
# To convert: NewX = f*x+dx, NewY = f*y+dy
|
||||||
|
def GetZoomFactor(SourceSize, TargetSize):
|
||||||
|
try:
|
||||||
|
if (SourceSize, TargetSize) == GetZoomFactor.Cached_Size:
|
||||||
|
return GetZoomFactor.Cached_Result
|
||||||
|
except AttributeError:
|
||||||
|
pass
|
||||||
|
GetZoomFactor.Cached_Size = (SourceSize, TargetSize)
|
||||||
|
try:
|
||||||
|
SourceAspect = SourceSize[0] / SourceSize[1]
|
||||||
|
TargetAspect = TargetSize[0] / TargetSize[1]
|
||||||
|
if TargetAspect < SourceAspect: # narrower
|
||||||
|
ScaleFactor = TargetSize[0] / SourceSize[0]
|
||||||
|
GetZoomFactor.Cached_Result = (
|
||||||
|
ScaleFactor,
|
||||||
|
0,
|
||||||
|
(TargetSize[1] - TargetSize[0] / SourceAspect) / 2,
|
||||||
|
)
|
||||||
|
elif TargetAspect > SourceAspect: # wider
|
||||||
|
ScaleFactor = TargetSize[1] / SourceSize[1]
|
||||||
|
GetZoomFactor.Cached_Result = (
|
||||||
|
ScaleFactor,
|
||||||
|
(TargetSize[0] - TargetSize[1] * SourceAspect) / 2,
|
||||||
|
0,
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
GetZoomFactor.Cached_Result = (TargetSize[0] / SourceSize[0], 0, 0)
|
||||||
|
return GetZoomFactor.Cached_Result
|
||||||
|
except ZeroDivisionError:
|
||||||
|
GetZoomFactor.Cached_Result = (1, 0, 0)
|
||||||
|
return GetZoomFactor.Cached_Result
|
||||||
|
|
||||||
|
|
||||||
|
# Calculation is based on https://github.com/jabbany/CommentCoreLibrary/issues/5#issuecomment-40087282
|
||||||
|
# and https://github.com/m13253/danmaku2ass/issues/7#issuecomment-41489422
|
||||||
|
# ASS FOV = width*4/3.0
|
||||||
|
# But Flash FOV = width/math.tan(100*math.pi/360.0)/2 will be used instead
|
||||||
|
# Result: (transX, transY, rotX, rotY, rotZ, scaleX, scaleY)
|
||||||
|
def ConvertFlashRotation(rotY, rotZ, X, Y, width, height):
|
||||||
|
def WrapAngle(deg):
|
||||||
|
return 180 - ((180 - deg) % 360)
|
||||||
|
|
||||||
|
rotY = WrapAngle(rotY)
|
||||||
|
rotZ = WrapAngle(rotZ)
|
||||||
|
if rotY in (90, -90):
|
||||||
|
rotY -= 1
|
||||||
|
if rotY == 0 or rotZ == 0:
|
||||||
|
outX = 0
|
||||||
|
outY = -rotY # Positive value means clockwise in Flash
|
||||||
|
outZ = -rotZ
|
||||||
|
rotY *= math.pi / 180.0
|
||||||
|
rotZ *= math.pi / 180.0
|
||||||
|
else:
|
||||||
|
rotY *= math.pi / 180.0
|
||||||
|
rotZ *= math.pi / 180.0
|
||||||
|
outY = (
|
||||||
|
math.atan2(-math.sin(rotY) * math.cos(rotZ), math.cos(rotY)) * 180 / math.pi
|
||||||
|
)
|
||||||
|
outZ = (
|
||||||
|
math.atan2(-math.cos(rotY) * math.sin(rotZ), math.cos(rotZ)) * 180 / math.pi
|
||||||
|
)
|
||||||
|
outX = math.asin(math.sin(rotY) * math.sin(rotZ)) * 180 / math.pi
|
||||||
|
trX = (
|
||||||
|
(X * math.cos(rotZ) + Y * math.sin(rotZ)) / math.cos(rotY)
|
||||||
|
+ (1 - math.cos(rotZ) / math.cos(rotY)) * width / 2
|
||||||
|
- math.sin(rotZ) / math.cos(rotY) * height / 2
|
||||||
|
)
|
||||||
|
trY = (
|
||||||
|
Y * math.cos(rotZ)
|
||||||
|
- X * math.sin(rotZ)
|
||||||
|
+ math.sin(rotZ) * width / 2
|
||||||
|
+ (1 - math.cos(rotZ)) * height / 2
|
||||||
|
)
|
||||||
|
trZ = (trX - width / 2) * math.sin(rotY)
|
||||||
|
FOV = width * math.tan(2 * math.pi / 9.0) / 2
|
||||||
|
try:
|
||||||
|
scaleXY = FOV / (FOV + trZ)
|
||||||
|
except ZeroDivisionError:
|
||||||
|
logging.error(f"Rotation makes object behind the camera: trZ == {trZ:.0f}")
|
||||||
|
scaleXY = 1
|
||||||
|
trX = (trX - width / 2) * scaleXY + width / 2
|
||||||
|
trY = (trY - height / 2) * scaleXY + height / 2
|
||||||
|
if scaleXY < 0:
|
||||||
|
scaleXY = -scaleXY
|
||||||
|
outX += 180
|
||||||
|
outY += 180
|
||||||
|
logging.error(
|
||||||
|
f"Rotation makes object behind the camera: trZ == {trZ:.0f} < {FOV:.0f}"
|
||||||
|
)
|
||||||
|
return (
|
||||||
|
trX,
|
||||||
|
trY,
|
||||||
|
WrapAngle(outX),
|
||||||
|
WrapAngle(outY),
|
||||||
|
WrapAngle(outZ),
|
||||||
|
scaleXY * 100,
|
||||||
|
scaleXY * 100,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def ProcessComments(
|
||||||
|
comments,
|
||||||
|
width,
|
||||||
|
height,
|
||||||
|
bottomReserved,
|
||||||
|
fontface,
|
||||||
|
fontsize,
|
||||||
|
alpha,
|
||||||
|
duration_marquee,
|
||||||
|
duration_still,
|
||||||
|
filters_regex,
|
||||||
|
reduced,
|
||||||
|
progress_callback,
|
||||||
|
):
|
||||||
|
styleid = f"biliass_{random.randint(0, 0xFFFF):04x}"
|
||||||
|
ass = AssText()
|
||||||
|
ass.WriteASSHead(width, height, fontface, fontsize, alpha, styleid)
|
||||||
|
rows = [[None] * (height - bottomReserved + 1) for i in range(4)]
|
||||||
|
for idx, i in enumerate(comments):
|
||||||
|
if progress_callback and idx % 1000 == 0:
|
||||||
|
progress_callback(idx, len(comments))
|
||||||
|
if isinstance(i[4], int):
|
||||||
|
skip = False
|
||||||
|
for filter_regex in filters_regex:
|
||||||
|
if filter_regex and filter_regex.search(i[3]):
|
||||||
|
skip = True
|
||||||
|
break
|
||||||
|
if skip:
|
||||||
|
continue
|
||||||
|
row = 0
|
||||||
|
rowmax = height - bottomReserved - i[7]
|
||||||
|
while row <= rowmax:
|
||||||
|
freerows = TestFreeRows(
|
||||||
|
rows,
|
||||||
|
i,
|
||||||
|
row,
|
||||||
|
width,
|
||||||
|
height,
|
||||||
|
bottomReserved,
|
||||||
|
duration_marquee,
|
||||||
|
duration_still,
|
||||||
|
)
|
||||||
|
if freerows >= i[7]:
|
||||||
|
MarkCommentRow(rows, i, row)
|
||||||
|
ass.WriteComment(
|
||||||
|
i,
|
||||||
|
row,
|
||||||
|
width,
|
||||||
|
height,
|
||||||
|
bottomReserved,
|
||||||
|
fontsize,
|
||||||
|
duration_marquee,
|
||||||
|
duration_still,
|
||||||
|
styleid,
|
||||||
|
)
|
||||||
|
break
|
||||||
|
else:
|
||||||
|
row += freerows or 1
|
||||||
|
else:
|
||||||
|
if not reduced:
|
||||||
|
row = FindAlternativeRow(rows, i, height, bottomReserved)
|
||||||
|
MarkCommentRow(rows, i, row)
|
||||||
|
ass.WriteComment(
|
||||||
|
i,
|
||||||
|
row,
|
||||||
|
width,
|
||||||
|
height,
|
||||||
|
bottomReserved,
|
||||||
|
fontsize,
|
||||||
|
duration_marquee,
|
||||||
|
duration_still,
|
||||||
|
styleid,
|
||||||
|
)
|
||||||
|
elif i[4] == "bilipos":
|
||||||
|
ass.WriteCommentBilibiliPositioned(i, width, height, styleid)
|
||||||
|
else:
|
||||||
|
logging.warning(f"Invalid comment: {i[3]!r}")
|
||||||
|
if progress_callback:
|
||||||
|
progress_callback(len(comments), len(comments))
|
||||||
|
return ass.to_string()
|
||||||
|
|
||||||
|
|
||||||
|
def TestFreeRows(
|
||||||
|
rows, c, row, width, height, bottomReserved, duration_marquee, duration_still
|
||||||
|
):
|
||||||
|
res = 0
|
||||||
|
rowmax = height - bottomReserved
|
||||||
|
targetRow = None
|
||||||
|
if c[4] in (1, 2):
|
||||||
|
while row < rowmax and res < c[7]:
|
||||||
|
if targetRow != rows[c[4]][row]:
|
||||||
|
targetRow = rows[c[4]][row]
|
||||||
|
if targetRow and targetRow[0] + duration_still > c[0]:
|
||||||
|
break
|
||||||
|
row += 1
|
||||||
|
res += 1
|
||||||
|
else:
|
||||||
|
try:
|
||||||
|
thresholdTime = c[0] - duration_marquee * (1 - width / (c[8] + width))
|
||||||
|
except ZeroDivisionError:
|
||||||
|
thresholdTime = c[0] - duration_marquee
|
||||||
|
while row < rowmax and res < c[7]:
|
||||||
|
if targetRow != rows[c[4]][row]:
|
||||||
|
targetRow = rows[c[4]][row]
|
||||||
|
try:
|
||||||
|
if targetRow and (
|
||||||
|
targetRow[0] > thresholdTime
|
||||||
|
or targetRow[0]
|
||||||
|
+ targetRow[8] * duration_marquee / (targetRow[8] + width)
|
||||||
|
> c[0]
|
||||||
|
):
|
||||||
|
break
|
||||||
|
except ZeroDivisionError:
|
||||||
|
pass
|
||||||
|
row += 1
|
||||||
|
res += 1
|
||||||
|
return res
|
||||||
|
|
||||||
|
|
||||||
|
def FindAlternativeRow(rows, c, height, bottomReserved):
|
||||||
|
res = 0
|
||||||
|
for row in range(height - bottomReserved - math.ceil(c[7])):
|
||||||
|
if not rows[c[4]][row]:
|
||||||
|
return row
|
||||||
|
elif rows[c[4]][row][0] < rows[c[4]][res][0]:
|
||||||
|
res = row
|
||||||
|
return res
|
||||||
|
|
||||||
|
|
||||||
|
def MarkCommentRow(rows, c, row):
|
||||||
|
try:
|
||||||
|
for i in range(row, row + math.ceil(c[7])):
|
||||||
|
rows[c[4]][i] = c
|
||||||
|
except IndexError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
def ASSEscape(s):
|
||||||
|
def ReplaceLeadingSpace(s):
|
||||||
|
sstrip = s.strip(" ")
|
||||||
|
slen = len(s)
|
||||||
|
if slen == len(sstrip):
|
||||||
|
return s
|
||||||
|
else:
|
||||||
|
llen = slen - len(s.lstrip(" "))
|
||||||
|
rlen = slen - len(s.rstrip(" "))
|
||||||
|
return "".join(("\u2007" * llen, sstrip, "\u2007" * rlen))
|
||||||
|
|
||||||
|
return "\\N".join(
|
||||||
|
ReplaceLeadingSpace(i) or " "
|
||||||
|
for i in str(s)
|
||||||
|
.replace("\\", "\\\\")
|
||||||
|
.replace("{", "\\{")
|
||||||
|
.replace("}", "\\}")
|
||||||
|
.split("\n")
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def CalculateLength(s):
|
||||||
|
return max(map(len, s.split("\n"))) # May not be accurate
|
||||||
|
|
||||||
|
|
||||||
|
def ConvertTimestamp(timestamp):
|
||||||
|
timestamp = round(timestamp * 100.0)
|
||||||
|
hour, minute = divmod(timestamp, 360000)
|
||||||
|
minute, second = divmod(minute, 6000)
|
||||||
|
second, centsecond = divmod(second, 100)
|
||||||
|
return "%d:%02d:%02d.%02d" % (int(hour), int(minute), int(second), int(centsecond))
|
||||||
|
|
||||||
|
|
||||||
|
def ConvertColor(RGB, width=1280, height=576):
|
||||||
|
if RGB == 0x000000:
|
||||||
|
return "000000"
|
||||||
|
elif RGB == 0xFFFFFF:
|
||||||
|
return "FFFFFF"
|
||||||
|
R = (RGB >> 16) & 0xFF
|
||||||
|
G = (RGB >> 8) & 0xFF
|
||||||
|
B = RGB & 0xFF
|
||||||
|
if width < 1280 and height < 576:
|
||||||
|
return f"{B:02X}{G:02X}{R:02X}"
|
||||||
|
else: # VobSub always uses BT.601 colorspace, convert to BT.709
|
||||||
|
|
||||||
|
def ClipByte(x):
|
||||||
|
return 255 if x > 255 else 0 if x < 0 else round(x)
|
||||||
|
|
||||||
|
return "{:02X}{:02X}{:02X}".format( # noqa: UP032
|
||||||
|
ClipByte(
|
||||||
|
R * 0.00956384088080656
|
||||||
|
+ G * 0.03217254540203729
|
||||||
|
+ B * 0.95826361371715607
|
||||||
|
),
|
||||||
|
ClipByte(
|
||||||
|
R * -0.10493933142075390
|
||||||
|
+ G * 1.17231478191855154
|
||||||
|
+ B * -0.06737545049779757
|
||||||
|
),
|
||||||
|
ClipByte(
|
||||||
|
R * 0.91348912373987645
|
||||||
|
+ G * 0.07858536372532510
|
||||||
|
+ B * 0.00792551253479842
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def ConvertType2(row, height, bottomReserved):
|
||||||
|
return height - bottomReserved - row
|
||||||
|
|
||||||
|
|
||||||
|
def FilterBadChars(string: str) -> str:
|
||||||
|
return re.sub("[\\x00-\\x08\\x0b\\x0c\\x0e-\\x1f]", "\ufffd", string)
|
||||||
|
|
||||||
|
|
||||||
|
class safe_list(list):
|
||||||
|
def get(self, index, default=None):
|
||||||
|
try:
|
||||||
|
return self[index]
|
||||||
|
except IndexError:
|
||||||
|
return default
|
||||||
|
|
||||||
|
|
||||||
|
def wrap_default(value: T | None, default: T) -> T:
|
||||||
|
return default if value is None else value
|
||||||
|
|
||||||
|
|
||||||
|
def Danmaku2ASS(
|
||||||
|
inputs: list[str | bytes] | str | bytes,
|
||||||
|
stage_width: int,
|
||||||
|
stage_height: int,
|
||||||
|
input_format: str = "xml",
|
||||||
|
reserve_blank: float = 0,
|
||||||
|
font_face: str = "sans-serif",
|
||||||
|
font_size: float = 25.0,
|
||||||
|
text_opacity: float = 1.0,
|
||||||
|
duration_marquee: float = 5.0,
|
||||||
|
duration_still: float = 5.0,
|
||||||
|
comment_filter: str | None = None,
|
||||||
|
is_reduce_comments: bool = False,
|
||||||
|
progress_callback: Callable[..., None] | None = None,
|
||||||
|
) -> str:
|
||||||
|
comment_filters: list[str] = [comment_filter] if comment_filter is not None else []
|
||||||
|
filters_regex = []
|
||||||
|
for comment_filter in comment_filters:
|
||||||
|
try:
|
||||||
|
if comment_filter:
|
||||||
|
filters_regex.append(re.compile(comment_filter))
|
||||||
|
except: # noqa: E722
|
||||||
|
raise ValueError(f"Invalid regular expression: {comment_filter}")
|
||||||
|
|
||||||
|
comments: list[Comment] = []
|
||||||
|
if not isinstance(inputs, list):
|
||||||
|
inputs = [inputs]
|
||||||
|
for input in inputs:
|
||||||
|
if input_format == "xml":
|
||||||
|
comments.extend(ReadCommentsBilibiliXml(input, font_size))
|
||||||
|
else:
|
||||||
|
if isinstance(input, str):
|
||||||
|
logging.warning("Protobuf 只能使用 bytes 转换")
|
||||||
|
comments.extend(ReadCommentsBilibiliProtobuf(input, font_size))
|
||||||
|
comments.sort()
|
||||||
|
return ProcessComments(
|
||||||
|
comments,
|
||||||
|
stage_width,
|
||||||
|
stage_height,
|
||||||
|
reserve_blank,
|
||||||
|
font_face,
|
||||||
|
font_size,
|
||||||
|
text_opacity,
|
||||||
|
duration_marquee,
|
||||||
|
duration_still,
|
||||||
|
filters_regex,
|
||||||
|
is_reduce_comments,
|
||||||
|
progress_callback,
|
||||||
|
)
|
|
@ -0,0 +1,38 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||||
|
# NO CHECKED-IN PROTOBUF GENCODE
|
||||||
|
# source: protobuf/danmaku.proto
|
||||||
|
# Protobuf Python Version: 5.28.0
|
||||||
|
"""Generated protocol buffer code."""
|
||||||
|
from google.protobuf import descriptor as _descriptor
|
||||||
|
from google.protobuf import descriptor_pool as _descriptor_pool
|
||||||
|
from google.protobuf import runtime_version as _runtime_version
|
||||||
|
from google.protobuf import symbol_database as _symbol_database
|
||||||
|
from google.protobuf.internal import builder as _builder
|
||||||
|
_runtime_version.ValidateProtobufRuntimeVersion(
|
||||||
|
_runtime_version.Domain.PUBLIC,
|
||||||
|
5,
|
||||||
|
28,
|
||||||
|
0,
|
||||||
|
'',
|
||||||
|
'protobuf/danmaku.proto'
|
||||||
|
)
|
||||||
|
# @@protoc_insertion_point(imports)
|
||||||
|
|
||||||
|
_sym_db = _symbol_database.Default()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x16protobuf/danmaku.proto\"\xba\x01\n\x0b\x44\x61nmakuElem\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x10\n\x08progress\x18\x02 \x01(\x05\x12\x0c\n\x04mode\x18\x03 \x01(\x05\x12\x10\n\x08\x66ontsize\x18\x04 \x01(\x05\x12\r\n\x05\x63olor\x18\x05 \x01(\r\x12\x10\n\x08mid_hash\x18\x06 \x01(\t\x12\x0f\n\x07\x63ontent\x18\x07 \x01(\t\x12\r\n\x05\x63time\x18\x08 \x01(\x03\x12\x0e\n\x06\x61\x63tion\x18\t \x01(\t\x12\x0c\n\x04pool\x18\n \x01(\x05\x12\x0e\n\x06id_str\x18\x0b \x01(\t\"+\n\x0c\x44\x61nmakuEvent\x12\x1b\n\x05\x65lems\x18\x01 \x03(\x0b\x32\x0c.DanmakuElemb\x06proto3')
|
||||||
|
|
||||||
|
_globals = globals()
|
||||||
|
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
|
||||||
|
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'protobuf.danmaku_pb2', _globals)
|
||||||
|
if not _descriptor._USE_C_DESCRIPTORS:
|
||||||
|
DESCRIPTOR._loaded_options = None
|
||||||
|
_globals['_DANMAKUELEM']._serialized_start=27
|
||||||
|
_globals['_DANMAKUELEM']._serialized_end=213
|
||||||
|
_globals['_DANMAKUEVENT']._serialized_start=215
|
||||||
|
_globals['_DANMAKUEVENT']._serialized_end=258
|
||||||
|
# @@protoc_insertion_point(module_scope)
|
|
@ -0,0 +1,71 @@
|
||||||
|
from google.protobuf.internal import containers as _containers
|
||||||
|
from google.protobuf import descriptor as _descriptor
|
||||||
|
from google.protobuf import message as _message
|
||||||
|
from typing import (
|
||||||
|
ClassVar as _ClassVar,
|
||||||
|
Iterable as _Iterable,
|
||||||
|
Mapping as _Mapping,
|
||||||
|
Optional as _Optional,
|
||||||
|
Union as _Union,
|
||||||
|
)
|
||||||
|
|
||||||
|
DESCRIPTOR: _descriptor.FileDescriptor
|
||||||
|
|
||||||
|
class DanmakuElem(_message.Message):
|
||||||
|
__slots__ = (
|
||||||
|
"id",
|
||||||
|
"progress",
|
||||||
|
"mode",
|
||||||
|
"fontsize",
|
||||||
|
"color",
|
||||||
|
"mid_hash",
|
||||||
|
"content",
|
||||||
|
"ctime",
|
||||||
|
"action",
|
||||||
|
"pool",
|
||||||
|
"id_str",
|
||||||
|
)
|
||||||
|
ID_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
PROGRESS_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
MODE_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
FONTSIZE_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
COLOR_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
MID_HASH_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
CONTENT_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
CTIME_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
ACTION_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
POOL_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
ID_STR_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
id: int
|
||||||
|
progress: int
|
||||||
|
mode: int
|
||||||
|
fontsize: int
|
||||||
|
color: int
|
||||||
|
mid_hash: str
|
||||||
|
content: str
|
||||||
|
ctime: int
|
||||||
|
action: str
|
||||||
|
pool: int
|
||||||
|
id_str: str
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
id: _Optional[int] = ...,
|
||||||
|
progress: _Optional[int] = ...,
|
||||||
|
mode: _Optional[int] = ...,
|
||||||
|
fontsize: _Optional[int] = ...,
|
||||||
|
color: _Optional[int] = ...,
|
||||||
|
mid_hash: _Optional[str] = ...,
|
||||||
|
content: _Optional[str] = ...,
|
||||||
|
ctime: _Optional[int] = ...,
|
||||||
|
action: _Optional[str] = ...,
|
||||||
|
pool: _Optional[int] = ...,
|
||||||
|
id_str: _Optional[str] = ...,
|
||||||
|
) -> None: ...
|
||||||
|
|
||||||
|
class DanmakuEvent(_message.Message):
|
||||||
|
__slots__ = ("elems",)
|
||||||
|
ELEMS_FIELD_NUMBER: _ClassVar[int]
|
||||||
|
elems: _containers.RepeatedCompositeFieldContainer[DanmakuElem]
|
||||||
|
def __init__(
|
||||||
|
self, elems: _Optional[_Iterable[_Union[DanmakuElem, _Mapping]]] = ...
|
||||||
|
) -> None: ...
|
|
@ -48,8 +48,14 @@ dev-dependencies = [
|
||||||
"typos>=1.23.7",
|
"typos>=1.23.7",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[tool.uv.sources]
|
||||||
|
biliass = { workspace = true }
|
||||||
|
|
||||||
|
[tool.uv.workspace]
|
||||||
|
members = ["packages/*"]
|
||||||
|
|
||||||
[tool.pytest.ini_options]
|
[tool.pytest.ini_options]
|
||||||
markers = ["api", "e2e", "processor", "ignore", "ci_skip", "ci_only"]
|
markers = ["api", "e2e", "processor", "biliass", "ignore", "ci_skip", "ci_only"]
|
||||||
|
|
||||||
[tool.pyright]
|
[tool.pyright]
|
||||||
include = ["yutto", "tests"]
|
include = ["yutto", "tests"]
|
||||||
|
|
|
@ -8,6 +8,10 @@ if TYPE_CHECKING:
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
TEST_DIR = Path("./__test_files__")
|
TEST_DIR = Path("./__test_files__")
|
||||||
|
BILIBILI_HEADERS = {
|
||||||
|
"User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36",
|
||||||
|
"Referer": "https://www.bilibili.com/",
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
def pytest_sessionstart(session: pytest.Session):
|
def pytest_sessionstart(session: pytest.Session):
|
||||||
|
|
|
@ -0,0 +1,31 @@
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
|
import httpx
|
||||||
|
import pytest
|
||||||
|
from biliass import ReadCommentsBilibiliProtobuf
|
||||||
|
|
||||||
|
from ..conftest import BILIBILI_HEADERS, TEST_DIR
|
||||||
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
|
||||||
|
def gen_protobuf(base_dir: Path):
|
||||||
|
filename = "test.pb"
|
||||||
|
filepath = base_dir / filename
|
||||||
|
cid = "18678311"
|
||||||
|
resp = httpx.get(
|
||||||
|
f"http://api.bilibili.com/x/v2/dm/web/seg.so?type=1&oid={cid}&segment_index={1}",
|
||||||
|
headers=BILIBILI_HEADERS,
|
||||||
|
)
|
||||||
|
with filepath.open("wb") as f:
|
||||||
|
f.write(resp.content)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.biliass
|
||||||
|
def test_protobuf():
|
||||||
|
gen_protobuf(TEST_DIR)
|
||||||
|
with TEST_DIR.joinpath("test.pb").open("rb") as f:
|
||||||
|
ReadCommentsBilibiliProtobuf(f.read(), 10)
|
|
@ -0,0 +1,40 @@
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
|
import httpx
|
||||||
|
import pytest
|
||||||
|
from biliass import ReadCommentsBilibiliXml
|
||||||
|
|
||||||
|
from ..conftest import BILIBILI_HEADERS, TEST_DIR
|
||||||
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
|
||||||
|
def gen_xml_v1(base_dir: Path):
|
||||||
|
filename = "test_v1.xml"
|
||||||
|
filepath = base_dir / filename
|
||||||
|
cid = "18678311"
|
||||||
|
resp = httpx.get(
|
||||||
|
f"http://comment.bilibili.com/{cid}.xml",
|
||||||
|
headers=BILIBILI_HEADERS,
|
||||||
|
follow_redirects=True,
|
||||||
|
)
|
||||||
|
resp.encoding = "utf-8"
|
||||||
|
with filepath.open("w", encoding="utf-8") as f:
|
||||||
|
f.write(resp.text)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.biliass
|
||||||
|
def test_xml_v1_text():
|
||||||
|
gen_xml_v1(TEST_DIR)
|
||||||
|
with TEST_DIR.joinpath("test_v1.xml").open("r") as f:
|
||||||
|
ReadCommentsBilibiliXml(f.read(), 10)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.biliass
|
||||||
|
def test_xml_v1_bytes():
|
||||||
|
gen_xml_v1(TEST_DIR)
|
||||||
|
with TEST_DIR.joinpath("test_v1.xml").open("rb") as f:
|
||||||
|
ReadCommentsBilibiliXml(f.read(), 10)
|
17
uv.lock
17
uv.lock
|
@ -1,6 +1,12 @@
|
||||||
version = 1
|
version = 1
|
||||||
requires-python = ">=3.9"
|
requires-python = ">=3.9"
|
||||||
|
|
||||||
|
[manifest]
|
||||||
|
members = [
|
||||||
|
"biliass",
|
||||||
|
"yutto",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "aiofiles"
|
name = "aiofiles"
|
||||||
version = "24.1.0"
|
version = "24.1.0"
|
||||||
|
@ -28,14 +34,13 @@ wheels = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "biliass"
|
name = "biliass"
|
||||||
version = "1.3.12"
|
version = "1.3.12"
|
||||||
source = { registry = "https://pypi.org/simple" }
|
source = { editable = "packages/biliass" }
|
||||||
dependencies = [
|
dependencies = [
|
||||||
{ name = "protobuf" },
|
{ name = "protobuf" },
|
||||||
]
|
]
|
||||||
sdist = { url = "https://files.pythonhosted.org/packages/e2/97/869ad7b7aa3bd4f732f9670ae23ea0015e8d0f997b0ad41ccf6a8be8541d/biliass-1.3.12.tar.gz", hash = "sha256:fb1ab9a96fbc94a6f8428ce9f80effff2e27894e77402d46ad42cf1257766d19", size = 23677 }
|
|
||||||
wheels = [
|
[package.metadata]
|
||||||
{ url = "https://files.pythonhosted.org/packages/8b/e8/cd9a77bd738e7cae8b1f4481b61380b9188baf91082dbef2b5013d231616/biliass-1.3.12-py3-none-any.whl", hash = "sha256:5da4e02fd70307def68ab538026ee3f2454177a1551c235315d382cc718d5ba2", size = 24449 },
|
requires-dist = [{ name = "protobuf", specifier = ">=5.28.0" }]
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "certifi"
|
name = "certifi"
|
||||||
|
@ -356,7 +361,7 @@ dev = [
|
||||||
[package.metadata]
|
[package.metadata]
|
||||||
requires-dist = [
|
requires-dist = [
|
||||||
{ name = "aiofiles", specifier = ">=24.1.0" },
|
{ name = "aiofiles", specifier = ">=24.1.0" },
|
||||||
{ name = "biliass", specifier = "==1.3.12" },
|
{ name = "biliass", editable = "packages/biliass" },
|
||||||
{ name = "colorama", marker = "sys_platform == 'win32'", specifier = ">=0.4.6" },
|
{ name = "colorama", marker = "sys_platform == 'win32'", specifier = ">=0.4.6" },
|
||||||
{ name = "dict2xml", specifier = ">=1.7.6" },
|
{ name = "dict2xml", specifier = ">=1.7.6" },
|
||||||
{ name = "httpx", extras = ["http2", "socks"], specifier = ">=0.27.0" },
|
{ name = "httpx", extras = ["http2", "socks"], specifier = ">=0.27.0" },
|
||||||
|
|
Loading…
Reference in New Issue