From 86b1a1a820eefb7a389eeca8f29c8e0c01623fdf Mon Sep 17 00:00:00 2001 From: David Idol Date: Tue, 1 Sep 2020 00:25:53 -0700 Subject: [PATCH 1/5] Add 2 click install feature --- ModAssistant/App.config | 16 +- .../Classes/External Interfaces/BeatSaver.cs | 22 + .../External Interfaces/SongPatcher.cs | 61 ++ ModAssistant/FFmpeg/LICENSE.txt | 674 ++++++++++++++++++ ModAssistant/FFmpeg/README.txt | 107 +++ ModAssistant/Localisation/en-DEBUG.xaml | 1 + ModAssistant/Localisation/en.xaml | 1 + ModAssistant/ModAssistant.csproj | 73 ++ ModAssistant/packages.config | 19 + 9 files changed, 972 insertions(+), 2 deletions(-) create mode 100644 ModAssistant/Classes/External Interfaces/SongPatcher.cs create mode 100644 ModAssistant/FFmpeg/LICENSE.txt create mode 100644 ModAssistant/FFmpeg/README.txt create mode 100644 ModAssistant/packages.config diff --git a/ModAssistant/App.config b/ModAssistant/App.config index 7a673b8e..9975eb6f 100644 --- a/ModAssistant/App.config +++ b/ModAssistant/App.config @@ -1,7 +1,7 @@ - + - +
@@ -69,4 +69,16 @@ + + + + + + + + + + + + diff --git a/ModAssistant/Classes/External Interfaces/BeatSaver.cs b/ModAssistant/Classes/External Interfaces/BeatSaver.cs index 0f9a3af4..ce384e1d 100644 --- a/ModAssistant/Classes/External Interfaces/BeatSaver.cs +++ b/ModAssistant/Classes/External Interfaces/BeatSaver.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.IO; using System.IO.Compression; +using System.Linq; using System.Net; using System.Net.Http.Headers; using System.Runtime.InteropServices; @@ -181,6 +182,27 @@ public static async Task InstallMap(BeatSaverApiResponseMap Map, bool sh } throw new Exception("Zip file not found."); } + + // Verify and patch separate audio file if needed + var hasFingerprintFile = File.Exists(Path.Combine(directory, "fingerprint.bin")); + if (hasFingerprintFile) + { + var noAudioFile = !Directory.EnumerateFiles(directory).Any(file => + { + var ext = Path.GetExtension(file); + return ext == ".egg" || ext == ".ogg" || ext == ".wav"; + }); + if (noAudioFile) + { + var patchSucccess = await SongPatcher.PromptAndPatchSongFromDisk(directory); + if (!patchSucccess) + { + MessageBox.Show($"{Application.Current.FindResource("OneClick:PatchingFailed")}"); + throw new Exception("Verification and patching failed."); + } + } + } + return mapName; } diff --git a/ModAssistant/Classes/External Interfaces/SongPatcher.cs b/ModAssistant/Classes/External Interfaces/SongPatcher.cs new file mode 100644 index 00000000..40eb9e42 --- /dev/null +++ b/ModAssistant/Classes/External Interfaces/SongPatcher.cs @@ -0,0 +1,61 @@ +using System; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using System.Windows.Forms; +using SaberSongPatcher; + +namespace ModAssistant.API +{ + public class SongPatcher + { + public static async Task PromptAndPatchSongFromDisk(string directory) + { + OpenFileDialog openFileDialog = new OpenFileDialog(); + var supportedExtensions = new[] + { + "mp3", + "m4a", + "ogg", + "wav", + "flac", + "aiff", + "wma", + }; + var audioExtensions = string.Join(";", supportedExtensions.Select(ext => $"*.{ext}")); + openFileDialog.Title = "Select master song audio file"; + openFileDialog.Filter = $"Audio files ({audioExtensions})|{audioExtensions}|All files (*.*)|*.*"; + openFileDialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Personal); + + var success = false; + if (openFileDialog.ShowDialog() == DialogResult.OK) + { + success = await PerformPatch(openFileDialog.FileName, directory); + } + return success; + } + + private static async Task PerformPatch(string inputFile, string mapDirectory) + { + var config = ConfigParser.ParseConfig(true, mapDirectory); + var context = new Context(config); + var inputValidator = new InputValidator(context); + var inputTransformer = new InputTransformer(context); + + var seemsCorrect = await inputValidator.ValidateInput(inputFile, mapDirectory); + if (!seemsCorrect) + { + return false; + } + + var outputFile = Path.Combine(mapDirectory, "song.egg"); + var success = await inputTransformer.TransformInput(inputFile, outputFile); + if (!success) + { + throw new Exception("Failed to transform audio."); + } + + return true; + } + } +} diff --git a/ModAssistant/FFmpeg/LICENSE.txt b/ModAssistant/FFmpeg/LICENSE.txt new file mode 100644 index 00000000..f288702d --- /dev/null +++ b/ModAssistant/FFmpeg/LICENSE.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/ModAssistant/FFmpeg/README.txt b/ModAssistant/FFmpeg/README.txt new file mode 100644 index 00000000..2b41621a --- /dev/null +++ b/ModAssistant/FFmpeg/README.txt @@ -0,0 +1,107 @@ +Zeranoe FFmpeg Builds + +Build: ffmpeg-4.2.2-win64-shared + +Configuration: + --enable-gpl + --enable-version3 + --enable-sdl2 + --enable-fontconfig + --enable-gnutls + --enable-iconv + --enable-libass + --enable-libdav1d + --enable-libbluray + --enable-libfreetype + --enable-libmp3lame + --enable-libopencore-amrnb + --enable-libopencore-amrwb + --enable-libopenjpeg + --enable-libopus + --enable-libshine + --enable-libsnappy + --enable-libsoxr + --enable-libtheora + --enable-libtwolame + --enable-libvpx + --enable-libwavpack + --enable-libwebp + --enable-libx264 + --enable-libx265 + --enable-libxml2 + --enable-libzimg + --enable-lzma + --enable-zlib + --enable-gmp + --enable-libvidstab + --enable-libvorbis + --enable-libvo-amrwbenc + --enable-libmysofa + --enable-libspeex + --enable-libxvid + --enable-libaom + --enable-libmfx + --enable-amf + --enable-ffnvcodec + --enable-cuvid + --enable-d3d11va + --enable-nvenc + --enable-nvdec + --enable-dxva2 + --enable-avisynth + --enable-libopenmpt + +Libraries: + SDL 20200120-cb4dae5 + Fontconfig 2.13.92 + GnuTLS 3.6.11.1 + libiconv 1.16 + libass 0.14.0 + dav1d 20200115-010eae8 + libbluray 20191112-137974c + FreeType 2.10.1 + LAME 3.100 + OpenCORE AMR 20170731-07a5be4 + OpenJPEG 20200113-b63a433 + Opus 20200119-6d29f51 + shine 20190420-76ea4f0 + Snappy 1.1.7 + libsoxr 20180224-945b592 + Theora 20171023-e5d205b + TwoLAME 0.4.0 + vpx 20200118-b78d3b2 + WavPack 5.2.0 + WebP 20200106-0fa56f3 + x264 20191127-1771b55 + x265 20200120-acc5d16 + libxml2 2.9.10 + z.lib 20191204-9ae36d7 + XZ Utils 5.2.4 + zlib 1.2.11 + GMP 6.1.2 + vid.stab 20190213-aeabc8d + Vorbis 20190128-9eadecc + VisualOn AMR-WB 20141107-3b3fcd0 + libmysofa 20190907-e07edb3 + Speex 20190808-58ac1d4 + Xvid 1.3.5 + aom 20200120-412efe2 + libmfx 1.28 + AMF 20191216-acbd877 + nv-codec-headers 20191126-250292d + OpenMPT 20191010-51cb021 + +Copyright (C) 2020 Kyle Schwarz + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . diff --git a/ModAssistant/Localisation/en-DEBUG.xaml b/ModAssistant/Localisation/en-DEBUG.xaml index d7daea69..5d88668a 100644 --- a/ModAssistant/Localisation/en-DEBUG.xaml +++ b/ModAssistant/Localisation/en-DEBUG.xaml @@ -157,6 +157,7 @@ OneClick:InstallDirNotFound {0} OneClick:InstalledAsset OneClick:AssetInstallFailed + OneClick:PatchingFailed {0} OneClick:ProtocolHandler:Registered {0} OneClick:ProtocolHandler:Unregistered {0} OneClick:Installing diff --git a/ModAssistant/Localisation/en.xaml b/ModAssistant/Localisation/en.xaml index 21dc8c7d..e27fdcf3 100644 --- a/ModAssistant/Localisation/en.xaml +++ b/ModAssistant/Localisation/en.xaml @@ -220,6 +220,7 @@ Beat Saber installation path not found. Installed: {0} Failed to install. + Input audio file does not match master audio file for this map. {0} OneClick™ Install handlers registered! {0} OneClick™ Install handlers unregistered! Installing: {0} diff --git a/ModAssistant/ModAssistant.csproj b/ModAssistant/ModAssistant.csproj index 48e6bfb7..4762c578 100644 --- a/ModAssistant/ModAssistant.csproj +++ b/ModAssistant/ModAssistant.csproj @@ -37,13 +37,63 @@ Resources\icon.ico + + ..\packages\FFmpeg.AutoGen.4.2.0\lib\net45\FFmpeg.AutoGen.dll + + + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + + + ..\packages\Newtonsoft.Json.Schema.3.0.13\lib\net45\Newtonsoft.Json.Schema.dll + + + ..\packages\NLog.4.7.3\lib\net45\NLog.dll + + + ..\packages\protobuf-net.3.0.29\lib\net461\protobuf-net.dll + + + ..\packages\protobuf-net.Core.3.0.29\lib\net461\protobuf-net.Core.dll + + + ..\packages\SaberSongPatcher.1.0.0\lib\netstandard2.0\SaberSongPatcherCommon.dll + + + ..\packages\SoundFingerprinting.7.4.12\lib\netstandard2.0\SoundFingerprinting.dll + + + ..\packages\SoundFingerprinting.Emy.7.4.12\lib\netstandard2.0\SoundFingerprinting.Emy.dll + + + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + + ..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll + + + + ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + + + + ..\packages\System.ServiceModel.Primitives.4.7.0\lib\net461\System.ServiceModel.Primitives.dll + + @@ -60,6 +110,9 @@ + + ..\packages\Xabe.FFmpeg.4.1.1\lib\netstandard2.0\Xabe.FFmpeg.dll + @@ -290,6 +343,7 @@ ResXFileCodeGenerator Resources.Designer.cs + PublicSettingsSingleFileGenerator Settings.Designer.cs @@ -304,5 +358,24 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ModAssistant/packages.config b/ModAssistant/packages.config new file mode 100644 index 00000000..a78b8c65 --- /dev/null +++ b/ModAssistant/packages.config @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file From cc6cb0f50dce86bb13b1fc44fd032b02d59445e9 Mon Sep 17 00:00:00 2001 From: David Idol Date: Tue, 1 Sep 2020 22:18:34 -0700 Subject: [PATCH 2/5] Working --- ModAssistant/App.config | 15 + .../Classes/External Interfaces/BeatSaver.cs | 5 +- ModAssistant/FFmpeg/LICENSE.txt | 674 ------------------ ModAssistant/FFmpeg/README.txt | 107 --- ModAssistant/ModAssistant.csproj | 33 +- ModAssistant/packages.config | 2 +- 6 files changed, 32 insertions(+), 804 deletions(-) delete mode 100644 ModAssistant/FFmpeg/LICENSE.txt delete mode 100644 ModAssistant/FFmpeg/README.txt diff --git a/ModAssistant/App.config b/ModAssistant/App.config index 9975eb6f..c08719a4 100644 --- a/ModAssistant/App.config +++ b/ModAssistant/App.config @@ -5,6 +5,7 @@
+
@@ -69,6 +70,20 @@ + + + + + + + + + + + + + + diff --git a/ModAssistant/Classes/External Interfaces/BeatSaver.cs b/ModAssistant/Classes/External Interfaces/BeatSaver.cs index ce384e1d..38fd514b 100644 --- a/ModAssistant/Classes/External Interfaces/BeatSaver.cs +++ b/ModAssistant/Classes/External Interfaces/BeatSaver.cs @@ -197,7 +197,10 @@ public static async Task InstallMap(BeatSaverApiResponseMap Map, bool sh var patchSucccess = await SongPatcher.PromptAndPatchSongFromDisk(directory); if (!patchSucccess) { - MessageBox.Show($"{Application.Current.FindResource("OneClick:PatchingFailed")}"); + if (showNotification) + { + MessageBox.Show($"{Application.Current.FindResource("OneClick:PatchingFailed")}"); + } throw new Exception("Verification and patching failed."); } } diff --git a/ModAssistant/FFmpeg/LICENSE.txt b/ModAssistant/FFmpeg/LICENSE.txt deleted file mode 100644 index f288702d..00000000 --- a/ModAssistant/FFmpeg/LICENSE.txt +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/ModAssistant/FFmpeg/README.txt b/ModAssistant/FFmpeg/README.txt deleted file mode 100644 index 2b41621a..00000000 --- a/ModAssistant/FFmpeg/README.txt +++ /dev/null @@ -1,107 +0,0 @@ -Zeranoe FFmpeg Builds - -Build: ffmpeg-4.2.2-win64-shared - -Configuration: - --enable-gpl - --enable-version3 - --enable-sdl2 - --enable-fontconfig - --enable-gnutls - --enable-iconv - --enable-libass - --enable-libdav1d - --enable-libbluray - --enable-libfreetype - --enable-libmp3lame - --enable-libopencore-amrnb - --enable-libopencore-amrwb - --enable-libopenjpeg - --enable-libopus - --enable-libshine - --enable-libsnappy - --enable-libsoxr - --enable-libtheora - --enable-libtwolame - --enable-libvpx - --enable-libwavpack - --enable-libwebp - --enable-libx264 - --enable-libx265 - --enable-libxml2 - --enable-libzimg - --enable-lzma - --enable-zlib - --enable-gmp - --enable-libvidstab - --enable-libvorbis - --enable-libvo-amrwbenc - --enable-libmysofa - --enable-libspeex - --enable-libxvid - --enable-libaom - --enable-libmfx - --enable-amf - --enable-ffnvcodec - --enable-cuvid - --enable-d3d11va - --enable-nvenc - --enable-nvdec - --enable-dxva2 - --enable-avisynth - --enable-libopenmpt - -Libraries: - SDL 20200120-cb4dae5 - Fontconfig 2.13.92 - GnuTLS 3.6.11.1 - libiconv 1.16 - libass 0.14.0 - dav1d 20200115-010eae8 - libbluray 20191112-137974c - FreeType 2.10.1 - LAME 3.100 - OpenCORE AMR 20170731-07a5be4 - OpenJPEG 20200113-b63a433 - Opus 20200119-6d29f51 - shine 20190420-76ea4f0 - Snappy 1.1.7 - libsoxr 20180224-945b592 - Theora 20171023-e5d205b - TwoLAME 0.4.0 - vpx 20200118-b78d3b2 - WavPack 5.2.0 - WebP 20200106-0fa56f3 - x264 20191127-1771b55 - x265 20200120-acc5d16 - libxml2 2.9.10 - z.lib 20191204-9ae36d7 - XZ Utils 5.2.4 - zlib 1.2.11 - GMP 6.1.2 - vid.stab 20190213-aeabc8d - Vorbis 20190128-9eadecc - VisualOn AMR-WB 20141107-3b3fcd0 - libmysofa 20190907-e07edb3 - Speex 20190808-58ac1d4 - Xvid 1.3.5 - aom 20200120-412efe2 - libmfx 1.28 - AMF 20191216-acbd877 - nv-codec-headers 20191126-250292d - OpenMPT 20191010-51cb021 - -Copyright (C) 2020 Kyle Schwarz - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . diff --git a/ModAssistant/ModAssistant.csproj b/ModAssistant/ModAssistant.csproj index 4762c578..20976158 100644 --- a/ModAssistant/ModAssistant.csproj +++ b/ModAssistant/ModAssistant.csproj @@ -13,6 +13,8 @@ {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 true + + AnyCPU @@ -55,8 +57,8 @@ ..\packages\protobuf-net.Core.3.0.29\lib\net461\protobuf-net.Core.dll - - ..\packages\SaberSongPatcher.1.0.0\lib\netstandard2.0\SaberSongPatcherCommon.dll + + ..\packages\SaberSongPatcher.1.0.2\lib\netstandard2.0\SaberSongPatcherCommon.dll ..\packages\SoundFingerprinting.7.4.12\lib\netstandard2.0\SoundFingerprinting.dll @@ -122,6 +124,7 @@ + @@ -358,24 +361,12 @@ - - - - - - - - - - - - - - - - - - - + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + \ No newline at end of file diff --git a/ModAssistant/packages.config b/ModAssistant/packages.config index a78b8c65..f32b90ed 100644 --- a/ModAssistant/packages.config +++ b/ModAssistant/packages.config @@ -6,7 +6,7 @@ - + From 8eed31effe6c215e4dd57109aefbfb00cf183362 Mon Sep 17 00:00:00 2001 From: David Idol Date: Tue, 1 Sep 2020 22:27:20 -0700 Subject: [PATCH 3/5] Add placeholder strings for other languages --- ModAssistant/Localisation/de.xaml | 1 + ModAssistant/Localisation/fr.xaml | 1 + ModAssistant/Localisation/it.xaml | 1 + ModAssistant/Localisation/ko.xaml | 1 + ModAssistant/Localisation/nl.xaml | 1 + ModAssistant/Localisation/ru.xaml | 1 + ModAssistant/Localisation/sv.xaml | 1 + ModAssistant/Localisation/zh.xaml | 1 + 8 files changed, 8 insertions(+) diff --git a/ModAssistant/Localisation/de.xaml b/ModAssistant/Localisation/de.xaml index 1d02ce20..5d7e2ee2 100644 --- a/ModAssistant/Localisation/de.xaml +++ b/ModAssistant/Localisation/de.xaml @@ -216,6 +216,7 @@ Beat Saber Installationspfad nicht gefunden. Installiert: {0} Installation fehlgeschlagen. + Input audio file does not match master audio file for this map. {0} OneClick™ Installation Handler registriert! {0} OneClick™ Installation Handler entfernt! Installing: {0} diff --git a/ModAssistant/Localisation/fr.xaml b/ModAssistant/Localisation/fr.xaml index 1cdc5450..ee083b7a 100644 --- a/ModAssistant/Localisation/fr.xaml +++ b/ModAssistant/Localisation/fr.xaml @@ -223,6 +223,7 @@ Chemin de l'installation de Beat Saber non trouvé. Installé : {0} Échec de l'installation. + Input audio file does not match master audio file for this map. {0} : gestionnaires d'installation OneClick™ inscrits ! {0} : gestionnaires d'installation OneClick™ désinscrits ! Installation de : {0} diff --git a/ModAssistant/Localisation/it.xaml b/ModAssistant/Localisation/it.xaml index d01fde6f..62f1e0e4 100644 --- a/ModAssistant/Localisation/it.xaml +++ b/ModAssistant/Localisation/it.xaml @@ -216,6 +216,7 @@ Directory d'installazione di Beat Saber non trovata. Installato: {0} Non sono riuscito ad installare la mappa. + Input audio file does not match master audio file for this map. {0} Registrazione dei gestori OneClick™ riuscita! {0} De-Regitrazione dei gestori OneClick™ riuscita! Installing: {0} diff --git a/ModAssistant/Localisation/ko.xaml b/ModAssistant/Localisation/ko.xaml index c2885356..e2295b7a 100644 --- a/ModAssistant/Localisation/ko.xaml +++ b/ModAssistant/Localisation/ko.xaml @@ -215,6 +215,7 @@ 비트세이버 설치 폴더를 찾을 수 없었습니다. 설치됨: {0} 설치에 실패하였습니다. + Input audio file does not match master audio file for this map. {0} OneClick™ 설치 관리자가 등록되었습니다! {0} OneClick™ 설치 관리자가 등록 취소되었습니다! Installing: {0} diff --git a/ModAssistant/Localisation/nl.xaml b/ModAssistant/Localisation/nl.xaml index b7f67fe3..e865c6cb 100644 --- a/ModAssistant/Localisation/nl.xaml +++ b/ModAssistant/Localisation/nl.xaml @@ -214,6 +214,7 @@ Kon het Beat Saber installatie pad niet vinden {0} Geïnstalleerd Installatie mislukt + Input audio file does not match master audio file for this map. {0} OneClick™ Installeer afhandelingen geregistreerd! {0} OneClick™ Install afhandelingen uitgeregistreerd! {0} word geïnstalleerd diff --git a/ModAssistant/Localisation/ru.xaml b/ModAssistant/Localisation/ru.xaml index 8b643492..173b3808 100644 --- a/ModAssistant/Localisation/ru.xaml +++ b/ModAssistant/Localisation/ru.xaml @@ -216,6 +216,7 @@ Установочный путь к Beat Saber не найден. Установлено: {0} Ошибка установки. + Input audio file does not match master audio file for this map. {0} OneClick™ установки зарегистрированы {0} OneClick™ установки не зарегистрированы! Установка: {0} diff --git a/ModAssistant/Localisation/sv.xaml b/ModAssistant/Localisation/sv.xaml index 1d973dec..b5996329 100644 --- a/ModAssistant/Localisation/sv.xaml +++ b/ModAssistant/Localisation/sv.xaml @@ -205,6 +205,7 @@ Det gick inte att ladda ned låten. Det kan vara strul med BeatSaver eller din internetuppkoppling. Misslyckades med att ladda ned låtens ZIP-fil. + Input audio file does not match master audio file for this map. Det gick inte att hitta installationsvägen för Beat Saber. Installerade: {0} Misslyckades med att installera. diff --git a/ModAssistant/Localisation/zh.xaml b/ModAssistant/Localisation/zh.xaml index 8a048edc..a14b077f 100644 --- a/ModAssistant/Localisation/zh.xaml +++ b/ModAssistant/Localisation/zh.xaml @@ -215,6 +215,7 @@ 找不到Beat Saber安装路径。 已添加：{0} 添加失败。 + Input audio file does not match master audio file for this map. {0} OneClick™ 一键添加处理程序已注册！ {0} OneClick™ 一键添加处理程序已移除！ 正在下载：{0} From fc1e2b1e3ce93f0efd55f2f2a5619a6ce0220616 Mon Sep 17 00:00:00 2001 From: David Idol Date: Sun, 6 Sep 2020 23:17:11 -0700 Subject: [PATCH 4/5] Usability improvements --- .../Classes/External Interfaces/BeatSaver.cs | 2 +- .../External Interfaces/SongPatcher.cs | 34 ++++++++++++++- ModAssistant/Localisation/de.xaml | 3 +- ModAssistant/Localisation/en-DEBUG.xaml | 3 +- ModAssistant/Localisation/en.xaml | 3 +- ModAssistant/Localisation/fr.xaml | 3 +- ModAssistant/Localisation/it.xaml | 3 +- ModAssistant/Localisation/ko.xaml | 3 +- ModAssistant/Localisation/nl.xaml | 3 +- ModAssistant/Localisation/ru.xaml | 3 +- ModAssistant/Localisation/sv.xaml | 3 +- ModAssistant/Localisation/zh.xaml | 3 +- ModAssistant/ModAssistant.csproj | 41 +++++++++++++++++++ 13 files changed, 94 insertions(+), 13 deletions(-) diff --git a/ModAssistant/Classes/External Interfaces/BeatSaver.cs b/ModAssistant/Classes/External Interfaces/BeatSaver.cs index 38fd514b..3ea40c5b 100644 --- a/ModAssistant/Classes/External Interfaces/BeatSaver.cs +++ b/ModAssistant/Classes/External Interfaces/BeatSaver.cs @@ -199,7 +199,7 @@ public static async Task InstallMap(BeatSaverApiResponseMap Map, bool sh { if (showNotification) { - MessageBox.Show($"{Application.Current.FindResource("OneClick:PatchingFailed")}"); + MessageBox.Show($"{Application.Current.FindResource("OneClick:PatchSong:Failed")}"); } throw new Exception("Verification and patching failed."); } diff --git a/ModAssistant/Classes/External Interfaces/SongPatcher.cs b/ModAssistant/Classes/External Interfaces/SongPatcher.cs index 40eb9e42..e33ae790 100644 --- a/ModAssistant/Classes/External Interfaces/SongPatcher.cs +++ b/ModAssistant/Classes/External Interfaces/SongPatcher.cs @@ -3,7 +3,10 @@ using System.Linq; using System.Threading.Tasks; using System.Windows.Forms; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using SaberSongPatcher; +using Application = System.Windows.Application; namespace ModAssistant.API { @@ -23,7 +26,7 @@ public static async Task PromptAndPatchSongFromDisk(string directory) "wma", }; var audioExtensions = string.Join(";", supportedExtensions.Select(ext => $"*.{ext}")); - openFileDialog.Title = "Select master song audio file"; + openFileDialog.Title = (string)Application.Current.FindResource("OneClick:PatchSong:SelectFile"); openFileDialog.Filter = $"Audio files ({audioExtensions})|{audioExtensions}|All files (*.*)|*.*"; openFileDialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Personal); @@ -48,7 +51,34 @@ private static async Task PerformPatch(string inputFile, string mapDirecto return false; } - var outputFile = Path.Combine(mapDirectory, "song.egg"); + var filename = "song.egg"; + var infoFile = Path.Combine(mapDirectory, "info.dat"); + if (!File.Exists(infoFile)) + { + infoFile = Path.Combine(mapDirectory, "Info.dat"); + } + if (File.Exists(infoFile)) + { + try + { + // Try to use the output filename from the info.dat file + using (StreamReader file = File.OpenText(infoFile)) + using (JsonTextReader reader = new JsonTextReader(file)) + { + JObject info = JObject.Load(reader); + var filenameToken = info.Value("_songFilename"); + if (!string.IsNullOrEmpty(filenameToken)) + { + filename = filenameToken; + } + } + } + catch (Exception) + { + } + } + + var outputFile = Path.Combine(mapDirectory, filename); var success = await inputTransformer.TransformInput(inputFile, outputFile); if (!success) { diff --git a/ModAssistant/Localisation/de.xaml b/ModAssistant/Localisation/de.xaml index 5d7e2ee2..a190a140 100644 --- a/ModAssistant/Localisation/de.xaml +++ b/ModAssistant/Localisation/de.xaml @@ -216,7 +216,8 @@ Beat Saber Installationspfad nicht gefunden. Installiert: {0} Installation fehlgeschlagen. - Input audio file does not match master audio file for this map. + Input audio file does not match master audio file for this map. + Select master song audio file {0} OneClick™ Installation Handler registriert! {0} OneClick™ Installation Handler entfernt! Installing: {0} diff --git a/ModAssistant/Localisation/en-DEBUG.xaml b/ModAssistant/Localisation/en-DEBUG.xaml index 5d88668a..84f1c15b 100644 --- a/ModAssistant/Localisation/en-DEBUG.xaml +++ b/ModAssistant/Localisation/en-DEBUG.xaml @@ -157,7 +157,8 @@ OneClick:InstallDirNotFound {0} OneClick:InstalledAsset OneClick:AssetInstallFailed - OneClick:PatchingFailed + OneClick:PatchSong:Failed + OneClick:PatchSong:SelectFile {0} OneClick:ProtocolHandler:Registered {0} OneClick:ProtocolHandler:Unregistered {0} OneClick:Installing diff --git a/ModAssistant/Localisation/en.xaml b/ModAssistant/Localisation/en.xaml index e27fdcf3..5685ee13 100644 --- a/ModAssistant/Localisation/en.xaml +++ b/ModAssistant/Localisation/en.xaml @@ -220,7 +220,8 @@ Beat Saber installation path not found. Installed: {0} Failed to install. - Input audio file does not match master audio file for this map. + Input audio file does not match master audio file for this map. + Select master song audio file {0} OneClick™ Install handlers registered! {0} OneClick™ Install handlers unregistered! Installing: {0} diff --git a/ModAssistant/Localisation/fr.xaml b/ModAssistant/Localisation/fr.xaml index ee083b7a..3d01c059 100644 --- a/ModAssistant/Localisation/fr.xaml +++ b/ModAssistant/Localisation/fr.xaml @@ -223,7 +223,8 @@ Chemin de l'installation de Beat Saber non trouvé. Installé : {0} Échec de l'installation. - Input audio file does not match master audio file for this map. + Input audio file does not match master audio file for this map. + Select master song audio file {0} : gestionnaires d'installation OneClick™ inscrits ! {0} : gestionnaires d'installation OneClick™ désinscrits ! Installation de : {0} diff --git a/ModAssistant/Localisation/it.xaml b/ModAssistant/Localisation/it.xaml index 62f1e0e4..43158f89 100644 --- a/ModAssistant/Localisation/it.xaml +++ b/ModAssistant/Localisation/it.xaml @@ -216,7 +216,8 @@ Directory d'installazione di Beat Saber non trovata. Installato: {0} Non sono riuscito ad installare la mappa. - Input audio file does not match master audio file for this map. + Input audio file does not match master audio file for this map. + Select master song audio file {0} Registrazione dei gestori OneClick™ riuscita! {0} De-Regitrazione dei gestori OneClick™ riuscita! Installing: {0} diff --git a/ModAssistant/Localisation/ko.xaml b/ModAssistant/Localisation/ko.xaml index e2295b7a..f150c9d4 100644 --- a/ModAssistant/Localisation/ko.xaml +++ b/ModAssistant/Localisation/ko.xaml @@ -215,7 +215,8 @@ 비트세이버 설치 폴더를 찾을 수 없었습니다. 설치됨: {0} 설치에 실패하였습니다. - Input audio file does not match master audio file for this map. + Input audio file does not match master audio file for this map. + Select master song audio file {0} OneClick™ 설치 관리자가 등록되었습니다! {0} OneClick™ 설치 관리자가 등록 취소되었습니다! Installing: {0} diff --git a/ModAssistant/Localisation/nl.xaml b/ModAssistant/Localisation/nl.xaml index e865c6cb..342ec720 100644 --- a/ModAssistant/Localisation/nl.xaml +++ b/ModAssistant/Localisation/nl.xaml @@ -214,7 +214,8 @@ Kon het Beat Saber installatie pad niet vinden {0} Geïnstalleerd Installatie mislukt - Input audio file does not match master audio file for this map. + Input audio file does not match master audio file for this map. + Select master song audio file {0} OneClick™ Installeer afhandelingen geregistreerd! {0} OneClick™ Install afhandelingen uitgeregistreerd! {0} word geïnstalleerd diff --git a/ModAssistant/Localisation/ru.xaml b/ModAssistant/Localisation/ru.xaml index 173b3808..628e4fdb 100644 --- a/ModAssistant/Localisation/ru.xaml +++ b/ModAssistant/Localisation/ru.xaml @@ -216,7 +216,8 @@ Установочный путь к Beat Saber не найден. Установлено: {0} Ошибка установки. - Input audio file does not match master audio file for this map. + Input audio file does not match master audio file for this map. + Select master song audio file {0} OneClick™ установки зарегистрированы {0} OneClick™ установки не зарегистрированы! Установка: {0} diff --git a/ModAssistant/Localisation/sv.xaml b/ModAssistant/Localisation/sv.xaml index b5996329..07343744 100644 --- a/ModAssistant/Localisation/sv.xaml +++ b/ModAssistant/Localisation/sv.xaml @@ -205,7 +205,8 @@ Det gick inte att ladda ned låten. Det kan vara strul med BeatSaver eller din internetuppkoppling. Misslyckades med att ladda ned låtens ZIP-fil. - Input audio file does not match master audio file for this map. + Input audio file does not match master audio file for this map. + Select master song audio file Det gick inte att hitta installationsvägen för Beat Saber. Installerade: {0} Misslyckades med att installera. diff --git a/ModAssistant/Localisation/zh.xaml b/ModAssistant/Localisation/zh.xaml index a14b077f..9205c5bd 100644 --- a/ModAssistant/Localisation/zh.xaml +++ b/ModAssistant/Localisation/zh.xaml @@ -215,7 +215,8 @@ 找不到Beat Saber安装路径。 已添加：{0} 添加失败。 - Input audio file does not match master audio file for this map. + Input audio file does not match master audio file for this map. + Select master song audio file {0} OneClick™ 一键添加处理程序已注册！ {0} OneClick™ 一键添加处理程序已移除！ 正在下载：{0} diff --git a/ModAssistant/ModAssistant.csproj b/ModAssistant/ModAssistant.csproj index 20976158..723cc08d 100644 --- a/ModAssistant/ModAssistant.csproj +++ b/ModAssistant/ModAssistant.csproj @@ -15,6 +15,22 @@ true + false + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 1 + 1.0.0.%2a + false + true + true AnyCPU @@ -38,6 +54,18 @@ Resources\icon.ico + + D52D100DAF433D9AB2FC684A9CDC145C85D477A0 + + + ModAssistant_TemporaryKey.pfx + + + true + + + true + ..\packages\FFmpeg.AutoGen.4.2.0\lib\net45\FFmpeg.AutoGen.dll @@ -346,6 +374,7 @@ ResXFileCodeGenerator Resources.Designer.cs + PublicSettingsSingleFileGenerator @@ -361,6 +390,18 @@ + + + False + Microsoft .NET Framework 4.6.1 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + + From c6334813f89817dcd8b2e6833c7d52c0ccae6baa Mon Sep 17 00:00:00 2001 From: David Idol Date: Sun, 6 Sep 2020 23:23:56 -0700 Subject: [PATCH 5/5] Fix project file --- ModAssistant/ModAssistant.csproj | 45 ++------------------------------ 1 file changed, 2 insertions(+), 43 deletions(-) diff --git a/ModAssistant/ModAssistant.csproj b/ModAssistant/ModAssistant.csproj index 723cc08d..748dd096 100644 --- a/ModAssistant/ModAssistant.csproj +++ b/ModAssistant/ModAssistant.csproj @@ -1,4 +1,4 @@ - + @@ -15,22 +15,6 @@ true - false - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 1 - 1.0.0.%2a - false - true - true AnyCPU @@ -54,18 +38,6 @@ Resources\icon.ico - - D52D100DAF433D9AB2FC684A9CDC145C85D477A0 - - - ModAssistant_TemporaryKey.pfx - - - true - - - true - ..\packages\FFmpeg.AutoGen.4.2.0\lib\net45\FFmpeg.AutoGen.dll @@ -374,7 +346,6 @@ ResXFileCodeGenerator Resources.Designer.cs - PublicSettingsSingleFileGenerator @@ -390,18 +361,6 @@ - - - False - Microsoft .NET Framework 4.6.1 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 - false - - @@ -410,4 +369,4 @@ - \ No newline at end of file +