feat: Make the code a bit less poopy and fixed a counter not being accurate

Cargo.lock

@@ -98,6 +98,12 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 
+[[package]]
+name = "deunicode"
+version = "1.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abd57806937c9cc163efc8ea3910e00a62e2aeb0b8119f1793a978088f8f6b04"
+
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -258,9 +264,10 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "xbst"
-version = "0.1.0"
+version = "0.2.0"
 dependencies = [
  "clap",
+ "deunicode",
  "thiserror",
  "zerocopy",
 ]

Cargo.toml

@@ -1,9 +1,10 @@
 [package]
 name = "xbst"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 
 [dependencies]
 thiserror = "2.0.12"
 clap = { version = "4.5.31", features = ["derive"] }
 zerocopy = { version = "0.8.26", features = ["derive"] }
+deunicode = "1.6.2"

LICENSE

@@ -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>.

readme.md

@@ -26,7 +26,9 @@ The input music folder needs the following structure:
   └ 💾 Music 1
  ```
 
- Directory/File names must not exceed 31 characters.
+Directory/File names must not exceed 31~ characters.
+
+If you encounter issues with song not playing you could try to change the codec to wmav1 or lower the bitrate.
 
 ```
 Usage: xbst [OPTIONS] [INPUT] [OUTPUT]
@@ -36,14 +38,16 @@ Arguments:
   [OUTPUT]  Output folder for the database and converted musics [default: ./output]
 
 Options:
-  -b, --bitrate <BITRATE>  Bitrate for the output [default: 192]
+  -b, --bitrate <BITRATE>  Bitrate for the output [default: 128]
+  -c, --codec <CODEC>      Codec to use for conversion [default: wmav2] [possible values: wmav1, wmav2]
   -h, --help               Print help
   -V, --version            Print version
 ```
 
 ## Known issues
 
-- The progress bar on soundtrack other than the first one doesn't progress
+- The progress bar on soundtrack other than the first one doesn't progress.
 - Some files, once converted, are quieter than usual?
+- When using wmav1, some audio files might sounds absolute ass.
 - Untested with a large library, probably has issues?
-- Code is poo poo
+- Code is still poo poo but a bit better

src/main.rs

@@ -1,8 +1,8 @@
 use std::{
     ffi::OsStr,
-    fs::{self, read_dir, File},
+    fs::{self, read_dir, DirEntry, File},
     io::{stdout, Write},
-    path::PathBuf,
+    path::{Path, PathBuf},
     process::Command,
     string::FromUtf8Error,
 };
@@ -10,10 +10,11 @@ use std::{
 mod utils;
 
 use clap::Parser;
+use deunicode::AsciiChars;
 use thiserror::Error;
 use zerocopy::IntoBytes;
 
-use crate::utils::{Header, MusicFile, Song, Soundtrack};
+use crate::utils::{Ansi, Codec, Header, Song, SongGroup, Soundtrack};
 
 #[derive(Error, Debug)]
 enum Errors {
@@ -25,6 +26,8 @@ enum Errors {
     FromUtf8(#[from] FromUtf8Error),
     #[error("Skill issue on the programmer part ngl, report this to dev pls")]
     SkillIssue(),
+    #[error("Didn't find any file to convert, is your input folder structured correctly?")]
+    NoFileToConvert(),
 
     #[error("You are missing ffprobe in your PATH")]
     MissingFfprobe(#[source] std::io::Error),
@@ -42,15 +45,20 @@ struct Args {
     #[arg(default_value = "./output")]
     output: String,
     /// Bitrate for the output
-    #[arg(short, long, default_value_t = 192)]
+    #[arg(short, long, default_value_t = 128)]
     bitrate: i16,
+    /// Codec to use for conversion
+    #[clap(value_enum)]
+    #[arg(short, long, default_value_t = Codec::Wmav2)]
+    codec: Codec,
 }
 
 fn main() {
     let args = Args::parse();
 
     println!(
-        "⠀⠀⠀⠂⣄⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+        "
+⠀⠀⠀⠂⣄⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
 ⠀⠀⠀⠀⠈⠲⣥⣀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣀⣤⠖⠁⠀⠀⠀⠀
 ⠀⠀⠀⠀⠀⠀⠘⠿⣿⣷⣦⣀⡀⠀⠀⢀⣠⣴⣾⣿⠟⠀⠀⠀⠀⠀⠀⠀
 ⠀⠀⠀⠀⠀⠀⠀⠀⠈⠻⣿⣿⣿⣿⣿⣿⣿⣿⡟⠁⠀⠀⠀⠀⠀⠀⠀⠀
@@ -71,166 +79,77 @@ fn main() {
 }
 
 fn process(args: &Args) -> Result<(), Errors> {
-    let mut soundtrack_count: i32 = 0;
-    let mut songs_count: u32 = 0;
-    let mut total_songs_count: u32 = 0;
-    let mut total_song_groups_count: i32 = 0;
-    let mut song_time_miliseconds: [i32; 6] = [0; 6];
-    let mut song_group_id: i32;
-
-    let mut soundtracks: Vec<Soundtrack> = Default::default();
-    let mut songs: Vec<Song> = Default::default();
-    let mut sound_groups_ids: Vec<i32> = Vec::with_capacity(84);
-
-    let mut files_to_convert: Vec<MusicFile> = Vec::new();
-
+    let mut soundtrack_count = 0;
     let input_path = PathBuf::from(&args.input);
     let music_directory = read_dir(input_path).map_err(Errors::UnknownFolder)?;
+    let mut soundtracks: Vec<Soundtrack> = Default::default();
+    let mut song_groups: Vec<Vec<SongGroup>> = Default::default();
+
+    let mut total_songs = 0;
+    let mut total_song_groups = 0;
+
+    let mut files_to_convert: Vec<PathBuf> = Default::default();
 
     // Loop through each folders for the soundtrack struct
     for (i, soundtrack_dirs) in music_directory.enumerate() {
         let soundtrack = soundtrack_dirs.map_err(Errors::UnknownFolder)?.path();
 
+        // Ignore non folders for soundtracks
         if !soundtrack.is_dir() {
             continue;
         }
 
         soundtrack_count += 1;
-        song_group_id = 0;
 
-        // Convert the folder name into 2 bytes
-        let mut soundtrack_name = soundtrack
-            .file_name()
-            .map_or(OsStr::new("Unknown soundtrack"), |f| f)
-            .to_string_lossy()
-            .trim()
-            .bytes()
-            .map(|b| [b, 0])
-            .collect::<Vec<[u8; 2]>>();
-        // Max value of 32
-        soundtrack_name.resize(32, [0; 2]);
-
-        let mut song_name: [[u8; 2]; 192] = [[0; 2]; 192];
-        let files = read_dir(soundtrack)
-            .map_err(Errors::UnknownIO)?
-            .collect::<Vec<_>>();
-
-        // Loop through each files in chunk of 6 (max songs allowed in a song group)
-        files.chunks(6).for_each(|song_files| {
-            let mut song_id: [i32; 6] = [0; 6];
-
-            song_group_id += 1;
-            sound_groups_ids.push(total_song_groups_count);
-            total_song_groups_count += 1;
-
-            let mut char_count = 0;
-            song_time_miliseconds = [0; 6];
-
-            song_files.iter().enumerate().for_each(|(g, f)| {
-                let song = f.as_ref().unwrap();
-
-                song_id[g] = total_songs_count as i32;
-                song_time_miliseconds[g] = match get_duration(song.path()) {
-                    Ok(s) => s,
-                    Err(e) => {
-                        eprintln!("\x1b[0;31m{}\x1b[0;20m", e);
-                        0
-                    }
-                };
-
-                songs_count += 1;
-                total_songs_count += 1;
-
-                let filepath = song.path();
-                let filename = filepath
-                    .file_stem()
-                    .map_or(OsStr::new("Unknown track"), |f| f)
-                    .to_string_lossy();
-
-                let mut name = filename.trim().bytes().collect::<Vec<u8>>();
-                name.resize(32, 0);
-
-                for b in name.iter() {
-                    song_name[char_count] = [*b, 0];
-                    char_count += 1;
-                }
-
-                files_to_convert.push(MusicFile {
-                    path: song.path(),
-                    soundtrack_index: 0,
-                    index: total_songs_count - 1,
-                });
-            });
-
-            let s = Song {
-                magic: 200819,
-                id: song_group_id - 1,
-                ipadding: 0,
-                soundtrack_id: i as i32,
-                song_id,
-                song_time_miliseconds,
-                song_name,
-                cpadding: [char::MIN; 16],
-            };
-
-            songs.push(s);
-
-            song_name = [[0; 2]; 192];
-        });
-
-        let mut total_time_miliseconds: i32 = 0;
-
-        for s in &songs {
-            if s.soundtrack_id == i as i32 {
-                total_time_miliseconds += s.song_time_miliseconds.iter().sum::<i32>()
-            }
-        }
-
-        sound_groups_ids.resize(84, 0);
-        let song_groups_ids: [i32; 84] = sound_groups_ids
-            .clone()
-            .try_into()
-            .map_err(|_| Errors::SkillIssue())?;
-
-        let st = Soundtrack {
-            magic: 136049,
-            id: i as i32,
-            num_songs: songs_count,
-            song_groups_ids: song_groups_ids,
-            total_time_miliseconds,
-            name: soundtrack_name
-                .try_into()
-                .map_err(|_| Errors::SkillIssue())?,
-            padding: [char::MIN; 24],
-        };
+        let st;
+        let song_group;
+        let mut unprocessed_files;
 
+        (
+            st,
+            song_group,
+            total_songs,
+            total_song_groups,
+            unprocessed_files,
+        ) = process_soundtrack(
+            soundtrack,
+            i,
+            soundtrack_count,
+            total_songs,
+            total_song_groups,
+        )?;
         soundtracks.push(st);
-        sound_groups_ids = Vec::with_capacity(84);
-        songs_count = 0;
+        song_groups.push(song_group);
+        files_to_convert.append(&mut unprocessed_files);
     }
 
     let mut soundtrack_ids: [i32; 100] = [0; 100];
+
     for i in 0..soundtrack_count {
-        soundtrack_ids[i as usize] = i;
+        soundtrack_ids[i] = i as i32;
     }
 
     let header = Header {
-        magic: 0001,
-        num_soundtracks: soundtrack_count,
-        next_soundtrack_id: soundtrack_count + 1,
+        magic: 1,
+        num_soundtracks: soundtrack_count as i32,
+        next_soundtrack_id: (soundtrack_count + 1) as i32,
         soundtrack_ids,
-        next_song_id: (songs_count as i32),
+        next_song_id: (total_songs + 1) as i32,
         padding: [char::MIN; 24],
     };
 
-    write_database(&args.output, header, soundtracks, songs)?;
+    if files_to_convert.is_empty() {
+        return Err(Errors::NoFileToConvert());
+    }
 
-    for f in files_to_convert {
-        let percentage: f64 = ((f.index + 1) as f64 / total_songs_count as f64) * 100.0;
+    write_database(&args.output, header, soundtracks, song_groups)?;
+
+    for (i, f) in files_to_convert.iter().enumerate() {
+        let percentage: f64 = ((i + 1) as f64 / total_songs as f64) * 100.0;
         print!(
             "{}{}\r{:3}% [{}{}] {:3}/{}",
-            "\x1B[1A",
-            "\x1B[K",
+            Ansi::CursorUp,
+            Ansi::ClearLine,
             percentage as usize,
             {
                 let mut bar = "=".repeat(percentage as usize / 3);
@@ -240,29 +159,26 @@ fn process(args: &Args) -> Result<(), Errors> {
                 bar
             },
             " ".repeat(100 / 3 - percentage as usize / 3),
-            f.index + 1,
-            total_songs_count
+            i + 1,
+            total_songs
         );
 
         print!(
-            "{}\r{}Processing {} ",
-            "\x1B[1B",
-            "\x1B[K",
-            f.path
-                .file_stem()
-                .map_or(OsStr::new("Unknown track"), |f| f)
+            "{}\r{}Processing {} - {}",
+            Ansi::CursorDown,
+            Ansi::ClearLine,
+            f.parent()
+                .and_then(|f| f.file_stem())
+                .unwrap_or_else(|| OsStr::new("Unknown soundtrack"))
+                .to_string_lossy(),
+            f.file_stem()
+                .unwrap_or_else(|| OsStr::new("Unknown track"))
                 .to_string_lossy()
         );
 
-        let _ = stdout().flush().map_err(Errors::UnknownIO);
+        stdout().flush().map_err(Errors::UnknownIO)?;
 
-        convert_to_wma(
-            f.path,
-            &args.output,
-            args.bitrate,
-            f.soundtrack_index as usize,
-            f.index as usize,
-        )?;
+        convert_to_wma(f, &args.output, args.bitrate, &args.codec, i)?;
     }
 
     print!("\x1B[1A\x1B[K\r\x1B[K Done.");
@@ -270,6 +186,173 @@ fn process(args: &Args) -> Result<(), Errors> {
     Ok(())
 }
 
+fn build_songs_group(
+    chunks: &[DirEntry],
+    song_group_id: usize,
+    soundtrack_id: usize,
+    total_songs: usize,
+) -> Result<(SongGroup, Vec<PathBuf>), Errors> {
+    let mut files_to_convert: Vec<PathBuf> = Default::default();
+    let mut songs: Vec<Song> = Default::default();
+    let mut song_group: SongGroup = SongGroup::default();
+
+    // Loop through each files in chunk of 6 (max songs allowed in a song group)
+    chunks.iter().enumerate().for_each(|(i, song)| {
+        let song_path = song.path();
+
+        // Ignore non files for song groups
+        if !song_path.is_file() {
+            return;
+        }
+
+        let song_id: i32 = (total_songs - chunks.len() + i) as i32;
+
+        let song_time_miliseconds = match get_duration(song_path) {
+            Ok(s) => s,
+            Err(e) => {
+                eprintln!("\x1b[0;31mFailed to get duration: {}\x1b[0;20m", e);
+                0
+            }
+        };
+
+        let filepath = song.path();
+        let filename = filepath
+            .file_stem()
+            .unwrap_or_else(|| OsStr::new("Unknown track"))
+            .to_string_lossy()
+            .ascii_chars()
+            .to_string();
+
+        let mut name = filename.trim().bytes().collect::<Vec<u8>>();
+        name.resize(32, 0);
+
+        let mut song_name: [[u8; 2]; 32] = [[0; 2]; 32];
+
+        for (char_count, b) in name.iter().enumerate() {
+            song_name[char_count] = [*b, 0];
+        }
+
+        let s = Song {
+            song_id,
+            song_time_miliseconds,
+            song_name,
+        };
+
+        songs.push(s);
+        files_to_convert.push(song.path());
+    });
+
+    for s in songs.chunks(6) {
+        let empty_song = Song::default();
+        let mut empty_song_groups = s.to_vec();
+        empty_song_groups.resize(6, empty_song);
+
+        song_group = SongGroup {
+            magic: 200819,
+            soundtrack_id: soundtrack_id as i32,
+            id: song_group_id as i32,
+            ipadding: 0,
+            songs: empty_song_groups.try_into().unwrap(),
+            cpadding: [char::MIN; 16],
+        };
+    }
+
+    Ok((song_group, files_to_convert))
+}
+
+fn process_soundtrack(
+    soundtrack: PathBuf,
+    soundtrack_index: usize,
+    soundtrack_count: usize,
+    mut total_songs: usize,
+    total_song_groups: usize,
+) -> Result<(Soundtrack, Vec<SongGroup>, usize, usize, Vec<PathBuf>), Errors> {
+    let mut files_to_convert: Vec<PathBuf> = Default::default();
+
+    let mut songs_count = 0;
+
+    let mut song_groups: Vec<SongGroup> = Default::default();
+    let mut song_groups_ids: Vec<i32> = Vec::with_capacity(84);
+
+    let mut song_group_id = total_song_groups;
+
+    let soundtrack_name_str = soundtrack
+        .file_name()
+        .unwrap_or_else(|| OsStr::new("Unknown soundtrack"))
+        .to_string_lossy()
+        .trim()
+        .ascii_chars()
+        .to_string();
+
+    // Convert the folder name into 2 bytes
+    let mut soundtrack_name = soundtrack_name_str
+        .bytes()
+        .map(|b| [b, 0])
+        .collect::<Vec<[u8; 2]>>();
+
+    // Max value of 32
+    soundtrack_name.resize(32, [0; 2]);
+
+    let files = read_dir(soundtrack)?
+        .filter_map(|x| x.ok())
+        .collect::<Vec<_>>();
+
+    let mut total_time_miliseconds: i32 = 0;
+
+    for chunk in files.chunks(6) {
+        total_songs += chunk.len();
+        songs_count += chunk.len();
+
+        let (songs, mut unconverted_files) =
+            build_songs_group(chunk, song_group_id, soundtrack_index, total_songs)?;
+
+        songs.songs.iter().for_each(|x| {
+            if songs.soundtrack_id == soundtrack_index as i32 {
+                total_time_miliseconds += x.song_time_miliseconds;
+            }
+        });
+
+        song_groups.push(songs);
+        song_group_id += 1;
+        files_to_convert.append(&mut unconverted_files);
+    }
+
+    for s in &song_groups {
+        song_groups_ids.push(s.id);
+    }
+
+    song_groups_ids.resize(84, 0);
+    let song_groups_ids: [i32; 84] = song_groups_ids
+        .clone()
+        .try_into()
+        .map_err(|_| Errors::SkillIssue())?;
+
+    let st = Soundtrack {
+        magic: 136049,
+        id: soundtrack_index as i32,
+        num_songs: songs_count as u32,
+        song_groups_ids,
+        total_time_miliseconds,
+        name: soundtrack_name
+            .try_into()
+            .map_err(|_| Errors::SkillIssue())?,
+        padding: [char::MIN; 24],
+    };
+
+    let mut soundtrack_ids: [i32; 100] = [0; 100];
+    for i in 0..soundtrack_count {
+        soundtrack_ids[i] = i as i32;
+    }
+
+    Ok((
+        st,
+        song_groups,
+        total_songs,
+        song_group_id,
+        files_to_convert,
+    ))
+}
+
 fn get_duration(path: PathBuf) -> Result<i32, Errors> {
     let output = Command::new("ffprobe")
         .args([
@@ -291,23 +374,23 @@ fn get_duration(path: PathBuf) -> Result<i32, Errors> {
 }
 
 fn convert_to_wma(
-    input: PathBuf,
+    input: &Path,
     output: &String,
     bitrate: i16,
-    soundtrack_index: usize,
+    codec: &Codec,
     song_index: usize,
 ) -> Result<(), Errors> {
-    let binding = input.into_os_string();
+    let binding = input.as_os_str();
     let input = binding.to_str().unwrap();
 
-    fs::create_dir_all(format!("{}/{:0>4}", output, soundtrack_index)).unwrap();
+    fs::create_dir_all(format!("{}/0000", output)).map_err(Errors::UnknownIO)?;
 
     Command::new("ffmpeg")
         .args([
             "-i",
             input,
             "-acodec",
-            "wmav1",
+            &codec.to_string(),
             "-ac",
             "2",
             "-ar",
@@ -319,10 +402,7 @@ fn convert_to_wma(
             "-map",
             "0:a",
             "-y",
-            &format!(
-                "{}/{:0>4}/{:0>8x}.wma",
-                output, soundtrack_index, song_index
-            ),
+            &format!("{}/0000/{:0>8x}.wma", output, song_index),
         ])
         .output()
         .map_err(Errors::MissingFfmpeg)?;
@@ -334,41 +414,42 @@ fn write_database(
     output: &String,
     header: Header,
     soundtracks: Vec<Soundtrack>,
-    songs: Vec<Song>,
+    songs: Vec<Vec<SongGroup>>,
 ) -> Result<(), Errors> {
     fs::create_dir_all(format!("{}/", &output)).map_err(Errors::UnknownIO)?;
     let mut database = File::create(format!("{}/ST.DB", &output)).map_err(Errors::UnknownIO)?;
 
-    database.write_all(&header.magic.as_bytes())?;
-    database.write_all(&header.num_soundtracks.as_bytes())?;
-    database.write_all(&header.next_soundtrack_id.as_bytes())?;
-    database.write_all(&header.soundtrack_ids.as_bytes())?;
-    database.write_all(&header.next_song_id.as_bytes())?;
-    database.write_all(&header.padding.as_bytes())?;
+    database.write_all(header.as_bytes())?;
 
-    for st in &soundtracks {
-        database.write_all(&st.magic.as_bytes())?;
-        database.write_all(&st.id.as_bytes())?;
-        database.write_all(&st.num_songs.as_bytes())?;
-        database.write_all(&st.song_groups_ids.as_bytes())?;
-        database.write_all(&st.total_time_miliseconds.as_bytes())?;
-        database.write_all(&st.name.as_bytes())?;
-        database.write_all(&st.padding.as_bytes())?;
-    }
+    database.write_all(soundtracks.as_bytes())?;
 
     for _ in 0..100 - &soundtracks.len() {
-        database.write_all(&[0 as u8; 512])?;
+        database.write_all(&[0_u8; 512])?;
     }
 
     for s in songs {
-        database.write_all(&s.magic.as_bytes())?;
-        database.write_all(&s.soundtrack_id.as_bytes())?;
-        database.write_all(&s.id.as_bytes())?;
-        database.write_all(&s.ipadding.as_bytes())?;
-        database.write_all(&s.song_id.as_bytes())?;
-        database.write_all(&s.song_time_miliseconds.as_bytes())?;
-        database.write_all(&s.song_name.as_bytes())?;
-        database.write_all(&s.cpadding.as_bytes())?;
+        for s in s {
+            database.write_all(s.magic.as_bytes())?;
+            database.write_all(s.soundtrack_id.as_bytes())?;
+            database.write_all(s.id.as_bytes())?;
+            database.write_all(s.ipadding.as_bytes())?;
+
+            for x in s.songs.chunks(6) {
+                for chunk in x {
+                    database.write_all(chunk.song_id.as_bytes())?;
+                }
+
+                for chunk in x {
+                    database.write_all(chunk.song_time_miliseconds.as_bytes())?;
+                }
+
+                for chunk in x {
+                    database.write_all(chunk.song_name.as_bytes())?;
+                }
+            }
+
+            database.write_all(s.cpadding.as_bytes())?;
+        }
     }
 
     Ok(())

src/utils.rs

@@ -1,21 +1,22 @@
-use std::path::PathBuf;
+use zerocopy::{Immutable, IntoBytes};
 
-use zerocopy::TryFromBytes;
-
-pub struct MusicFile {
-    pub path: PathBuf,
-    pub soundtrack_index: u32,
-    pub index: u32,
+#[derive(clap::ValueEnum, Debug, Clone)]
+pub enum Codec {
+    Wmav1,
+    Wmav2,
 }
 
-#[derive(Debug, TryFromBytes)]
-#[repr(C)]
-pub struct Database {
-    pub header: Header,
-    pub soundtrack: Soundtrack,
+impl std::fmt::Display for Codec {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Codec::Wmav1 => write!(f, "wmav1"),
+            Codec::Wmav2 => write!(f, "wmav2"),
+        }
+    }
 }
 
-#[derive(Debug, TryFromBytes)]
+// https://xboxdevwiki.net/Soundtracks#ST.DB
+#[derive(Debug, Immutable, IntoBytes)]
 #[repr(C)]
 pub struct Header {
     pub magic: i32,
@@ -26,7 +27,7 @@ pub struct Header {
     pub padding: [char; 24],
 }
 
-#[derive(Debug, TryFromBytes)]
+#[derive(Debug, Immutable, IntoBytes)]
 #[repr(C)]
 pub struct Soundtrack {
     pub magic: i32,
@@ -38,15 +39,91 @@ pub struct Soundtrack {
     pub padding: [char; 24],
 }
 
-#[derive(Debug, TryFromBytes)]
+#[derive(Debug, Immutable, IntoBytes, Clone, Copy)]
 #[repr(C)]
 pub struct Song {
+    pub song_id: i32,
+    pub song_time_miliseconds: i32,
+    pub song_name: [[u8; 2]; 32],
+}
+
+#[derive(Debug, Immutable, IntoBytes, Clone, Copy)]
+#[repr(C)]
+pub struct SongGroup {
     pub magic: i32,
     pub soundtrack_id: i32,
     pub id: i32,
     pub ipadding: i32,
-    pub song_id: [i32; 6],
-    pub song_time_miliseconds: [i32; 6],
-    pub song_name: [[u8; 2]; 192],
+    pub songs: [Song; 6],
     pub cpadding: [char; 16],
 }
+
+impl Default for Header {
+    #[inline]
+    fn default() -> Header {
+        Header {
+            magic: 0,
+            num_soundtracks: 0,
+            next_soundtrack_id: 0,
+            soundtrack_ids: [0; 100],
+            next_song_id: 0,
+            padding: [char::MIN; 24],
+        }
+    }
+}
+
+impl Default for Soundtrack {
+    #[inline]
+    fn default() -> Soundtrack {
+        Soundtrack {
+            magic: 0,
+            id: 0,
+            num_songs: 0,
+            song_groups_ids: [0; 84],
+            total_time_miliseconds: 0,
+            name: [[0; 2]; 32],
+            padding: [char::MIN; 24],
+        }
+    }
+}
+
+impl Default for Song {
+    #[inline]
+    fn default() -> Song {
+        Song {
+            song_id: 0,
+            song_time_miliseconds: 0,
+            song_name: [[0; 2]; 32],
+        }
+    }
+}
+
+impl Default for SongGroup {
+    #[inline]
+    fn default() -> SongGroup {
+        SongGroup {
+            magic: 0,
+            soundtrack_id: 0,
+            id: 0,
+            ipadding: 0,
+            songs: [Song::default(); 6],
+            cpadding: [char::MIN; 16],
+        }
+    }
+}
+
+pub enum Ansi {
+    ClearLine,
+    CursorUp,
+    CursorDown,
+}
+
+impl std::fmt::Display for Ansi {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Ansi::ClearLine => write!(f, "\x1B[K"),
+            Ansi::CursorUp => write!(f, "\x1B[1A"),
+            Ansi::CursorDown => write!(f, "\x1B[1B"),
+        }
+    }
+}