refactor, hauchiwa 0.0.2
This commit is contained in:
parent
f35f60e883
commit
9ecc3f62cf
7
Cargo.lock
generated
7
Cargo.lock
generated
|
@ -191,6 +191,9 @@ name = "camino"
|
|||
version = "1.1.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239"
|
||||
dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
|
@ -722,7 +725,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "hauchiwa"
|
||||
version = "0.0.1"
|
||||
version = "0.0.2"
|
||||
dependencies = [
|
||||
"camino",
|
||||
"chrono",
|
||||
|
@ -730,12 +733,12 @@ dependencies = [
|
|||
"grass",
|
||||
"gray_matter",
|
||||
"hayagriva",
|
||||
"hypertext",
|
||||
"image",
|
||||
"notify",
|
||||
"notify-debouncer-mini",
|
||||
"rayon",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"sha256",
|
||||
"tungstenite",
|
||||
]
|
||||
|
|
|
@ -3,13 +3,12 @@ name = "ssg"
|
|||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
[workspace]
|
||||
|
||||
[dependencies.hauchiwa]
|
||||
path = "hauchiwa"
|
||||
path = "../hauchiwa"
|
||||
|
||||
[dependencies]
|
||||
camino = "1.1.7"
|
||||
camino = { version = "1.1.7", features = ["serde1"] }
|
||||
chrono = "0.4.38"
|
||||
clap = { version = "4.5.7", features = ["derive"] }
|
||||
emojis = "0.6.2"
|
||||
|
|
|
@ -1,26 +0,0 @@
|
|||
[package]
|
||||
name = "hauchiwa"
|
||||
version = "0.0.1"
|
||||
edition = "2021"
|
||||
authors = ["Maciej Jur <maciej@kamoshi.org>"]
|
||||
keywords = ["ssg"]
|
||||
description = "Static site generator library"
|
||||
license = "GPL-3.0"
|
||||
|
||||
[dependencies]
|
||||
camino = "1.1.7"
|
||||
gray_matter = { version = "0.2.8", default-features = false, features = ["yaml"] }
|
||||
chrono = "0.4.38"
|
||||
glob = "0.3.1"
|
||||
grass = { version = "0.13.3", default-features = false, features = ["random"] }
|
||||
hayagriva = "0.5.3"
|
||||
hypertext = "0.5.1"
|
||||
image = "0.24.0"
|
||||
rayon = "1.10.0"
|
||||
serde = { version = "1.0.203", features = ["derive"] }
|
||||
sha256 = { version = "1.5.0", default-features = false }
|
||||
|
||||
# Watch
|
||||
notify = "6.1.1"
|
||||
notify-debouncer-mini = "0.4.1"
|
||||
tungstenite = "0.23.0"
|
675
hauchiwa/LICENSE
675
hauchiwa/LICENSE
|
@ -1,675 +0,0 @@
|
|||
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,3 +0,0 @@
|
|||
# Hauchiwa
|
||||
|
||||
Static site generator library
|
|
@ -1,234 +0,0 @@
|
|||
use std::collections::HashMap;
|
||||
use std::fs;
|
||||
use std::fs::File;
|
||||
use std::io;
|
||||
use std::io::Write;
|
||||
use std::path::Path;
|
||||
use std::process::Command;
|
||||
use std::rc::Rc;
|
||||
|
||||
use camino::{Utf8Path, Utf8PathBuf};
|
||||
|
||||
use crate::site::Source;
|
||||
use crate::tree::{Asset, AssetKind, FileItemKind, Output, OutputKind, PipelineItem, Sack, Virtual};
|
||||
use crate::BuildContext;
|
||||
|
||||
pub(crate) fn clean_dist() {
|
||||
println!("Cleaning dist");
|
||||
if fs::metadata("dist").is_ok() {
|
||||
fs::remove_dir_all("dist").unwrap();
|
||||
}
|
||||
fs::create_dir("dist").unwrap();
|
||||
}
|
||||
|
||||
pub(crate) fn build_hash(
|
||||
content: &[Output],
|
||||
cache: &Utf8Path,
|
||||
) -> HashMap<Utf8PathBuf, Utf8PathBuf> {
|
||||
println!("Optimizing images. Cache in {}", cache);
|
||||
let now = std::time::Instant::now();
|
||||
|
||||
let images: Vec<&Output> = content
|
||||
.iter()
|
||||
.filter(|&e| match e.kind {
|
||||
OutputKind::Asset(ref a) => matches!(a.kind, AssetKind::Image),
|
||||
_ => false,
|
||||
})
|
||||
.collect();
|
||||
|
||||
let hashes = crate::hash::hash_assets(cache, &images);
|
||||
copy_recursively(cache, Path::new("dist/hash")).unwrap();
|
||||
println!("Finished optimizing. Elapsed: {:.2?}", now.elapsed());
|
||||
hashes
|
||||
}
|
||||
|
||||
pub(crate) fn build_styles() {
|
||||
let css = grass::from_path("styles/styles.scss", &grass::Options::default()).unwrap();
|
||||
fs::write("dist/styles.css", css).unwrap();
|
||||
}
|
||||
|
||||
pub(crate) fn build_content(
|
||||
ctx: &BuildContext,
|
||||
pending: &[&Output],
|
||||
hole: &[&Output],
|
||||
hash: Option<HashMap<Utf8PathBuf, Utf8PathBuf>>,
|
||||
) {
|
||||
let now = std::time::Instant::now();
|
||||
render_all(ctx, pending, hole, hash);
|
||||
println!("Elapsed: {:.2?}", now.elapsed());
|
||||
}
|
||||
|
||||
pub(crate) fn build_static() {
|
||||
copy_recursively(std::path::Path::new("public"), std::path::Path::new("dist")).unwrap();
|
||||
}
|
||||
|
||||
pub(crate) fn build_pagefind() {
|
||||
let res = Command::new("pagefind")
|
||||
.args(["--site", "dist"])
|
||||
.output()
|
||||
.unwrap();
|
||||
|
||||
println!("{}", String::from_utf8(res.stdout).unwrap());
|
||||
}
|
||||
|
||||
pub(crate) fn build_js() {
|
||||
let res = Command::new("esbuild")
|
||||
.arg("js/vanilla/reveal.js")
|
||||
.arg("js/vanilla/photos.ts")
|
||||
.arg("js/search/dist/search.js")
|
||||
.arg("--format=esm")
|
||||
.arg("--bundle")
|
||||
.arg("--splitting")
|
||||
.arg("--minify")
|
||||
.arg("--outdir=dist/js/")
|
||||
.output()
|
||||
.unwrap();
|
||||
|
||||
println!("{}", String::from_utf8(res.stderr).unwrap());
|
||||
}
|
||||
|
||||
fn copy_recursively(src: impl AsRef<Path>, dst: impl AsRef<Path>) -> io::Result<()> {
|
||||
fs::create_dir_all(&dst)?;
|
||||
for entry in fs::read_dir(src)? {
|
||||
let entry = entry?;
|
||||
let filetype = entry.file_type()?;
|
||||
if filetype.is_dir() {
|
||||
copy_recursively(entry.path(), dst.as_ref().join(entry.file_name()))?;
|
||||
} else {
|
||||
fs::copy(entry.path(), dst.as_ref().join(entry.file_name()))?;
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn render_all(
|
||||
ctx: &BuildContext,
|
||||
pending: &[&Output],
|
||||
hole: &[&Output],
|
||||
hash: Option<HashMap<Utf8PathBuf, Utf8PathBuf>>,
|
||||
) {
|
||||
pending
|
||||
.iter()
|
||||
.map(|item| {
|
||||
let file = match &item.kind {
|
||||
OutputKind::Asset(a) => Some(&a.meta.path),
|
||||
OutputKind::Virtual(_) => None,
|
||||
};
|
||||
|
||||
render(
|
||||
item,
|
||||
Sack {
|
||||
ctx,
|
||||
hole,
|
||||
path: &item.path,
|
||||
file,
|
||||
hash: hash.clone(),
|
||||
},
|
||||
)
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
fn render(item: &Output, sack: Sack) {
|
||||
let dist = Utf8Path::new("dist");
|
||||
let o = dist.join(&item.path);
|
||||
fs::create_dir_all(o.parent().unwrap()).unwrap();
|
||||
|
||||
match item.kind {
|
||||
OutputKind::Asset(ref real) => {
|
||||
let i = &real.meta.path;
|
||||
|
||||
match &real.kind {
|
||||
AssetKind::Html(closure) => {
|
||||
let mut file = File::create(&o).unwrap();
|
||||
file.write_all(closure(&sack).as_bytes()).unwrap();
|
||||
println!("HTML: {} -> {}", i, o);
|
||||
}
|
||||
AssetKind::Bibtex(_) => (),
|
||||
AssetKind::Image => {
|
||||
fs::create_dir_all(o.parent().unwrap()).unwrap();
|
||||
fs::copy(i, &o).unwrap();
|
||||
println!("Image: {} -> {}", i, o);
|
||||
}
|
||||
}
|
||||
}
|
||||
OutputKind::Virtual(Virtual(ref closure)) => {
|
||||
let mut file = File::create(&o).unwrap();
|
||||
file.write_all(closure(&sack).as_bytes()).unwrap();
|
||||
println!("Virtual: -> {}", o);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn build(
|
||||
ctx: &BuildContext,
|
||||
sources: &[Source],
|
||||
special: &[Rc<Output>],
|
||||
) -> Vec<Rc<Output>> {
|
||||
crate::build::clean_dist();
|
||||
|
||||
let content: Vec<Output> = sources
|
||||
.iter()
|
||||
.flat_map(Source::get)
|
||||
.map(to_bundle)
|
||||
.filter_map(Option::from)
|
||||
.collect();
|
||||
|
||||
let assets: Vec<_> = content
|
||||
.iter()
|
||||
.chain(special.iter().map(AsRef::as_ref))
|
||||
.collect();
|
||||
|
||||
let hashes = crate::build::build_hash(&content, ".cache".into());
|
||||
crate::build::build_content(ctx, &assets, &assets, Some(hashes));
|
||||
crate::build::build_static();
|
||||
crate::build::build_styles();
|
||||
crate::build::build_pagefind();
|
||||
crate::build::build_js();
|
||||
|
||||
content
|
||||
.into_iter()
|
||||
.map(Rc::new)
|
||||
.chain(special.iter().map(ToOwned::to_owned))
|
||||
.collect()
|
||||
}
|
||||
|
||||
fn to_bundle(item: PipelineItem) -> PipelineItem {
|
||||
let meta = match item {
|
||||
PipelineItem::Skip(meta) if matches!(meta.kind, FileItemKind::Bundle) => meta,
|
||||
_ => return item,
|
||||
};
|
||||
|
||||
let path = meta.path.strip_prefix("content").unwrap().to_owned();
|
||||
|
||||
match meta.path.extension() {
|
||||
// any image
|
||||
Some("jpg" | "png" | "gif") => Output {
|
||||
kind: Asset {
|
||||
kind: AssetKind::Image,
|
||||
meta,
|
||||
}
|
||||
.into(),
|
||||
path,
|
||||
link: None,
|
||||
}
|
||||
.into(),
|
||||
// bibliography
|
||||
Some("bib") => {
|
||||
let data = fs::read_to_string(&meta.path).unwrap();
|
||||
let data = hayagriva::io::from_biblatex_str(&data).unwrap();
|
||||
|
||||
Output {
|
||||
kind: Asset {
|
||||
kind: AssetKind::Bibtex(data),
|
||||
meta,
|
||||
}
|
||||
.into(),
|
||||
path,
|
||||
link: None,
|
||||
}
|
||||
.into()
|
||||
}
|
||||
_ => meta.into(),
|
||||
}
|
||||
}
|
|
@ -1,65 +0,0 @@
|
|||
use std::{collections::HashMap, fs};
|
||||
|
||||
use camino::{Utf8Path, Utf8PathBuf};
|
||||
use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
|
||||
|
||||
use crate::tree::{AssetKind, Output, OutputKind};
|
||||
|
||||
pub(crate) fn hash_assets(
|
||||
cache: &Utf8Path,
|
||||
items: &[&Output],
|
||||
) -> HashMap<Utf8PathBuf, Utf8PathBuf> {
|
||||
fs::create_dir_all(cache).unwrap();
|
||||
|
||||
items
|
||||
.par_iter()
|
||||
.filter_map(|item| match item.kind {
|
||||
OutputKind::Asset(ref asset) => match asset.kind {
|
||||
AssetKind::Image => {
|
||||
let buffer = std::fs::read(&asset.meta.path).expect("Couldn't read file");
|
||||
let format = image::guess_format(&buffer).expect("Couldn't read format");
|
||||
|
||||
if matches!(format, image::ImageFormat::Gif) {
|
||||
return None;
|
||||
}
|
||||
|
||||
let path = item.path.to_owned();
|
||||
let hash = hash_image(cache, &buffer, &asset.meta.path);
|
||||
Some((path, hash))
|
||||
}
|
||||
_ => None,
|
||||
},
|
||||
_ => None,
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
fn optimize_image(buffer: &[u8], file: &Utf8Path, path: &Utf8Path) -> Vec<u8> {
|
||||
println!("Hashing image {} -> {}", file, path);
|
||||
let img = image::load_from_memory(buffer).expect("Couldn't load image");
|
||||
let dim = (img.width(), img.height());
|
||||
|
||||
let mut out = Vec::new();
|
||||
let encoder = image::codecs::webp::WebPEncoder::new_lossless(&mut out);
|
||||
|
||||
encoder
|
||||
.encode(&img.to_rgba8(), dim.0, dim.1, image::ColorType::Rgba8)
|
||||
.expect("Encoding error");
|
||||
|
||||
out
|
||||
}
|
||||
|
||||
fn hash_image(cache: &Utf8Path, buffer: &[u8], file: &Utf8Path) -> Utf8PathBuf {
|
||||
let hash = sha256::digest(buffer);
|
||||
let path = cache.join(&hash).with_extension("webp");
|
||||
|
||||
if !path.exists() {
|
||||
let img = optimize_image(buffer, file, &path);
|
||||
fs::write(path, img).expect("Couldn't output optimized image");
|
||||
}
|
||||
|
||||
Utf8Path::new("/")
|
||||
.join("hash")
|
||||
.join(hash)
|
||||
.with_extension("webp")
|
||||
}
|
|
@ -1,147 +0,0 @@
|
|||
mod hash;
|
||||
mod tree;
|
||||
mod site;
|
||||
mod build;
|
||||
mod watch;
|
||||
|
||||
use std::{fs, process::Command};
|
||||
|
||||
use camino::{Utf8Path, Utf8PathBuf};
|
||||
use chrono::{DateTime, Datelike, Utc};
|
||||
use gray_matter::Matter;
|
||||
use gray_matter::engine::YAML;
|
||||
use hypertext::{Raw, Renderable};
|
||||
use serde::Deserialize;
|
||||
use tree::{Asset, FileItemKind, Output, PipelineItem};
|
||||
|
||||
pub use crate::tree::{Content, Outline, Sack, TreePage};
|
||||
pub use crate::site::Website;
|
||||
|
||||
#[derive(Debug, Clone, Copy)]
|
||||
pub enum Mode {
|
||||
Build,
|
||||
Watch,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct BuildContext {
|
||||
pub mode: Mode,
|
||||
pub year: i32,
|
||||
pub date: String,
|
||||
pub link: String,
|
||||
pub hash: String,
|
||||
}
|
||||
|
||||
impl BuildContext {
|
||||
fn new() -> Self {
|
||||
let time = chrono::Utc::now();
|
||||
Self {
|
||||
mode: Mode::Build,
|
||||
year: time.year(),
|
||||
date: time.format("%Y/%m/%d %H:%M").to_string(),
|
||||
link: "https://git.kamoshi.org/kamov/website".into(),
|
||||
hash: String::from_utf8(
|
||||
Command::new("git")
|
||||
.args(["rev-parse", "--short", "HEAD"])
|
||||
.output()
|
||||
.expect("Couldn't load git revision")
|
||||
.stdout,
|
||||
)
|
||||
.expect("Invalid UTF8")
|
||||
.trim()
|
||||
.into(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Default for BuildContext {
|
||||
fn default() -> Self {
|
||||
Self::new()
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct Link {
|
||||
pub path: Utf8PathBuf,
|
||||
pub name: String,
|
||||
pub desc: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct LinkDate {
|
||||
pub link: Link,
|
||||
pub date: DateTime<Utc>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub enum Linkable {
|
||||
Link(Link),
|
||||
Date(LinkDate),
|
||||
}
|
||||
|
||||
pub fn process_content<T>(item: PipelineItem) -> PipelineItem
|
||||
where
|
||||
T: for<'de> Deserialize<'de> + Content + Clone + Send + Sync + 'static,
|
||||
{
|
||||
let meta = match item {
|
||||
PipelineItem::Skip(e) if matches!(e.kind, FileItemKind::Index) => e,
|
||||
_ => return item,
|
||||
};
|
||||
|
||||
let dir = meta.path.parent().unwrap().strip_prefix("content").unwrap();
|
||||
let dir = match meta.path.file_stem().unwrap() {
|
||||
"index" => dir.to_owned(),
|
||||
name => dir.join(name),
|
||||
};
|
||||
let path = dir.join("index.html");
|
||||
|
||||
match meta.path.extension() {
|
||||
Some("md" | "mdx" | "lhs") => {
|
||||
let raw = fs::read_to_string(&meta.path).unwrap();
|
||||
let (matter, parsed) = parse_frontmatter::<T>(&raw);
|
||||
let link = T::as_link(&matter, Utf8Path::new("/").join(&dir));
|
||||
|
||||
Output {
|
||||
kind: Asset {
|
||||
kind: crate::tree::AssetKind::html(move |sack| {
|
||||
let lib = sack.get_library();
|
||||
let (outline, parsed, bib) = T::parse(
|
||||
parsed.clone(),
|
||||
lib,
|
||||
dir.clone(),
|
||||
sack.hash
|
||||
.as_ref()
|
||||
.map(ToOwned::to_owned)
|
||||
.unwrap_or_default(),
|
||||
);
|
||||
T::render(matter.clone(), sack, Raw(parsed), outline, bib)
|
||||
.render()
|
||||
.into()
|
||||
}),
|
||||
meta,
|
||||
}
|
||||
.into(),
|
||||
path,
|
||||
link,
|
||||
}
|
||||
.into()
|
||||
}
|
||||
_ => meta.into(),
|
||||
}
|
||||
}
|
||||
|
||||
fn parse_frontmatter<D>(raw: &str) -> (D, String)
|
||||
where
|
||||
D: for<'de> Deserialize<'de>,
|
||||
{
|
||||
let parser = Matter::<YAML>::new();
|
||||
let result = parser.parse_with_struct::<D>(raw).unwrap();
|
||||
|
||||
(
|
||||
// Just the front matter
|
||||
result.data,
|
||||
// The rest of the content
|
||||
result.content,
|
||||
)
|
||||
}
|
||||
|
|
@ -1,103 +0,0 @@
|
|||
use std::{collections::HashSet, rc::Rc};
|
||||
|
||||
use camino::{Utf8Path, Utf8PathBuf};
|
||||
|
||||
use crate::tree::{Output, PipelineItem, Sack, Virtual};
|
||||
use crate::{BuildContext, Mode};
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct Website {
|
||||
sources: Vec<Source>,
|
||||
special: Vec<Rc<Output>>,
|
||||
}
|
||||
|
||||
impl Website {
|
||||
pub fn new() -> WebsiteBuilder {
|
||||
WebsiteBuilder::default()
|
||||
}
|
||||
|
||||
pub fn build(&self) {
|
||||
let ctx = BuildContext {
|
||||
mode: Mode::Build,
|
||||
..Default::default()
|
||||
};
|
||||
let _ = crate::build::build(&ctx, &self.sources, &self.special.clone());
|
||||
}
|
||||
|
||||
pub fn watch(&self) {
|
||||
let ctx = BuildContext {
|
||||
mode: Mode::Watch,
|
||||
..Default::default()
|
||||
};
|
||||
let state = crate::build::build(&ctx, &self.sources, &self.special.clone());
|
||||
crate::watch::watch(&ctx, &self.sources, state).unwrap()
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
pub struct WebsiteBuilder {
|
||||
sources: Vec<Source>,
|
||||
special: Vec<Rc<Output>>,
|
||||
}
|
||||
|
||||
impl WebsiteBuilder {
|
||||
pub fn add_source(
|
||||
mut self,
|
||||
path: &'static str,
|
||||
exts: HashSet<&'static str>,
|
||||
func: fn(PipelineItem) -> PipelineItem,
|
||||
) -> Self {
|
||||
self.sources.push(Source { path, exts, func });
|
||||
self
|
||||
}
|
||||
|
||||
pub fn add_virtual(
|
||||
mut self,
|
||||
func: fn(&Sack) -> String,
|
||||
path: Utf8PathBuf,
|
||||
) -> Self {
|
||||
self.special.push(Output {
|
||||
kind: Virtual::new(func).into(),
|
||||
path,
|
||||
link: None,
|
||||
}.into());
|
||||
self
|
||||
}
|
||||
|
||||
pub fn finish(self) -> Website {
|
||||
Website {
|
||||
sources: self.sources,
|
||||
special: self.special,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub(crate) struct Source {
|
||||
pub path: &'static str,
|
||||
pub exts: HashSet<&'static str>,
|
||||
pub func: fn(PipelineItem) -> PipelineItem,
|
||||
}
|
||||
|
||||
impl Source {
|
||||
pub(crate) fn get(&self) -> Vec<PipelineItem> {
|
||||
crate::tree::gather(self.path, &self.exts)
|
||||
.into_iter()
|
||||
.map(self.func)
|
||||
.collect()
|
||||
}
|
||||
|
||||
pub(crate) fn get_maybe(&self, path: &Utf8Path) -> Option<PipelineItem> {
|
||||
let pattern = glob::Pattern::new(self.path).expect("Bad pattern");
|
||||
if !pattern.matches_path(path.as_std_path()) {
|
||||
return None;
|
||||
};
|
||||
|
||||
let item = match path.is_file() {
|
||||
true => Some(crate::tree::to_source(path.to_owned(), &self.exts)),
|
||||
false => None,
|
||||
};
|
||||
|
||||
item.map(Into::into).map(self.func)
|
||||
}
|
||||
}
|
|
@ -1,308 +0,0 @@
|
|||
//! The purpose of this module is to process the data loaded from content files, which involves
|
||||
//! loading the data from hard drive, and then processing it further depending on the file type.
|
||||
|
||||
use std::collections::{HashMap, HashSet};
|
||||
use std::fmt::Debug;
|
||||
use std::usize;
|
||||
|
||||
use camino::{Utf8Path, Utf8PathBuf};
|
||||
use glob::glob;
|
||||
use hayagriva::Library;
|
||||
use hypertext::Renderable;
|
||||
|
||||
use crate::{BuildContext, Link, LinkDate, Linkable};
|
||||
|
||||
pub struct Outline(pub Vec<(String, String)>);
|
||||
|
||||
/// Represents a piece of content that can be rendered as a page. This trait needs to be
|
||||
/// implemented for the front matter associated with some web page as that is what ultimately
|
||||
/// matters when rendering the page. Each front matter *definition* maps to exactly one kind of
|
||||
/// rendered page on the website.
|
||||
pub trait Content {
|
||||
/// Parse the document. Pass an optional library for bibliography.
|
||||
/// This generates the initial HTML markup from content.
|
||||
fn parse(
|
||||
document: String,
|
||||
library: Option<&Library>,
|
||||
path: Utf8PathBuf,
|
||||
hash: HashMap<Utf8PathBuf, Utf8PathBuf>,
|
||||
) -> (Outline, String, Option<Vec<String>>);
|
||||
|
||||
/// Render the full page from parsed content.
|
||||
fn render<'s, 'p, 'html>(
|
||||
self,
|
||||
sack: &'s Sack,
|
||||
parsed: impl Renderable + 'p,
|
||||
outline: Outline,
|
||||
bib: Option<Vec<String>>,
|
||||
) -> impl Renderable + 'html
|
||||
where
|
||||
's: 'html,
|
||||
'p: 'html;
|
||||
|
||||
/// Get link for this content
|
||||
fn as_link(&self, path: Utf8PathBuf) -> Option<Linkable>;
|
||||
}
|
||||
|
||||
/// Marks whether the item should be treated as a content page, converted into a standalone HTML
|
||||
/// page, or as a bundled asset.
|
||||
#[derive(Debug, Clone)]
|
||||
pub(crate) enum FileItemKind {
|
||||
/// Marks items converted to `index.html`.
|
||||
Index,
|
||||
/// Marks items from bundle.
|
||||
Bundle,
|
||||
}
|
||||
|
||||
/// Metadata for a single item consumed by SSG.
|
||||
#[derive(Debug, Clone)]
|
||||
pub(crate) struct FileItem {
|
||||
/// The kind of an item from disk.
|
||||
pub kind: FileItemKind,
|
||||
/// Original source file location.
|
||||
pub path: Utf8PathBuf,
|
||||
}
|
||||
|
||||
/// Marks how the asset should be processed by the SSG.
|
||||
pub(crate) enum AssetKind {
|
||||
/// Data renderable to HTML. In order to process the data, a closure should be called.
|
||||
Html(Box<dyn Fn(&Sack) -> String + Send + Sync>),
|
||||
/// Bibliographical data.
|
||||
Bibtex(Library),
|
||||
/// Image. For now they are simply cloned to the `dist` director.
|
||||
Image,
|
||||
}
|
||||
|
||||
impl Debug for AssetKind {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
match self {
|
||||
Self::Html(fun) => {
|
||||
// rust mental gymnastics moment
|
||||
let ptr = &**fun as *const dyn Fn(&Sack) -> String as *const () as usize;
|
||||
f.debug_tuple("Html").field(&ptr).finish()
|
||||
}
|
||||
Self::Bibtex(b) => f.debug_tuple("Bibtex").field(b).finish(),
|
||||
Self::Image => write!(f, "Image"),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl AssetKind {
|
||||
pub fn html(f: impl Fn(&Sack) -> String + Send + Sync + 'static) -> Self {
|
||||
Self::Html(Box::new(f))
|
||||
}
|
||||
}
|
||||
|
||||
/// Asset corresponding to a file on disk.
|
||||
#[derive(Debug)]
|
||||
pub(crate) struct Asset {
|
||||
/// The kind of a processed asset.
|
||||
pub kind: AssetKind,
|
||||
/// File metadata
|
||||
pub meta: FileItem,
|
||||
}
|
||||
|
||||
/// Dynamically generated asset not corresponding to any file on disk. This is useful when the
|
||||
/// generated page is not a content page, e.g. page list.
|
||||
pub(crate) struct Virtual(pub Box<dyn Fn(&Sack) -> String + Send + Sync>);
|
||||
|
||||
impl Virtual {
|
||||
pub fn new(call: impl Fn(&Sack) -> String + Send + Sync + 'static) -> Self {
|
||||
Self(Box::new(call))
|
||||
}
|
||||
}
|
||||
|
||||
impl Debug for Virtual {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
// rust mental gymnastics moment
|
||||
let ptr = &*self.0 as *const dyn Fn(&Sack) -> String as *const () as usize;
|
||||
f.debug_tuple("Virtual").field(&ptr).finish()
|
||||
}
|
||||
}
|
||||
|
||||
/// The kind of an output item.
|
||||
#[derive(Debug)]
|
||||
pub(crate) enum OutputKind {
|
||||
/// Marks an output item which corresponds to a file on disk.
|
||||
Asset(Asset),
|
||||
/// Marks an output item which doesn't correspond to any file.
|
||||
Virtual(Virtual),
|
||||
}
|
||||
|
||||
impl From<Asset> for OutputKind {
|
||||
fn from(value: Asset) -> Self {
|
||||
OutputKind::Asset(value)
|
||||
}
|
||||
}
|
||||
|
||||
impl From<Virtual> for OutputKind {
|
||||
fn from(value: Virtual) -> Self {
|
||||
OutputKind::Virtual(value)
|
||||
}
|
||||
}
|
||||
|
||||
/// Renderable output
|
||||
#[derive(Debug)]
|
||||
pub(crate) struct Output {
|
||||
/// The kind of an output item
|
||||
pub(crate) kind: OutputKind,
|
||||
/// Path for the output in dist
|
||||
pub(crate) path: Utf8PathBuf,
|
||||
/// Optional URL data for outputted page.
|
||||
pub(crate) link: Option<Linkable>,
|
||||
}
|
||||
|
||||
/// Items currently in the pipeline. In order for an item to be rendered, it needs to be marked as
|
||||
/// `Take`, which means it needs to have an output location assigned to itself.
|
||||
#[derive(Debug)]
|
||||
pub enum PipelineItem {
|
||||
/// Unclaimed file.
|
||||
Skip(FileItem),
|
||||
/// Data ready to be processed.
|
||||
Take(Output),
|
||||
}
|
||||
|
||||
impl From<FileItem> for PipelineItem {
|
||||
fn from(value: FileItem) -> Self {
|
||||
Self::Skip(value)
|
||||
}
|
||||
}
|
||||
|
||||
impl From<Output> for PipelineItem {
|
||||
fn from(value: Output) -> Self {
|
||||
Self::Take(value)
|
||||
}
|
||||
}
|
||||
|
||||
impl From<PipelineItem> for Option<Output> {
|
||||
fn from(value: PipelineItem) -> Self {
|
||||
match value {
|
||||
PipelineItem::Skip(_) => None,
|
||||
PipelineItem::Take(e) => Some(e),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// This struct allows for querying the website hierarchy. It is passed to each rendered website
|
||||
/// page, so that it can easily access the website metadata.
|
||||
pub struct Sack<'a> {
|
||||
pub ctx: &'a BuildContext,
|
||||
/// Literally all of the content
|
||||
pub hole: &'a [&'a Output],
|
||||
/// Current path for the page being rendered
|
||||
pub path: &'a Utf8PathBuf,
|
||||
/// Original file location for this page
|
||||
pub file: Option<&'a Utf8PathBuf>,
|
||||
/// Hashed optimized images
|
||||
pub hash: Option<HashMap<Utf8PathBuf, Utf8PathBuf>>,
|
||||
}
|
||||
|
||||
impl<'a> Sack<'a> {
|
||||
pub fn get_links(&self, path: &str) -> Vec<LinkDate> {
|
||||
let pattern = glob::Pattern::new(path).expect("Bad glob pattern");
|
||||
self.hole
|
||||
.iter()
|
||||
.filter(|item| pattern.matches_path(item.path.as_ref()))
|
||||
.filter_map(|item| match &item.link {
|
||||
Some(Linkable::Date(link)) => Some(link.clone()),
|
||||
_ => None,
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
pub fn get_tree(&self, path: &str) -> TreePage {
|
||||
let glob = glob::Pattern::new(path).expect("Bad glob pattern");
|
||||
let list = self
|
||||
.hole
|
||||
.iter()
|
||||
.filter(|item| glob.matches_path(item.path.as_ref()))
|
||||
.filter_map(|item| match &item.link {
|
||||
Some(Linkable::Link(link)) => Some(link.clone()),
|
||||
_ => None,
|
||||
});
|
||||
|
||||
let mut tree = TreePage::new();
|
||||
for link in list {
|
||||
tree.add_link(&link);
|
||||
}
|
||||
|
||||
tree
|
||||
}
|
||||
|
||||
pub fn get_library(&self) -> Option<&Library> {
|
||||
let glob = format!("{}/*.bib", self.path.parent()?);
|
||||
let glob = glob::Pattern::new(&glob).expect("Bad glob pattern");
|
||||
let opts = glob::MatchOptions {
|
||||
case_sensitive: true,
|
||||
require_literal_separator: true,
|
||||
require_literal_leading_dot: false,
|
||||
};
|
||||
|
||||
self.hole
|
||||
.iter()
|
||||
.filter(|item| glob.matches_path_with(item.path.as_ref(), opts))
|
||||
.filter_map(|asset| match asset.kind {
|
||||
OutputKind::Asset(ref real) => Some(real),
|
||||
_ => None,
|
||||
})
|
||||
.find_map(|asset| match asset.kind {
|
||||
AssetKind::Bibtex(ref lib) => Some(lib),
|
||||
_ => None,
|
||||
})
|
||||
}
|
||||
|
||||
/// Get the path for original file location
|
||||
pub fn get_file(&self) -> Option<&'a Utf8Path> {
|
||||
self.file.map(Utf8PathBuf::as_ref)
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct TreePage {
|
||||
pub link: Option<Link>,
|
||||
pub subs: HashMap<String, TreePage>,
|
||||
}
|
||||
|
||||
impl TreePage {
|
||||
fn new() -> Self {
|
||||
TreePage {
|
||||
link: None,
|
||||
subs: HashMap::new(),
|
||||
}
|
||||
}
|
||||
|
||||
fn add_link(&mut self, link: &Link) {
|
||||
let mut ptr = self;
|
||||
for part in link.path.iter().skip(1) {
|
||||
ptr = ptr.subs.entry(part.to_string()).or_insert(TreePage::new());
|
||||
}
|
||||
ptr.link = Some(link.clone());
|
||||
}
|
||||
}
|
||||
|
||||
pub fn gather(pattern: &str, exts: &HashSet<&'static str>) -> Vec<PipelineItem> {
|
||||
glob(pattern)
|
||||
.expect("Invalid glob pattern")
|
||||
.filter_map(|path| {
|
||||
let path = path.unwrap();
|
||||
let path = Utf8PathBuf::from_path_buf(path).expect("Filename is not valid UTF8");
|
||||
|
||||
match path.is_dir() {
|
||||
true => None,
|
||||
false => Some(to_source(path, exts)),
|
||||
}
|
||||
})
|
||||
.map(Into::into)
|
||||
.collect()
|
||||
}
|
||||
|
||||
pub(crate) fn to_source(path: Utf8PathBuf, exts: &HashSet<&'static str>) -> FileItem {
|
||||
let hit = path.extension().map_or(false, |ext| exts.contains(ext));
|
||||
|
||||
let kind = match hit {
|
||||
true => FileItemKind::Index,
|
||||
false => FileItemKind::Bundle,
|
||||
};
|
||||
|
||||
FileItem { kind, path }
|
||||
}
|
|
@ -1,150 +0,0 @@
|
|||
use std::collections::HashMap;
|
||||
use std::env;
|
||||
use std::io::Result;
|
||||
use std::net::{TcpListener, TcpStream};
|
||||
use std::path::Path;
|
||||
use std::rc::Rc;
|
||||
use std::sync::mpsc::Sender;
|
||||
use std::sync::{Arc, Mutex};
|
||||
use std::thread::JoinHandle;
|
||||
use std::time::Duration;
|
||||
|
||||
use camino::{Utf8Path, Utf8PathBuf};
|
||||
use notify::RecursiveMode;
|
||||
use notify_debouncer_mini::new_debouncer;
|
||||
use tungstenite::WebSocket;
|
||||
|
||||
use crate::build::{build_content, build_styles};
|
||||
use crate::site::Source;
|
||||
use crate::tree::Output;
|
||||
use crate::BuildContext;
|
||||
|
||||
pub(crate) fn watch(ctx: &BuildContext, sources: &[Source], mut state: Vec<Rc<Output>>) -> Result<()> {
|
||||
let root = env::current_dir().unwrap();
|
||||
let server = TcpListener::bind("127.0.0.1:1337")?;
|
||||
let client = Arc::new(Mutex::new(vec![]));
|
||||
|
||||
let (tx, rx) = std::sync::mpsc::channel();
|
||||
let mut debouncer = new_debouncer(Duration::from_millis(250), tx).unwrap();
|
||||
|
||||
debouncer
|
||||
.watcher()
|
||||
.watch(Path::new("styles"), RecursiveMode::Recursive)
|
||||
.unwrap();
|
||||
|
||||
debouncer
|
||||
.watcher()
|
||||
.watch(Path::new("content"), RecursiveMode::Recursive)
|
||||
.unwrap();
|
||||
|
||||
let thread_i = new_thread_ws_incoming(server, client.clone());
|
||||
let (tx_reload, thread_o) = new_thread_ws_reload(client.clone());
|
||||
|
||||
while let Ok(events) = rx.recv().unwrap() {
|
||||
let paths: Vec<Utf8PathBuf> = events
|
||||
.into_iter()
|
||||
.filter_map(|event| {
|
||||
Utf8PathBuf::from_path_buf(event.path)
|
||||
.ok()
|
||||
.and_then(|path| path.strip_prefix(&root).ok().map(ToOwned::to_owned))
|
||||
})
|
||||
.collect();
|
||||
|
||||
let mut dirty = false;
|
||||
|
||||
{
|
||||
let items: Vec<Rc<Output>> = paths
|
||||
.iter()
|
||||
.filter_map(|path| sources.iter().find_map(|s| s.get_maybe(path)))
|
||||
.filter_map(Option::from)
|
||||
.map(Rc::new)
|
||||
.collect();
|
||||
|
||||
if !items.is_empty() {
|
||||
let state_next = update_stream(&state, &items);
|
||||
let abc: Vec<&Output> = items.iter().map(AsRef::as_ref).collect();
|
||||
let xyz: Vec<&Output> = state_next.iter().map(AsRef::as_ref).collect();
|
||||
build_content(ctx, &abc, &xyz, None);
|
||||
state = state_next;
|
||||
dirty = true;
|
||||
}
|
||||
}
|
||||
|
||||
if paths.iter().any(|path| path.starts_with("styles")) {
|
||||
build_styles();
|
||||
dirty = true;
|
||||
}
|
||||
|
||||
if dirty {
|
||||
tx_reload.send(()).unwrap();
|
||||
}
|
||||
}
|
||||
|
||||
thread_i.join().unwrap();
|
||||
thread_o.join().unwrap();
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn update_stream(old: &[Rc<Output>], new: &[Rc<Output>]) -> Vec<Rc<Output>> {
|
||||
let mut map: HashMap<&Utf8Path, Rc<Output>> = HashMap::new();
|
||||
|
||||
for output in old.iter().chain(new) {
|
||||
map.insert(&output.path, output.clone());
|
||||
}
|
||||
|
||||
map.into_values().collect()
|
||||
}
|
||||
|
||||
fn new_thread_ws_incoming(
|
||||
server: TcpListener,
|
||||
client: Arc<Mutex<Vec<WebSocket<TcpStream>>>>,
|
||||
) -> JoinHandle<()> {
|
||||
std::thread::spawn(move || {
|
||||
for stream in server.incoming() {
|
||||
let socket = tungstenite::accept(stream.unwrap()).unwrap();
|
||||
client.lock().unwrap().push(socket);
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
fn new_thread_ws_reload(
|
||||
client: Arc<Mutex<Vec<WebSocket<TcpStream>>>>,
|
||||
) -> (Sender<()>, JoinHandle<()>) {
|
||||
let (tx, rx) = std::sync::mpsc::channel();
|
||||
|
||||
let thread = std::thread::spawn(move || {
|
||||
while rx.recv().is_ok() {
|
||||
let mut clients = client.lock().unwrap();
|
||||
let mut broken = vec![];
|
||||
|
||||
for (i, socket) in clients.iter_mut().enumerate() {
|
||||
match socket.send("reload".into()) {
|
||||
Ok(_) => {}
|
||||
Err(tungstenite::error::Error::Io(e)) => {
|
||||
if e.kind() == std::io::ErrorKind::BrokenPipe {
|
||||
broken.push(i);
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
eprintln!("Error: {:?}", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for i in broken.into_iter().rev() {
|
||||
clients.remove(i);
|
||||
}
|
||||
|
||||
// Close all but the last 10 connections
|
||||
let len = clients.len();
|
||||
if len > 10 {
|
||||
for mut socket in clients.drain(0..len - 10) {
|
||||
socket.close(None).ok();
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
(tx, thread)
|
||||
}
|
|
@ -17,11 +17,11 @@ const INTRO: &str = r#"
|
|||
質問があったらメールを送信してくれてください。
|
||||
"#;
|
||||
|
||||
fn intro() -> impl Renderable {
|
||||
let (_, html, _) = parse(INTRO.into(), None, "".into(), HashMap::new());
|
||||
fn intro(sack: &Sack) -> impl Renderable {
|
||||
let (parsed, _, _) = parse(INTRO, sack, "".into(), None);
|
||||
maud!(
|
||||
section .p-card.intro-jp lang="ja-JP" {
|
||||
(Raw(html))
|
||||
(Raw(parsed))
|
||||
}
|
||||
)
|
||||
}
|
||||
|
@ -66,21 +66,14 @@ fn latest(sack: &Sack) -> impl Renderable {
|
|||
)
|
||||
}
|
||||
|
||||
pub(crate) fn home<'s, 'p, 'html>(
|
||||
sack: &'s Sack,
|
||||
main: impl Renderable + 'p,
|
||||
) -> impl Renderable + 'html
|
||||
where
|
||||
's: 'html,
|
||||
'p: 'html,
|
||||
{
|
||||
let main = maud_move!(
|
||||
pub(crate) fn home(sack: &Sack, main: &str) -> String {
|
||||
let main = maud!(
|
||||
main .l-home {
|
||||
article .l-home__article.markdown {
|
||||
(main)
|
||||
(Raw(main))
|
||||
}
|
||||
aside .l-home__aside {
|
||||
(intro())
|
||||
(intro(sack))
|
||||
// (kanji())
|
||||
(photo())
|
||||
(latest(sack))
|
||||
|
@ -88,5 +81,5 @@ where
|
|||
}
|
||||
);
|
||||
|
||||
crate::html::page(sack, main, "Home".into())
|
||||
crate::html::page(sack, main, "Home".into()).render().into()
|
||||
}
|
||||
|
|
|
@ -27,15 +27,6 @@ socket.addEventListener("message", (event) => {
|
|||
});
|
||||
"#;
|
||||
|
||||
const JS_IMPORTS: &str = r#"
|
||||
{
|
||||
"imports": {
|
||||
"reveal": "/js/vanilla/reveal.js",
|
||||
"photos": "/js/vanilla/photos.js"
|
||||
}
|
||||
}
|
||||
"#;
|
||||
|
||||
fn head<'s, 'html>(sack: &'s Sack, title: String) -> impl Renderable + 'html
|
||||
where
|
||||
's: 'html,
|
||||
|
@ -60,7 +51,7 @@ where
|
|||
link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png";
|
||||
link rel="icon" href="/favicon.ico" sizes="any";
|
||||
|
||||
script type="importmap" {(Raw(JS_IMPORTS))}
|
||||
script type="importmap" {(Raw(sack.get_import_map()))}
|
||||
|
||||
@if matches!(sack.ctx.mode, Mode::Watch) {
|
||||
script { (Raw(JS_RELOAD)) }
|
||||
|
@ -244,7 +235,7 @@ where
|
|||
sack,
|
||||
maud!(
|
||||
main #app {}
|
||||
script type="module" src="/js/search/dist/search.js" {}
|
||||
script type="module" { (Raw("import 'search';")) }
|
||||
),
|
||||
String::from("Search"),
|
||||
)
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
use std::collections::HashMap;
|
||||
|
||||
use camino::Utf8PathBuf;
|
||||
use camino::{Utf8Path, Utf8PathBuf};
|
||||
use chrono::{DateTime, Utc};
|
||||
use hauchiwa::{Content, Link, LinkDate, Linkable, Outline, Sack};
|
||||
use hauchiwa::{Bibliography, Content, Link, LinkDate, Linkable, Outline, Sack};
|
||||
use hayagriva::Library;
|
||||
use hypertext::{html_elements, maud_move, GlobalAttributes, Renderable};
|
||||
use hypertext::{html_elements, maud_move, GlobalAttributes, Raw, Renderable};
|
||||
use serde::Deserialize;
|
||||
|
||||
/// Represents a simple post.
|
||||
|
@ -17,27 +17,23 @@ pub(crate) struct Post {
|
|||
}
|
||||
|
||||
impl Content for Post {
|
||||
fn parse(
|
||||
data: String,
|
||||
lib: Option<&Library>,
|
||||
dir: Utf8PathBuf,
|
||||
hash: HashMap<Utf8PathBuf, Utf8PathBuf>,
|
||||
) -> (Outline, String, Option<Vec<String>>) {
|
||||
crate::text::md::parse(data, lib, dir, hash)
|
||||
fn parse_content(
|
||||
content: &str,
|
||||
sack: &Sack,
|
||||
path: &Utf8Path,
|
||||
library: Option<&Library>,
|
||||
) -> (String, Outline, Bibliography) {
|
||||
crate::text::md::parse(content, sack, path, library)
|
||||
}
|
||||
|
||||
fn render<'s, 'p, 'html>(
|
||||
self,
|
||||
sack: &'s Sack,
|
||||
parsed: impl Renderable + 'p,
|
||||
fn as_html(
|
||||
&self,
|
||||
parsed: &str,
|
||||
sack: &Sack,
|
||||
outline: Outline,
|
||||
bib: Option<Vec<String>>,
|
||||
) -> impl Renderable + 'html
|
||||
where
|
||||
's: 'html,
|
||||
'p: 'html,
|
||||
{
|
||||
post(self, sack, parsed, outline, bib)
|
||||
bibliography: Bibliography,
|
||||
) -> String {
|
||||
post(self, parsed, sack, outline, bibliography).render().into()
|
||||
}
|
||||
|
||||
fn as_link(&self, path: Utf8PathBuf) -> Option<Linkable> {
|
||||
|
@ -53,17 +49,17 @@ impl Content for Post {
|
|||
}
|
||||
|
||||
pub fn post<'s, 'p, 'html>(
|
||||
fm: Post,
|
||||
metadata: &'p Post,
|
||||
parsed: &'p str,
|
||||
sack: &'s Sack,
|
||||
content: impl Renderable + 'p,
|
||||
outline: Outline,
|
||||
bib: Option<Vec<String>>,
|
||||
bibliography: Bibliography,
|
||||
) -> impl Renderable + 'html
|
||||
where
|
||||
's: 'html,
|
||||
'p: 'html,
|
||||
{
|
||||
let heading = fm.title.clone();
|
||||
let heading = metadata.title.clone();
|
||||
let main = maud_move!(
|
||||
main .wiki-main {
|
||||
|
||||
|
@ -83,15 +79,15 @@ where
|
|||
h1 #top { (heading) }
|
||||
}
|
||||
section .wiki-article__markdown.markdown {
|
||||
(content)
|
||||
(Raw(parsed))
|
||||
}
|
||||
|
||||
@if let Some(bib) = bib {
|
||||
@if let Some(bib) = bibliography.0 {
|
||||
(crate::html::misc::show_bibliography(bib))
|
||||
}
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
crate::html::page(sack, main, fm.title.clone())
|
||||
crate::html::page(sack, main, metadata.title.clone())
|
||||
}
|
||||
|
|
|
@ -1,10 +1,8 @@
|
|||
use std::collections::HashMap;
|
||||
|
||||
use camino::Utf8PathBuf;
|
||||
use camino::{Utf8Path, Utf8PathBuf};
|
||||
use chrono::{DateTime, Utc};
|
||||
use hauchiwa::{Content, Link, LinkDate, Linkable, Outline, Sack};
|
||||
use hauchiwa::{Bibliography, Content, Link, LinkDate, Linkable, Outline, Sack};
|
||||
use hayagriva::Library;
|
||||
use hypertext::{html_elements, maud_move, GlobalAttributes, Raw, Renderable};
|
||||
use hypertext::{html_elements, maud, GlobalAttributes, Raw, Renderable};
|
||||
use serde::Deserialize;
|
||||
|
||||
const CSS: &str = r#"
|
||||
|
@ -25,19 +23,18 @@ pub(crate) struct Slideshow {
|
|||
}
|
||||
|
||||
impl Content for Slideshow {
|
||||
fn parse(
|
||||
data: String,
|
||||
_: Option<&Library>,
|
||||
dir: Utf8PathBuf,
|
||||
hash: HashMap<Utf8PathBuf, Utf8PathBuf>,
|
||||
) -> (Outline, String, Option<Vec<String>>) {
|
||||
let html = data
|
||||
fn parse_content(
|
||||
content: &str,
|
||||
sack: &Sack,
|
||||
path: &Utf8Path,
|
||||
library: Option<&Library>,
|
||||
) -> (String, Outline, Bibliography) {
|
||||
let parsed = content
|
||||
.split("\n-----\n")
|
||||
.map(|chunk| {
|
||||
chunk
|
||||
.split("\n---\n")
|
||||
.map(|s| crate::text::md::parse(s.to_owned(), None, dir.clone(), hash.clone()))
|
||||
.map(|e| e.1)
|
||||
.map(|slide| crate::text::md::parse(&slide, sack, path, library).0)
|
||||
.collect::<Vec<_>>()
|
||||
})
|
||||
.map(|stack| match stack.len() > 1 {
|
||||
|
@ -51,20 +48,10 @@ impl Content for Slideshow {
|
|||
false => format!("<section>{}</section>", stack[0]),
|
||||
})
|
||||
.collect::<String>();
|
||||
(Outline(vec![]), html, None)
|
||||
(parsed, Outline(vec![]), Bibliography(None))
|
||||
}
|
||||
|
||||
fn render<'s, 'p, 'html>(
|
||||
self,
|
||||
sack: &'s Sack,
|
||||
parsed: impl Renderable + 'p,
|
||||
_: Outline,
|
||||
_: Option<Vec<String>>,
|
||||
) -> impl Renderable + 'html
|
||||
where
|
||||
's: 'html,
|
||||
'p: 'html,
|
||||
{
|
||||
fn as_html(&self, parsed: &str, sack: &Sack, _: Outline, _: Bibliography) -> String {
|
||||
show(self, sack, parsed)
|
||||
}
|
||||
|
||||
|
@ -80,30 +67,24 @@ impl Content for Slideshow {
|
|||
}
|
||||
}
|
||||
|
||||
pub fn show<'s, 'p, 'html>(
|
||||
fm: Slideshow,
|
||||
sack: &'s Sack,
|
||||
slides: impl Renderable + 'p,
|
||||
) -> impl Renderable + 'html
|
||||
where
|
||||
's: 'html,
|
||||
'p: 'html,
|
||||
{
|
||||
pub fn show(fm: &Slideshow, sack: &Sack, slides: &str) -> String {
|
||||
crate::html::bare(
|
||||
sack,
|
||||
maud_move!(
|
||||
maud!(
|
||||
div .reveal {
|
||||
div .slides {
|
||||
(slides)
|
||||
(Raw(slides))
|
||||
}
|
||||
}
|
||||
|
||||
script type="module" {
|
||||
(Raw("import 'reveal';"))
|
||||
(Raw("import 'reveal'; import 'search';"))
|
||||
}
|
||||
|
||||
style { (Raw(CSS)) }
|
||||
),
|
||||
fm.title.clone(),
|
||||
)
|
||||
.render()
|
||||
.into()
|
||||
}
|
||||
|
|
|
@ -1,9 +1,7 @@
|
|||
use std::collections::HashMap;
|
||||
|
||||
use camino::Utf8PathBuf;
|
||||
use hauchiwa::{Content, Link, Linkable, Outline, Sack};
|
||||
use camino::{Utf8Path, Utf8PathBuf};
|
||||
use hauchiwa::{Bibliography, Content, Link, Linkable, Outline, Sack};
|
||||
use hayagriva::Library;
|
||||
use hypertext::{html_elements, maud_move, GlobalAttributes, Renderable};
|
||||
use hypertext::{html_elements, maud_move, GlobalAttributes, Raw, Renderable};
|
||||
use serde::Deserialize;
|
||||
|
||||
/// Represents a wiki page
|
||||
|
@ -13,27 +11,23 @@ pub struct Wiki {
|
|||
}
|
||||
|
||||
impl Content for Wiki {
|
||||
fn parse(
|
||||
data: String,
|
||||
lib: Option<&Library>,
|
||||
path: Utf8PathBuf,
|
||||
hash: HashMap<Utf8PathBuf, Utf8PathBuf>,
|
||||
) -> (Outline, String, Option<Vec<String>>) {
|
||||
crate::text::md::parse(data, lib, path, hash)
|
||||
fn parse_content(
|
||||
content: &str,
|
||||
sack: &Sack,
|
||||
path: &Utf8Path,
|
||||
library: Option<&Library>,
|
||||
) -> (String, Outline, Bibliography) {
|
||||
crate::text::md::parse(content, sack, path, library)
|
||||
}
|
||||
|
||||
fn render<'s, 'p, 'html>(
|
||||
self,
|
||||
sack: &'s Sack,
|
||||
parsed: impl Renderable + 'p,
|
||||
fn as_html(
|
||||
&self,
|
||||
parsed: &str,
|
||||
sack: &Sack,
|
||||
outline: Outline,
|
||||
bib: Option<Vec<String>>,
|
||||
) -> impl Renderable + 'html
|
||||
where
|
||||
's: 'html,
|
||||
'p: 'html,
|
||||
{
|
||||
wiki(self, sack, parsed, outline, bib)
|
||||
bibliography: Bibliography,
|
||||
) -> String {
|
||||
wiki(self, parsed, sack, outline, bibliography)
|
||||
}
|
||||
|
||||
fn as_link(&self, path: Utf8PathBuf) -> Option<Linkable> {
|
||||
|
@ -45,17 +39,13 @@ impl Content for Wiki {
|
|||
}
|
||||
}
|
||||
|
||||
fn wiki<'s, 'p, 'html>(
|
||||
matter: Wiki,
|
||||
sack: &'s Sack,
|
||||
parsed: impl Renderable + 'p,
|
||||
fn wiki(
|
||||
matter: &Wiki,
|
||||
parsed: &str,
|
||||
sack: &Sack,
|
||||
_: Outline,
|
||||
bib: Option<Vec<String>>,
|
||||
) -> impl Renderable + 'html
|
||||
where
|
||||
's: 'html,
|
||||
'p: 'html,
|
||||
{
|
||||
bibliography: Bibliography,
|
||||
) -> String {
|
||||
let heading = matter.title.clone();
|
||||
let main = maud_move!(
|
||||
main .wiki-main {
|
||||
|
@ -81,10 +71,10 @@ where
|
|||
h1 #top { (heading) }
|
||||
}
|
||||
section .wiki-article__markdown.markdown {
|
||||
(parsed)
|
||||
(Raw(parsed))
|
||||
}
|
||||
|
||||
@if let Some(bib) = bib {
|
||||
@if let Some(bib) = bibliography.0 {
|
||||
(crate::html::misc::show_bibliography(bib))
|
||||
}
|
||||
}
|
||||
|
@ -92,4 +82,6 @@ where
|
|||
);
|
||||
|
||||
crate::html::page(sack, main, matter.title.to_owned())
|
||||
.render()
|
||||
.into()
|
||||
}
|
||||
|
|
48
src/main.rs
48
src/main.rs
|
@ -3,8 +3,8 @@ mod text;
|
|||
mod ts;
|
||||
|
||||
use clap::{Parser, ValueEnum};
|
||||
use hauchiwa::{process_content, Website};
|
||||
use hypertext::{Raw, Renderable};
|
||||
use hauchiwa::Website;
|
||||
use hypertext::Renderable;
|
||||
|
||||
#[derive(Parser, Debug, Clone)]
|
||||
struct Args {
|
||||
|
@ -21,27 +21,14 @@ enum Mode {
|
|||
fn main() {
|
||||
let args = Args::parse();
|
||||
|
||||
let website = Website::new()
|
||||
.add_source(
|
||||
"content/about.md",
|
||||
["md"].into(),
|
||||
process_content::<crate::html::Post>,
|
||||
)
|
||||
.add_source(
|
||||
"content/posts/**/*",
|
||||
["md", "mdx"].into(),
|
||||
process_content::<crate::html::Post>,
|
||||
)
|
||||
.add_source(
|
||||
"content/slides/**/*",
|
||||
["md", "lhs"].into(),
|
||||
process_content::<crate::html::Slideshow>,
|
||||
)
|
||||
.add_source(
|
||||
"content/wiki/**/*",
|
||||
["md"].into(),
|
||||
process_content::<crate::html::Wiki>,
|
||||
)
|
||||
let website = Website::design()
|
||||
.content::<crate::html::Post>("content/about.md", ["md"].into())
|
||||
.content::<crate::html::Post>("content/posts/**/*", ["md", "mdx"].into())
|
||||
.content::<crate::html::Slideshow>("content/slides/**/*", ["md", "lhs"].into())
|
||||
.content::<crate::html::Wiki>("content/wiki/**/*", ["md"].into())
|
||||
.js("search", "./js/search/dist/search.js")
|
||||
.js("photos", "./js/vanilla/photos.js")
|
||||
.js("reveal", "./js/vanilla/reveal.js")
|
||||
.add_virtual(
|
||||
|sack| crate::html::map(sack).render().to_owned().into(),
|
||||
"map/index.html".into(),
|
||||
|
@ -67,19 +54,8 @@ fn main() {
|
|||
.add_virtual(
|
||||
|sack| {
|
||||
let data = std::fs::read_to_string("content/index.md").unwrap();
|
||||
let (_, html, _) = text::md::parse(
|
||||
data,
|
||||
None,
|
||||
"".into(),
|
||||
sack.hash
|
||||
.as_ref()
|
||||
.map(ToOwned::to_owned)
|
||||
.unwrap_or_default(),
|
||||
);
|
||||
crate::html::home(sack, Raw(html))
|
||||
.render()
|
||||
.to_owned()
|
||||
.into()
|
||||
let (parsed, _, _) = text::md::parse(&data, sack, "".into(), None);
|
||||
crate::html::home(sack, &parsed)
|
||||
},
|
||||
"index.html".into(),
|
||||
)
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
use std::collections::HashMap;
|
||||
|
||||
use camino::Utf8PathBuf;
|
||||
use hauchiwa::Outline;
|
||||
use camino::{Utf8Path, Utf8PathBuf};
|
||||
use hauchiwa::{Bibliography, Outline, Sack};
|
||||
use hayagriva::{
|
||||
archive::ArchivedStyle,
|
||||
citationberg::{IndependentStyle, Locale, Style},
|
||||
|
@ -48,13 +48,13 @@ static STYLE: Lazy<IndependentStyle> =
|
|||
});
|
||||
|
||||
pub fn parse(
|
||||
text: String,
|
||||
lib: Option<&Library>,
|
||||
dir: Utf8PathBuf,
|
||||
hash: HashMap<Utf8PathBuf, Utf8PathBuf>,
|
||||
) -> (Outline, String, Option<Vec<String>>) {
|
||||
content: &str,
|
||||
sack: &Sack,
|
||||
path: &Utf8Path,
|
||||
library: Option<&Library>,
|
||||
) -> (String, Outline, Bibliography) {
|
||||
let (outline, stream) = {
|
||||
let stream = Parser::new_ext(&text, *OPTS);
|
||||
let stream = Parser::new_ext(content, *OPTS);
|
||||
let mut stream: Vec<_> = TextMergeStream::new(stream).collect();
|
||||
let outline = set_heading_ids(&mut stream);
|
||||
(outline, stream)
|
||||
|
@ -64,7 +64,7 @@ pub fn parse(
|
|||
.into_iter()
|
||||
.map(make_math)
|
||||
.map(make_emoji)
|
||||
.map(swap_hashed_image(dir, hash))
|
||||
.map(swap_hashed_image(path, &sack.artifacts.images))
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
let stream = make_code(stream)
|
||||
|
@ -73,15 +73,15 @@ pub fn parse(
|
|||
.flat_map(make_cite)
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
let (stream, bib) = match lib {
|
||||
let (stream, bib) = match library {
|
||||
Some(lib) => make_bib(stream, lib),
|
||||
None => (stream, None),
|
||||
};
|
||||
|
||||
let mut html = String::new();
|
||||
pulldown_cmark::html::push_html(&mut html, stream.into_iter());
|
||||
let mut parsed = String::new();
|
||||
pulldown_cmark::html::push_html(&mut parsed, stream.into_iter());
|
||||
|
||||
(outline, html, bib)
|
||||
(parsed, outline, Bibliography(bib))
|
||||
}
|
||||
|
||||
fn make_bib<'a, 'b>(
|
||||
|
@ -356,10 +356,10 @@ fn make_emoji(event: Event) -> Event {
|
|||
}
|
||||
}
|
||||
|
||||
fn swap_hashed_image(
|
||||
dir: Utf8PathBuf,
|
||||
hash: HashMap<Utf8PathBuf, Utf8PathBuf>,
|
||||
) -> impl Fn(Event) -> Event {
|
||||
fn swap_hashed_image<'a>(
|
||||
dir: &'a Utf8Path,
|
||||
hash: &'a HashMap<Utf8PathBuf, Utf8PathBuf>,
|
||||
) -> impl Fn(Event) -> Event + 'a {
|
||||
move |event| match event {
|
||||
Event::Start(start) => match start {
|
||||
Tag::Image {
|
||||
|
|
Loading…
Reference in a new issue