Sync with dev branch #3
4
.github/workflows/main.yml
vendored
4
.github/workflows/main.yml
vendored
@ -1,4 +0,0 @@
|
|||||||
- name: Upload coverage reports to Codecov
|
|
||||||
uses: codecov/codecov-action@v4.0.1
|
|
||||||
with:
|
|
||||||
token: ${{ secrets.CODECOV_TOKEN }}
|
|
||||||
5
.idea/.gitignore
vendored
Normal file
5
.idea/.gitignore
vendored
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
# Default ignored files
|
||||||
|
/shelf/
|
||||||
|
/workspace.xml
|
||||||
|
# Editor-based HTTP Client requests
|
||||||
|
/httpRequests/
|
||||||
12
.idea/AquaVox.iml
Normal file
12
.idea/AquaVox.iml
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<module type="WEB_MODULE" version="4">
|
||||||
|
<component name="NewModuleRootManager">
|
||||||
|
<content url="file://$MODULE_DIR$">
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/temp" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/tmp" />
|
||||||
|
</content>
|
||||||
|
<orderEntry type="inheritedJdk" />
|
||||||
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
|
</component>
|
||||||
|
</module>
|
||||||
48
.idea/codeStyles/Project.xml
Normal file
48
.idea/codeStyles/Project.xml
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
<component name="ProjectCodeStyleConfiguration">
|
||||||
|
<code_scheme name="Project" version="173">
|
||||||
|
<HTMLCodeStyleSettings>
|
||||||
|
<option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
|
||||||
|
</HTMLCodeStyleSettings>
|
||||||
|
<JSCodeStyleSettings version="0">
|
||||||
|
<option name="FORCE_SEMICOLON_STYLE" value="true" />
|
||||||
|
<option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
|
||||||
|
<option name="USE_DOUBLE_QUOTES" value="false" />
|
||||||
|
<option name="FORCE_QUOTE_STYlE" value="true" />
|
||||||
|
<option name="ENFORCE_TRAILING_COMMA" value="Remove" />
|
||||||
|
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
|
||||||
|
<option name="SPACES_WITHIN_IMPORTS" value="true" />
|
||||||
|
</JSCodeStyleSettings>
|
||||||
|
<TypeScriptCodeStyleSettings version="0">
|
||||||
|
<option name="FORCE_SEMICOLON_STYLE" value="true" />
|
||||||
|
<option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
|
||||||
|
<option name="USE_DOUBLE_QUOTES" value="false" />
|
||||||
|
<option name="FORCE_QUOTE_STYlE" value="true" />
|
||||||
|
<option name="ENFORCE_TRAILING_COMMA" value="Remove" />
|
||||||
|
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
|
||||||
|
<option name="SPACES_WITHIN_IMPORTS" value="true" />
|
||||||
|
</TypeScriptCodeStyleSettings>
|
||||||
|
<VueCodeStyleSettings>
|
||||||
|
<option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
|
||||||
|
<option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
|
||||||
|
</VueCodeStyleSettings>
|
||||||
|
<codeStyleSettings language="HTML">
|
||||||
|
<option name="SOFT_MARGINS" value="120" />
|
||||||
|
<indentOptions>
|
||||||
|
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
||||||
|
</indentOptions>
|
||||||
|
</codeStyleSettings>
|
||||||
|
<codeStyleSettings language="JavaScript">
|
||||||
|
<option name="SOFT_MARGINS" value="120" />
|
||||||
|
</codeStyleSettings>
|
||||||
|
<codeStyleSettings language="TypeScript">
|
||||||
|
<option name="SOFT_MARGINS" value="120" />
|
||||||
|
</codeStyleSettings>
|
||||||
|
<codeStyleSettings language="Vue">
|
||||||
|
<option name="SOFT_MARGINS" value="120" />
|
||||||
|
<indentOptions>
|
||||||
|
<option name="INDENT_SIZE" value="4" />
|
||||||
|
<option name="TAB_SIZE" value="4" />
|
||||||
|
</indentOptions>
|
||||||
|
</codeStyleSettings>
|
||||||
|
</code_scheme>
|
||||||
|
</component>
|
||||||
5
.idea/codeStyles/codeStyleConfig.xml
Normal file
5
.idea/codeStyles/codeStyleConfig.xml
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
<component name="ProjectCodeStyleConfiguration">
|
||||||
|
<state>
|
||||||
|
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
|
||||||
|
</state>
|
||||||
|
</component>
|
||||||
6
.idea/jsLibraryMappings.xml
Normal file
6
.idea/jsLibraryMappings.xml
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="JavaScriptLibraryMappings">
|
||||||
|
<includedPredefinedLibrary name="Node.js Core" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
8
.idea/modules.xml
Normal file
8
.idea/modules.xml
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="ProjectModuleManager">
|
||||||
|
<modules>
|
||||||
|
<module fileurl="file://$PROJECT_DIR$/.idea/AquaVox.iml" filepath="$PROJECT_DIR$/.idea/AquaVox.iml" />
|
||||||
|
</modules>
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
17
.idea/runConfigurations/Run_Dev_Server.xml
Normal file
17
.idea/runConfigurations/Run_Dev_Server.xml
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
<component name="ProjectRunConfigurationManager">
|
||||||
|
<configuration default="false" name="Run Dev Server" type="ShConfigurationType" focusToolWindowBeforeRun="true">
|
||||||
|
<option name="SCRIPT_TEXT" value="bun dev" />
|
||||||
|
<option name="INDEPENDENT_SCRIPT_PATH" value="true" />
|
||||||
|
<option name="SCRIPT_PATH" value="" />
|
||||||
|
<option name="SCRIPT_OPTIONS" value="" />
|
||||||
|
<option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
|
||||||
|
<option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||||
|
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
|
||||||
|
<option name="INTERPRETER_PATH" value="/opt/homebrew/bin/nu" />
|
||||||
|
|
|||||||
|
<option name="INTERPRETER_OPTIONS" value="" />
|
||||||
|
<option name="EXECUTE_IN_TERMINAL" value="true" />
|
||||||
|
<option name="EXECUTE_SCRIPT_FILE" value="false" />
|
||||||
|
<envs />
|
||||||
|
<method v="2" />
|
||||||
|
</configuration>
|
||||||
|
</component>
|
||||||
6
.idea/vcs.xml
Normal file
6
.idea/vcs.xml
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="VcsDirectoryMappings">
|
||||||
|
<mapping directory="" vcs="Git" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
674
LICENSE
Normal file
674
LICENSE
Normal file
@ -0,0 +1,674 @@
|
|||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
the GNU General Public License is intended to guarantee your freedom to
|
||||||
|
share and change all versions of a program--to make sure it remains free
|
||||||
|
software for all its users. We, the Free Software Foundation, use the
|
||||||
|
GNU General Public License for most of our software; it applies also to
|
||||||
|
any other work released this way by its authors. You can apply it to
|
||||||
|
your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to prevent others from denying you
|
||||||
|
these rights or asking you to surrender the rights. Therefore, you have
|
||||||
|
certain responsibilities if you distribute copies of the software, or if
|
||||||
|
you modify it: responsibilities to respect the freedom of others.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
|
freedoms that you received. You must make sure that they, too, receive
|
||||||
|
or can get the source code. And you must show them these terms so they
|
||||||
|
know their rights.
|
||||||
|
|
||||||
|
Developers that use the GNU GPL protect your rights with two steps:
|
||||||
|
(1) assert copyright on the software, and (2) offer you this License
|
||||||
|
giving you legal permission to copy, distribute and/or modify it.
|
||||||
|
|
||||||
|
For the developers' and authors' protection, the GPL clearly explains
|
||||||
|
that there is no warranty for this free software. For both users' and
|
||||||
|
authors' sake, the GPL requires that modified versions be marked as
|
||||||
|
changed, so that their problems will not be attributed erroneously to
|
||||||
|
authors of previous versions.
|
||||||
|
|
||||||
|
Some devices are designed to deny users access to install or run
|
||||||
|
modified versions of the software inside them, although the manufacturer
|
||||||
|
can do so. This is fundamentally incompatible with the aim of
|
||||||
|
protecting users' freedom to change the software. The systematic
|
||||||
|
pattern of such abuse occurs in the area of products for individuals to
|
||||||
|
use, which is precisely where it is most unacceptable. Therefore, we
|
||||||
|
have designed this version of the GPL to prohibit the practice for those
|
||||||
|
products. If such problems arise substantially in other domains, we
|
||||||
|
stand ready to extend this provision to those domains in future versions
|
||||||
|
of the GPL, as needed to protect the freedom of users.
|
||||||
|
|
||||||
|
Finally, every program is threatened constantly by software patents.
|
||||||
|
States should not allow patents to restrict development and use of
|
||||||
|
software on general-purpose computers, but in those that do, we wish to
|
||||||
|
avoid the special danger that patents applied to a free program could
|
||||||
|
make it effectively proprietary. To prevent this, the GPL assures that
|
||||||
|
patents cannot be used to render the program non-free.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Use with the GNU Affero General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU Affero General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the special requirements of the GNU Affero General Public License,
|
||||||
|
section 13, concerning interaction through a network will apply to the
|
||||||
|
combination as such.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU General Public License from time to time. Such new versions will
|
||||||
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
state the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If the program does terminal interaction, make it output a short
|
||||||
|
notice like this when it starts in an interactive mode:
|
||||||
|
|
||||||
|
<program> Copyright (C) <year> <name of author>
|
||||||
|
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
|
parts of the General Public License. Of course, your program's commands
|
||||||
|
might be different; for a GUI interface, you would use an "about box".
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
|
For more information on this, and how to apply and follow the GNU GPL, see
|
||||||
|
<https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
The GNU General Public License does not permit incorporating your program
|
||||||
|
into proprietary programs. If your program is a subroutine library, you
|
||||||
|
may consider it more useful to permit linking proprietary applications with
|
||||||
|
the library. If this is what you want to do, use the GNU Lesser General
|
||||||
|
Public License instead of this License. But first, please read
|
||||||
|
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "aquavox",
|
"name": "aquavox",
|
||||||
"version": "1.12.8",
|
"version": "1.12.14",
|
||||||
"private": false,
|
"private": false,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite dev",
|
"dev": "vite dev",
|
||||||
|
|||||||
@ -1,3 +0,0 @@
|
|||||||
<div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
@ -3,6 +3,7 @@
|
|||||||
import { onMount } from 'svelte';
|
import { onMount } from 'svelte';
|
||||||
import userAdjustingProgress from '$lib/state/userAdjustingProgress';
|
import userAdjustingProgress from '$lib/state/userAdjustingProgress';
|
||||||
import progressBarSlideValue from '$lib/state/progressBarSlideValue';
|
import progressBarSlideValue from '$lib/state/progressBarSlideValue';
|
||||||
|
import truncate from '$lib/truncate';
|
||||||
|
|
||||||
export let name: string;
|
export let name: string;
|
||||||
export let singer: string = '';
|
export let singer: string = '';
|
||||||
@ -35,7 +36,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function volumeBarChangeTouch(e: TouchEvent) {
|
function volumeBarChangeTouch(e: TouchEvent) {
|
||||||
const value = turncate(
|
const value = truncate(
|
||||||
e.touches[0].clientX - volumeBar.getBoundingClientRect().x,
|
e.touches[0].clientX - volumeBar.getBoundingClientRect().x,
|
||||||
0,
|
0,
|
||||||
volumeBar.getBoundingClientRect().width
|
volumeBar.getBoundingClientRect().width
|
||||||
@ -49,8 +50,8 @@
|
|||||||
progressBarSlideValue.set((e.offsetX / progressBar.getBoundingClientRect().width) * duration);
|
progressBarSlideValue.set((e.offsetX / progressBar.getBoundingClientRect().width) * duration);
|
||||||
}
|
}
|
||||||
|
|
||||||
function turncate(value: number, min: number, max: number) {
|
function progressBarMouseUp(offsetX: number) {
|
||||||
return Math.min(Math.max(value, min), max);
|
adjustDisplayProgress(offsetX / progressBar.getBoundingClientRect().width);
|
||||||
}
|
}
|
||||||
|
|
||||||
onMount(() => {
|
onMount(() => {
|
||||||
@ -85,7 +86,7 @@
|
|||||||
>
|
>
|
||||||
{#if !showInfoTop}
|
{#if !showInfoTop}
|
||||||
<div class="song-info">
|
<div class="song-info">
|
||||||
<div class="song-info-top {isInfoTopOverflowing ? 'animate' : ''}" bind:this={songInfoTopContainer}>
|
<div class="song-info-regular {isInfoTopOverflowing ? 'animate' : ''}" bind:this={songInfoTopContainer}>
|
||||||
<span
|
<span
|
||||||
class="song-name text-shadow {isInfoTopOverflowing ? 'animate' : ''}"
|
class="song-name text-shadow {isInfoTopOverflowing ? 'animate' : ''}"
|
||||||
bind:this={songInfoTopContent}>{name}</span
|
bind:this={songInfoTopContent}>{name}</span
|
||||||
@ -100,51 +101,34 @@
|
|||||||
{formatDuration(progress)}
|
{formatDuration(progress)}
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
class="progress-bar shadow-md"
|
aria-valuemax={duration}
|
||||||
on:click={(e) => progressBarOnClick(e)}
|
aria-valuemin="0"
|
||||||
|
aria-valuenow={progress}
|
||||||
bind:this={progressBar}
|
bind:this={progressBar}
|
||||||
|
class="progress-bar shadow-md"
|
||||||
|
on:keydown
|
||||||
|
on:keyup
|
||||||
on:mousedown={() => {
|
on:mousedown={() => {
|
||||||
userAdjustingProgress.set(true);
|
userAdjustingProgress.set(true);
|
||||||
}}
|
}}
|
||||||
on:mousemove={(e) => {
|
on:mousemove={(e) => {
|
||||||
if ($userAdjustingProgress) {
|
if ($userAdjustingProgress) {
|
||||||
|
console.log(e.offsetX )
|
||||||
adjustDisplayProgress(e.offsetX / progressBar.getBoundingClientRect().width);
|
adjustDisplayProgress(e.offsetX / progressBar.getBoundingClientRect().width);
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
on:touchstart={(e) => {
|
on:mouseup={(e) => {
|
||||||
if (e.cancelable) {
|
const offsetX = e.offsetX;
|
||||||
e.preventDefault();
|
progressBarOnClick(e);
|
||||||
}
|
// Q: why it needs delay?
|
||||||
userAdjustingProgress.set(true);
|
// A: I do not know.
|
||||||
}}
|
setTimeout(()=> {
|
||||||
on:touchmove={(e) => {
|
|
||||||
e.preventDefault();
|
|
||||||
userAdjustingProgress.set(true);
|
|
||||||
if ($userAdjustingProgress) {
|
|
||||||
lastTouchProgress =
|
|
||||||
turncate(
|
|
||||||
e.touches[0].clientX - progressBar.getBoundingClientRect().x,
|
|
||||||
0,
|
|
||||||
progressBar.getBoundingClientRect().width
|
|
||||||
) / progressBar.getBoundingClientRect().width;
|
|
||||||
adjustDisplayProgress(lastTouchProgress);
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
on:touchend={(e) => {
|
|
||||||
e.preventDefault();
|
|
||||||
userAdjustingProgress.set(false);
|
|
||||||
adjustProgress(lastTouchProgress);
|
|
||||||
}}
|
|
||||||
on:mouseup={() => {
|
|
||||||
userAdjustingProgress.set(false);
|
userAdjustingProgress.set(false);
|
||||||
|
progressBarMouseUp(offsetX);
|
||||||
|
}, 50);
|
||||||
}}
|
}}
|
||||||
role="slider"
|
role="slider"
|
||||||
aria-valuemin="0"
|
|
||||||
aria-valuemax={duration}
|
|
||||||
aria-valuenow={progress}
|
|
||||||
tabindex="0"
|
tabindex="0"
|
||||||
on:keydown
|
|
||||||
on:keyup
|
|
||||||
>
|
>
|
||||||
<div class="bar" style={`width: ${(progress / (duration + 0.001)) * 100}%;`}></div>
|
<div class="bar" style={`width: ${(progress / (duration + 0.001)) * 100}%;`}></div>
|
||||||
</div>
|
</div>
|
||||||
@ -152,26 +136,49 @@
|
|||||||
<div class="time-indicator text-shadow-md time-total">{formatDuration(duration)}</div>
|
<div class="time-indicator text-shadow-md time-total">{formatDuration(duration)}</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="controls top-32 flex h-16 overflow-hidden items-center justify-center">
|
<div class="controls top-32 flex h-16 overflow-hidden items-center justify-center">
|
||||||
<button style="filter: drop-shadow( 0 4px 8px rgba(0, 0, 0, 0.12) );" class="control-btn previous">
|
<button class="control-btn previous" style="filter: drop-shadow( 0 4px 8px rgba(0, 0, 0, 0.12) );">
|
||||||
<img class="control-img switch-song-img" src="/previous.svg" alt="上一曲" />
|
<img alt="上一曲" class="control-img switch-song-img" src="/previous.svg" />
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
style="filter: drop-shadow( 0 4px 8px rgba(0, 0, 0, 0.12) );"
|
|
||||||
class="control-btn play-btn"
|
class="control-btn play-btn"
|
||||||
on:click={() => clickPlay()}
|
on:click={(e) => clickPlay()}
|
||||||
|
on:focus={null}
|
||||||
|
on:mouseleave={(e) => {
|
||||||
|
e.currentTarget.style.backgroundColor = '';
|
||||||
|
}}
|
||||||
|
on:mouseover={(e) => {
|
||||||
|
e.currentTarget.style.backgroundColor = 'rgba(0, 0, 0, 0.2)';
|
||||||
|
}}
|
||||||
|
on:touchend={(e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
e.currentTarget.style.backgroundColor = '';
|
||||||
|
e.currentTarget.style.scale = '1';
|
||||||
|
clickPlay();
|
||||||
|
}}
|
||||||
|
on:touchstart={(e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
e.currentTarget.style.backgroundColor = 'rgba(0, 0, 0, 0.2)';
|
||||||
|
e.currentTarget.style.scale = '0.8';
|
||||||
|
}}
|
||||||
|
style="filter: drop-shadow( 0 4px 8px rgba(0, 0, 0, 0.12) );"
|
||||||
恩?(x 恩?(x
诶嘿，调试代码忘删了，寒寒是这样的 诶嘿，调试代码忘删了，寒寒是这样的
|
|||||||
>
|
>
|
||||||
<img class="control-img" src={paused ? '/play.svg' : '/pause.svg'} alt="暂停或播放" />
|
<img alt={paused ? '播放' : '暂停'} class="control-img" src={paused ? '/play.svg' : '/pause.svg'} />
|
||||||
</button>
|
</button>
|
||||||
<button style="filter: drop-shadow( 0 4px 8px rgba(0, 0, 0, 0.12) );" class="control-btn next">
|
<button class="control-btn next" style="filter: drop-shadow( 0 4px 8px rgba(0, 0, 0, 0.12) );">
|
||||||
<img class="control-img switch-song-img" src="/next.svg" alt="下一曲" />
|
<img alt="下一曲" class="control-img switch-song-img" src="/next.svg" />
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="relative top-52 h-6 flex">
|
<div class="relative top-52 h-6 flex">
|
||||||
<img class="scale-75" src="/volumeDown.svg" alt="最小音量" />
|
<img alt="最小音量" class="scale-75" src="/volumeDown.svg" />
|
||||||
<div
|
<div
|
||||||
|
aria-valuemax="1"
|
||||||
|
aria-valuemin="0"
|
||||||
|
aria-valuenow={volume}
|
||||||
|
bind:this={volumeBar}
|
||||||
class="progress-bar shadow-md !top-1/2 !translate-y-[-50%]"
|
class="progress-bar shadow-md !top-1/2 !translate-y-[-50%]"
|
||||||
on:click={(e) => volumeBarOnChange(e)}
|
on:click={(e) => volumeBarOnChange(e)}
|
||||||
bind:this={volumeBar}
|
on:keydown
|
||||||
|
on:keyup
|
||||||
on:mousedown={() => {
|
on:mousedown={() => {
|
||||||
userAdjustingVolume = true;
|
userAdjustingVolume = true;
|
||||||
}}
|
}}
|
||||||
@ -180,11 +187,12 @@
|
|||||||
volumeBarOnChange(e);
|
volumeBarOnChange(e);
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
on:touchstart={(e) => {
|
on:mouseup={() => {
|
||||||
if (e.cancelable) {
|
userAdjustingVolume = false;
|
||||||
|
}}
|
||||||
|
on:touchend={(e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
}
|
userAdjustingVolume = false;
|
||||||
userAdjustingVolume = true;
|
|
||||||
}}
|
}}
|
||||||
on:touchmove={(e) => {
|
on:touchmove={(e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
@ -193,24 +201,18 @@
|
|||||||
volumeBarChangeTouch(e);
|
volumeBarChangeTouch(e);
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
on:touchend={(e) => {
|
on:touchstart={(e) => {
|
||||||
|
if (e.cancelable) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
userAdjustingVolume = false;
|
}
|
||||||
}}
|
userAdjustingVolume = true;
|
||||||
on:mouseup={() => {
|
|
||||||
userAdjustingVolume = false;
|
|
||||||
}}
|
}}
|
||||||
role="slider"
|
role="slider"
|
||||||
aria-valuemin="0"
|
|
||||||
aria-valuemax="1"
|
|
||||||
aria-valuenow={volume}
|
|
||||||
tabindex="0"
|
tabindex="0"
|
||||||
on:keydown
|
|
||||||
on:keyup
|
|
||||||
>
|
>
|
||||||
<div class="bar" style={`width: ${volume * 100}%;`}></div>
|
<div class="bar" style={`width: ${volume * 100}%;`}></div>
|
||||||
</div>
|
</div>
|
||||||
<img class="scale-75" src="/volumeUp.svg" alt="最大音量" />
|
<img alt="最大音量" class="scale-75" src="/volumeUp.svg" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -221,6 +223,7 @@
|
|||||||
left: 50%;
|
left: 50%;
|
||||||
transform: translate(-50%, 0);
|
transform: translate(-50%, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
.control-btn {
|
.control-btn {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
height: 3.7rem;
|
height: 3.7rem;
|
||||||
@ -228,11 +231,10 @@
|
|||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
margin: 0 0.5rem;
|
margin: 0 0.5rem;
|
||||||
border-radius: 0.5rem;
|
border-radius: 0.5rem;
|
||||||
transition: 0.1s;
|
transition: 0.45s;
|
||||||
}
|
scale: 1;
|
||||||
.control-btn:hover {
|
|
||||||
background-color: rgba(0, 0, 0, 0.1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.control-img {
|
.control-img {
|
||||||
height: 2rem;
|
height: 2rem;
|
||||||
width: 2rem;
|
width: 2rem;
|
||||||
@ -240,6 +242,7 @@
|
|||||||
left: 50%;
|
left: 50%;
|
||||||
transform: translateX(-50%);
|
transform: translateX(-50%);
|
||||||
}
|
}
|
||||||
|
|
||||||
.switch-song-img {
|
.switch-song-img {
|
||||||
width: auto !important;
|
width: auto !important;
|
||||||
height: 1.7rem !important;
|
height: 1.7rem !important;
|
||||||
@ -256,13 +259,15 @@
|
|||||||
font-family: sans-serif;
|
font-family: sans-serif;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
.song-info-top {
|
|
||||||
|
.song-info-regular {
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
height: 2.375rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.song-info-top.animate {
|
.song-info-regular.animate {
|
||||||
mask-image: linear-gradient(
|
mask-image: linear-gradient(
|
||||||
90deg,
|
90deg,
|
||||||
rgba(0, 0, 0, 0) 0%,
|
rgba(0, 0, 0, 0) 0%,
|
||||||
@ -283,12 +288,15 @@
|
|||||||
height: 2.5rem;
|
height: 2.5rem;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
}
|
}
|
||||||
|
|
||||||
.song-name.animate {
|
.song-name.animate {
|
||||||
animation: scroll 10s linear infinite;
|
animation: scroll 10s linear infinite;
|
||||||
}
|
}
|
||||||
|
|
||||||
.song-name::-webkit-scrollbar {
|
.song-name::-webkit-scrollbar {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
@keyframes scroll {
|
@keyframes scroll {
|
||||||
0% {
|
0% {
|
||||||
transform: translateX(100%);
|
transform: translateX(100%);
|
||||||
@ -300,10 +308,12 @@
|
|||||||
transform: translateX(-100%);
|
transform: translateX(-100%);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.song-author {
|
.song-author {
|
||||||
font-size: 1.2rem;
|
font-size: 1.2rem;
|
||||||
color: rgba(255, 255, 255, 0.8);
|
color: rgba(255, 255, 255, 0.8);
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress {
|
.progress {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
@ -311,6 +321,7 @@
|
|||||||
transform: translate(-50%, 0);
|
transform: translate(-50%, 0);
|
||||||
height: 2.4rem;
|
height: 2.4rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-bar {
|
.progress-bar {
|
||||||
-webkit-appearance: none;
|
-webkit-appearance: none;
|
||||||
appearance: none;
|
appearance: none;
|
||||||
@ -325,9 +336,11 @@
|
|||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
transition: 0.3s;
|
transition: 0.3s;
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-bar:hover {
|
.progress-bar:hover {
|
||||||
height: 0.7rem;
|
height: 0.7rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.bar {
|
.bar {
|
||||||
background-color: white;
|
background-color: white;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
@ -351,10 +364,18 @@
|
|||||||
display: inline-block;
|
display: inline-block;
|
||||||
top: 0.2rem;
|
top: 0.2rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.time-current {
|
.time-current {
|
||||||
left: 0;
|
left: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.time-total {
|
.time-total {
|
||||||
right: 0;
|
right: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media (min-width: 768px) {
|
||||||
|
.control-btn {
|
||||||
|
transition: 0.1s
|
||||||
|
}
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@ -4,6 +4,8 @@
|
|||||||
import progressBarRaw from '$lib/state/progressBarRaw';
|
import progressBarRaw from '$lib/state/progressBarRaw';
|
||||||
import type { LrcJsonData } from 'lrc-parser-ts';
|
import type { LrcJsonData } from 'lrc-parser-ts';
|
||||||
import progressBarSlideValue from '$lib/state/progressBarSlideValue';
|
import progressBarSlideValue from '$lib/state/progressBarSlideValue';
|
||||||
|
import nextUpdate from '$lib/state/nextUpdate';
|
||||||
|
import truncate from '$lib/truncate';
|
||||||
|
|
||||||
// Component input properties
|
// Component input properties
|
||||||
export let lyrics: string[];
|
export let lyrics: string[];
|
||||||
@ -12,24 +14,47 @@
|
|||||||
|
|
||||||
// Local state and variables
|
// Local state and variables
|
||||||
let getLyricIndex: Function;
|
let getLyricIndex: Function;
|
||||||
const debugMode = false;
|
let debugMode = false;
|
||||||
|
if (localStorage.getItem('debugMode') == null) {
|
||||||
|
localStorage.setItem('debugMode', 'false');
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
debugMode = localStorage.getItem('debugMode')!.toLowerCase() === "true";
|
||||||
|
}
|
||||||
let currentLyricIndex = -1;
|
let currentLyricIndex = -1;
|
||||||
let currentPositionIndex = -1;
|
let currentPositionIndex = -1;
|
||||||
let currentAnimationIndex = -1;
|
let currentAnimationIndex = -1;
|
||||||
let lyricsContainer: HTMLDivElement;
|
let lyricsContainer: HTMLDivElement | null;
|
||||||
let nextUpdate = -1;
|
|
||||||
let lastAdjustProgress = 0;
|
let lastAdjustProgress = 0;
|
||||||
let localProgress = 0;
|
let localProgress = 0;
|
||||||
let lastScroll = 0;
|
let lastScroll = 0;
|
||||||
let scrolling = false;
|
let scrolling = false;
|
||||||
let scriptScrolling = false;
|
let scriptScrolling = false;
|
||||||
|
|
||||||
|
let currentLyricTopMargin = 288;
|
||||||
|
|
||||||
// References to lyric elements
|
// References to lyric elements
|
||||||
let refs: HTMLParagraphElement[] = [];
|
let refs: HTMLParagraphElement[] = [];
|
||||||
let _refs: any[] = [];
|
let _refs: any[] = [];
|
||||||
$: refs = _refs.filter(Boolean);
|
$: refs = _refs.filter(Boolean);
|
||||||
$: getLyricIndex = createLyricsSearcher(originalLyrics);
|
$: getLyricIndex = createLyricsSearcher(originalLyrics);
|
||||||
|
|
||||||
|
|
||||||
|
// handle KeyDown event
|
||||||
|
function onKeyDown(e: KeyboardEvent) {
|
||||||
|
if (e.altKey && e.shiftKey && (e.metaKey || e.key === 'OS') && e.key === 'Enter') {
|
||||||
|
debugMode = !debugMode;
|
||||||
|
localStorage.setItem('debugMode', debugMode ? 'true' : 'false');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// using for debug mode
|
||||||
|
function extractTranslateValue(s: string): string | null {
|
||||||
|
const regex = /translateY\((-?\d*px)\)/;
|
||||||
|
let arr = regex.exec(s);
|
||||||
|
return arr==null ? null : arr[1];
|
||||||
|
}
|
||||||
|
|
||||||
// Helper function to get CSS class for a lyric based on its index and progress
|
// Helper function to get CSS class for a lyric based on its index and progress
|
||||||
function getClass(lyricIndex: number, progress: number) {
|
function getClass(lyricIndex: number, progress: number) {
|
||||||
if (!originalLyrics.scripts) return 'previous-lyric';
|
if (!originalLyrics.scripts) return 'previous-lyric';
|
||||||
@ -38,6 +63,100 @@
|
|||||||
else return 'previous-lyric';
|
else return 'previous-lyric';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Function to move the lyrics up smoothly
|
||||||
|
async function moveToNextLine(h: number) {
|
||||||
|
console.debug(new Date().getTime() , 'moveToNextLine', h);
|
||||||
|
// the line that's going to process (like a pointer)
|
||||||
|
// by default, it's "the next line" after the lift
|
||||||
|
let processingLineIndex = currentPositionIndex + 2;
|
||||||
|
|
||||||
|
// modify translateY of all lines in viewport one by one to lift them up
|
||||||
|
for (let i = processingLineIndex; i < refs.length; i++) {
|
||||||
|
const lyric = refs[i];
|
||||||
|
lyric.style.transition =
|
||||||
|
`transform .6s cubic-bezier(.28,.01,.29,.99), filter 200ms ease, opacity 200ms ease,
|
||||||
|
font-size 200ms ease, scale 250ms ease`;
|
||||||
|
lyric.style.transform = `translateY(${-h}px)`;
|
||||||
|
processingLineIndex = i;
|
||||||
|
await sleep(75);
|
||||||
|
const twoLinesAhead = refs[i - 2];
|
||||||
|
if (lyricsContainer && twoLinesAhead.getBoundingClientRect().top > lyricsContainer.getBoundingClientRect().height) break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (refs.length - processingLineIndex < 3) {
|
||||||
|
for (let i = processingLineIndex; i < refs.length; i++) {
|
||||||
|
const lyric = refs[i];
|
||||||
|
lyric.style.transition =
|
||||||
|
'transform .6s cubic-bezier(.28,.01,.29,.99), filter 200ms ease, opacity 200ms ease, font-size 200ms ease, scale 250ms ease';
|
||||||
|
lyric.style.transform = `translateY(${-h}px)`;
|
||||||
|
processingLineIndex = i;
|
||||||
|
await sleep(75);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
for (let i = processingLineIndex; i < refs.length; i++) {
|
||||||
|
refs[i].style.transition =
|
||||||
|
'transform 0s, filter 200ms ease, opacity 200ms ease, font-size 200ms ease, scale 250ms ease';
|
||||||
|
const height = refs[i].getBoundingClientRect().height;
|
||||||
|
refs[i].style.transform = `translateY(${-height}px)`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// wait until the animation end
|
||||||
|
await sleep(650);
|
||||||
|
|
||||||
|
// clear the transition to let the following style changes could be done without animation
|
||||||
|
for (let i = 0; i < refs.length; i++) {
|
||||||
|
refs[i].style.transition =
|
||||||
|
'transform 0s, filter 200ms ease, opacity 200ms ease, font-size 200ms ease, scale 250ms ease';
|
||||||
|
}
|
||||||
|
// reset the translateY, and immediately scroll down to provide visual stability
|
||||||
|
for (let i = 0; i < refs.length; i++) {
|
||||||
|
refs[i].style.transform = `translateY(0px)`;
|
||||||
|
}
|
||||||
|
scriptScrolling = true;
|
||||||
|
if (lyricsContainer !== null) {
|
||||||
|
lyricsContainer.scrollTop += h;
|
||||||
|
}
|
||||||
|
await sleep(500);
|
||||||
|
scriptScrolling = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Scroll the lyrics container to the given lyric
|
||||||
|
async function scrollToLyric(currentLyric: HTMLParagraphElement) {
|
||||||
|
if (!originalLyrics || !originalLyrics.scripts || !lyricsContainer) return;
|
||||||
|
scriptScrolling = true;
|
||||||
|
lyricsContainer.scrollTop += currentLyric.getBoundingClientRect().top - currentLyricTopMargin;
|
||||||
|
for (let i = 0; i < refs.length; i++) {
|
||||||
|
refs[i].style.transform = 'translateY(0px)';
|
||||||
|
}
|
||||||
|
setTimeout(() => {
|
||||||
|
scriptScrolling = false;
|
||||||
|
}, 500);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle scroll events in the lyrics container
|
||||||
|
function scrollHandler() {
|
||||||
|
scrolling = !scriptScrolling;
|
||||||
|
if (scrolling && originalLyrics.scripts) {
|
||||||
|
lastScroll = new Date().getTime();
|
||||||
|
for (let i = 0; i < originalLyrics.scripts.length; i++) {
|
||||||
|
if (refs[i]) {
|
||||||
|
refs[i].style.filter = 'blur(0px)';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
setTimeout(() => {
|
||||||
|
if (new Date().getTime() - lastScroll > 5000) {
|
||||||
|
scrolling = false;
|
||||||
|
}
|
||||||
|
}, 5500);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Utility function to create a sleep/delay
|
||||||
|
function sleep(ms: number) {
|
||||||
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
||||||
|
}
|
||||||
|
|
||||||
// Scroll to corresponding lyric while adjusting progress
|
// Scroll to corresponding lyric while adjusting progress
|
||||||
$: {
|
$: {
|
||||||
if ($userAdjustingProgress == true) {
|
if ($userAdjustingProgress == true) {
|
||||||
@ -47,6 +166,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Update the current lyric and apply blur effect based on the progress
|
// Update the current lyric and apply blur effect based on the progress
|
||||||
|
// worked in real-time.
|
||||||
$: {
|
$: {
|
||||||
(() => {
|
(() => {
|
||||||
if (!lyricsContainer || !originalLyrics.scripts) return;
|
if (!lyricsContainer || !originalLyrics.scripts) return;
|
||||||
@ -57,10 +177,10 @@
|
|||||||
|
|
||||||
if (cl.start <= progress && progress <= cl.end) {
|
if (cl.start <= progress && progress <= cl.end) {
|
||||||
currentLyricIndex = currentPositionIndex;
|
currentLyricIndex = currentPositionIndex;
|
||||||
nextUpdate = cl.end;
|
nextUpdate.set(cl.end);
|
||||||
} else {
|
} else {
|
||||||
currentLyricIndex = -1;
|
currentLyricIndex = -1;
|
||||||
nextUpdate = cl.start;
|
nextUpdate.set(cl.start);
|
||||||
}
|
}
|
||||||
|
|
||||||
const currentLyric = refs[currentPositionIndex];
|
const currentLyric = refs[currentPositionIndex];
|
||||||
@ -68,7 +188,7 @@
|
|||||||
|
|
||||||
for (let i = 0; i < scripts.length; i++) {
|
for (let i = 0; i < scripts.length; i++) {
|
||||||
const offset = Math.abs(i - currentPositionIndex);
|
const offset = Math.abs(i - currentPositionIndex);
|
||||||
const blurRadius = Math.min(offset * 1, 16);
|
const blurRadius = Math.min(offset * 0.96, 16);
|
||||||
if (refs[i]) {
|
if (refs[i]) {
|
||||||
refs[i].style.filter = `blur(${blurRadius}px)`;
|
refs[i].style.filter = `blur(${blurRadius}px)`;
|
||||||
}
|
}
|
||||||
@ -76,73 +196,53 @@
|
|||||||
})();
|
})();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Utility function to create a sleep/delay
|
// Main function that control's lyrics update during playing
|
||||||
function sleep(ms: number) {
|
// triggered by nextUpdate's update
|
||||||
return new Promise((resolve) => setTimeout(resolve, ms));
|
async function lyricsUpdate(){
|
||||||
|
if (
|
||||||
|
currentPositionIndex < 0 ||
|
||||||
|
currentPositionIndex === currentAnimationIndex ||
|
||||||
|
currentPositionIndex === lastAdjustProgress ||
|
||||||
|
$userAdjustingProgress === true ||
|
||||||
|
scrolling
|
||||||
|
) return;
|
||||||
|
|
||||||
|
const currentLyric = refs[currentPositionIndex];
|
||||||
|
const currentLyricRect = currentLyric.getBoundingClientRect();
|
||||||
|
|
||||||
|
if (originalLyrics.scripts && currentLyricRect.top < 0) return;
|
||||||
|
|
||||||
|
const offsetHeight = truncate(currentLyricRect.top - currentLyricTopMargin, 0, Infinity);
|
||||||
|
|
||||||
|
// prepare current line
|
||||||
|
currentLyric.style.transition = `transform .6s cubic-bezier(.28,.01,.29,.99), filter 200ms ease,
|
||||||
|
opacity 200ms ease, font-size 200ms ease, scale 250ms ease`;
|
||||||
|
currentLyric.style.transform = `translateY(${-offsetHeight}px)`;
|
||||||
|
|
||||||
|
for (let i = currentPositionIndex - 1; i >= 0; i--) {
|
||||||
|
refs[i].style.transition = `transform .6s cubic-bezier(.28,.01,.29,.99), filter 200ms ease,
|
||||||
|
opacity 200ms ease, font-size 200ms ease, scale 250ms ease`;
|
||||||
|
refs[i].style.transform = `translateY(${-offsetHeight}px)`;
|
||||||
|
}
|
||||||
|
if (currentPositionIndex + 1 < refs.length) {
|
||||||
|
const nextLyric = refs[currentPositionIndex + 1];
|
||||||
|
nextLyric.style.transition = `transform .6s cubic-bezier(.28,.01,.29,.99), filter 200ms ease,
|
||||||
|
opacity 200ms ease, font-size 200ms ease, scale 250ms ease`;
|
||||||
|
nextLyric.style.transform = `translateY(${-offsetHeight}px)`;
|
||||||
|
await moveToNextLine(offsetHeight);
|
||||||
|
}
|
||||||
|
currentAnimationIndex = currentPositionIndex;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Function to move the lyrics up smoothly
|
|
||||||
async function moveToNextLine(h: number) {
|
|
||||||
let pos = currentPositionIndex + 2;
|
|
||||||
for (let i = currentPositionIndex + 2; i < refs.length; i++) {
|
|
||||||
const lyric = refs[i];
|
|
||||||
lyric.style.transition =
|
|
||||||
'transform .6s cubic-bezier(.28,.01,.29,.99), filter 200ms ease, opacity 200ms ease, font-size 200ms ease, scale 250ms ease';
|
|
||||||
lyric.style.transform = `translateY(${-h}px)`;
|
|
||||||
pos = i;
|
|
||||||
await sleep(75);
|
|
||||||
if (refs[i - 2].getBoundingClientRect().top > lyricsContainer.getBoundingClientRect().height) break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (refs.length - pos < 3) {
|
nextUpdate.subscribe(lyricsUpdate)
|
||||||
for (let i = pos; i < refs.length; i++) {
|
|
||||||
const lyric = refs[i];
|
|
||||||
lyric.style.transition =
|
|
||||||
'transform .6s cubic-bezier(.28,.01,.29,.99), filter 200ms ease, opacity 200ms ease, font-size 200ms ease, scale 250ms ease';
|
|
||||||
lyric.style.transform = `translateY(${-h}px)`;
|
|
||||||
pos = i;
|
|
||||||
await sleep(75);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
for (let i = pos; i < refs.length; i++) {
|
|
||||||
refs[i].style.transition =
|
|
||||||
'transform 0s, filter 200ms ease, opacity 200ms ease, font-size 200ms ease, scale 250ms ease';
|
|
||||||
const height = refs[i].getBoundingClientRect().height;
|
|
||||||
refs[i].style.transform = `translateY(${-height}px)`;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
await sleep(650);
|
// Process while user is adjusting progress
|
||||||
for (let i = 0; i < refs.length; i++) {
|
userAdjustingProgress.subscribe((adjusting) => {
|
||||||
refs[i].style.transition =
|
|
||||||
'transform 0s, filter 200ms ease, opacity 200ms ease, font-size 200ms ease, scale 250ms ease';
|
|
||||||
}
|
|
||||||
for (let i = 0; i < refs.length; i++) {
|
|
||||||
refs[i].style.transform = `translateY(0px)`;
|
|
||||||
}
|
|
||||||
scriptScrolling = true;
|
|
||||||
lyricsContainer.scrollTop += h;
|
|
||||||
setTimeout(() => {
|
|
||||||
scriptScrolling = false;
|
|
||||||
}, 500);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Scroll the lyrics container to the given lyric
|
|
||||||
async function scrollToLyric(currentLyric: HTMLParagraphElement) {
|
|
||||||
if (!originalLyrics || !originalLyrics.scripts || !lyricsContainer) return;
|
|
||||||
scriptScrolling = true;
|
|
||||||
lyricsContainer.scrollTop += currentLyric.getBoundingClientRect().top - 144;
|
|
||||||
setTimeout(() => {
|
|
||||||
scriptScrolling = false;
|
|
||||||
}, 500);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Handle user adjusting progress state changes
|
|
||||||
userAdjustingProgress.subscribe((v) => {
|
|
||||||
if (!originalLyrics) return;
|
if (!originalLyrics) return;
|
||||||
const scripts = originalLyrics.scripts;
|
const scripts = originalLyrics.scripts;
|
||||||
if (!scripts) return;
|
if (!scripts) return;
|
||||||
if (v) {
|
if (adjusting) {
|
||||||
for (let i = 0; i < scripts.length; i++) {
|
for (let i = 0; i < scripts.length; i++) {
|
||||||
refs[i].style.filter = `blur(0px)`;
|
refs[i].style.filter = `blur(0px)`;
|
||||||
}
|
}
|
||||||
@ -175,91 +275,40 @@
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// Handle scroll events in the lyrics container
|
|
||||||
function scrollHandler() {
|
|
||||||
scrolling = !scriptScrolling;
|
|
||||||
if (scrolling && originalLyrics.scripts) {
|
|
||||||
lastScroll = new Date().getTime();
|
|
||||||
for (let i = 0; i < originalLyrics.scripts.length; i++) {
|
|
||||||
if (refs[i]) {
|
|
||||||
refs[i].style.filter = 'blur(0px)';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
setTimeout(() => {
|
|
||||||
if (new Date().getTime() - lastScroll > 5000) {
|
|
||||||
scrolling = false;
|
|
||||||
}
|
|
||||||
}, 5500);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update lyrics position based on progress
|
|
||||||
$: {
|
|
||||||
(() => {
|
|
||||||
if ($userAdjustingProgress) {
|
|
||||||
nextUpdate = progress;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (nextUpdate - progress >= 0.05) return;
|
|
||||||
if (
|
|
||||||
currentPositionIndex < 0 ||
|
|
||||||
currentPositionIndex === currentAnimationIndex ||
|
|
||||||
currentPositionIndex === lastAdjustProgress ||
|
|
||||||
scrolling
|
|
||||||
)
|
|
||||||
return;
|
|
||||||
|
|
||||||
const currentLyric = refs[currentPositionIndex];
|
|
||||||
|
|
||||||
if (originalLyrics.scripts && currentLyric.getBoundingClientRect().top < 0) return;
|
|
||||||
|
|
||||||
const offsetHeight =
|
|
||||||
refs[currentPositionIndex].getBoundingClientRect().height +
|
|
||||||
refs[currentPositionIndex].getBoundingClientRect().top -
|
|
||||||
144;
|
|
||||||
|
|
||||||
currentLyric.style.transition =
|
|
||||||
'transform .6s cubic-bezier(.28,.01,.29,.99), filter 200ms ease, opacity 200ms ease, font-size 200ms ease, scale 250ms ease';
|
|
||||||
currentLyric.style.transform = `translateY(${-offsetHeight}px)`;
|
|
||||||
|
|
||||||
for (let i = currentPositionIndex - 1; i >= 0; i--) {
|
|
||||||
refs[i].style.transition =
|
|
||||||
'transform .6s cubic-bezier(.28,.01,.29,.99), filter 200ms ease, opacity 200ms ease, font-size 200ms ease, scale 250ms ease';
|
|
||||||
const height = refs[i].getBoundingClientRect().height;
|
|
||||||
refs[i].style.transform = `translateY(${-offsetHeight}px)`;
|
|
||||||
}
|
|
||||||
if (currentPositionIndex + 1 < refs.length) {
|
|
||||||
const nextLyric = refs[currentPositionIndex + 1];
|
|
||||||
nextLyric.style.transition =
|
|
||||||
'transform .6s cubic-bezier(.28,.01,.29,.99), filter 200ms ease, opacity 200ms ease, font-size 200ms ease, scale 250ms ease';
|
|
||||||
nextLyric.style.transform = `translateY(${-offsetHeight}px)`;
|
|
||||||
moveToNextLine(offsetHeight);
|
|
||||||
}
|
|
||||||
currentAnimationIndex = currentPositionIndex;
|
|
||||||
})();
|
|
||||||
}
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{#if lyrics && originalLyrics}
|
<svelte:window on:keydown={onKeyDown} />
|
||||||
|
|
||||||
|
{#if debugMode && lyricsContainer}
|
||||||
|
<div
|
||||||
|
class="absolute top-6 right-10 font-mono text-sm backdrop-blur-md z-20 bg-[rgba(255,255,255,0.15)] px-2 rounded-xl">
|
||||||
|
<p>
|
||||||
|
LyricIndex: {currentLyricIndex} PositionIndex: {currentPositionIndex}
|
||||||
|
AnimationIndex:{currentAnimationIndex}
|
||||||
|
NextUpdate: {$nextUpdate}
|
||||||
|
Progress: {progress.toFixed(2)}
|
||||||
|
lastAdjustProgress: {lastAdjustProgress}
|
||||||
|
scrollPosition: {lyricsContainer.scrollTop}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
|
||||||
|
{#if lyrics && originalLyrics && originalLyrics.scripts}
|
||||||
<div
|
<div
|
||||||
class="absolute top-[6.5rem] md:top-36 xl:top-0 w-screen xl:w-[52vw] px-6 md:px-12 lg:px-[7.5rem] xl:left-[45vw] xl:px-[3vw] h-[calc(100vh-17rem)] xl:h-screen font-sans
|
class="absolute top-[6.5rem] md:top-36 xl:top-0 w-screen xl:w-[52vw] px-6 md:px-12 lg:px-[7.5rem] xl:left-[45vw] xl:px-[3vw] h-[calc(100vh-17rem)] xl:h-screen font-sans
|
||||||
text-left no-scrollbar overflow-y-auto z-[1] pt-16 lyrics"
|
text-left no-scrollbar overflow-y-auto z-[1] pt-16 lyrics"
|
||||||
bind:this={lyricsContainer}
|
bind:this={lyricsContainer}
|
||||||
on:scroll={scrollHandler}
|
on:scroll={scrollHandler}
|
||||||
>
|
>
|
||||||
{#if debugMode}
|
|
||||||
<p class="fixed top-6 right-20 font-mono text-sm">
|
|
||||||
LyricIndex: {currentLyricIndex} PositionIndex: {currentPositionIndex} AnimationIndex:{currentAnimationIndex}
|
|
||||||
NextUpdate: {nextUpdate}
|
|
||||||
Progress: {progress.toFixed(2)}
|
|
||||||
lastAdjustProgress: {lastAdjustProgress}
|
|
||||||
</p>
|
|
||||||
{/if}
|
|
||||||
{#each lyrics as lyric, i}
|
{#each lyrics as lyric, i}
|
||||||
<p bind:this={_refs[i]} class={`${getClass(i, progress)} text-shadow-lg`}>
|
<p bind:this={_refs[i]} class={`${getClass(i, progress)} text-shadow-lg`}>
|
||||||
{#if debugMode}
|
{#if debugMode && refs[i] && refs[i].style !== undefined}
|
||||||
<span class="text-lg absolute">{i}</span>
|
<span class="text-lg absolute -translate-y-4">{i}
|
||||||
|
{originalLyrics.scripts[i].start} ~ {originalLyrics.scripts[i].end}
|
||||||
|
tY: {extractTranslateValue(refs[i].style.transform)}
|
||||||
|
top: {Math.round(refs[i].getBoundingClientRect().top)}px
|
||||||
|
</span>
|
||||||
{/if}
|
{/if}
|
||||||
{lyric}
|
{lyric}
|
||||||
</p>
|
</p>
|
||||||
@ -268,7 +317,18 @@
|
|||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
|
<!--suppress CssUnusedSymbol -->
|
||||||
<style>
|
<style>
|
||||||
|
:root {
|
||||||
|
--lyric-mobile-font-size: 2rem;
|
||||||
|
--lyric-mobile-line-height: 2.4rem;
|
||||||
|
--lyric-mobile-margin: 1.5rem 0;
|
||||||
|
--lyric-mobile-font-weight: 700;
|
||||||
|
--lyric-desktop-font-size: 3.5rem;
|
||||||
|
--lyric-desktop-line-height: 4.5rem;
|
||||||
|
--lyric-desktop-margin: 1.75rem 0;
|
||||||
|
}
|
||||||
|
|
||||||
.lyrics {
|
.lyrics {
|
||||||
mask-image: linear-gradient(
|
mask-image: linear-gradient(
|
||||||
rgba(0, 0, 0, 0) 0%,
|
rgba(0, 0, 0, 0) 0%,
|
||||||
@ -277,73 +337,83 @@
|
|||||||
rgba(0, 0, 0, 0) 100%
|
rgba(0, 0, 0, 0) 100%
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
.no-scrollbar {
|
.no-scrollbar {
|
||||||
scrollbar-width: none;
|
scrollbar-width: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.no-scrollbar::-webkit-scrollbar {
|
.no-scrollbar::-webkit-scrollbar {
|
||||||
width: 0px;
|
width: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.current-lyric {
|
.current-lyric {
|
||||||
position: relative;
|
position: relative;
|
||||||
color: white;
|
color: white;
|
||||||
font-weight: 600;
|
font-weight: var(--lyric-mobile-font-weight);
|
||||||
font-size: 2.1rem;
|
font-size: var(--lyric-mobile-font-size);
|
||||||
line-height: 2.7rem;
|
line-height: var(--lyric-mobile-line-height);
|
||||||
margin: 1rem 0rem;
|
margin: var(--lyric-mobile-margin);
|
||||||
scale: 1.02 1;
|
scale: 1.02 1;
|
||||||
top: 1rem;
|
top: 1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.previous-lyric {
|
.previous-lyric {
|
||||||
position: relative;
|
position: relative;
|
||||||
color: rgba(255, 255, 255, 0.7);
|
color: rgba(255, 255, 255, 0.48);
|
||||||
font-weight: 600;
|
font-weight: var(--lyric-mobile-font-weight);
|
||||||
font-size: 2.1rem;
|
font-size: var(--lyric-mobile-font-size);
|
||||||
line-height: 2.7rem;
|
line-height: var(--lyric-mobile-line-height);
|
||||||
margin: 1rem 0rem;
|
margin: var(--lyric-mobile-margin);
|
||||||
top: 1rem;
|
top: 1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.after-lyric {
|
.after-lyric {
|
||||||
position: relative;
|
position: relative;
|
||||||
color: rgba(255, 255, 255, 0.7);
|
color: rgba(255, 255, 255, 0.48);
|
||||||
font-weight: 600;
|
font-weight: var(--lyric-mobile-font-weight);
|
||||||
font-size: 2.1rem;
|
font-size: var(--lyric-mobile-font-size);
|
||||||
line-height: 2.7rem;
|
line-height: var(--lyric-mobile-line-height);
|
||||||
margin: 1rem 0rem;
|
margin: var(--lyric-mobile-margin);
|
||||||
top: 1rem;
|
top: 1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (min-width: 768px) {
|
@media (min-width: 768px) {
|
||||||
.current-lyric {
|
.current-lyric {
|
||||||
font-size: 3rem;
|
font-size: 3rem;
|
||||||
line-height: 4rem;
|
line-height: 4rem;
|
||||||
margin: 2.4rem 0rem;
|
margin: 2.4rem 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.after-lyric {
|
.after-lyric {
|
||||||
font-size: 3rem;
|
font-size: 3rem;
|
||||||
line-height: 3.3rem;
|
line-height: 3.3rem;
|
||||||
margin: 2.4rem 0rem;
|
margin: 2.4rem 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.previous-lyric {
|
.previous-lyric {
|
||||||
font-size: 3em;
|
font-size: 3em;
|
||||||
line-height: 3.3rem;
|
line-height: 3.3rem;
|
||||||
margin: 2.4rem 0rem;
|
margin: 2.4rem 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (min-width: 1024px) {
|
@media (min-width: 1024px) {
|
||||||
.current-lyric {
|
.current-lyric {
|
||||||
font-size: 3.5rem;
|
font-size: var(--lyric-desktop-font-size);
|
||||||
line-height: 6.5rem;
|
line-height: var(--lyric-desktop-line-height);
|
||||||
margin: 0rem 0rem;
|
margin: var(--lyric-desktop-margin);
|
||||||
}
|
}
|
||||||
|
|
||||||
.after-lyric {
|
.after-lyric {
|
||||||
font-size: 3.5rem;
|
font-size: var(--lyric-desktop-font-size);
|
||||||
line-height: 6.5rem;
|
line-height: var(--lyric-desktop-line-height);
|
||||||
margin: 0rem 0rem;
|
margin: var(--lyric-desktop-margin);
|
||||||
}
|
}
|
||||||
|
|
||||||
.previous-lyric {
|
.previous-lyric {
|
||||||
font-size: 3.5rem;
|
font-size: var(--lyric-desktop-font-size);
|
||||||
line-height: 6.5rem;
|
line-height: var(--lyric-desktop-line-height);
|
||||||
margin: 0rem 0rem;
|
margin: var(--lyric-desktop-margin);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
3
src/lib/state/nextUpdate.ts
Normal file
3
src/lib/state/nextUpdate.ts
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
import { writable } from 'svelte/store';
|
||||||
|
const nextUpdate = writable(-1);
|
||||||
|
export default nextUpdate;
|
||||||
3
src/lib/truncate.ts
Normal file
3
src/lib/truncate.ts
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
export default function truncate(value: number, min: number, max: number) {
|
||||||
|
return Math.min(Math.max(value, min), max);
|
||||||
|
}
|
||||||
@ -1,27 +1,28 @@
|
|||||||
import { songNameCache } from '$lib/server/cache.js';
|
import { songNameCache } from '$lib/server/cache.js';
|
||||||
import { loadData } from '$lib/server/database/loadData';
|
import { loadData } from '$lib/server/database/loadData';
|
||||||
import { json, error } from '@sveltejs/kit';
|
import { error, json } from '@sveltejs/kit';
|
||||||
|
import type { RequestHandler } from './$types';
|
||||||
|
|
||||||
export async function GET({ url }) {
|
export const GET: RequestHandler = async ({ url }) => {
|
||||||
const keyword = url.searchParams.get("keyword");
|
const keyword = url.searchParams.get('keyword');
|
||||||
|
|
||||||
loadData();
|
await loadData();
|
||||||
|
|
||||||
if (keyword === null) {
|
if (keyword === null) {
|
||||||
return error(400, {
|
return error(400, {
|
||||||
"message": "Miss parameter: keyword"
|
'message': 'Miss parameter: keyword'
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
const resultList: MusicMetadata[] = [];
|
const resultList: MusicMetadata[] = [];
|
||||||
|
|
||||||
for (const songName of songNameCache.keys()){
|
for (const songName of songNameCache.keys()) {
|
||||||
if (songName.toLocaleLowerCase().includes(keyword.toLocaleLowerCase())) {
|
if (songName.toLocaleLowerCase().includes(keyword.toLocaleLowerCase())) {
|
||||||
resultList.push(songNameCache.get(songName)!);
|
resultList.push(songNameCache.get(songName)!);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return json({
|
return json({
|
||||||
"result": resultList
|
'result': resultList
|
||||||
});
|
});
|
||||||
}
|
};
|
||||||
@ -2,8 +2,9 @@ import { safePath } from '$lib/server/safePath';
|
|||||||
import { getCurrentFormattedDateTime } from '$lib/songUpdateTime';
|
import { getCurrentFormattedDateTime } from '$lib/songUpdateTime';
|
||||||
import { json, error } from '@sveltejs/kit';
|
import { json, error } from '@sveltejs/kit';
|
||||||
import fs from 'fs';
|
import fs from 'fs';
|
||||||
|
import type { RequestHandler } from './$types';
|
||||||
|
|
||||||
export async function GET({ params }) {
|
export const GET: RequestHandler = async ({ params }) => {
|
||||||
const filePath = safePath(`${params.id}.json`, { base: './data/song' });
|
const filePath = safePath(`${params.id}.json`, { base: './data/song' });
|
||||||
if (!filePath) {
|
if (!filePath) {
|
||||||
return error(404, {
|
return error(404, {
|
||||||
@ -13,13 +14,13 @@ export async function GET({ params }) {
|
|||||||
let data;
|
let data;
|
||||||
try { data = fs.readFileSync(filePath); } catch (e) {
|
try { data = fs.readFileSync(filePath); } catch (e) {
|
||||||
return error(404, {
|
return error(404, {
|
||||||
message: "No correspoding song."
|
message: "No corresponding song."
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
return json(JSON.parse(data.toString()));
|
return json(JSON.parse(data.toString()));
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function POST({ params, request }) {
|
export const POST: RequestHandler = async ({ request, params }) => {
|
||||||
const timeStamp = new Date().getTime();
|
const timeStamp = new Date().getTime();
|
||||||
try {
|
try {
|
||||||
if (!fs.existsSync("./data/pending/")) {
|
if (!fs.existsSync("./data/pending/")) {
|
||||||
|
|||||||
@ -1,8 +1,9 @@
|
|||||||
import { songData } from '$lib/server/cache.js';
|
import { songData } from '$lib/server/cache.js';
|
||||||
import { loadData } from '$lib/server/database/loadData.js';
|
import { loadData } from '$lib/server/database/loadData.js';
|
||||||
import { json } from '@sveltejs/kit';
|
import { json } from '@sveltejs/kit';
|
||||||
|
import type { RequestHandler } from './$types';
|
||||||
|
|
||||||
export async function GET({ url }) {
|
export const GET: RequestHandler = async ({ url }) => {
|
||||||
const limit = parseInt(url.searchParams.get("limit") ?? "20");
|
const limit = parseInt(url.searchParams.get("limit") ?? "20");
|
||||||
const offset = parseInt(url.searchParams.get("offset") ?? "0");
|
const offset = parseInt(url.searchParams.get("offset") ?? "0");
|
||||||
loadData();
|
loadData();
|
||||||
|
|||||||
@ -1,9 +1,8 @@
|
|||||||
/** @type {import('./$types').PageLoad} */
|
|
||||||
import { safePath } from '$lib/server/safePath';
|
|
||||||
import fs from 'fs';
|
import fs from 'fs';
|
||||||
|
import type { PageServerLoad } from './$types';
|
||||||
|
import { safePath } from '$lib/server/safePath';
|
||||||
|
|
||||||
|
export const load: PageServerLoad = ({ params }) => {
|
||||||
export function load({ params }) {
|
|
||||||
const filePath = safePath(`${params.id}.json`, { base: './data/song' });
|
const filePath = safePath(`${params.id}.json`, { base: './data/song' });
|
||||||
if (!filePath) {
|
if (!filePath) {
|
||||||
return {
|
return {
|
||||||
|
|||||||
@ -11,6 +11,8 @@
|
|||||||
import lrcParser, { type LrcJsonData } from 'lrc-parser-ts';
|
import lrcParser, { type LrcJsonData } from 'lrc-parser-ts';
|
||||||
import userAdjustingProgress from '$lib/state/userAdjustingProgress';
|
import userAdjustingProgress from '$lib/state/userAdjustingProgress';
|
||||||
import type { IAudioMetadata } from 'music-metadata-browser';
|
import type { IAudioMetadata } from 'music-metadata-browser';
|
||||||
|
import { onMount } from 'svelte';
|
||||||
|
import progressBarRaw from '$lib/state/progressBarRaw';
|
||||||
|
|
||||||
const audioId = $page.params.id;
|
const audioId = $page.params.id;
|
||||||
let audioPlayer: HTMLAudioElement;
|
let audioPlayer: HTMLAudioElement;
|
||||||
@ -150,20 +152,12 @@
|
|||||||
$: {
|
$: {
|
||||||
clearInterval(mainInterval);
|
clearInterval(mainInterval);
|
||||||
mainInterval = setInterval(() => {
|
mainInterval = setInterval(() => {
|
||||||
if (
|
|
||||||
audioPlayer !== null &&
|
|
||||||
audioPlayer.currentTime !== undefined
|
|
||||||
) {
|
|
||||||
if ($userAdjustingProgress === false)
|
if ($userAdjustingProgress === false)
|
||||||
currentProgress = audioPlayer.currentTime;
|
currentProgress = audioPlayer.currentTime;
|
||||||
progressBarRaw.set(audioPlayer.currentTime);
|
progressBarRaw.set(audioPlayer.currentTime);
|
||||||
}
|
|
||||||
}, 50);
|
}, 50);
|
||||||
}
|
}
|
||||||
|
|
||||||
import { onMount } from 'svelte';
|
|
||||||
import progressBarRaw from '$lib/state/progressBarRaw';
|
|
||||||
|
|
||||||
onMount(() => {
|
onMount(() => {
|
||||||
audioPlayer.volume = localStorage.getItem('volume') ? Number(localStorage.getItem('volume')) : 1;
|
audioPlayer.volume = localStorage.getItem('volume') ? Number(localStorage.getItem('volume')) : 1;
|
||||||
});
|
});
|
||||||
@ -175,13 +169,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$: {
|
$: hasLyrics = !!originalLyrics;
|
||||||
if (originalLyrics) {
|
|
||||||
hasLyrics = true;
|
|
||||||
} else {
|
|
||||||
hasLyrics = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
readDB();
|
readDB();
|
||||||
|
感觉这两个地方是有race的 [Link](https://github.com/alikia2x/AquaVox/pull/3/files#diff-912f1411e25ef4727a9d113a5a4a7aecf9e57ca2866fd1c98c44ac267810ee4bR125)
感觉这两个地方是有race的
这块包没问题的 这块包没问题的
|
|||||||
</script>
|
</script>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user
works only on my machine
TRUE💀