.gitignore

@@ -3,7 +3,7 @@
 debug/
 target/
 
-Cargo.lock
+minidisc-rs/Cargo.lock
 
 #These are backup files generated by rustfmt
 **/*.rs.bk

Cargo.toml

@@ -1,42 +1,18 @@
 [package]
-name = "minidisc_pc"
+name = "minidisc-cli"
-version = "0.1.0"
+homepage = "https://github.com/G2-Games/minidisc-rs"
-edition = "2021"
+repository = "https://github.com/G2-Games/minidisc-rs"
-homepage = "https://github.com/G2-Games/minidisc-cli/"
-repository = "https://github.com/G2-Games/minidisc-cli/minidisc-rs/"
-description = "A library for controlling and uploading data to NetMD and Hi-MD minidisc devices."
-license-file = "LICENSE"
-authors = ["G2 <ke0bhogsg@gmail.com>"]
 readme = "README.md"
-
+version = "0.0.1"
-# Have docs.rs make documentation for most supported targets
+edition = "2021"
-[package.metadata.docs.rs]
+authors = ["G2 <g2@g2games.dev>"]
-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"]
+license = "AGPL-3.0"
-
-[lib]
-crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-diacritics = "0.2.0"
+hex = "0.4.3"
-encoding_rs = "0.8.33"
-nofmt = "1.0.0"
-once_cell = "1.18.0"
-unicode-normalization = "0.1.22"
-regex = "1.10.2"
-lazy_static = "1.4.0"
 cross_usb = "0.2"
-num-derive = "0.3.3"
+tokio = { version = "1.35.1", features = ["macros", "rt", "rt-multi-thread"] }
-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 = ["sync"] }
-unicode-jp = { git = "https://github.com/uzabase/unicode-jp-rs.git" }
 
-[target.'cfg(target_family = "wasm")'.dependencies]
+[dependencies.minidisc_rs]
-gloo = { version = "0.11.0", features = ["futures"] }
+path = "minidisc-rs"
-
+version = "0.0.1"
-[package.metadata.wasm-pack.profile.dev.wasm-bindgen]
-dwarf-debug-info = true

README.md

@@ -1,3 +1,6 @@
-# minidisc
+# minidisc-cli
+A simple command line application to show the capabilities of `minidisc-rs`
+
+# minidisc-rs
+A library for interfacing with Net-MD and Hi-MD devices written in rust
 
-Docs are a work in progress.

minidisc-rs/.gitignore

@@ -0,0 +1,10 @@
+# Generated by Cargo
+# will have compiled files and executables
+debug/
+target/
+
+# These are backup files generated by rustfmt
+**/*.rs.bk
+
+# MSVC Windows builds of rustc generate these, which store debugging information
+*.pdb

minidisc-rs/Cargo.toml

@@ -0,0 +1,44 @@
+[package]
+name = "minidisc_rs"
+version = "0.0.1"
+homepage = "https://github.com/G2-Games/minidisc-cli/"
+repository = "https://github.com/G2-Games/minidisc-cli/minidisc-rs/"
+description = "An interface in rust to control NetMD and Hi-MD minidisc devices."
+license-file = "LICENSE"
+authors = ["G2 <g2@g2games.dev>"]
+edition = "2021"
+readme = "README.md"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+diacritics = "0.2.0"
+encoding_rs = "0.8.33"
+nofmt = "1.0.0"
+once_cell = "1.18.0"
+unicode-normalization = "0.1.22"
+hex = "0.4.3"
+regex = "1.10.2"
+lazy_static = "1.4.0"
+cross_usb = "0.2"
+num-derive = "0.3.3"
+num-traits = "0.2.14"
+rand = "0.8.5"
+getrandom = { version = "0.2.12", features = ["js"] }
+des = "0.8.1"
+cbc = "0.1.2"
+ecb = "0.1.2"
+
+[dependencies.unicode-jp]
+# Relying on this fork for now as it has up-to-date deps
+git = "https://github.com/uzabase/unicode-jp-rs.git"
+
+[target.'cfg(target_family = "wasm")'.dependencies]
+web-sys = { version = "0.3", features = ["console"] }
+gloo = { version = "0.11.0", features = ["futures"] }
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[package.metadata.wasm-pack.profile.dev.wasm-bindgen]
+dwarf-debug-info = true

minidisc-rs/LICENSE

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

minidisc-rs/README.md

@@ -0,0 +1,3 @@
+# minidisc
+
+Docs are a work in progress.

minidisc-rs/src/netmd/base.rs

@@ -5,10 +5,12 @@ use std::error::Error;
 use std::time::Duration;
 
 // USB stuff
-use cross_usb::usb::{ControlIn, ControlOut, ControlType, Device, Interface, Recipient};
+//use nusb::transfer::{Control, ControlIn, ControlOut, ControlType, Recipient, RequestBuffer};
 use cross_usb::{UsbDevice, UsbInterface};
+use cross_usb::usb::{ControlIn, ControlOut, ControlType, Device, Interface, Recipient};
 
 use super::utils::cross_sleep;
+//use nusb::{Device, DeviceInfo, Interface};
 
 const DEFAULT_TIMEOUT: Duration = Duration::new(10000, 0);
 const BULK_WRITE_ENDPOINT: u8 = 0x02;
@@ -67,15 +69,6 @@ pub static DEVICE_IDS: Lazy<Box<[DeviceId]>> = Lazy::new(|| {
     }
 });
 
-pub static DEVICE_IDS_CROSSUSB: Lazy<Box<[cross_usb::DeviceFilter]>> = Lazy::new(|| {
-    DEVICE_IDS.iter().map(|d|{
-        cross_usb::device_filter! {
-            vendor_id: d.vendor_id,
-            product_id: d.product_id,
-        }
-    }).collect()
-});
-
 /// The current status of the Minidisc device
 pub enum Status {
     Ready,
@@ -256,11 +249,12 @@ impl NetMD {
             length = self.poll().await?.0;
 
             if length > 0 {
-                break;
+                break
             }
 
             // Back off while trying again
-            let sleep_time = Self::READ_REPLY_RETRY_INTERVAL * (u32::pow(2, attempt) - 1);
+            let sleep_time = Self::READ_REPLY_RETRY_INTERVAL
+                * (u32::pow(2, attempt / 10) - 1);
 
             cross_sleep(sleep_time).await;
         }
@@ -329,9 +323,6 @@ impl NetMD {
     }
 
     pub async fn write_bulk(&mut self, data: &[u8]) -> Result<usize, Box<dyn Error>> {
-        Ok(self
+        Ok(self.usb_interface.bulk_out(BULK_WRITE_ENDPOINT, data).await?)
-            .usb_interface
-            .bulk_out(BULK_WRITE_ENDPOINT, data)
-            .await?)
     }
 }

minidisc-rs/src/netmd/commands.rs

@@ -1,12 +1,13 @@
 #![cfg_attr(debug_assertions, allow(dead_code))]
+use std::error::Error;
 use num_derive::FromPrimitive;
 use num_traits::FromPrimitive;
-use std::error::Error;
 
-use super::interface::{MDSession, MDTrack, NetMDInterface};
+use super::interface::{NetMDInterface, MDTrack};
 use super::utils::cross_sleep;
 
-#[derive(FromPrimitive, PartialEq)]
+#[derive(FromPrimitive)]
+#[derive(PartialEq)]
 pub enum OperatingStatus{
     Ready = 50687,
     Playing = 50037,
@@ -54,21 +55,11 @@ pub async fn device_status(interface: &mut NetMDInterface) -> Result<DeviceStatu
         frame: position[4],
     };
 
-    Ok(DeviceStatus {
+    Ok(DeviceStatus { disc_present, state, track, time })
-        disc_present,
-        state,
-        track,
-        time,
-    })
 }
 
 pub async fn prepare_download(interface: &mut NetMDInterface) -> Result<(), Box<dyn Error>>{
-    while ![OperatingStatus::DiscBlank, OperatingStatus::Ready].contains(
+    while ![OperatingStatus::DiscBlank, OperatingStatus::Ready].contains(&device_status(interface).await?.state.unwrap_or(OperatingStatus::NoDisc)) {
-        &device_status(interface)
-            .await?
-            .state
-            .unwrap_or(OperatingStatus::NoDisc),
-    ) {
         cross_sleep(200).await;
     }
 
@@ -81,22 +72,8 @@ pub async fn prepare_download(interface: &mut NetMDInterface) -> Result<(), Box<
     Ok(())
 }
 
-pub async fn download<F>(
+pub async fn download(interface: &mut NetMDInterface, _track: MDTrack) -> Result<(), Box<dyn Error>>{
-    interface: &mut NetMDInterface,
-    track: MDTrack,
-    progress_callback: F,
-) -> Result<(u16, Vec<u8>, Vec<u8>), Box<dyn Error>>
-where
-    F: Fn(usize, usize),
-{
     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?;
-    interface.release().await?;
 
-    Ok(result)
+    Ok(())
 }

minidisc-rs/src/netmd/interface.rs

@@ -6,13 +6,12 @@ use crate::netmd::utils::{
     sanitize_half_width_title, time_to_duration,
 };
 use cbc::cipher::block_padding::NoPadding;
-use cbc::cipher::{BlockDecryptMut, BlockEncryptMut, KeyInit, KeyIvInit};
+use cbc::cipher::{KeyIvInit, BlockEncryptMut, BlockDecryptMut, KeyInit};
 use encoding_rs::SHIFT_JIS;
-use num_derive::FromPrimitive;
 use rand::RngCore;
 use std::collections::HashMap;
 use std::error::Error;
-use tokio::sync::mpsc::UnboundedReceiver;
+use std::str::FromStr;
 
 use lazy_static::lazy_static;
 
@@ -32,7 +31,7 @@ enum Track {
     Restart = 0x0001,
 }
 
-#[derive(Debug, Clone, Copy, FromPrimitive)]
+#[derive(Debug)]
 pub enum DiscFormat {
     LP4 = 0,
     LP2 = 2,
@@ -40,7 +39,7 @@ pub enum DiscFormat {
     SPStereo = 6,
 }
 
-#[derive(Clone, Hash, Eq, PartialEq, FromPrimitive)]
+#[derive(Clone, Hash, Eq, PartialEq)]
 pub enum WireFormat {
     Pcm = 0x00,
     L105kbps = 0x90,
@@ -226,8 +225,7 @@ impl NetMDInterface {
         self.change_descriptor_state(
             &Descriptor::DiscSubunitIdentifier,
             &DescriptorAction::OpenRead,
-        )
+        ).await;
-        .await;
 
         let mut query = format_query("1809 00 ff00 0000 0000".to_string(), vec![])?;
 
@@ -295,8 +293,7 @@ impl NetMDInterface {
         let _manufacturer_dep_data =
             &buffer[buffer_offset..buffer_offset + manufacturer_dep_length as usize];
 
-        self.change_descriptor_state(&Descriptor::DiscSubunitIdentifier, &DescriptorAction::Close)
+        self.change_descriptor_state(&Descriptor::DiscSubunitIdentifier, &DescriptorAction::Close).await;
-            .await;
 
         for media in supported_media_type_specifications {
             if media.supported_media_type != 0x301 {
@@ -326,11 +323,7 @@ impl NetMDInterface {
         Ok(result)
     }
 
-    async fn change_descriptor_state(
+    async fn change_descriptor_state(&mut self, descriptor: &Descriptor, action: &DescriptorAction) {
-        &mut self,
-        descriptor: &Descriptor,
-        action: &DescriptorAction,
-    ) {
         let mut query = format_query("1808".to_string(), vec![]).unwrap();
 
         query.append(&mut descriptor.get_array());
@@ -466,7 +459,7 @@ impl NetMDInterface {
         Ok(())
     }
 
-    pub async fn release(&mut self) -> Result<(), Box<dyn Error>> {
+    async fn release(&mut self) -> Result<(), Box<dyn Error>> {
         let mut query = format_query("ff 0100 ffff ffff ffff ffff ffff ffff".to_string(), vec![])?;
 
         let reply = self.send_query(&mut query, false, false).await?;
@@ -480,8 +473,7 @@ impl NetMDInterface {
         self.change_descriptor_state(
             &Descriptor::OperatingStatusBlock,
             &DescriptorAction::OpenRead,
-        )
+        ).await;
-        .await;
 
         let mut query = format_query(
             "1809 8001 0230 8800 0030 8804 00 ff00 00000000".to_string(),
@@ -495,8 +487,7 @@ impl NetMDInterface {
             "1809 8001 0230 8800 0030 8804 00 1000 00090000 %x".to_string(),
         )?;
 
-        self.change_descriptor_state(&Descriptor::OperatingStatusBlock, &DescriptorAction::Close)
+        self.change_descriptor_state(&Descriptor::OperatingStatusBlock, &DescriptorAction::Close).await;
-            .await;
 
         let final_array = res[0].to_vec().unwrap();
 
@@ -516,8 +507,7 @@ impl NetMDInterface {
         self.change_descriptor_state(
             &Descriptor::OperatingStatusBlock,
             &DescriptorAction::OpenRead,
-        )
+        ).await;
-        .await;
         let mut query = format_query(
             "1809 8001 0330 8802 0030 8805 0030 8806 00 ff00 00000000".to_string(),
             vec![],
@@ -533,8 +523,7 @@ impl NetMDInterface {
         let operating_status = result[1].to_vec().unwrap();
         let status_mode = result[0].to_i64().unwrap() as u8;
 
-        self.change_descriptor_state(&Descriptor::OperatingStatusBlock, &DescriptorAction::Close)
+        self.change_descriptor_state(&Descriptor::OperatingStatusBlock, &DescriptorAction::Close).await;
-            .await;
 
         if operating_status.len() < 2 {
             return Err("Unparsable operating system".into());
@@ -556,8 +545,7 @@ impl NetMDInterface {
         self.change_descriptor_state(
             &Descriptor::OperatingStatusBlock,
             &DescriptorAction::OpenRead,
-        )
+        ).await;
-        .await;
         let mut query = format_query(
             "1809 8001 0330 %w 0030 8805 0030 %w 00 ff00 00000000".to_string(),
             vec![QueryValue::Number(p1 as i64), QueryValue::Number(p2 as i64)],
@@ -571,8 +559,7 @@ impl NetMDInterface {
             "1809 8001 0330 %?%? %?%? %?%? %?%? %?%? %? 1000 00%?0000 %x %?".to_string(),
         );
 
-        self.change_descriptor_state(&Descriptor::OperatingStatusBlock, &DescriptorAction::Close)
+        self.change_descriptor_state(&Descriptor::OperatingStatusBlock, &DescriptorAction::Close).await;
-            .await;
 
         Ok(res.unwrap()[0].to_vec().unwrap())
     }
@@ -589,8 +576,7 @@ impl NetMDInterface {
         self.change_descriptor_state(
             &Descriptor::OperatingStatusBlock,
             &DescriptorAction::OpenRead,
-        )
+        ).await;
-        .await;
 
         let mut query = format_query(
             "1809 8001 0430 8802 0030 8805 0030 0003 0030 0002 00 ff00 00000000".to_string(),
@@ -614,8 +600,7 @@ impl NetMDInterface {
             result[4].to_i64().unwrap() as u16,
         ];
 
-        self.change_descriptor_state(&Descriptor::OperatingStatusBlock, &DescriptorAction::Close)
+        self.change_descriptor_state(&Descriptor::OperatingStatusBlock, &DescriptorAction::Close).await;
-            .await;
 
         Ok(final_result)
     }
@@ -722,24 +707,21 @@ impl NetMDInterface {
     // TODO: Ensure this is returning the correct value, it
     // looks like it actually might be a 16 bit integer
     pub async fn disc_flags(&mut self) -> Result<u8, Box<dyn Error>> {
-        self.change_descriptor_state(&Descriptor::RootTD, &DescriptorAction::OpenRead)
+        self.change_descriptor_state(&Descriptor::RootTD, &DescriptorAction::OpenRead).await;
-            .await;
         let mut query = format_query("1806 01101000 ff00 0001000b".to_string(), vec![]).unwrap();
 
         let reply = self.send_query(&mut query, false, false).await?;
 
         let res = scan_query(reply, "1806 01101000 1000 0001000b %b".to_string()).unwrap();
 
-        self.change_descriptor_state(&Descriptor::RootTD, &DescriptorAction::Close)
+        self.change_descriptor_state(&Descriptor::RootTD, &DescriptorAction::Close).await;
-            .await;
 
         Ok(res[0].to_i64().unwrap() as u8)
     }
 
     /// The number of tracks on  the disc
     pub async fn track_count(&mut self) -> Result<u16, Box<dyn Error>> {
-        self.change_descriptor_state(&Descriptor::AudioContentsTD, &DescriptorAction::OpenRead)
+        self.change_descriptor_state(&Descriptor::AudioContentsTD, &DescriptorAction::OpenRead).await;
-            .await;
 
         let mut query =
             format_query("1806 02101001 3000 1000 ff00 00000000".to_string(), vec![]).unwrap();
@@ -752,17 +734,14 @@ impl NetMDInterface {
         )
         .unwrap();
 
-        self.change_descriptor_state(&Descriptor::AudioContentsTD, &DescriptorAction::Close)
+        self.change_descriptor_state(&Descriptor::AudioContentsTD, &DescriptorAction::Close).await;
-            .await;
 
         Ok(res[0].to_i64().unwrap() as u16)
     }
 
     async fn raw_disc_title(&mut self, wchar: bool) -> Result<String, Box<dyn Error>> {
-        self.change_descriptor_state(&Descriptor::AudioContentsTD, &DescriptorAction::OpenRead)
+        self.change_descriptor_state(&Descriptor::AudioContentsTD, &DescriptorAction::OpenRead).await;
-            .await;
+        self.change_descriptor_state(&Descriptor::DiscTitleTD, &DescriptorAction::OpenRead).await;
-        self.change_descriptor_state(&Descriptor::DiscTitleTD, &DescriptorAction::OpenRead)
-            .await;
 
         let mut done: i32 = 0;
         let mut remaining: i32 = 0;
@@ -816,10 +795,8 @@ impl NetMDInterface {
 
         let res = result.join("");
 
-        self.change_descriptor_state(&Descriptor::DiscTitleTD, &DescriptorAction::Close)
+        self.change_descriptor_state(&Descriptor::DiscTitleTD, &DescriptorAction::Close).await;
-            .await;
+        self.change_descriptor_state(&Descriptor::AudioContentsTD, &DescriptorAction::Close).await;
-        self.change_descriptor_state(&Descriptor::AudioContentsTD, &DescriptorAction::Close)
-            .await;
 
         Ok(res)
     }
@@ -952,8 +929,7 @@ impl NetMDInterface {
             false => Descriptor::AudioUTOC1TD,
         };
 
-        self.change_descriptor_state(&descriptor_type, &DescriptorAction::OpenRead)
+        self.change_descriptor_state(&descriptor_type, &DescriptorAction::OpenRead).await;
-            .await;
 
         let mut track_titles: Vec<String> = vec![];
         for i in tracks {
@@ -982,8 +958,7 @@ impl NetMDInterface {
             )
         }
 
-        self.change_descriptor_state(&descriptor_type, &DescriptorAction::Close)
+        self.change_descriptor_state(&descriptor_type, &DescriptorAction::Close).await;
-            .await;
 
         Ok(track_titles)
     }
@@ -999,7 +974,11 @@ impl NetMDInterface {
     }
 
     // Sets the title of the disc
-    pub async fn set_disc_title(&mut self, title: &str, wchar: bool) -> Result<(), Box<dyn Error>> {
+    pub async fn set_disc_title(
+        &mut self,
+        title: &str,
+        wchar: bool,
+    ) -> Result<(), Box<dyn Error>> {
         let current_title = self.raw_disc_title(wchar).await?;
         if current_title == title {
             return Err("Title is already the same".into());
@@ -1022,13 +1001,10 @@ impl NetMDInterface {
         let new_len = new_title.len();
 
         if self.net_md_device.vendor_id().await == &0x04dd {
-            self.change_descriptor_state(&Descriptor::AudioUTOC1TD, &DescriptorAction::OpenWrite)
+            self.change_descriptor_state(&Descriptor::AudioUTOC1TD, &DescriptorAction::OpenWrite).await
-                .await
         } else {
-            self.change_descriptor_state(&Descriptor::DiscTitleTD, &DescriptorAction::Close)
+            self.change_descriptor_state(&Descriptor::DiscTitleTD, &DescriptorAction::Close).await;
-                .await;
+            self.change_descriptor_state(&Descriptor::DiscTitleTD, &DescriptorAction::OpenWrite).await
-            self.change_descriptor_state(&Descriptor::DiscTitleTD, &DescriptorAction::OpenWrite)
-                .await
         }
 
         let mut query = format_query(
@@ -1044,15 +1020,11 @@ impl NetMDInterface {
         let _ = self.send_query(&mut query, false, false).await;
 
         if self.net_md_device.vendor_id().await == &0x04dd {
-            self.change_descriptor_state(&Descriptor::AudioUTOC1TD, &DescriptorAction::Close)
+            self.change_descriptor_state(&Descriptor::AudioUTOC1TD, &DescriptorAction::Close).await
-                .await
         } else {
-            self.change_descriptor_state(&Descriptor::DiscTitleTD, &DescriptorAction::Close)
+            self.change_descriptor_state(&Descriptor::DiscTitleTD, &DescriptorAction::Close).await;
-                .await;
+            self.change_descriptor_state(&Descriptor::DiscTitleTD, &DescriptorAction::OpenRead).await;
-            self.change_descriptor_state(&Descriptor::DiscTitleTD, &DescriptorAction::OpenRead)
+            self.change_descriptor_state(&Descriptor::DiscTitleTD, &DescriptorAction::Close).await;
-                .await;
-            self.change_descriptor_state(&Descriptor::DiscTitleTD, &DescriptorAction::Close)
-                .await;
         }
 
         Ok(())
@@ -1090,8 +1062,7 @@ impl NetMDInterface {
             Err(error) => return Err(error),
         };
 
-        self.change_descriptor_state(&descriptor, &DescriptorAction::OpenWrite)
+        self.change_descriptor_state(&descriptor, &DescriptorAction::OpenWrite).await;
-            .await;
         let mut query = format_query(
             "1807 022018%b %w 3000 0a00 5000 %w 0000 %w %*".to_string(),
             vec![
@@ -1108,8 +1079,7 @@ impl NetMDInterface {
             reply,
             "1807 022018%? %?%? 3000 0a00 5000 %?%? 0000 %?%?".to_string(),
         );
-        self.change_descriptor_state(&descriptor, &DescriptorAction::Close)
+        self.change_descriptor_state(&descriptor, &DescriptorAction::Close).await;
-            .await;
 
         Ok(())
     }
@@ -1147,8 +1117,7 @@ impl NetMDInterface {
         p1: i32,
         p2: i32,
     ) -> Result<Vec<u8>, Box<dyn Error>> {
-        self.change_descriptor_state(&Descriptor::AudioContentsTD, &DescriptorAction::OpenRead)
+        self.change_descriptor_state(&Descriptor::AudioContentsTD, &DescriptorAction::OpenRead).await;
-            .await;
 
         let mut query = format_query(
             "1806 02201001 %w %w %w ff00 00000000".to_string(),
@@ -1165,8 +1134,7 @@ impl NetMDInterface {
             "1806 02201001 %?%? %?%? %?%? 1000 00%?0000 %x".to_string(),
         )?;
 
-        self.change_descriptor_state(&Descriptor::AudioContentsTD, &DescriptorAction::Close)
+        self.change_descriptor_state(&Descriptor::AudioContentsTD, &DescriptorAction::Close).await;
-            .await;
 
         Ok(res[0].to_vec().unwrap())
     }
@@ -1178,8 +1146,7 @@ impl NetMDInterface {
     ) -> Result<Vec<std::time::Duration>, Box<dyn Error>> {
         let mut times: Vec<std::time::Duration> = vec![];
 
-        self.change_descriptor_state(&Descriptor::AudioContentsTD, &DescriptorAction::OpenRead)
+        self.change_descriptor_state(&Descriptor::AudioContentsTD, &DescriptorAction::OpenRead).await;
-            .await;
         for track in tracks {
             let mut query = format_query(
                 "1806 02201001 %w %w %w ff00 00000000".to_string(),
@@ -1211,8 +1178,7 @@ impl NetMDInterface {
             times.push(length);
         }
 
-        self.change_descriptor_state(&Descriptor::AudioContentsTD, &DescriptorAction::Close)
+        self.change_descriptor_state(&Descriptor::AudioContentsTD, &DescriptorAction::Close).await;
-            .await;
 
         Ok(times)
     }
@@ -1243,8 +1209,7 @@ impl NetMDInterface {
 
     /// Gets a track's flags
     pub async fn track_flags(&mut self, track: u16) -> Result<u8, Box<dyn Error>> {
-        self.change_descriptor_state(&Descriptor::AudioContentsTD, &DescriptorAction::OpenRead)
+        self.change_descriptor_state(&Descriptor::AudioContentsTD, &DescriptorAction::OpenRead).await;
-            .await;
         let mut query = format_query(
             "1806 01201001 %w ff00 00010008".to_string(),
             vec![QueryValue::Number(track as i64)],
@@ -1253,16 +1218,14 @@ impl NetMDInterface {
 
         let res = scan_query(reply, "1806 01201001 %?%? 10 00 00010008 %b".to_string())?;
 
-        self.change_descriptor_state(&Descriptor::AudioContentsTD, &DescriptorAction::Close)
+        self.change_descriptor_state(&Descriptor::AudioContentsTD, &DescriptorAction::Close).await;
-            .await;
 
         Ok(res[0].to_i64().unwrap() as u8)
     }
 
     /// Gets the disc capacity as a `std::time::Duration`
     pub async fn disc_capacity(&mut self) -> Result<[std::time::Duration; 3], Box<dyn Error>> {
-        self.change_descriptor_state(&Descriptor::RootTD, &DescriptorAction::OpenRead)
+        self.change_descriptor_state(&Descriptor::RootTD, &DescriptorAction::OpenRead).await;
-            .await;
         let mut query = format_query("1806 02101000 3080 0300 ff00 00000000".to_string(), vec![])?;
         let reply = self.send_query(&mut query, false, false).await?;
         let mut result: [std::time::Duration; 3] = [std::time::Duration::from_secs(0); 3];
@@ -1285,8 +1248,7 @@ impl NetMDInterface {
             result[i] = std::time::Duration::from_micros(time_micros);
         }
 
-        self.change_descriptor_state(&Descriptor::RootTD, &DescriptorAction::Close)
+        self.change_descriptor_state(&Descriptor::RootTD, &DescriptorAction::Close).await;
-            .await;
 
         Ok(result)
     }
@@ -1295,8 +1257,7 @@ impl NetMDInterface {
         self.change_descriptor_state(
             &Descriptor::OperatingStatusBlock,
             &DescriptorAction::OpenRead,
-        )
+        ).await;
-        .await;
         let mut query = format_query(
             "1809 8001 0330 8801 0030 8805 0030 8807 00 ff00 00000000".to_string(),
             vec![],
@@ -1306,8 +1267,7 @@ impl NetMDInterface {
 
         let res = scan_query(reply, "1809 8001 0330 8801 0030 8805 0030 8807 00 1000 000e0000 000c 8805 0008 80e0 0110 %b %b 4000".to_string())?;
 
-        self.change_descriptor_state(&Descriptor::OperatingStatusBlock, &DescriptorAction::Close)
+        self.change_descriptor_state(&Descriptor::OperatingStatusBlock, &DescriptorAction::Close).await;
-            .await;
 
         Ok(res.into_iter().map(|x| x.to_i64().unwrap() as u8).collect())
     }
@@ -1471,8 +1431,8 @@ impl NetMDInterface {
 
     pub async fn setup_download(
         &mut self,
-        contentid: &[u8],
+        contentid: Vec<u8>,
-        keyenckey: &[u8],
+        keyenckey: Vec<u8>,
         hex_session_key: &[u8],
     ) -> Result<(), Box<dyn Error>> {
         if contentid.len() != 20 {
@@ -1481,14 +1441,12 @@ impl NetMDInterface {
         if keyenckey.len() != 8 {
             return Err("Supplied Key Encryption Key length wrong".into());
         }
-        if hex_session_key.len() != 8 {
+        if hex_session_key.len() != 16 {
             return Err("Supplied Session Key length wrong".into());
         }
 
-        let mut message = [vec![1, 1, 1, 1], contentid.to_vec(), keyenckey.to_vec()].concat();
+        let mut message = [vec![1, 1, 1, 1], contentid, keyenckey].concat();
-        DesCbcEnc::new(hex_session_key.into(), &[0u8; 8].into())
+        DesCbcEnc::new(hex_session_key.into(), &[0u8; 8].into()).encrypt_padded_mut::<NoPadding>(message.as_mut_slice(), 32).unwrap();
-            .encrypt_padded_mut::<NoPadding>(message.as_mut_slice(), 32)
-            .unwrap();
 
         let mut query = format_query(
             "1800 080046 f0030103 22 ff 0000 %*".to_string(),
@@ -1507,17 +1465,15 @@ impl NetMDInterface {
         track_number: u16,
         hex_session_key: &[u8],
     ) -> Result<(), Box<dyn Error>> {
-        if hex_session_key.len() != 8 {
+        if hex_session_key.len() != 16 {
             return Err("Supplied Session Key length wrong".into());
         }
 
         let mut message = [0u8; 8];
-        DesEcbEnc::new(hex_session_key.into())
+        DesEcbEnc::new(hex_session_key.into()).encrypt_padded_mut::<NoPadding>(&mut message, 8).unwrap();
-            .encrypt_padded_mut::<NoPadding>(&mut message, 8)
-            .unwrap();
 
         let mut query = format_query(
-            "1800 080046 f0030103 48 ff 00 1001 %w %*".to_string(),
+            "1800 080046 f0030103 22 ff 0000 %*".to_string(),
             vec![
                 QueryValue::Number(track_number as i64),
                 QueryValue::Array(Vec::from(message)),
@@ -1526,34 +1482,29 @@ impl NetMDInterface {
 
         let reply = self.send_query(&mut query, false, false).await?;
 
-        scan_query(reply, "1800 080046 f0030103 48 00 00 1001 %?%?".to_string())?;
+        scan_query(reply, "1800 080046 f0030103 22 00 0000".to_string())?;
 
         Ok(())
     }
 
-    #[allow(clippy::too_many_arguments)]
+    pub async fn send_track(
-    pub async fn send_track<F>(
         &mut self,
         wireformat: u8,
         discformat: u8,
-        frames: u32,
+        frames: i32,
         pkt_size: u32,
         // key   // iv    // data
-        mut packets: UnboundedReceiver<(Vec<u8>, Vec<u8>, Vec<u8>)>,
+        packets: Vec<(Vec<u8>, Vec<u8>, Vec<u8>)>,
         hex_session_key: &[u8],
-        progress_callback: F,
+    ) -> Result<(i64, String, String), Box<dyn Error>> {
-    ) -> Result<(u16, Vec<u8>, Vec<u8>), Box<dyn Error>>
+        if hex_session_key.len() != 16 {
-    where
-        F: Fn(usize, usize),
-    {
-        if hex_session_key.len() != 8 {
             return Err("Supplied Session Key length wrong".into());
         }
 
         // Sharps are slow
         cross_sleep(200).await;
 
-        let total_bytes: usize = (pkt_size + 24) as usize; //framesizedict[wireformat] * frames + pktcount * 24;
+        let total_bytes = pkt_size + 24; //framesizedict[wireformat] * frames + pktcount * 24;
 
         let mut query = format_query(
             "1800 080046 f0030103 28 ff 000100 1001 ffff 00 %b %b %d %d".to_string(),
@@ -1569,29 +1520,20 @@ impl NetMDInterface {
             reply,
             "1800 080046 f0030103 28 00 000100 1001 %?%? 00 %*".to_string(),
         )?;
-        self.net_md_device.poll().await?;
 
         // Sharps are slow
         cross_sleep(200).await;
 
         let mut _written_bytes = 0;
-        let mut packet_count = 0;
+        for (packet_count, (key, iv, data)) in packets.into_iter().enumerate() {
-
-        while let Some((key, iv, data)) = packets.recv().await {
             let binpack = if packet_count == 0 {
-                let packed_length: Vec<u8> = pkt_size.to_be_bytes().to_vec();
+                let packed_length: Vec<u8> = pkt_size.to_le_bytes().to_vec();
-                [vec![0, 0, 0, 0], packed_length, key, iv, data].concat()
+                [vec![0, 0, 0, 0], packed_length, key, iv, data.clone()].concat()
             } else {
-                data
+                data.clone()
             };
             self.net_md_device.write_bulk(&binpack).await?;
-            _written_bytes += binpack.len();
+            _written_bytes += data.len();
-            packet_count += 1;
-            (progress_callback)(total_bytes, _written_bytes);
-            if total_bytes == _written_bytes {
-                packets.close();
-                break;
-            }
         }
 
         reply = self.read_reply(false).await?;
@@ -1602,14 +1544,14 @@ impl NetMDInterface {
         )?;
 
         let mut encrypted_data = res[1].to_vec().unwrap();
-        DesCbcDec::new(hex_session_key.into(), &[0u8; 8].into())
+        DesCbcDec::new(hex_session_key.into(), &[0u8; 8].into()).decrypt_padded_mut::<NoPadding>(&mut encrypted_data).unwrap();
-            .decrypt_padded_mut::<NoPadding>(&mut encrypted_data)
-            .unwrap();
 
-        let part1 = encrypted_data[0..8].to_vec();
+        let reply_data = String::from_utf8(encrypted_data)?;
-        let part2 = encrypted_data[12..32].to_vec();
 
-        Ok((res[0].to_i64().unwrap() as u16, part1, part2))
+        let part1 = String::from_str(&reply_data[0..8]).unwrap();
+        let part2 = String::from_str(&reply_data[12..32]).unwrap();
+
+        Ok((res[0].to_i64().unwrap(), part1, part2))
     }
 
     pub async fn track_uuid(&mut self, track: u16) -> Result<String, Box<dyn Error>> {
@@ -1646,18 +1588,14 @@ pub fn retailmac(key: &[u8], value: &[u8], iv: &[u8; 8]) -> Vec<u8> {
     let mut end = [0u8; 8];
     end.clone_from_slice(&value[8..]);
 
-    DesCbcEnc::new(&subkey_a.into(), iv.into())
+    DesCbcEnc::new(&subkey_a.into(), iv.into()).encrypt_padded_mut::<NoPadding>(&mut beginning, 8).unwrap();
-        .encrypt_padded_mut::<NoPadding>(&mut beginning, 8)
-        .unwrap();
 
     let iv2 = &beginning[beginning.len() - 8..];
     
     let mut wonky_key = [0u8; 24];
-    wonky_key[0..16].clone_from_slice(key);
+    wonky_key[0..16].clone_from_slice(&key);
     wonky_key[16..].clone_from_slice(&key[0..8]);
-    TDesCbcEnc::new(&wonky_key.into(), iv2.into())
+    TDesCbcEnc::new(&wonky_key.into(), iv2.into()).encrypt_padded_mut::<NoPadding>(&mut end, 8).unwrap();
-        .encrypt_padded_mut::<NoPadding>(&mut end, 8)
-        .unwrap();
 
     end[..8].to_vec()
 }
@@ -1694,41 +1632,34 @@ impl EKBOpenSource {
     pub fn ekb_data_for_leaf_id(&self) -> EKBData {
         EKBData {
             chains: [
-                [
+                [0x25, 0x45, 0x06, 0x4d, 0xea, 0xca, 0x14, 0xf9, 0x96, 0xbd, 0xc8, 0xa4, 0x06, 0xc2, 0x2b, 0x81],
-                    0x25, 0x45, 0x06, 0x4d, 0xea, 0xca, 0x14, 0xf9, 0x96, 0xbd, 0xc8, 0xa4, 0x06,
+                [0xfb, 0x60, 0xbd, 0xdd, 0x0d, 0xbc, 0xab, 0x84, 0x8a, 0x00, 0x5e, 0x03, 0x19, 0x4d, 0x3e, 0xda],
-                    0xc2, 0x2b, 0x81,
-                ],
-                [
-                    0xfb, 0x60, 0xbd, 0xdd, 0x0d, 0xbc, 0xab, 0x84, 0x8a, 0x00, 0x5e, 0x03, 0x19,
-                    0x4d, 0x3e, 0xda,
-                ],
             ],
             depth: 9,
             signature: [
-                0x8f, 0x2b, 0xc3, 0x52, 0xe8, 0x6c, 0x5e, 0xd3, 0x06, 0xdc, 0xae, 0x18, 0xd2, 0xf3,
+                0x8f, 0x2b, 0xc3, 0x52, 0xe8, 0x6c, 0x5e, 0xd3, 0x06, 0xdc, 0xae, 0x18,
-                0x8c, 0x7f, 0x89, 0xb5, 0xe1, 0x85, 0x55, 0xa1, 0x05, 0xea,
+                0xd2, 0xf3, 0x8c, 0x7f, 0x89, 0xb5, 0xe1, 0x85, 0x55, 0xa1, 0x05, 0xea,
             ],
         }
     }
 }
 
+#[derive(Clone)]
 pub struct MDTrack {
-    pub title: String,
+    title: String,
-    pub format: WireFormat,
+    format: WireFormat,
-    pub data: Vec<u8>,
+    data: Vec<u8>,
-    pub chunk_size: usize,
+    chunk_size: i32,
-    pub full_width_title: Option<String>,
+    full_width_title: Option<String>,
-
+    encrypt_packets_iterator: EncryptPacketsIterator,
-    #[allow(clippy::type_complexity)]
-    pub encrypt_packets_iterator:
-        Box<dyn Fn(DataEncryptorInput) -> UnboundedReceiver<(Vec<u8>, Vec<u8>, Vec<u8>)>>,
 }
 
-pub struct DataEncryptorInput {
+#[derive(Clone)]
-    pub kek: [u8; 8],
+pub struct EncryptPacketsIterator {
-    pub frame_size: usize,
+    kek: Vec<u8>,
-    pub data: Vec<u8>,
+    frame_size: i32,
-    pub chunk_size: usize,
+    data: Vec<u8>,
+    chunk_size: i32,
 }
 
 impl MDTrack {
@@ -1752,7 +1683,7 @@ impl MDTrack {
         *FRAME_SIZE.get(&self.format).unwrap()
     }
 
-    pub fn chunk_size(&self) -> usize {
+    pub fn chunk_size(self) -> i32 {
         self.chunk_size
     }
 
@@ -1765,47 +1696,31 @@ impl MDTrack {
         len
     }
 
-    pub fn content_id(&self) -> [u8; 20] {
+    pub fn content_id() -> [u8; 20] {
         [
             0x01, 0x0f, 0x50, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x48, 0xa2, 0x8d, 0x3e, 0x1a,
             0x3b, 0x0c, 0x44, 0xaf, 0x2f, 0xa0,
         ]
     }
 
-    pub fn get_kek(&self) -> [u8; 8] {
+    pub fn get_kek() -> [u8; 8] {
         [0x14, 0xe3, 0x83, 0x4e, 0xe2, 0xd3, 0xcc, 0xa5]
     }
-
-    pub fn get_encrypting_iterator(&mut self) -> UnboundedReceiver<(Vec<u8>, Vec<u8>, Vec<u8>)> {
-        (self.encrypt_packets_iterator)(DataEncryptorInput {
-            kek: self.get_kek(),
-            frame_size: self.frame_size(),
-            chunk_size: self.chunk_size(),
-            data: std::mem::take(&mut self.data),
-        })
-    }
 }
 
-pub struct MDSession<'a> {
+pub struct MDSession {
-    pub md: &'a mut NetMDInterface,
+    pub md: NetMDInterface,
     pub ekb_object: EKBOpenSource,
     pub hex_session_key: Option<Vec<u8>>,
 }
 
-impl<'a> MDSession<'a> {
+impl MDSession {
     pub async fn init(&mut self) -> Result<(), Box<dyn Error>>{
         self.md.enter_secure_session().await?;
         self.md.leaf_id().await?;
 
         let ekb = self.ekb_object.ekb_data_for_leaf_id();
-        self.md
+        self.md.send_key_data(self.ekb_object.ekb_id(), ekb.chains, ekb.depth, ekb.signature).await?;
-            .send_key_data(
-                self.ekb_object.ekb_id(),
-                ekb.chains,
-                ekb.depth,
-                ekb.signature,
-            )
-            .await?;
         let mut nonce = vec![0u8; 8];
         rand::thread_rng().fill_bytes(&mut nonce);
 
@@ -1817,69 +1732,11 @@ impl<'a> MDSession<'a> {
     }
 
     pub async fn close(&mut self) -> Result<(), Box<dyn Error>> {
-        if self.hex_session_key.is_none() {
+        if let None = self.hex_session_key {
             self.md.session_key_forget().await?;
         }
         self.hex_session_key = None;
 
         Ok(())
     }
-
-    pub async fn download_track<F>(
-        &mut self,
-        mut track: MDTrack,
-        progress_callback: F,
-        disc_format: Option<DiscFormat>,
-    ) -> Result<(u16, Vec<u8>, Vec<u8>), Box<dyn Error>>
-    where
-        F: Fn(usize, usize),
-    {
-        if self.hex_session_key.is_none() {
-            return Err("Cannot download a track using a non-init()'ed session!".into());
-        }
-        self.md
-            .setup_download(
-                &track.content_id(),
-                &track.get_kek(),
-                self.hex_session_key.as_ref().unwrap(),
-            )
-            .await?;
-        let data_format = track.data_format();
-        let final_disc_format = disc_format.unwrap_or(*DISC_FOR_WIRE.get(&data_format).unwrap());
-
-        let (track_index, uuid, ccid) = self
-            .md
-            .send_track(
-                data_format as u8,
-                final_disc_format as u8,
-                track.frame_count() as u32,
-                track.total_size() as u32,
-                track.get_encrypting_iterator(),
-                self.hex_session_key.as_ref().unwrap().as_slice(),
-                progress_callback,
-            )
-            .await?;
-
-        self.md
-            .set_track_title(track_index, &track.title, false)
-            .await?;
-        if let Some(full_width) = track.full_width_title {
-            self.md
-                .set_track_title(track_index, &full_width, true)
-                .await?;
-        }
-        self.md
-            .commit_track(track_index, self.hex_session_key.as_ref().unwrap())
-            .await?;
-
-        Ok((track_index, uuid, ccid))
-    }
-
-    pub fn new(md: &'a mut NetMDInterface) -> Self {
-        MDSession {
-            md,
-            ekb_object: EKBOpenSource {},
-            hex_session_key: None,
-        }
-    }
 }

minidisc-rs/src/netmd/mod.rs

@@ -5,9 +5,8 @@
  */
 
 mod base;
-pub mod commands;
-pub mod encryption;
 pub mod interface;
 mod mappings;
 mod query_utils;
 mod utils;
+mod commands;

minidisc-rs/src/netmd/utils.rs

@@ -173,7 +173,7 @@ pub fn agressive_sanitize_title(title: &str) -> String {
     .into()
 }
 
-pub fn time_to_duration(time: &[u64]) -> std::time::Duration {
+pub fn time_to_duration(time: &Vec<u64>) -> std::time::Duration {
     assert_eq!(time.len(), 4);
     std::time::Duration::from_micros(
         (time[0] * 3600000000) + (time[1] * 60000000) + (time[2] * 1000000) + (time[3] * 11600),

src/main.rs

@@ -0,0 +1,57 @@
+use minidisc_rs::netmd::interface;
+use cross_usb::usb::Device;
+use cross_usb::{device_filter, get_device};
+
+#[tokio::main]
+async fn main() {
+    // Can find devices this way
+    let filter = vec![
+        device_filter!{vendor_id:0x054c, product_id:0x0186}, // MZ-NH600
+        device_filter!{vendor_id:0x054c, product_id:0x00c9}, // MZ-NF610
+    ];
+
+    let device = get_device(filter).await.expect("No device found matching critera");
+
+    dbg!(device.vendor_id().await);
+
+    // Ensure the player is a minidisc player and not some other random device
+    let mut player_controller = match interface::NetMDInterface::new(&device).await {
+        Ok(player) => player,
+        Err(err) => {
+            dbg!(err);
+            panic!();
+        },
+    };
+
+    println!(
+        "Player Model: {}",
+        player_controller
+            .net_md_device
+            .device_name()
+            .await
+            .clone()
+            .unwrap()
+    );
+
+    let now = std::time::Instant::now();
+    let half_title = player_controller.disc_title(false).await.unwrap_or("".to_string());
+    let full_title = player_controller.disc_title(true).await.unwrap_or("".to_string());
+    println!(
+        "Disc Title: {} | {}",
+        half_title,
+        full_title
+    );
+
+    let track_count = player_controller.track_count().await.unwrap();
+    println!("{}", track_count);
+    let track_titles = player_controller.track_titles((0..track_count).collect(), false).await.unwrap();
+    let track_titlesw = player_controller.track_titles((0..track_count).collect(), true).await.unwrap();
+    let track_lengths = player_controller.track_lengths((0..track_count).collect()).await.unwrap();
+    for (i, track) in track_titles.iter().enumerate() {
+        println!(
+            "Track {i} Info:\n    Title: {track} | {}\n    Length: {:?}",
+            track_titlesw[i], track_lengths[i]
+        );
+    }
+    println!("{:?}", now.elapsed());
+}

src/netmd/encryption.rs

@@ -1,77 +0,0 @@
-use cbc::cipher::block_padding::NoPadding;
-use cbc::cipher::{BlockDecryptMut, BlockEncryptMut, KeyInit, KeyIvInit};
-use rand::RngCore;
-use std::thread;
-use tokio::sync::mpsc::{unbounded_channel, UnboundedReceiver};
-
-use super::interface::DataEncryptorInput;
-
-type DesEcbEnc = ecb::Decryptor<des::Des>;
-type DesCbcEnc = cbc::Encryptor<des::Des>;
-
-pub fn new_thread_encryptor(
-    _input: DataEncryptorInput,
-) -> UnboundedReceiver<(Vec<u8>, Vec<u8>, Vec<u8>)> {
-    let (tx, rx) = unbounded_channel::<(Vec<u8>, Vec<u8>, Vec<u8>)>();
-    let input = Box::from(_input);
-    thread::spawn(move || {
-        let mut 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 mut packet_count = 0u32;
-        let mut current_chunk_size;
-
-        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 input_data_length = input_data.len();
-
-        let mut offset: usize = 0;
-        while offset < input_data_length {
-            if packet_count > 0 {
-                current_chunk_size = default_chunk_size;
-            } else {
-                current_chunk_size = default_chunk_size - 24;
-            }
-
-            current_chunk_size = std::cmp::min(current_chunk_size, input_data_length - offset);
-
-            let this_data_chunk = &mut input_data[offset..offset + current_chunk_size];
-            DesCbcEnc::new(&random_key.into(), &iv.into())
-                .encrypt_padded_mut::<NoPadding>(this_data_chunk, current_chunk_size)
-                .unwrap();
-
-            tx.send((
-                encrypted_random_key.to_vec(),
-                iv.to_vec(),
-                this_data_chunk.to_vec(),
-            ))
-            .unwrap();
-
-            iv.copy_from_slice(&this_data_chunk[this_data_chunk.len() - 8..]);
-
-            packet_count += 1;
-            offset += current_chunk_size;
-        }
-    });
-
-    rx
-}