2025-04-20 04:02:53 -05:00
17 changed files with 1757 additions and 2439 deletions
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@ -1,6 +1,2 @@
 [target.'cfg(target_family = "wasm")']
 rustflags = ["--cfg=web_sys_unstable_apis"]
 # Enable for testing WASM-only stuff
 [build]
 #target = "wasm32-unknown-unknown"
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@ -16,8 +16,8 @@ jobs:
    steps:
    - uses: actions/checkout@v3
-    - name: Build Linux
+    - name: Build
-      run: cargo build --verbose --target x86_64-unknown-linux-gnu
+      run: cargo build --verbose
    - name: Run tests
      run: cargo test --verbose
    - name: Run clippy
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,57 +1,47 @@
 [package]
 name = "minidisc"
-version = "0.1.3"
+version = "0.1.1"
 edition = "2021"
 homepage = "https://github.com/G2-Games/minidisc-rs/"
-repository = "https://github.com/G2-Games/minidisc-rs/"
+repository = "https://github.com/G2-Games/minidisc-cli/minidisc-rs/"
 documentation = "https://docs.rs/cross_usb"
 description = "A library for interacting with NetMD and Hi-MD minidisc devices."
-license = "MIT OR Apache-2.0"
+license = "AGPL-3.0"
 authors = ["G2 <ke0bhogsg@gmail.com>", "Asivery"]
 readme = "README.md"
-keywords = ["minidisc", "netmd", "net-md", "hi-md", "sony"]
+keywords = ["minidisc"]
 categories = ["hardware-support", "wasm", "multimedia::audio"]
 # Have docs.rs make documentation for most supported targets
 [package.metadata.docs.rs]
-targets = [
+targets = ["x86_64-unknown-linux-gnu", "x86_64-pc-windows-msvc", "aarch64-pc-windows-msvc", "x86_64-apple-darwin", "aarch64-apple-darwin", "wasm32-unknown-unknown"]
    "x86_64-unknown-linux-gnu",
    "x86_64-pc-windows-msvc",
    "aarch64-pc-windows-msvc",
    "x86_64-apple-darwin",
    "aarch64-apple-darwin",
    "wasm32-unknown-unknown"
 ]
 [lib]
 crate-type = ["cdylib", "rlib"]
 [dev-dependencies]
 tokio-test = "0.4.3"
 [dependencies]
 diacritics = "0.2.0"
 encoding_rs = "0.8.33"
 nofmt = "1.0.0"
 once_cell = "1.18.0"
 unicode-normalization = "0.1.22"
-regex = "1.10"
+regex = "1.10.2"
-cross_usb = "0.4"
+lazy_static = "1.4.0"
-num-derive = "0.4.2"
+cross_usb = "0.2"
 num-derive = "0.3.3"
 num-traits = "0.2.14"
 rand = "0.8.5"
 getrandom = { version = "0.2", features = ["js"] }
 des = "0.8"
 cbc = "0.1"
 ecb = "0.1"
-tokio = { version = "1.36", features = ["full", "sync"] }
+tokio = { version = "1.36", features = ["sync"] }
 g2-unicode-jp = "0.4.1"
 thiserror = "1.0.57"
 phf = { version = "0.11.2", features = ["phf_macros", "macros"] }
 byteorder = "1.5.0"
 log = "0.4.22"
 [target.'cfg(target_family = "wasm")'.dependencies]
-gloo = { version = "0.11.0", features = ["futures", "worker"] }
+gloo = { version = "0.11.0", features = ["futures"] }
-futures = "0.3.30"
+
 [package.metadata.wasm-pack.profile.dev.wasm-bindgen]
 dwarf-debug-info = true
--- a/661
+++ b/661
@ -0,0 +1,661 @@
                    GNU AFFERO GENERAL PUBLIC LICENSE
                       Version 3, 19 November 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 Affero General Public License is a free, copyleft license for
 software and other kinds of works, specifically designed to ensure
 cooperation with the community in the case of network server software.
  The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
 our General Public Licenses are 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.
  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.
  Developers that use our General Public Licenses protect your rights
 with two steps: (1) assert copyright on the software, and (2) offer
 you this License which gives you legal permission to copy, distribute
 and/or modify the software.
  A secondary benefit of defending all users' freedom is that
 improvements made in alternate versions of the program, if they
 receive widespread use, become available for other developers to
 incorporate.  Many developers of free software are heartened and
 encouraged by the resulting cooperation.  However, in the case of
 software used on network servers, this result may fail to come about.
 The GNU General Public License permits making a modified version and
 letting the public access it on a server without ever releasing its
 source code to the public.
  The GNU Affero General Public License is designed specifically to
 ensure that, in such cases, the modified source code becomes available
 to the community.  It requires the operator of a network server to
 provide the source code of the modified version running there to the
 users of that server.  Therefore, public use of a modified version, on
 a publicly accessible server, gives the public access to the source
 code of the modified version.
  An older license, called the Affero General Public License and
 published by Affero, was designed to accomplish similar goals.  This is
 a different license, not a version of the Affero GPL, but Affero has
 released a new version of the Affero GPL which permits relicensing under
 this license.
  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 Affero 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. Remote Network Interaction; Use with the GNU General Public License.
  Notwithstanding any other provision of this License, if you modify the
 Program, your modified version must prominently offer all users
 interacting with it remotely through a computer network (if your version
 supports such interaction) an opportunity to receive the Corresponding
 Source of your version by providing access to the Corresponding Source
 from a network server at no charge, through some standard or customary
 means of facilitating copying of software.  This Corresponding Source
 shall include the Corresponding Source for any work covered by version 3
 of the GNU General Public License that is incorporated pursuant to the
 following paragraph.
  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 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 work with which it is combined will remain governed by version
 3 of the GNU General Public License.
  14. Revised Versions of this License.
  The Free Software Foundation may publish revised and/or new versions of
 the GNU Affero 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 Affero 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 Affero 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 Affero 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 Affero 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 Affero General Public License for more details.
    You should have received a copy of the GNU Affero 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 your software can interact with users remotely through a computer
 network, you should also make sure that it provides a way for users to
 get its source.  For example, if your program is a web application, its
 interface could display a "Source" link that leads users to an archive
 of the code.  There are many ways you could offer source, and different
 solutions will be better for different programs; see section 13 for the
 specific requirements.
  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 AGPL, see
 <https://www.gnu.org/licenses/>.
--- a/202
+++ b/202
@ -1,202 +0,0 @@
                                 Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/
   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
   1. Definitions.
      "License" shall mean the terms and conditions for use, reproduction,
      and distribution as defined by Sections 1 through 9 of this document.
      "Licensor" shall mean the copyright owner or entity authorized by
      the copyright owner that is granting the License.
      "Legal Entity" shall mean the union of the acting entity and all
      other entities that control, are controlled by, or are under common
      control with that entity. For the purposes of this definition,
      "control" means (i) the power, direct or indirect, to cause the
      direction or management of such entity, whether by contract or
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
      outstanding shares, or (iii) beneficial ownership of such entity.
      "You" (or "Your") shall mean an individual or Legal Entity
      exercising permissions granted by this License.
      "Source" form shall mean the preferred form for making modifications,
      including but not limited to software source code, documentation
      source, and configuration files.
      "Object" form shall mean any form resulting from mechanical
      transformation or translation of a Source form, including but
      not limited to compiled object code, generated documentation,
      and conversions to other media types.
      "Work" shall mean the work of authorship, whether in Source or
      Object form, made available under the License, as indicated by a
      copyright notice that is included in or attached to the work
      (an example is provided in the Appendix below).
      "Derivative Works" shall mean any work, whether in Source or Object
      form, that is based on (or derived from) the Work and for which the
      editorial revisions, annotations, elaborations, or other modifications
      represent, as a whole, an original work of authorship. For the purposes
      of this License, Derivative Works shall not include works that remain
      separable from, or merely link (or bind by name) to the interfaces of,
      the Work and Derivative Works thereof.
      "Contribution" shall mean any work of authorship, including
      the original version of the Work and any modifications or additions
      to that Work or Derivative Works thereof, that is intentionally
      submitted to Licensor for inclusion in the Work by the copyright owner
      or by an individual or Legal Entity authorized to submit on behalf of
      the copyright owner. For the purposes of this definition, "submitted"
      means any form of electronic, verbal, or written communication sent
      to the Licensor or its representatives, including but not limited to
      communication on electronic mailing lists, source code control systems,
      and issue tracking systems that are managed by, or on behalf of, the
      Licensor for the purpose of discussing and improving the Work, but
      excluding communication that is conspicuously marked or otherwise
      designated in writing by the copyright owner as "Not a Contribution."
      "Contributor" shall mean Licensor and any individual or Legal Entity
      on behalf of whom a Contribution has been received by Licensor and
      subsequently incorporated within the Work.
   2. Grant of Copyright License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      copyright license to reproduce, prepare Derivative Works of,
      publicly display, publicly perform, sublicense, and distribute the
      Work and such Derivative Works in Source or Object form.
   3. Grant of Patent License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      (except as stated in this section) patent license to make, have made,
      use, offer to sell, sell, import, and otherwise transfer the Work,
      where such license applies only to those patent claims licensable
      by such Contributor that are necessarily infringed by their
      Contribution(s) alone or by combination of their Contribution(s)
      with the Work to which such Contribution(s) was submitted. If You
      institute patent litigation against any entity (including a
      cross-claim or counterclaim in a lawsuit) alleging that the Work
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
      as of the date such litigation is filed.
   4. Redistribution. You may reproduce and distribute copies of the
      Work or Derivative Works thereof in any medium, with or without
      modifications, and in Source or Object form, provided that You
      meet the following conditions:
      (a) You must give any other recipients of the Work or
          Derivative Works a copy of this License; and
      (b) You must cause any modified files to carry prominent notices
          stating that You changed the files; and
      (c) You must retain, in the Source form of any Derivative Works
          that You distribute, all copyright, patent, trademark, and
          attribution notices from the Source form of the Work,
          excluding those notices that do not pertain to any part of
          the Derivative Works; and
      (d) If the Work includes a "NOTICE" text file as part of its
          distribution, then any Derivative Works that You distribute must
          include a readable copy of the attribution notices contained
          within such NOTICE file, excluding those notices that do not
          pertain to any part of the Derivative Works, in at least one
          of the following places: within a NOTICE text file distributed
          as part of the Derivative Works; within the Source form or
          documentation, if provided along with the Derivative Works; or,
          within a display generated by the Derivative Works, if and
          wherever such third-party notices normally appear. The contents
          of the NOTICE file are for informational purposes only and
          do not modify the License. You may add Your own attribution
          notices within Derivative Works that You distribute, alongside
          or as an addendum to the NOTICE text from the Work, provided
          that such additional attribution notices cannot be construed
          as modifying the License.
      You may add Your own copyright statement to Your modifications and
      may provide additional or different license terms and conditions
      for use, reproduction, or distribution of Your modifications, or
      for any such Derivative Works as a whole, provided Your use,
      reproduction, and distribution of the Work otherwise complies with
      the conditions stated in this License.
   5. Submission of Contributions. Unless You explicitly state otherwise,
      any Contribution intentionally submitted for inclusion in the Work
      by You to the Licensor shall be under the terms and conditions of
      this License, without any additional terms or conditions.
      Notwithstanding the above, nothing herein shall supersede or modify
      the terms of any separate license agreement you may have executed
      with Licensor regarding such Contributions.
   6. Trademarks. This License does not grant permission to use the trade
      names, trademarks, service marks, or product names of the Licensor,
      except as required for reasonable and customary use in describing the
      origin of the Work and reproducing the content of the NOTICE file.
   7. Disclaimer of Warranty. Unless required by applicable law or
      agreed to in writing, Licensor provides the Work (and each
      Contributor provides its Contributions) on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
      implied, including, without limitation, any warranties or conditions
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
      PARTICULAR PURPOSE. You are solely responsible for determining the
      appropriateness of using or redistributing the Work and assume any
      risks associated with Your exercise of permissions under this License.
   8. Limitation of Liability. In no event and under no legal theory,
      whether in tort (including negligence), contract, or otherwise,
      unless required by applicable law (such as deliberate and grossly
      negligent acts) or agreed to in writing, shall any Contributor be
      liable to You for damages, including any direct, indirect, special,
      incidental, or consequential damages of any character arising as a
      result of this License or out of the use or inability to use the
      Work (including but not limited to damages for loss of goodwill,
      work stoppage, computer failure or malfunction, or any and all
      other commercial damages or losses), even if such Contributor
      has been advised of the possibility of such damages.
   9. Accepting Warranty or Additional Liability. While redistributing
      the Work or Derivative Works thereof, You may choose to offer,
      and charge a fee for, acceptance of support, warranty, indemnity,
      or other liability obligations and/or rights consistent with this
      License. However, in accepting such obligations, You may act only
      on Your own behalf and on Your sole responsibility, not on behalf
      of any other Contributor, and only if You agree to indemnify,
      defend, and hold each Contributor harmless for any liability
      incurred by, or claims asserted against, such Contributor by reason
      of your accepting any such warranty or additional liability.
   END OF TERMS AND CONDITIONS
   APPENDIX: How to apply the Apache License to your work.
      To apply the Apache License to your work, attach the following
      boilerplate notice, with the fields enclosed by brackets "[]"
      replaced with your own identifying information. (Don't include
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
      file or class name and description of purpose be included on the
      same "printed page" as the copyright notice for easier
      identification within third-party archives.
   Copyright [yyyy] [name of copyright owner]
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
       http://www.apache.org/licenses/LICENSE-2.0
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
--- a/21
+++ b/21
@ -1,21 +0,0 @@
 MIT License
 Copyright (c) 2024 G2
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
--- a/README.md
+++ b/README.md
@ -1,31 +1,21 @@
 # Rust Minidisc
 [![Lib.rs Version](https://img.shields.io/crates/v/minidisc?style=for-the-badge&logo=rust&label=lib.rs&color=%23a68bfc)](https://lib.rs/crates/minidisc)
 [![docs.rs](https://img.shields.io/docsrs/minidisc?style=for-the-badge)](https://docs.rs/minidisc/)
 A library for controlling and interfacing with [MiniDisc](https://en.wikipedia.org/wiki/MiniDisc) devices from within Rust programs. Compatible with many cross platform targets (including Web Assembly!) by using [cross-usb](https://github.com/G2-Games/cross-usb).
-The feature set is very similar to that of [netmd-js](https://github.com/cybercase/netmd-js) which this library is inspired by. Development of this project was made much easier by the absolutely awesome [Web Minidisc project](https://github.com/asivery/webminidisc), [NetMD-exploits](https://github.com/asivery/netmd-exploits), and the C based [Linux Minidisc project](https://github.com/linux-minidisc/linux-minidisc). Go check those projects out!
+The feature set is very similar to that of [netmd-js](https://github.com/cybercase/netmd-js) which this library is inspired by. For more information check out the absolutely awesome [Web Minidisc project](https://github.com/asivery/webminidisc), [NetMD-exploits](https://github.com/asivery/netmd-exploits), and the C based [Linux Minidisc project](https://github.com/linux-minidisc/linux-minidisc).
-> [!IMPORTANT]
+Documentation has not been finished and is a work in progress.
 > Documentation has not been finished and is a work in progress. Any contributions would be appreciated!
 ## Current Features
 ### NetMD
 - [x] Track upload
 - [x] Track management
 - [x] Playback control
- [x] Group Management
+- [ ] Group Management
 - [x] Track download ([MZ-RH1](https://www.minidisc.wiki/equipment/sony/portable/mz-rh1) only) 
 - [ ] Factory Mode
 ### Hi-MD
 - [ ] Track upload
 - [ ] Track management
 - [ ] Playback control
 - [ ] Group Management
-
+- [ ] Track download
 ## Todo
 - [ ] Exploits (from [NetMD-exploits](https://github.com/asivery/netmd-exploits))
 - [ ] Hi-MD experimentation
 - [ ] Documentation
 - [ ] Better JS bindings
--- a/src/lib.rs
+++ b/src/lib.rs
@ -1,30 +1,5 @@
-//! A crate for controlling NetMD and Hi-MD devices.
+/// A crate for controlling NetMD and Hi-MD devices.
-//!
+///
-//! This crate is entirely `async` (a necessity because of USB in WASM), but
+/// To use this library, first you need to get a device from [cross-usb] and then open a [netmd::interface::NetMDInterface]
 //! it can be used in programs which are not async by using a crate like
 //! [futures_lite](https://docs.rs/futures-lite/) with the `block_on` function.
 //!
 //! To use this library, first you need to get a device from [`cross_usb`] and
 //! then open a [`netmd::NetMDContext`].
 //!
 //! ```no_run
 //! # tokio_test::block_on(async {
 //! use cross_usb::get_device;
 //! use minidisc::netmd::base::DEVICE_IDS_CROSSUSB;
 //! use minidisc::netmd::NetMDContext;
 //!
 //! // Get a device using the built-in list of descriptors for minidisc devices
 //! let dev_descriptor = cross_usb::get_device(DEVICE_IDS_CROSSUSB.to_vec()).await
 //!     .expect("Failed to find device");
 //!
 //! // Open a NetMD Context with the device
 //! let mut context = NetMDContext::new(dev_descriptor).await
 //!     .expect("Could not create context");
 //!
 //! // Perform operations on it ...
 //! context.list_content().await
 //!     .expect("Could not list disc contents");
 //! # })
 //! ```
 pub mod netmd;
--- a/src/main.rs
+++ b/src/main.rs
@ -1,42 +0,0 @@
 use std::{process::exit, time::Duration};
 #[tokio::main]
 async fn main() {
    let Ok(player) = cross_usb::get_device(minidisc::netmd::DEVICE_IDS_CROSSUSB.to_vec()).await else {
        eprintln!("Could not find a MiniDisc device");
        exit(1);
    };
    let Ok(mut player) = minidisc::netmd::NetMDContext::new(player).await else {
        eprintln!("Could not open device!");
        exit(1);
    };
    let disc = player.list_content().await.expect("Could not retrieve player's contents");
    for track in disc.tracks() {
        println!(
            "{:02}:\n    Title: {} | {}\n Duration: {}\n Encoding: {}\n",
            track.index(),
            track.title(), track.full_width_title(),
            pretty_time(track.duration().as_duration()),
            track.encoding(),
        );
    }
 }
 fn pretty_time(dur: Duration) -> String {
    let mut string = String::new();
    if dur >= Duration::from_secs(3600) {
        string.push_str(&format!("{:02}", dur.as_secs() / 3600));
        string.push(':');
    }
    if dur >= Duration::from_secs(60) {
        string.push_str(&format!("{:02}", (dur.as_secs() / 60) % 3600).to_string());
        string.push(':');
    }
    if dur >= Duration::from_secs(60) {
        string.push_str(&format!("{:02}", dur.as_secs() % 60).to_string());
    }
    string
 }
--- a/src/netmd/base.rs
+++ b/src/netmd/base.rs
@ -1,82 +1,79 @@
 #![cfg_attr(debug_assertions, allow(dead_code))]
 use std::time::Duration;
 use nofmt;
 use once_cell::sync::Lazy;
 use thiserror::Error;
 // USB stuff
-use cross_usb::prelude::*;
+use cross_usb::usb::{ControlIn, ControlOut, ControlType, Device, Interface, Recipient, UsbError};
-use cross_usb::usb::{ControlIn, ControlOut, ControlType, Recipient, Error};
+use cross_usb::{UsbDevice, UsbInterface};
 use cross_usb::{DeviceInfo, Interface};
 use super::utils::cross_sleep;
 const BULK_WRITE_ENDPOINT: u8 = 0x02;
 const BULK_READ_ENDPOINT: u8 = 0x81;
-nofmt::pls! { // Skip formatting the following info
+pub static DEVICE_IDS: Lazy<Box<[DeviceId]>> = Lazy::new(|| {
-/// Device IDs for use in matching existing devices
+    nofmt::pls! {
-pub static DEVICE_IDS: &[DeviceId] = &[
+        Box::new([
-    DeviceId { vendor_id: 0x04dd, product_id: 0x7202, name: Some("Sharp IM-MT899H") },
+            DeviceId {vendor_id: 0x04dd, product_id: 0x7202, name: Some(String::from("Sharp IM-MT899H"))},
-    DeviceId { vendor_id: 0x04dd, product_id: 0x9013, name: Some("Sharp IM-DR400") },
+            DeviceId {vendor_id: 0x04dd, product_id: 0x9013, name: Some(String::from("Sharp IM-DR400"))},
-    DeviceId { vendor_id: 0x04dd, product_id: 0x9014, name: Some("Sharp IM-DR80") },
+            DeviceId {vendor_id: 0x04dd, product_id: 0x9014, name: Some(String::from("Sharp IM-DR80"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x0034, name: Some("Sony PCLK-XX") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x0034, name: Some(String::from("Sony PCLK-XX"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x0036, name: Some("Sony") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x0036, name: Some(String::from("Sony"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x0075, name: Some("Sony MZ-N1") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x0075, name: Some(String::from("Sony MZ-N1"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x007c, name: Some("Sony") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x007c, name: Some(String::from("Sony"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x0080, name: Some("Sony LAM-1") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x0080, name: Some(String::from("Sony LAM-1"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x0081, name: Some("Sony MDS-JB980/MDS-NT1/MDS-JE780") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x0081, name: Some(String::from("Sony MDS-JB980/MDS-NT1/MDS-JE780"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x0084, name: Some("Sony MZ-N505") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x0084, name: Some(String::from("Sony MZ-N505"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x0085, name: Some("Sony MZ-S1") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x0085, name: Some(String::from("Sony MZ-S1"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x0086, name: Some("Sony MZ-N707") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x0086, name: Some(String::from("Sony MZ-N707"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x008e, name: Some("Sony CMT-C7NT") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x008e, name: Some(String::from("Sony CMT-C7NT"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x0097, name: Some("Sony PCGA-MDN1") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x0097, name: Some(String::from("Sony PCGA-MDN1"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x00ad, name: Some("Sony CMT-L7HD") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x00ad, name: Some(String::from("Sony CMT-L7HD"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x00c6, name: Some("Sony MZ-N10") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x00c6, name: Some(String::from("Sony MZ-N10"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x00c7, name: Some("Sony MZ-N910") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x00c7, name: Some(String::from("Sony MZ-N910"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x00c8, name: Some("Sony MZ-N710/NF810") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x00c8, name: Some(String::from("Sony MZ-N710/NF810"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x00c9, name: Some("Sony MZ-N510/N610") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x00c9, name: Some(String::from("Sony MZ-N510/N610"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x00ca, name: Some("Sony MZ-NE410/NF520D") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x00ca, name: Some(String::from("Sony MZ-NE410/NF520D"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x00e7, name: Some("Sony CMT-M333NT/M373NT") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x00e7, name: Some(String::from("Sony CMT-M333NT/M373NT"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x00eb, name: Some("Sony MZ-NE810/NE910") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x00eb, name: Some(String::from("Sony MZ-NE810/NE910"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x0101, name: Some("Sony LAM") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x0101, name: Some(String::from("Sony LAM"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x0113, name: Some("Aiwa AM-NX1") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x0113, name: Some(String::from("Aiwa AM-NX1"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x013f, name: Some("Sony MDS-S500") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x013f, name: Some(String::from("Sony MDS-S500"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x014c, name: Some("Aiwa AM-NX9") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x014c, name: Some(String::from("Aiwa AM-NX9"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x017e, name: Some("Sony MZ-NH1") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x017e, name: Some(String::from("Sony MZ-NH1"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x0180, name: Some("Sony MZ-NH3D") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x0180, name: Some(String::from("Sony MZ-NH3D"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x0182, name: Some("Sony MZ-NH900") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x0182, name: Some(String::from("Sony MZ-NH900"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x0184, name: Some("Sony MZ-NH700/NH800") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x0184, name: Some(String::from("Sony MZ-NH700/NH800"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x0186, name: Some("Sony MZ-NH600") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x0186, name: Some(String::from("Sony MZ-NH600"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x0187, name: Some("Sony MZ-NH600D") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x0187, name: Some(String::from("Sony MZ-NH600D"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x0188, name: Some("Sony MZ-N920") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x0188, name: Some(String::from("Sony MZ-N920"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x018a, name: Some("Sony LAM-3") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x018a, name: Some(String::from("Sony LAM-3"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x01e9, name: Some("Sony MZ-DH10P") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x01e9, name: Some(String::from("Sony MZ-DH10P"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x0219, name: Some("Sony MZ-RH10") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x0219, name: Some(String::from("Sony MZ-RH10"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x021b, name: Some("Sony MZ-RH710/MZ-RH910") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x021b, name: Some(String::from("Sony MZ-RH710/MZ-RH910"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x021d, name: Some("Sony CMT-AH10") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x021d, name: Some(String::from("Sony CMT-AH10"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x022c, name: Some("Sony CMT-AH10") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x022c, name: Some(String::from("Sony CMT-AH10"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x023c, name: Some("Sony DS-HMD1") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x023c, name: Some(String::from("Sony DS-HMD1"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x0286, name: Some("Sony MZ-RH1") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x0286, name: Some(String::from("Sony MZ-RH1"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x011a, name: Some("Sony CMT-SE7") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x011a, name: Some(String::from("Sony CMT-SE7"))},
-    DeviceId { vendor_id: 0x054c, product_id: 0x0148, name: Some("Sony MDS-A1") },
+            DeviceId {vendor_id: 0x054c, product_id: 0x0148, name: Some(String::from("Sony MDS-A1"))},
-    DeviceId { vendor_id: 0x0b28, product_id: 0x1004, name: Some("Kenwood MDX-J9") },
+            DeviceId {vendor_id: 0x0b28, product_id: 0x1004, name: Some(String::from("Kenwood MDX-J9"))},
-    DeviceId { vendor_id: 0x04da, product_id: 0x23b3, name: Some("Panasonic SJ-MR250") },
+            DeviceId {vendor_id: 0x04da, product_id: 0x23b3, name: Some(String::from("Panasonic SJ-MR250"))},
-    DeviceId { vendor_id: 0x04da, product_id: 0x23b6, name: Some("Panasonic SJ-MR270") },
+            DeviceId {vendor_id: 0x04da, product_id: 0x23b6, name: Some(String::from("Panasonic SJ-MR270"))},
-];
+        ])
-}
+    }
 });
 /// Device IDs for use with [cross_usb]
 pub static DEVICE_IDS_CROSSUSB: Lazy<Box<[cross_usb::DeviceFilter]>> = Lazy::new(|| {
-    DEVICE_IDS
+    DEVICE_IDS.iter().map(|d|{
        .iter()
        .map(|d| {
        cross_usb::device_filter! {
            vendor_id: d.vendor_id,
            product_id: d.product_id,
        }
-        })
+    }).collect()
        .collect()
 });
 /// The current status of the Minidisc device
@ -96,7 +93,7 @@ pub enum Status {
 pub struct DeviceId {
    vendor_id: u16,
    product_id: u16,
-    name: Option<&'static str>,
+    name: Option<String>,
 }
 #[derive(Error, Debug, PartialEq, Eq, PartialOrd, Ord)]
@ -114,17 +111,12 @@ pub enum NetMDError {
    UnknownDevice(DeviceId),
    #[error("usb connection error")]
-    UsbError(#[from] Error),
+    UsbError(#[from] UsbError),
 }
-/// A low-level USB connection to a NetMD device.
+/// A USB connection to a NetMD device
 ///
 /// With this you can send raw commands to the device and recieve raw data.
 ///
 /// For simple communication with a NetMD device, you most likely want the
 /// higher level [`super::NetMDInterface`] or [`super::NetMDContext`] interfaces
 pub struct NetMD {
-    usb_interface: Interface,
+    usb_interface: UsbInterface,
    model: DeviceId,
 }
@ -132,10 +124,10 @@ impl NetMD {
    const READ_REPLY_RETRY_INTERVAL: u32 = 10;
    /// Creates a new interface to a NetMD device
-    pub async fn new(usb_descriptor: DeviceInfo) -> Result<Self, NetMDError> {
+    pub async fn new(usb_device: &UsbDevice) -> Result<Self, NetMDError> {
        let mut model = DeviceId {
-            vendor_id: usb_descriptor.vendor_id().await,
+            vendor_id: usb_device.vendor_id().await,
-            product_id: usb_descriptor.product_id().await,
+            product_id: usb_device.product_id().await,
            name: None,
        };
@ -143,7 +135,7 @@ impl NetMD {
            if device_type.vendor_id == model.vendor_id
                && device_type.product_id == model.product_id
            {
-                model.name = device_type.name;
+                model.name = device_type.name.clone();
                break;
            }
        }
@ -153,7 +145,6 @@ impl NetMD {
            Some(_) => (),
        }
        let usb_device = usb_descriptor.open().await?;
        let usb_interface = usb_device.open_interface(0).await?;
        Ok(Self {
@ -163,8 +154,8 @@ impl NetMD {
    }
    /// Gets the device name, this is limited to the devices in the list
-    pub fn device_name(&self) -> Option<&str> {
+    pub fn device_name(&self) -> &Option<String> {
-        self.model.name
+        &self.model.name
    }
    /// Gets the vendor id
@ -207,17 +198,15 @@ impl NetMD {
        Ok((length_bytes, poll_result))
    }
    /// Send a control message to the device (Raw bytes)
    pub async fn send_command(&mut self, command: Vec<u8>) -> Result<(), NetMDError> {
        self._send_command(command, false).await
    }
    /// Send a factory control message to the device (Raw bytes)
    pub async fn send_factory_command(&mut self, command: Vec<u8>) -> Result<(), NetMDError> {
        self._send_command(command, true).await
    }
-    /// Send a control message to the device, can also send factory commands
+    /// Send a control message to the device
    async fn _send_command(
        &mut self,
        command: Vec<u8>,
@ -319,24 +308,20 @@ impl NetMD {
    }
    // Default chunksize should be 0x10000
-    pub async fn read_bulk<F: Fn(usize, usize)>(
+    pub async fn read_bulk(
        &mut self,
        length: usize,
        chunksize: usize,
        progress_callback: Option<F>,
    ) -> Result<Vec<u8>, NetMDError> {
-        let result = self
+        let result = self.read_bulk_to_array(length, chunksize).await?;
            .read_bulk_to_array(length, chunksize, progress_callback)
            .await?;
        Ok(result)
    }
-    pub async fn read_bulk_to_array<F: Fn(usize, usize)>(
+    pub async fn read_bulk_to_array(
        &mut self,
        length: usize,
        chunksize: usize,
        progress_callback: Option<F>,
    ) -> Result<Vec<u8>, NetMDError> {
        let mut final_result: Vec<u8> = Vec::new();
        let mut done = 0;
@ -354,10 +339,6 @@ impl NetMD {
                Err(error) => return Err(NetMDError::UsbError(error)),
            };
            if let Some(cb) = &progress_callback {
                cb(length, done)
            }
            final_result.extend_from_slice(&res);
        }
--- a/src/netmd/commands.rs
+++ b/src/netmd/commands.rs
@ -1,25 +1,13 @@
 #![cfg_attr(debug_assertions, allow(dead_code))]
 use cross_usb::DeviceInfo;
 use num_derive::FromPrimitive;
 use num_traits::FromPrimitive;
 use regex::Regex;
 use std::error::Error;
 use std::time::Duration;
-use crate::netmd::interface::DiscFlag;
+use super::interface::{MDSession, MDTrack, NetMDInterface};
-use crate::netmd::utils::{create_aea_header, create_wav_header, AeaOptions, RawTime};
+use super::utils::cross_sleep;
-use super::interface::{
+#[derive(FromPrimitive, PartialEq)]
    Channels, Direction, DiscFormat, Encoding, InterfaceError, MDSession, MDTrack, NetMDInterface,
    TrackFlag,
 };
 use super::utils::{
    cross_sleep, half_width_title_length, half_width_to_full_width_range,
    sanitize_full_width_title, sanitize_half_width_title,
 };
 /// The current reported status from the device.
 #[derive(Debug, Clone, Copy, FromPrimitive, PartialEq, Eq)]
 pub enum OperatingStatus {
    Ready = 50687,
    Playing = 50037,
@ -32,16 +20,12 @@ pub enum OperatingStatus {
    ReadyForTransfer = 65319,
 }
 /// A representation of time in the way a NetMD device uses internally.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct Time {
    pub minute: u16,
    pub second: u16,
    pub frame: u16,
 }
 /// A representation of the current status of the device.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct DeviceStatus {
    pub disc_present: bool,
    pub state: Option<OperatingStatus>,
@ -49,291 +33,12 @@ pub struct DeviceStatus {
    pub time: Time,
 }
-/// Information about a single track
+pub async fn device_status(interface: &mut NetMDInterface) -> Result<DeviceStatus, Box<dyn Error>> {
-#[derive(Debug, Clone, PartialEq, Eq)]
+    let status = interface.status().await?;
-pub struct Track {
+    let playback_status = interface.playback_status2().await?;
    index: u16,
    title: String,
    full_width_title: String,
    duration: RawTime,
    channel: Channels,
    encoding: Encoding,
    protected: TrackFlag,
 }
 impl Track {
    /// Get the number of title cells a title will take up.
    pub fn cells_for_title(&self) -> (usize, usize) {
        let encoding_name_correction = match self.encoding {
            Encoding::SP => 0,
            _ => 1,
        };
        let full_width_length = chars_to_cells(self.full_width_title.len() * 2);
        let half_width_length = chars_to_cells(half_width_title_length(&self.title));
        (
            usize::max(encoding_name_correction, half_width_length),
            usize::max(encoding_name_correction, full_width_length),
        )
    }
    pub fn index(&self) -> u16 {
        self.index
    }
    pub fn title(&self) -> &String {
        &self.title
    }
    pub fn full_width_title(&self) -> &String {
        &self.full_width_title
    }
    pub fn duration(&self) -> RawTime {
        self.duration
    }
    pub fn channels(&self) -> Channels {
        self.channel
    }
    pub fn encoding(&self) -> Encoding {
        self.encoding
    }
    pub fn protected(&self) -> TrackFlag {
        self.protected
    }
 }
 /// Information about a single group on the disc, containing [`Track`]s
 #[derive(Debug, Clone)]
 pub struct Group {
    index: u16,
    title: Option<String>,
    full_width_title: Option<String>,
    tracks: Vec<Track>,
 }
 /// Information about a MiniDisc complete with [`Track`]s, [`Group`]s, and metadata.
 #[derive(Debug, Clone)]
 pub struct Disc {
    title: String,
    full_width_title: String,
    writeable: bool,
    write_protected: bool,
    used: u64,
    left: u64,
    total: u64,
    track_count: u16,
    groups: Vec<Group>,
 }
 impl Disc {
    pub fn track_count(&self) -> u16 {
        self.groups
            .iter()
            .map(|g| g.tracks.len())
            .reduce(|acc, s| acc + s)
            .unwrap() as u16
    }
    pub fn tracks(&self) -> Vec<Track> {
        let mut tracks: Vec<Track> = self.groups.iter().flat_map(|g| g.tracks.clone()).collect();
        tracks.sort_unstable_by_key(|t| t.index);
        tracks
    }
    fn remaining_characters_for_titles(
        &self,
        ignore_disc_titles: bool,
        include_groups: bool,
    ) -> (usize, usize) {
        const CELL_LIMIT: usize = 255;
        let groups = self.groups.iter().filter(|g| g.title.is_some());
        let (disc_fw_title, disc_hw_title) = if !ignore_disc_titles {
            (self.full_width_title.clone(), self.full_width_title.clone())
        } else {
            (String::new(), String::new())
        };
        let mut fw_title = disc_fw_title + "0;//";
        let mut hw_title = disc_hw_title + "0;//";
        if include_groups {
            for group in groups {
                let indices: Vec<u16> = group.tracks.iter().map(|t| t.index).collect();
                let min_group_index = indices.iter().min().unwrap();
                let max_group_index = indices.iter().max().unwrap();
                let range = format!("{}{}", min_group_index + 1, {
                    if group.tracks.len() - 1 != 0 {
                        format!("-{}", max_group_index + 1)
                    } else {
                        String::from("")
                    }
                });
                fw_title.push_str((group.full_width_title.clone().unwrap() + &range).as_str());
                hw_title.push_str((group.title.clone().unwrap() + &range).as_str());
            }
        }
        let mut used_half_width_cells = 0;
        let mut used_full_width_cells = 0;
        used_full_width_cells += chars_to_cells(fw_title.len() * 2);
        used_half_width_cells += chars_to_cells(half_width_title_length(&hw_title));
        for track in self.tracks() {
            let (half_width, full_width) = track.cells_for_title();
            used_half_width_cells += half_width;
            used_full_width_cells += full_width;
        }
        (
            usize::max(CELL_LIMIT - used_full_width_cells, 0) * 7,
            usize::max(CELL_LIMIT - used_half_width_cells, 0) * 7,
        )
    }
    pub fn compile_disc_titles(&self) -> (String, String) {
        let (available_full_width, available_half_width) =
            self.remaining_characters_for_titles(true, false);
        let use_full_width = self
            .groups
            .iter()
            .filter(|n| n.full_width_title.as_ref().is_some_and(|t| !t.is_empty()))
            .count()
            > 0
            || self
                .tracks()
                .iter()
                .filter(|t| !t.full_width_title.is_empty())
                .count()
                > 0;
        let mut new_raw_title = String::new();
        let mut new_raw_full_width_title = String::new();
        if !self.title.is_empty() {
            new_raw_title = format!("0;{}//", self.title);
        }
        if use_full_width {
            new_raw_full_width_title = format!("０；{}／／", self.full_width_title);
        }
        for group in &self.groups {
            if group.title.is_none() || group.tracks.is_empty() {
                continue;
            }
            let min_group_index = group
                .tracks
                .iter()
                .map(|t| t.index)
                .min()
                .unwrap_or_default();
            let mut range = format!("{}", min_group_index + 1);
            if group.tracks.len() != 1 {
                range.push_str(&format!(
                    "-{}",
                    min_group_index as usize + group.tracks.len()
                ));
            }
            let new_raw_title_after_group =
                new_raw_title.clone() + &format!("{};{}//", range, group.title.as_ref().unwrap());
            let new_raw_full_width_title_after_group = new_raw_full_width_title.clone()
                + &half_width_to_full_width_range(&range)
                + &format!(
                    "；{}／／",
                    group.full_width_title.as_ref().unwrap_or(&String::new())
                );
            let half_width_titles_length_in_toc =
                chars_to_cells(half_width_title_length(&new_raw_title_after_group));
            if use_full_width {
                let full_width_titles_length_in_toc =
                    chars_to_cells(new_raw_full_width_title_after_group.len() * 2) * 7;
                if available_full_width as isize - full_width_titles_length_in_toc as isize >= 0 {
                    new_raw_full_width_title = new_raw_full_width_title_after_group
                }
            }
            if available_half_width as isize - half_width_titles_length_in_toc as isize >= 0 {
                new_raw_title = new_raw_title_after_group
            }
        }
        let half_width_titles_length_in_toc =
            chars_to_cells(half_width_title_length(&new_raw_title)) * 7;
        let full_width_titles_length_in_toc = chars_to_cells(new_raw_full_width_title.len() * 2);
        if (available_half_width as isize - half_width_titles_length_in_toc as isize) < 0 {
            new_raw_title = String::new();
        }
        if (available_full_width as isize - full_width_titles_length_in_toc as isize) < 0 {
            new_raw_full_width_title = String::new();
        }
        (
            new_raw_title,
            if use_full_width {
                new_raw_full_width_title
            } else {
                String::new()
            },
        )
    }
 }
 /// Context for interacting with a NetMD device as a wrapper around a [`NetMDInterface`].
 ///
 /// This struct wraps a [`NetMDInterface`] and allows for some higher level
 /// functions, but it is still necessary to interact with the [`NetMDInterface`]
 /// when performing many operations.
 pub struct NetMDContext {
    interface: NetMDInterface,
 }
 impl NetMDContext {
    /// Create a new context to control a NetMD device
    pub async fn new(device: DeviceInfo) -> Result<Self, InterfaceError> {
        let interface = NetMDInterface::new(device).await?;
        Ok(Self { interface })
    }
    /// Change to the next track (skip forward)
    pub async fn next_track(&mut self) -> Result<(), InterfaceError> {
        self.interface.track_change(Direction::Next).await
    }
    /// Change to the next track (skip back)
    pub async fn previous_track(&mut self) -> Result<(), InterfaceError> {
        self.interface.track_change(Direction::Previous).await
    }
    /// Change to the next track (skip to beginning of track)
    pub async fn restart_track(&mut self) -> Result<(), InterfaceError> {
        self.interface.track_change(Direction::Restart).await
    }
    /// Get the current status of the device
    pub async fn device_status(&mut self) -> Result<DeviceStatus, Box<dyn Error>> {
        let status = self.interface.status().await?;
        let playback_status = self.interface.playback_status2().await?;
    let b1: u16 = playback_status[4] as u16;
    let b2: u16 = playback_status[5] as u16;
-        let position = self.interface.position().await?;
+    let position = interface.position().await?;
    let operating_status = b1 << 8 | b2;
    let track = position[0] as u8;
@ -356,202 +61,11 @@ impl NetMDContext {
        track,
        time,
    })
-    }
+}
-    /// Get a representation of the current disc inserted in the device.
+pub async fn prepare_download(interface: &mut NetMDInterface) -> Result<(), Box<dyn Error>> {
    pub async fn list_content(&mut self) -> Result<Disc, Box<dyn Error>> {
        let flags = self.interface.disc_flags().await?;
        let title = self.interface.disc_title(false).await?;
        let full_width_title = self.interface.disc_title(true).await?;
        let disc_capacity: [RawTime; 3] = self.interface.disc_capacity().await?;
        let track_count = self.interface.track_count().await?;
        let mut frames_used = disc_capacity[0].as_frames();
        let mut frames_total = disc_capacity[1].as_frames();
        let mut frames_left = disc_capacity[2].as_frames();
        // Some devices report the time remaining of the currently selected recording mode. (Sharps)
        while frames_total > 512 * 60 * 82 {
            frames_used /= 2;
            frames_total /= 2;
            frames_left /= 2;
        }
        let track_group_list = self.interface.track_group_list().await?;
        let mut groups = vec![];
        for (index, group) in track_group_list.iter().enumerate() {
            let mut tracks = vec![];
            for track in &group.2 {
                let (encoding, channel) = self.interface.track_encoding(*track).await.unwrap();
                let duration = self.interface.track_length(*track).await?;
                let flags = self.interface.track_flags(*track).await?;
                let title = self.interface.track_title(*track, false).await?;
                let full_width_title = self.interface.track_title(*track, true).await?;
                tracks.push(Track {
                    index: *track,
                    title,
                    full_width_title,
                    duration,
                    channel,
                    encoding,
                    protected: TrackFlag::from_u8(flags).unwrap(),
                })
            }
            groups.push(Group {
                index: index as u16,
                title: group.0.clone(),
                full_width_title: group.1.clone(),
                tracks,
            })
        }
        let disc = Disc {
            title,
            full_width_title,
            writeable: (flags & DiscFlag::Writable as u8) != 0,
            write_protected: (flags & DiscFlag::WriteProtected as u8) != 0,
            used: frames_used,
            left: frames_left,
            total: frames_total,
            track_count,
            groups,
        };
        Ok(disc)
    }
    pub async fn rewrite_disc_groups(&mut self, disc: Disc) -> Result<(), Box<dyn Error>> {
        let (new_raw_title, new_raw_full_width_title) = disc.compile_disc_titles();
        self.interface.set_disc_title(&new_raw_title, false).await?;
        self.interface
            .set_disc_title(&new_raw_full_width_title, false)
            .await?;
        Ok(())
    }
    /// Rename a disc while preserving group titles
    pub async fn rename_disc(
        &mut self,
        new_name: &str,
        new_fw_name: Option<&str>,
    ) -> Result<(), Box<dyn Error>> {
        let new_name = sanitize_half_width_title(new_name);
        let new_fw_name = new_fw_name.map(sanitize_full_width_title);
        let old_name = self.interface.disc_title(false).await?;
        let old_fw_name = self.interface.disc_title(true).await?;
        let old_raw_name = self.interface.raw_disc_title(false).await?;
        let old_raw_fw_name = self.interface.raw_disc_title(true).await?;
        let has_groups = old_raw_name.contains("//");
        let has_fw_groups = old_raw_fw_name.contains("／／");
        let has_groups_and_title = old_raw_name.starts_with("0;");
        let has_fw_groups_and_title = old_raw_fw_name.starts_with("０；");
        if new_fw_name.as_ref().is_some_and(|n| n != &old_fw_name) {
            let new_fw_name_with_groups;
            if has_fw_groups {
                if has_fw_groups_and_title {
                    let re = Regex::new(r"^０；.*?／／").unwrap();
                    new_fw_name_with_groups = re
                        .replace_all(
                            &old_raw_fw_name,
                            if !new_fw_name.as_ref().unwrap().is_empty() {
                                format!("０；{}／／", new_fw_name.unwrap())
                            } else {
                                String::new()
                            },
                        )
                        .into()
                } else {
                    new_fw_name_with_groups =
                        format!("０；{}／／{}", new_fw_name.unwrap(), old_raw_fw_name);
                }
            } else {
                new_fw_name_with_groups = new_fw_name.unwrap();
            }
            self.interface
                .set_disc_title(&new_fw_name_with_groups, true)
                .await?;
        }
        if new_name == old_name {
            return Ok(());
        }
        let new_name_with_groups;
        if has_groups {
            if has_groups_and_title {
                let re = Regex::new(r"^0;.*?\/\/").unwrap();
                new_name_with_groups = re
                    .replace_all(
                        &old_raw_name,
                        if !new_name.is_empty() {
                            format!("0;{}//", new_name)
                        } else {
                            String::new()
                        },
                    )
                    .into()
            } else {
                new_name_with_groups = format!("0;{}//{}", new_name, old_raw_name);
            }
        } else {
            new_name_with_groups = new_name
        }
        self.interface
            .set_disc_title(&new_name_with_groups, false)
            .await?;
        Ok(())
    }
    /// Get a track from the device. This only works with MZ-RH1 devices.
    pub async fn upload<F: Fn(usize, usize)>(
        &mut self,
        track: u16,
        progress_callback: Option<F>,
    ) -> Result<(DiscFormat, Vec<u8>), Box<dyn Error>> {
        let mut output_vec = Vec::new();
        let (format, _frames, result) = self
            .interface
            .save_track_to_array(track, progress_callback)
            .await?;
        let header;
        match format {
            DiscFormat::SPMono | DiscFormat::SPStereo => {
                let aea_options = AeaOptions {
                    name: &self.interface.track_title(track, false).await?,
                    channels: if format == DiscFormat::SPStereo { 2 } else { 1 },
                    sound_groups: f32::floor(result.len() as f32 / 212.0) as u32,
                    ..Default::default()
                };
                header = create_aea_header(aea_options);
            }
            DiscFormat::LP2 | DiscFormat::LP4 => {
                header = create_wav_header(format, result.len() as u32);
            }
        }
        output_vec.extend_from_slice(&header);
        output_vec.extend_from_slice(&result);
        Ok((format, header))
    }
    async fn prepare_download(&mut self) -> Result<(), Box<dyn Error>> {
    while ![OperatingStatus::DiscBlank, OperatingStatus::Ready].contains(
-            &self
+        &device_status(interface)
                .device_status()
            .await?
            .state
            .unwrap_or(OperatingStatus::NoDisc),
@ -559,94 +73,31 @@ impl NetMDContext {
        cross_sleep(Duration::from_millis(200)).await;
    }
-        let _ = self.interface.session_key_forget().await;
+    let _ = interface.session_key_forget().await;
-        let _ = self.interface.leave_secure_session().await;
+    let _ = interface.leave_secure_session().await;
-        self.interface.acquire().await?;
+    interface.acquire().await?;
-        let _ = self.interface.disable_new_track_protection(1).await;
+    let _ = interface.disable_new_track_protection(1).await;
    Ok(())
-    }
+}
-    /// Start downloading an [`MDTrack`] to the device.
+pub async fn download<F>(
-    ///
+    interface: &mut NetMDInterface,
    /// Progress is updated in the `progress_callback` closure.
    ///
    /// # Downloading a track:
    /// ```no_run
    /// # tokio_test::block_on(async {
    /// use minidisc::netmd::DEVICE_IDS_CROSSUSB;
    /// use minidisc::netmd::NetMDContext;
    /// use minidisc::netmd::interface::{MDTrack, NetMDInterface};
    ///
    /// // Get the minidisc device from cross_usb
    /// let device = cross_usb::get_device(DEVICE_IDS_CROSSUSB.to_vec()).await.unwrap();
    ///
    /// // Obtain a NetMDContext and acquire it
    /// let mut context = NetMDContext::new(device).await.unwrap();
    /// context.interface_mut().acquire().await.unwrap();
    ///
    /// // Read in an audio file to a vec, for LP2 and LP4 this must be encoded properly
    /// let track_contents: Vec<u8> =
    ///     std::fs::read("audio_file.wav")
    ///         .expect("Could not read track")[0x60..].to_vec();
    ///
    /// // Construct the track
    /// let track = MDTrack {
    ///     chunk_size: 0x400,
    ///     title: String::from("My Track Title"),
    ///     format: minidisc::netmd::interface::WireFormat::LP2,
    ///     full_width_title: None,
    ///     data: track_contents,
    /// };
    ///
    /// // Download it to the player!
    /// context.download(
    ///     track,
    ///     |out_of: usize, done: usize| println!("Done {} / {}", done, out_of)
    /// ).await.expect("Starting download failed");
    /// # })
    /// ```
    pub async fn download<F: Fn(usize, usize)>(
        &mut self,
    track: MDTrack,
    progress_callback: F,
-    ) -> Result<(u16, Vec<u8>, Vec<u8>), Box<dyn Error>>
+) -> Result<(u16, Vec<u8>, Vec<u8>), Box<dyn Error>>
-    {
+where
-        self.prepare_download().await?;
+    F: Fn(usize, usize),
-        // Lock the interface by providing it to the session
+{
-        let mut session = MDSession::new(&mut self.interface);
+    prepare_download(interface).await?;
    let mut session = MDSession::new(interface);
    session.init().await?;
    let result = session
        .download_track(track, progress_callback, None)
        .await?;
    session.close().await?;
-        self.interface.release().await?;
+    interface.release().await?;
    Ok(result)
    }
    /// Get a reference to the underlying interface.
    ///
    /// [`NetMDContext::interface_mut()`] is almost certainly more useful
    /// in most cases.
    pub fn interface(&self) -> &NetMDInterface {
        &self.interface
    }
    /// Get a mutable reference to the underlying interface.
    pub fn interface_mut(&mut self) -> &mut NetMDInterface {
        &mut self.interface
    }
 }
 impl From<NetMDInterface> for NetMDContext {
    /// Create a context from an already opened interface.
    fn from(value: NetMDInterface) -> Self {
        Self { interface: value }
    }
 }
 fn chars_to_cells(len: usize) -> usize {
    f32::ceil(len as f32 / 7.0) as usize
 }
--- a/src/netmd/encryption.rs
+++ b/src/netmd/encryption.rs
@ -9,28 +9,11 @@ use super::interface::DataEncryptorInput;
 type DesEcbEnc = ecb::Decryptor<des::Des>;
 type DesCbcEnc = cbc::Encryptor<des::Des>;
-pub struct Encryptor {
+pub fn new_thread_encryptor(
-    #[allow(clippy::type_complexity)]
+    _input: DataEncryptorInput,
-    channel: Option<UnboundedReceiver<(Vec<u8>, Vec<u8>, Vec<u8>)>>,
+) -> UnboundedReceiver<(Vec<u8>, Vec<u8>, Vec<u8>)> {
    state: Option<EncryptorState>,
 }
 struct EncryptorState {
    input_data: Vec<u8>,
    iv: [u8; 8],
    random_key: [u8; 8],
    encrypted_random_key: [u8; 8],
    default_chunk_size: usize,
    current_chunk_size: usize,
    offset: usize,
    packet_count: usize,
    closed: bool,
 }
 impl Encryptor {
    pub fn new_threaded(input: DataEncryptorInput) -> Self {
    let (tx, rx) = unbounded_channel::<(Vec<u8>, Vec<u8>, Vec<u8>)>();
-
+    let input = Box::from(_input);
    thread::spawn(move || {
        let mut iv = [0u8; 8];
@ -90,108 +73,5 @@ impl Encryptor {
        }
    });
-        Self {
+    rx
            channel: Some(rx),
            state: None
        }
    }
    pub fn new(input: DataEncryptorInput) -> Self {
        let iv = [0u8; 8];
        // Create the random key
        let mut random_key = [0u8; 8];
        rand::thread_rng().fill_bytes(&mut random_key);
        // Encrypt it with the kek
        let mut encrypted_random_key = random_key;
        if let Err(x) = DesEcbEnc::new(&input.kek.into())
            .decrypt_padded_mut::<NoPadding>(&mut encrypted_random_key)
        {
            panic!("Cannot create main key {:?}", x)
        };
        let default_chunk_size = match input.chunk_size {
            0 => 0x00100000,
            e => e,
        };
        let packet_count = 0;
        let current_chunk_size = 0;
        let mut input_data = input.data.clone();
        if (input_data.len() % input.frame_size) != 0 {
            let padding_remaining = input.frame_size - (input_data.len() % input.frame_size);
            input_data.extend(std::iter::repeat(0).take(padding_remaining));
        }
        let offset: usize = 0;
        Encryptor {
            channel: None,
            state: Some(EncryptorState {
                input_data,
                iv,
                random_key,
                encrypted_random_key,
                current_chunk_size,
                offset,
                default_chunk_size,
                packet_count,
                closed: false,
            })
        }
    }
    /// Get the next encrypted value
    pub async fn next(&mut self) -> Option<(Vec<u8>, Vec<u8>, Vec<u8>)> {
        let output;
        if let Some(state) = self.state.as_mut() {
            if state.closed {
                return None
            }
            if state.packet_count > 0 {
                state.current_chunk_size = state.default_chunk_size;
            } else {
                state.current_chunk_size = state.default_chunk_size - 24;
            }
            state.current_chunk_size = std::cmp::min(state.current_chunk_size, state.input_data.len() - state.offset);
            let this_data_chunk = &mut state.input_data[state.offset..state.offset + state.current_chunk_size];
            DesCbcEnc::new(&state.random_key.into(), &state.iv.into())
                .encrypt_padded_mut::<NoPadding>(this_data_chunk, state.current_chunk_size)
                .unwrap();
            output = Some((
                state.encrypted_random_key.to_vec(),
                state.iv.to_vec(),
                this_data_chunk.to_vec(),
            ));
            state.iv.copy_from_slice(&this_data_chunk[this_data_chunk.len() - 8..]);
            state.packet_count += 1;
            state.offset += state.current_chunk_size;
        } else if let Some(channel) = self.channel.as_mut() {
            output = channel.recv().await
        } else {
            unreachable!("If you got here, this is bad!");
        }
        output
    }
    /// Call close to return none from subsequent calls
    pub fn close(&mut self) {
        if let Some(state) = self.state.as_mut() {
            state.closed = true;
        } else if let Some(channel) = self.channel.as_mut() {
            channel.close()
        } else {
            unreachable!("If you got here, this is bad!");
        }
    }
 }
--- a/src/netmd/interface.rs
+++ b/src/netmd/interface.rs
--- a/src/netmd/mappings.rs
+++ b/src/netmd/mappings.rs
--- a/src/netmd/mod.rs
+++ b/src/netmd/mod.rs
@ -1,5 +1,8 @@
-//! This module contains all functionality for interacting with NetMD minidisc
+/*!
-//! devices.
+ * This crate is an interface in rust to control NetMD and Hi-MD minidisc devices.
 *
 * Documentation coming soon
 */
 pub mod base;
 pub mod commands;
@ -8,15 +11,3 @@ pub mod interface;
 mod mappings;
 mod query_utils;
 mod utils;
 #[doc(inline)]
 pub use base::DEVICE_IDS_CROSSUSB;
 #[doc(inline)]
 pub use commands::NetMDContext;
 #[doc(inline)]
 pub use interface::NetMDInterface;
 #[doc(inline)]
 pub use base::NetMD;
--- a/src/netmd/query_utils.rs
+++ b/src/netmd/query_utils.rs
@ -1,19 +1,23 @@
 use crate::netmd::utils;
 use lazy_static::lazy_static;
 use std::collections::hash_map::HashMap;
 use thiserror::Error;
-/// %b, w, d, q - explained above (can have endiannes overriden by '>' and '<' operators, f. ex. %>d %<q)
+lazy_static! {
-/// %s - Uint8Array preceded by 2 bytes of length
+    /// %b, w, d, q - explained above (can have endiannes overriden by '>' and '<' operators, f. ex. %>d %<q)
-/// %x - Uint8Array preceded by 2 bytes of length
+    /// %s - Uint8Array preceded by 2 bytes of length
-/// %z - Uint8Array preceded by 1 byte of length
+    /// %x - Uint8Array preceded by 2 bytes of length
-/// %* - raw Uint8Array
+    /// %z - Uint8Array preceded by 1 byte of length
-/// %B - BCD-encoded 1-byte number
+    /// %* - raw Uint8Array
-/// %W - BCD-encoded 2-byte number
+    /// %B - BCD-encoded 1-byte number
-static FORMAT_TYPE_LEN_DICT: phf::Map<char, i32> = phf::phf_map! {
+    /// %W - BCD-encoded 2-byte number
-    'b' => 1, // byte
+    static ref FORMAT_TYPE_LEN_DICT: HashMap<char, i32> = HashMap::from([
-    'w' => 2, // word
+        ('b', 1), // byte
-    'd' => 4, // doubleword
+        ('w', 2), // word
-    'q' => 8, // quadword
+        ('d', 4), // doubleword
-};
+        ('q', 8), // quadword
    ]);
 }
 const DEBUG: bool = false;
@ -26,15 +30,18 @@ pub enum QueryValue {
 #[derive(Error, Debug, Eq, PartialEq, PartialOrd, Ord)]
 pub enum ValueError {
    #[error("type mismatch: expected {expected}, got {actual}")]
-    TypeMismatch { expected: String, actual: String },
+    TypeMismatch {
        expected: String,
        actual: String
    }
 }
 impl QueryValue {
-    pub fn _from_array<const S: usize>(value: [u8; S]) -> Self {
+    pub fn from_array<const S: usize>(value: [u8; S]) -> Self {
        Self::Array(value.to_vec())
    }
-    pub fn _to_array<const S: usize>(&self) -> Result<[u8; S], ValueError> {
+    pub fn to_array<const S: usize>(&self) -> Result<[u8; S], ValueError> {
        let mut array = [0u8; S];
        match self {
            QueryValue::Array(a) => {
@ -42,10 +49,10 @@ impl QueryValue {
                    array[i] = *byte
                }
                Ok(array)
-            }
+            },
            _ => Err(ValueError::TypeMismatch {
                expected: String::from("Vec<u8>"),
-                actual: format!("{:?}", self),
+                actual: format!("{:?}", self)
            }),
        }
    }
@ -55,7 +62,7 @@ impl QueryValue {
            QueryValue::Array(a) => Ok(a.to_vec()),
            _ => Err(ValueError::TypeMismatch {
                expected: String::from("Vec<u8>"),
-                actual: format!("{:?}", self),
+                actual: format!("{:?}", self)
            }),
        }
    }
@ -65,21 +72,7 @@ impl QueryValue {
            QueryValue::Number(a) => Ok(*a),
            _ => Err(ValueError::TypeMismatch {
                expected: String::from("i64"),
-                actual: format!("{:?}", self),
+                actual: format!("{:?}", self)
            }),
        }
    }
 }
 impl TryInto<i64> for QueryValue {
    type Error = ValueError;
    fn try_into(self) -> Result<i64, Self::Error> {
        match self {
            QueryValue::Number(a) => Ok(a),
            _ => Err(ValueError::TypeMismatch {
                expected: String::from("i64"),
                actual: format!("{:?}", self),
            }),
        }
    }
@ -90,16 +83,13 @@ pub enum QueryError {
    #[error("unrecognized format character: `{0}`")]
    UnrecognizedChar(char),
-    #[error("format and input mismatch at {index}: expected {expected:#04x}, got {actual:#04x} (format {format_string})")]
+    #[error("Format and input mismatch at {index}: expected {expected:#04x}, got {actual:#04x} (format {format_string})")]
    InputMismatch {
        index: usize,
        expected: u8,
        actual: u8,
        format_string: String,
-    },
+    }
    #[error("input data is empty")]
    EmptyData,
 }
 /// Formats a query using a standard input to send to the player
@ -198,15 +188,10 @@ pub fn format_query(format: String, args: Vec<QueryValue>) -> Result<Vec<u8>, Qu
 }
 /// Scans a result using a standard input to recieve from the player
-pub fn scan_query(query_result: Vec<u8>, format: String) -> Result<Vec<QueryValue>, QueryError> {
+pub fn scan_query(
-    if DEBUG {
+    query_result: Vec<u8>,
-        println!("RECV<<< F: {}", format);
+    format: String,
-    }
+) -> Result<Vec<QueryValue>, QueryError> {
    if query_result.is_empty() {
        return Err(QueryError::EmptyData)
    }
    let mut result: Vec<QueryValue> = Vec::new();
    let initial_length = query_result.len();
@ -312,7 +297,7 @@ pub fn scan_query(query_result: Vec<u8>, format: String) -> Result<Vec<QueryValu
                    index: i,
                    expected: format_value,
                    actual: input_value,
-                    format_string: format,
+                    format_string: format
                });
            }
            half = None;
--- a/src/netmd/utils.rs
+++ b/src/netmd/utils.rs
@ -1,20 +1,14 @@
 use crate::netmd::mappings::{ALLOWED_HW_KANA, MAPPINGS_DE, MAPPINGS_HW, MAPPINGS_JP, MAPPINGS_RU};
 use byteorder::{LittleEndian, WriteBytesExt};
 use diacritics;
 use encoding_rs::SHIFT_JIS;
 use regex::Regex;
-use std::{error::Error, io::Write, time::Duration, vec::IntoIter};
+use std::{collections::hash_map::HashMap, error::Error, vec::IntoIter, time::Duration};
 use unicode_normalization::UnicodeNormalization;
 extern crate kana;
 use kana::*;
-use super::{
+/// Sleep for a specified number of milliseconds on any platform
    interface::DiscFormat,
    mappings::{HW_TO_FW_RANGE_MAP, MULTI_BYTE_CHARS},
 };
 /// Sleep for a specified [Duration] on any platform
 pub async fn cross_sleep(duration: Duration) {
    #[cfg(not(target_family = "wasm"))]
    std::thread::sleep(duration);
@ -25,13 +19,13 @@ pub async fn cross_sleep(duration: Duration) {
 pub fn bcd_to_int(mut bcd: i32) -> i32 {
    let mut value = 0;
-    let mut nybble = 0;
+    let mut nibble = 0;
    while bcd != 0 {
-        let nybble_value = bcd & 0xf;
+        let nibble_value = bcd & 0xf;
        bcd >>= 4;
-        value += nybble_value * i32::pow(10, nybble);
+        value += nibble_value * i32::pow(10, nibble);
-        nybble += 1;
+        nibble += 1;
    }
    value
@ -52,9 +46,25 @@ pub fn int_to_bcd(mut value: i32) -> i32 {
 }
 pub fn half_width_to_full_width_range(range: &str) -> String {
    let mappings: HashMap<char, char> = HashMap::from([
        ('0', '０'),
        ('1', '１'),
        ('2', '２'),
        ('3', '３'),
        ('4', '４'),
        ('5', '５'),
        ('6', '６'),
        ('7', '７'),
        ('8', '８'),
        ('9', '９'),
        ('-', '－'),
        ('/', '／'),
        (';', '；'),
    ]);
    range
        .chars()
-        .map(|char| HW_TO_FW_RANGE_MAP.get(&char).unwrap())
+        .map(|char| mappings.get(&char).unwrap())
        .collect()
 }
@ -65,41 +75,30 @@ pub fn get_bytes<const S: usize>(iterator: &mut IntoIter<u8>) -> Result<[u8; S],
    Ok(bytes)
 }
-pub fn length_after_encoding_to_sjis(string: &str) -> usize {
+pub fn length_after_encoding_to_jis(string: &str) -> usize {
    let new_string = SHIFT_JIS.encode(string);
    new_string.0.len()
 }
-pub fn validate_sjis(sjis_string: Vec<u8>) -> bool {
+pub fn validate_shift_jis(sjis_string: Vec<u8>) -> bool {
    let (_, _, had_errors) = SHIFT_JIS.decode(&sjis_string);
    had_errors
 }
 /// Ensure string contains only hardware allowed characters
 fn check(string: String) -> Option<String> {
-    if MAPPINGS_HW.contains_key(string.as_str()) {
+    if MAPPINGS_HW.contains_key(&string) {
-        return Some(MAPPINGS_HW.get(string.as_str()).unwrap().to_string());
+        return Some(MAPPINGS_HW.get(&string).unwrap().to_string());
    }
    let mut ch = string.chars();
-    if (ch.next().unwrap() as u32) < 0x7f || ALLOWED_HW_KANA.contains(&string.as_str()) {
+    if (ch.next().unwrap() as u32) < 0x7f || ALLOWED_HW_KANA.contains(&string) {
        return Some(string);
    }
    None
 }
-pub fn half_width_title_length(title: &str) -> usize {
+pub fn sanitize_half_width_title(title: &str) -> Vec<u8> {
    let multibyte_len = title
        .chars()
        .map(|c| (*MULTI_BYTE_CHARS.get(&c).unwrap_or(&0) as usize))
        .reduce(|a, b| a + b)
        .unwrap_or_default();
    title.len() + multibyte_len
 }
 pub fn sanitize_half_width_title(title: &str) -> String {
    let mut string_title = wide2ascii(title);
    string_title = nowidespace(&string_title);
    string_title = hira2kata(&string_title);
@ -114,46 +113,50 @@ pub fn sanitize_half_width_title(title: &str) -> String {
        })
        .collect();
-    new_title
+    let sjis_string = SHIFT_JIS.encode(&new_title).0;
    if validate_shift_jis(sjis_string.clone().into()) {
        return agressive_sanitize_title(title).into();
    }
    sjis_string.into()
 }
 // TODO: This function is bad, probably should do the string sanitization in the frontend
-pub fn sanitize_full_width_title(title: &str) -> String {
+pub fn sanitize_full_width_title(title: &str, just_remap: bool) -> Vec<u8> {
    let new_title: String = title
        .chars()
        .map(|c| c.to_string())
        .map(|character| {
-            match MAPPINGS_JP.get(character.to_string().as_str()) {
+            match MAPPINGS_JP.get(&character.to_string()) {
-                Some(string) => string,
+                Some(string) => string.clone(),
-                None => character.as_str(),
+                None => character.to_string().clone(),
            }
            .to_string()
        })
        .map(|character| {
-            match MAPPINGS_RU.get(character.as_str()) {
+            match MAPPINGS_RU.get(&character.to_string()) {
-                Some(string) => string,
+                Some(string) => string.clone(),
-                None => character.as_str(),
+                None => character.to_string().clone(),
            }
            .to_string()
        })
        .map(|character| {
-            match MAPPINGS_DE.get(character.as_str()) {
+            match MAPPINGS_DE.get(&character.to_string()) {
-                Some(string) => string,
+                Some(string) => string.clone(),
-                None => character.as_str(),
+                None => character.to_string().clone(),
            }
            .to_string()
        })
        .collect::<String>();
-    new_title
+    if just_remap {
-}
+        return new_title.into();
    };
-/// Convert a UTF-8 string to Shift-JIS for use on the player
+    let sjis_string = SHIFT_JIS.encode(&new_title).0;
 pub fn to_sjis(sjis_str: &str) -> Vec<u8> {
    let sjis_string = SHIFT_JIS.encode(sjis_str).0;
-    if validate_sjis(sjis_string.clone().into()) {
+    if validate_shift_jis(sjis_string.clone().into()) {
-        return agressive_sanitize_title(sjis_str).into();
+        return agressive_sanitize_title(title).into();
    }
    sjis_string.into()
@ -170,146 +173,9 @@ pub fn agressive_sanitize_title(title: &str) -> String {
    .into()
 }
-pub struct AeaOptions<'a> {
+pub fn time_to_duration(time: &[u64]) -> std::time::Duration {
-    pub name: &'a str,
+    assert_eq!(time.len(), 4);
    pub channels: u32,
    pub sound_groups: u32,
    pub group_start: u32,
    pub encrypted: u32,
    pub flags: &'a [u8],
 }
 impl<'a> Default for AeaOptions<'a> {
    fn default() -> Self {
        Self {
            name: "",
            channels: 2,
            sound_groups: 1,
            group_start: 0,
            encrypted: 0,
            flags: &[0, 0, 0, 0, 0, 0, 0, 0],
        }
    }
 }
 pub fn create_aea_header(options: AeaOptions) -> Vec<u8> {
    let encoded_name = options.name.as_bytes();
    let mut header: Vec<u8> = Vec::new();
    header.write_u32::<LittleEndian>(2048).unwrap();
    header.write_all(encoded_name).unwrap();
    header
        .write_all(&vec![0; 256 - encoded_name.len()])
        .unwrap();
    header
        .write_u32::<LittleEndian>(options.sound_groups)
        .unwrap();
    header.write_all(&[options.channels as u8, 0]).unwrap();
    // Write the flags
    header
        .write_u32::<LittleEndian>(options.flags[0] as u32)
        .unwrap();
    header
        .write_u32::<LittleEndian>(options.flags[1] as u32)
        .unwrap();
    header
        .write_u32::<LittleEndian>(options.flags[2] as u32)
        .unwrap();
    header
        .write_u32::<LittleEndian>(options.flags[3] as u32)
        .unwrap();
    header
        .write_u32::<LittleEndian>(options.flags[4] as u32)
        .unwrap();
    header
        .write_u32::<LittleEndian>(options.flags[5] as u32)
        .unwrap();
    header
        .write_u32::<LittleEndian>(options.flags[6] as u32)
        .unwrap();
    header
        .write_u32::<LittleEndian>(options.flags[7] as u32)
        .unwrap();
    header.write_u32::<LittleEndian>(0).unwrap();
    header.write_u32::<LittleEndian>(options.encrypted).unwrap();
    header
        .write_u32::<LittleEndian>(options.group_start)
        .unwrap();
    // return the header
    header
 }
 pub fn create_wav_header(format: DiscFormat, bytes: u32) -> Vec<u8> {
    let mut header: Vec<u8> = Vec::new();
    let (joint_stereo, bytes_per_frame) = match format {
        DiscFormat::LP4 => (192, 0),
        DiscFormat::LP2 => (96, 1),
        _ => unreachable!("Cannot create WAV header for disc type {:?}", format),
    };
    let bytes_per_second = (bytes_per_frame * 44100) / 512;
    header.write_all(r"RIFF".as_bytes()).unwrap();
    header.write_u32::<LittleEndian>(bytes + 60).unwrap();
    header.write_all(r"WAVEfmt".as_bytes()).unwrap();
    header.write_u32::<LittleEndian>(32).unwrap();
    header.write_u16::<LittleEndian>(0x270).unwrap(); // ATRAC3
    header.write_u16::<LittleEndian>(2).unwrap(); // Stereo
    header.write_u32::<LittleEndian>(44100).unwrap();
    header.write_u32::<LittleEndian>(bytes_per_second).unwrap();
    header
        .write_u16::<LittleEndian>(bytes_per_frame as u16 * 2)
        .unwrap();
    header.write_all(&[0, 0]).unwrap();
    header.write_u16::<LittleEndian>(14).unwrap();
    header.write_u16::<LittleEndian>(1).unwrap();
    header.write_u32::<LittleEndian>(bytes_per_frame).unwrap();
    header.write_u16::<LittleEndian>(joint_stereo).unwrap();
    header.write_u16::<LittleEndian>(joint_stereo).unwrap();
    header.write_u16::<LittleEndian>(1).unwrap();
    header.write_u16::<LittleEndian>(0).unwrap();
    header.write_all(r"data".as_bytes()).unwrap();
    header.write_u32::<LittleEndian>(bytes).unwrap();
    header
 }
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 pub struct RawTime {
    pub hours: u64,
    pub minutes: u64,
    pub seconds: u64,
    pub frames: u64,
 }
 impl From<RawTime> for Duration {
    fn from(val: RawTime) -> Self {
        val.as_duration()
    }
 }
 impl RawTime {
    pub fn as_duration(&self) -> Duration {
    std::time::Duration::from_micros(
-            (self.hours * 3600000000)
+        (time[0] * 3600000000) + (time[1] * 60000000) + (time[2] * 1000000) + (time[3] * 11600),
                + (self.minutes * 60000000)
                + (self.seconds * 1000000)
                + (self.frames * 11600),
    )
    }
    pub fn as_frames(&self) -> u64 {
        ((self.hours * 60 + self.minutes) * 60 + self.seconds) * 512 + self.frames
    }
 }