diff --git a/.gitignore b/.gitignore index 448e5cb..3fd0341 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,18 @@ jackify-install-engine/*.dds .DS_Store Thumbs.db +# Development-only directories (should not be in public repo) +docs/ +testing/ + +# PyInstaller build files (development only) +*.spec +hook-*.py +requirements-packaging.txt + +# Development logs +logs/ + # NOTE: .dll, .json, .deps.json, .runtimeconfig.json in jackify-install-engine/ # are currently tracked because it's unclear if they are required for runtime/distribution # or are build artifacts. Do not ignore until this is confirmed. \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index c4e4215..3cfa45f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Jackify Changelog +## v0.0.31 - Pre-Alpha Polish Update +**Release Date:** September 7, 2025 + +### Engine Update +- **jackify-engine Updated**: Latest engine version with improved compatibility and performance + +### Bug Fixes +- **GUI Startup Warning**: Fixed cosmetic "No shortcuts found pointing to 'ModOrganizer.exe'" warning appearing on GUI startup + - Changed warning level to debug-only to reduce console noise for normal users + - Warning still available for debugging when debug mode is enabled + +--- + ## v0.0.30 - FNV/Enderal Support and better Modlist Selection **Release Date:** September 5, 2025 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..8f2d284 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,19 @@ +# Contributing to Jackify + +Thank you for your interest in Jackify. + +## Current Development Phase + +Jackify is currently in active early development with a solo maintainer. To keep development focused and manageable, we are not accepting pull requests at this time. + +## How You Can Help + +- **Report Issues**: Found a bug? Have a feature request? Please open a GitHub Issue +- **Share Feedback**: Your experience and suggestions help shape Jackify's development +- **Test & Report**: Try different modlists and report what works or does not work + +## Future Contributions + +As the project matures, we plan to open up for community contributions. Watch for updates. + +Thank you for understanding and supporting Jackify. \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d2066fa --- /dev/null +++ b/LICENSE @@ -0,0 +1,691 @@ +Copyright (C) 2025 Jackify Project + + 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 + + + + 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 +. \ No newline at end of file diff --git a/docs/SessionEnd.md b/docs/SessionEnd.md deleted file mode 100644 index 957c968..0000000 --- a/docs/SessionEnd.md +++ /dev/null @@ -1,6 +0,0 @@ -Session End: 2025-07-06 - -- v0.0.12 released: SuccessDialog redesign, accurate workflow timing, robust app icon, game type display, non-modal dialog, asset best practices, and more. -- All changes merged to master and pushed to remote. -- See CHANGELOG.md for full details. - diff --git a/hook-PySide6.py b/hook-PySide6.py deleted file mode 100644 index 1e5891b..0000000 --- a/hook-PySide6.py +++ /dev/null @@ -1,106 +0,0 @@ -# Custom PyInstaller hook to optimize PySide6 by removing unused components -# This significantly reduces build size by excluding unnecessary Qt modules and tools - -from PyInstaller.utils.hooks import collect_data_files, collect_submodules -import os -import shutil -from pathlib import Path - -def hook(hook_api): - """ - PySide6 optimization hook - removes unused Qt modules and development tools - to reduce build size and improve startup performance. - """ - - # Get the PySide6 data files - pyside_datas = collect_data_files('PySide6') - - # Filter out unnecessary components - filtered_datas = [] - - for src, dst in pyside_datas: - # Skip development tools and scripts - if any(skip in src for skip in [ - '/scripts/', - '/assistant/', - '/designer/', - '/linguist/', - '/lupdate', - '/lrelease', - '/qmllint', - '/qmlformat', - '/qmlls', - '/qsb', - '/svgtoqml', - '/balsam', - '/balsamui' - ]): - continue - - # Skip unused Qt modules (keep only what Jackify uses) - if any(skip in src for skip in [ - 'Qt3D', - 'QtBluetooth', - 'QtCharts', - 'QtConcurrent', # Keep this one - might be needed - 'QtDataVisualization', - 'QtDBus', - 'QtDesigner', - 'QtGraphs', - 'QtHelp', - 'QtHttpServer', - 'QtLocation', - 'QtMultimedia', - 'QtNfc', - 'QtOpenGL', # Keep this one - might be needed by QtWidgets - 'QtPdf', - 'QtPositioning', - 'QtPrintSupport', - 'QtQml', - 'QtQuick', - 'QtRemoteObjects', - 'QtScxml', - 'QtSensors', - 'QtSerial', - 'QtSpatialAudio', - 'QtSql', - 'QtStateMachine', - 'QtSvg', - 'QtTest', - 'QtTextToSpeech', - 'QtWeb', - 'QtXml', - 'QtNetworkAuth', - 'QtUiTools' - ]): - continue - - # Keep core modules that Jackify uses - if any(keep in src for keep in [ - 'QtCore', - 'QtGui', - 'QtWidgets', - 'QtNetwork' - ]): - filtered_datas.append((src, dst)) - continue - - # Add the filtered data files - hook_api.add_datas(filtered_datas) - - # Also filter submodules to exclude unused ones - pyside_modules = collect_submodules('PySide6') - filtered_modules = [] - - for module in pyside_modules: - # Keep only core modules - if any(keep in module for keep in [ - 'PySide6.QtCore', - 'PySide6.QtGui', - 'PySide6.QtWidgets', - 'PySide6.QtNetwork' - ]): - filtered_modules.append(module) - - # Add the filtered modules - hook_api.add_imports(*filtered_modules) diff --git a/hook-jackify.py b/hook-jackify.py deleted file mode 100644 index bd91eea..0000000 --- a/hook-jackify.py +++ /dev/null @@ -1,17 +0,0 @@ -# Custom hook to exclude temp directory from Jackify engine data collection -from PyInstaller.utils.hooks import collect_data_files -import os - -def hook(hook_api): - # Get the original data files for jackify.engine - datas = collect_data_files('jackify.engine') - - # Filter out any files in the temp directory - filtered_datas = [] - for src, dst in datas: - # Skip any files that contain 'temp' in their path - if 'temp' not in src: - filtered_datas.append((src, dst)) - - # Set the filtered data files - hook_api.add_datas(filtered_datas) \ No newline at end of file diff --git a/jackify.spec b/jackify.spec deleted file mode 100644 index e733ee2..0000000 --- a/jackify.spec +++ /dev/null @@ -1,49 +0,0 @@ -# -*- mode: python ; coding: utf-8 -*- - - -a = Analysis( - ['jackify/frontends/gui/__main__.py'], - pathex=[], - binaries=[], - datas=[('jackify/engine', 'jackify/engine'), ('jackify/shared', 'jackify/shared'), ('assets/JackifyLogo_256.png', 'assets')], - hiddenimports=[ - 'PySide6.QtCore', 'PySide6.QtGui', 'PySide6.QtWidgets', - 'jackify.backend.core', 'jackify.backend.handlers', 'jackify.backend.services', 'jackify.backend.models', - 'jackify.backend.handlers.resolution_handler', 'jackify.backend.handlers.modlist_handler', - 'jackify.backend.handlers.menu_handler', 'jackify.backend.handlers.path_handler', - 'jackify.frontends.cli', 'jackify.frontends.cli.main', - 'jackify.frontends.cli.menus', 'jackify.frontends.cli.menus.main_menu', - 'jackify.frontends.cli.menus.tuxborn_menu', 'jackify.frontends.cli.menus.wabbajack_menu', - 'jackify.frontends.gui.widgets.unsupported_game_dialog', - 'jackify.shared.paths', 'jackify.shared.ui_utils' - ], - hookspath=['.'], - hooksconfig={}, - runtime_hooks=[], - excludes=['tkinter', 'matplotlib', 'numpy', 'scipy', 'pandas', 'IPython', 'jupyter', 'test', 'tests', 'unittest'], - noarchive=False, - optimize=0, -) -pyz = PYZ(a.pure) - -exe = EXE( - pyz, - a.scripts, - a.binaries, - a.datas, - [], - name='jackify', - debug=False, - bootloader_ignore_signals=False, - strip=False, - upx=True, - upx_exclude=[], - runtime_tmpdir=None, - console=True, - disable_windowed_traceback=False, - argv_emulation=False, - target_arch=None, - codesign_identity=None, - entitlements_file=None, - icon='assets/JackifyLogo_256.png', -) diff --git a/jackify/__init__.py b/jackify/__init__.py index 81e53c5..a180e77 100644 --- a/jackify/__init__.py +++ b/jackify/__init__.py @@ -5,4 +5,4 @@ This package provides both CLI and GUI interfaces for managing Wabbajack modlists natively on Linux systems. """ -__version__ = "0.0.30" +__version__ = "0.0.31" diff --git a/jackify/backend/core/modlist_operations.py b/jackify/backend/core/modlist_operations.py index 6e6bc0b..43c8920 100644 --- a/jackify/backend/core/modlist_operations.py +++ b/jackify/backend/core/modlist_operations.py @@ -592,6 +592,7 @@ class ModlistInstallCLI: """ Run the configuration phase: execute the Linux-native Jackify Install Engine. """ + import os import subprocess import time import sys diff --git a/jackify/backend/handlers/modlist_handler.py b/jackify/backend/handlers/modlist_handler.py index 060a08a..fed80ec 100644 --- a/jackify/backend/handlers/modlist_handler.py +++ b/jackify/backend/handlers/modlist_handler.py @@ -235,7 +235,7 @@ class ModlistHandler: # 2. Get shortcuts pointing to the executable from shortcuts.vdf matching_vdf_shortcuts = self.shortcut_handler.find_shortcuts_by_exe(executable_name) if not matching_vdf_shortcuts: - self.logger.warning(f"No shortcuts found pointing to '{executable_name}' in shortcuts.vdf.") + self.logger.debug(f"No shortcuts found pointing to '{executable_name}' in shortcuts.vdf.") return [] self.logger.debug(f"Shortcuts matching executable '{executable_name}' in VDF: {matching_vdf_shortcuts}") diff --git a/jackify/backend/handlers/path_handler.py b/jackify/backend/handlers/path_handler.py index 2ec36df..d9e0cd6 100644 --- a/jackify/backend/handlers/path_handler.py +++ b/jackify/backend/handlers/path_handler.py @@ -291,10 +291,50 @@ class PathHandler: logger.error("Could not determine location for dxvk.conf") return False - # Create simple dxvk.conf content - just one line - dxvk_conf_content = "dxvk.enableGraphicsPipelineLibrary = False\n" + # The required line that Jackify needs + required_line = "dxvk.enableGraphicsPipelineLibrary = False" + + # Check if dxvk.conf already exists + if os.path.exists(dxvk_conf_path): + logger.info(f"Found existing dxvk.conf at {dxvk_conf_path}") + + # Read existing content + try: + with open(dxvk_conf_path, 'r') as f: + existing_content = f.read().strip() + + # Check if our required line is already present + existing_lines = existing_content.split('\n') if existing_content else [] + has_required_line = any(line.strip() == required_line for line in existing_lines) + + if has_required_line: + logger.info("Required DXVK setting already present in existing file") + return True + else: + # Append our required line to existing content + if existing_content: + # File has content, append our line + updated_content = existing_content + '\n' + required_line + '\n' + logger.info("Appending required DXVK setting to existing file") + else: + # File is empty, just add our line + updated_content = required_line + '\n' + logger.info("Adding required DXVK setting to empty file") + + with open(dxvk_conf_path, 'w') as f: + f.write(updated_content) + + logger.info(f"dxvk.conf updated successfully at {dxvk_conf_path}") + return True + + except Exception as e: + logger.error(f"Error reading/updating existing dxvk.conf: {e}") + # Fall back to creating new file + logger.info("Falling back to creating new dxvk.conf file") + + # Create new dxvk.conf file (original behavior) + dxvk_conf_content = required_line + '\n' - # Write dxvk.conf to the appropriate location with open(dxvk_conf_path, 'w') as f: f.write(dxvk_conf_content) diff --git a/jackify/backend/handlers/shortcut_handler.py b/jackify/backend/handlers/shortcut_handler.py index 2646b1a..ef29ebd 100644 --- a/jackify/backend/handlers/shortcut_handler.py +++ b/jackify/backend/handlers/shortcut_handler.py @@ -1203,8 +1203,8 @@ class ShortcutHandler: return [] if not matching_shortcuts: - # Changed log level to warning as this is an expected outcome sometimes - self.logger.warning(f"No shortcuts found pointing to '{executable_name}' in {vdf_path}.") + # Changed log level to debug as this is an expected outcome sometimes + self.logger.debug(f"No shortcuts found pointing to '{executable_name}' in {vdf_path}.") return matching_shortcuts diff --git a/jackify/engine/Wabbajack.CLI.Builder.dll b/jackify/engine/Wabbajack.CLI.Builder.dll index 14bc2e4..4eb91bb 100644 Binary files a/jackify/engine/Wabbajack.CLI.Builder.dll and b/jackify/engine/Wabbajack.CLI.Builder.dll differ diff --git a/jackify/engine/Wabbajack.Common.dll b/jackify/engine/Wabbajack.Common.dll index ea7197d..2299d0d 100644 Binary files a/jackify/engine/Wabbajack.Common.dll and b/jackify/engine/Wabbajack.Common.dll differ diff --git a/jackify/engine/Wabbajack.Compiler.dll b/jackify/engine/Wabbajack.Compiler.dll index 6c70d0f..38175b9 100644 Binary files a/jackify/engine/Wabbajack.Compiler.dll and b/jackify/engine/Wabbajack.Compiler.dll differ diff --git a/jackify/engine/Wabbajack.Compression.BSA.dll b/jackify/engine/Wabbajack.Compression.BSA.dll index 3346388..b2aa836 100644 Binary files a/jackify/engine/Wabbajack.Compression.BSA.dll and b/jackify/engine/Wabbajack.Compression.BSA.dll differ diff --git a/jackify/engine/Wabbajack.Compression.Zip.dll b/jackify/engine/Wabbajack.Compression.Zip.dll index 86eca20..8f532f0 100644 Binary files a/jackify/engine/Wabbajack.Compression.Zip.dll and b/jackify/engine/Wabbajack.Compression.Zip.dll differ diff --git a/jackify/engine/Wabbajack.Configuration.dll b/jackify/engine/Wabbajack.Configuration.dll index d21ec14..3baa3cf 100644 Binary files a/jackify/engine/Wabbajack.Configuration.dll and b/jackify/engine/Wabbajack.Configuration.dll differ diff --git a/jackify/engine/Wabbajack.DTOs.dll b/jackify/engine/Wabbajack.DTOs.dll index ff69a67..6ebb595 100644 Binary files a/jackify/engine/Wabbajack.DTOs.dll and b/jackify/engine/Wabbajack.DTOs.dll differ diff --git a/jackify/engine/Wabbajack.Downloaders.Bethesda.dll b/jackify/engine/Wabbajack.Downloaders.Bethesda.dll index ea3576a..41eaa95 100644 Binary files a/jackify/engine/Wabbajack.Downloaders.Bethesda.dll and b/jackify/engine/Wabbajack.Downloaders.Bethesda.dll differ diff --git a/jackify/engine/Wabbajack.Downloaders.Dispatcher.dll b/jackify/engine/Wabbajack.Downloaders.Dispatcher.dll index a9612e1..ee6032a 100644 Binary files a/jackify/engine/Wabbajack.Downloaders.Dispatcher.dll and b/jackify/engine/Wabbajack.Downloaders.Dispatcher.dll differ diff --git a/jackify/engine/Wabbajack.Downloaders.GameFile.dll b/jackify/engine/Wabbajack.Downloaders.GameFile.dll index 1b07e36..87c6841 100644 Binary files a/jackify/engine/Wabbajack.Downloaders.GameFile.dll and b/jackify/engine/Wabbajack.Downloaders.GameFile.dll differ diff --git a/jackify/engine/Wabbajack.Downloaders.GoogleDrive.dll b/jackify/engine/Wabbajack.Downloaders.GoogleDrive.dll index a58d978..eb98b38 100644 Binary files a/jackify/engine/Wabbajack.Downloaders.GoogleDrive.dll and b/jackify/engine/Wabbajack.Downloaders.GoogleDrive.dll differ diff --git a/jackify/engine/Wabbajack.Downloaders.Http.dll b/jackify/engine/Wabbajack.Downloaders.Http.dll index 5c06301..49920d1 100644 Binary files a/jackify/engine/Wabbajack.Downloaders.Http.dll and b/jackify/engine/Wabbajack.Downloaders.Http.dll differ diff --git a/jackify/engine/Wabbajack.Downloaders.IPS4OAuth2Downloader.dll b/jackify/engine/Wabbajack.Downloaders.IPS4OAuth2Downloader.dll index 68ad669..aab87ca 100644 Binary files a/jackify/engine/Wabbajack.Downloaders.IPS4OAuth2Downloader.dll and b/jackify/engine/Wabbajack.Downloaders.IPS4OAuth2Downloader.dll differ diff --git a/jackify/engine/Wabbajack.Downloaders.Interfaces.dll b/jackify/engine/Wabbajack.Downloaders.Interfaces.dll index 05b2ee1..1e85fa5 100644 Binary files a/jackify/engine/Wabbajack.Downloaders.Interfaces.dll and b/jackify/engine/Wabbajack.Downloaders.Interfaces.dll differ diff --git a/jackify/engine/Wabbajack.Downloaders.Manual.dll b/jackify/engine/Wabbajack.Downloaders.Manual.dll index 16589f1..6f52935 100644 Binary files a/jackify/engine/Wabbajack.Downloaders.Manual.dll and b/jackify/engine/Wabbajack.Downloaders.Manual.dll differ diff --git a/jackify/engine/Wabbajack.Downloaders.MediaFire.dll b/jackify/engine/Wabbajack.Downloaders.MediaFire.dll index d754bbb..32221f7 100644 Binary files a/jackify/engine/Wabbajack.Downloaders.MediaFire.dll and b/jackify/engine/Wabbajack.Downloaders.MediaFire.dll differ diff --git a/jackify/engine/Wabbajack.Downloaders.Mega.dll b/jackify/engine/Wabbajack.Downloaders.Mega.dll index e21a295..aa46591 100644 Binary files a/jackify/engine/Wabbajack.Downloaders.Mega.dll and b/jackify/engine/Wabbajack.Downloaders.Mega.dll differ diff --git a/jackify/engine/Wabbajack.Downloaders.ModDB.dll b/jackify/engine/Wabbajack.Downloaders.ModDB.dll index 88b79a0..47267ea 100644 Binary files a/jackify/engine/Wabbajack.Downloaders.ModDB.dll and b/jackify/engine/Wabbajack.Downloaders.ModDB.dll differ diff --git a/jackify/engine/Wabbajack.Downloaders.Nexus.dll b/jackify/engine/Wabbajack.Downloaders.Nexus.dll index adc782d..f3e7bd1 100644 Binary files a/jackify/engine/Wabbajack.Downloaders.Nexus.dll and b/jackify/engine/Wabbajack.Downloaders.Nexus.dll differ diff --git a/jackify/engine/Wabbajack.Downloaders.VerificationCache.dll b/jackify/engine/Wabbajack.Downloaders.VerificationCache.dll index 0f79b0a..9dd653c 100644 Binary files a/jackify/engine/Wabbajack.Downloaders.VerificationCache.dll and b/jackify/engine/Wabbajack.Downloaders.VerificationCache.dll differ diff --git a/jackify/engine/Wabbajack.Downloaders.WabbajackCDN.dll b/jackify/engine/Wabbajack.Downloaders.WabbajackCDN.dll index 6fab3b8..3e7d78e 100644 Binary files a/jackify/engine/Wabbajack.Downloaders.WabbajackCDN.dll and b/jackify/engine/Wabbajack.Downloaders.WabbajackCDN.dll differ diff --git a/jackify/engine/Wabbajack.FileExtractor.dll b/jackify/engine/Wabbajack.FileExtractor.dll index aba226a..dcc701f 100644 Binary files a/jackify/engine/Wabbajack.FileExtractor.dll and b/jackify/engine/Wabbajack.FileExtractor.dll differ diff --git a/jackify/engine/Wabbajack.Hashing.PHash.dll b/jackify/engine/Wabbajack.Hashing.PHash.dll index 3c8fd44..a949418 100644 Binary files a/jackify/engine/Wabbajack.Hashing.PHash.dll and b/jackify/engine/Wabbajack.Hashing.PHash.dll differ diff --git a/jackify/engine/Wabbajack.Hashing.xxHash64.dll b/jackify/engine/Wabbajack.Hashing.xxHash64.dll index 19bfe0d..90761b7 100644 Binary files a/jackify/engine/Wabbajack.Hashing.xxHash64.dll and b/jackify/engine/Wabbajack.Hashing.xxHash64.dll differ diff --git a/jackify/engine/Wabbajack.IO.Async.dll b/jackify/engine/Wabbajack.IO.Async.dll index 1154cdf..ec4bd4b 100644 Binary files a/jackify/engine/Wabbajack.IO.Async.dll and b/jackify/engine/Wabbajack.IO.Async.dll differ diff --git a/jackify/engine/Wabbajack.Installer.dll b/jackify/engine/Wabbajack.Installer.dll index 457fdd1..1b139a2 100644 Binary files a/jackify/engine/Wabbajack.Installer.dll and b/jackify/engine/Wabbajack.Installer.dll differ diff --git a/jackify/engine/Wabbajack.Networking.BethesdaNet.dll b/jackify/engine/Wabbajack.Networking.BethesdaNet.dll index 1fd459e..ef51818 100644 Binary files a/jackify/engine/Wabbajack.Networking.BethesdaNet.dll and b/jackify/engine/Wabbajack.Networking.BethesdaNet.dll differ diff --git a/jackify/engine/Wabbajack.Networking.Discord.dll b/jackify/engine/Wabbajack.Networking.Discord.dll index d4a9a4b..2e8f27e 100644 Binary files a/jackify/engine/Wabbajack.Networking.Discord.dll and b/jackify/engine/Wabbajack.Networking.Discord.dll differ diff --git a/jackify/engine/Wabbajack.Networking.GitHub.dll b/jackify/engine/Wabbajack.Networking.GitHub.dll index c1ef00d..4b3fa1a 100644 Binary files a/jackify/engine/Wabbajack.Networking.GitHub.dll and b/jackify/engine/Wabbajack.Networking.GitHub.dll differ diff --git a/jackify/engine/Wabbajack.Networking.Http.Interfaces.dll b/jackify/engine/Wabbajack.Networking.Http.Interfaces.dll index db75358..b2e15c5 100644 Binary files a/jackify/engine/Wabbajack.Networking.Http.Interfaces.dll and b/jackify/engine/Wabbajack.Networking.Http.Interfaces.dll differ diff --git a/jackify/engine/Wabbajack.Networking.Http.dll b/jackify/engine/Wabbajack.Networking.Http.dll index 9fcbab4..4c42eb1 100644 Binary files a/jackify/engine/Wabbajack.Networking.Http.dll and b/jackify/engine/Wabbajack.Networking.Http.dll differ diff --git a/jackify/engine/Wabbajack.Networking.NexusApi.dll b/jackify/engine/Wabbajack.Networking.NexusApi.dll index b135342..38369c5 100644 Binary files a/jackify/engine/Wabbajack.Networking.NexusApi.dll and b/jackify/engine/Wabbajack.Networking.NexusApi.dll differ diff --git a/jackify/engine/Wabbajack.Networking.WabbajackClientApi.dll b/jackify/engine/Wabbajack.Networking.WabbajackClientApi.dll index 9405ba2..b9b151d 100644 Binary files a/jackify/engine/Wabbajack.Networking.WabbajackClientApi.dll and b/jackify/engine/Wabbajack.Networking.WabbajackClientApi.dll differ diff --git a/jackify/engine/Wabbajack.Paths.IO.dll b/jackify/engine/Wabbajack.Paths.IO.dll index dceb0fa..8c44315 100644 Binary files a/jackify/engine/Wabbajack.Paths.IO.dll and b/jackify/engine/Wabbajack.Paths.IO.dll differ diff --git a/jackify/engine/Wabbajack.Paths.dll b/jackify/engine/Wabbajack.Paths.dll index 9423f72..9f1573b 100644 Binary files a/jackify/engine/Wabbajack.Paths.dll and b/jackify/engine/Wabbajack.Paths.dll differ diff --git a/jackify/engine/Wabbajack.RateLimiter.dll b/jackify/engine/Wabbajack.RateLimiter.dll index 05f2c2a..db25f6b 100644 Binary files a/jackify/engine/Wabbajack.RateLimiter.dll and b/jackify/engine/Wabbajack.RateLimiter.dll differ diff --git a/jackify/engine/Wabbajack.Server.Lib.dll b/jackify/engine/Wabbajack.Server.Lib.dll index 3f9d903..74ebf28 100644 Binary files a/jackify/engine/Wabbajack.Server.Lib.dll and b/jackify/engine/Wabbajack.Server.Lib.dll differ diff --git a/jackify/engine/Wabbajack.Services.OSIntegrated.dll b/jackify/engine/Wabbajack.Services.OSIntegrated.dll index d9da7ae..8b7269a 100644 Binary files a/jackify/engine/Wabbajack.Services.OSIntegrated.dll and b/jackify/engine/Wabbajack.Services.OSIntegrated.dll differ diff --git a/jackify/engine/Wabbajack.VFS.Interfaces.dll b/jackify/engine/Wabbajack.VFS.Interfaces.dll index 49b9b3d..05c4be9 100644 Binary files a/jackify/engine/Wabbajack.VFS.Interfaces.dll and b/jackify/engine/Wabbajack.VFS.Interfaces.dll differ diff --git a/jackify/engine/Wabbajack.VFS.dll b/jackify/engine/Wabbajack.VFS.dll index d1f6a6f..0b1cf09 100644 Binary files a/jackify/engine/Wabbajack.VFS.dll and b/jackify/engine/Wabbajack.VFS.dll differ diff --git a/jackify/engine/jackify-engine.deps.json b/jackify/engine/jackify-engine.deps.json index a08e564..11c0d9a 100644 --- a/jackify/engine/jackify-engine.deps.json +++ b/jackify/engine/jackify-engine.deps.json @@ -7,7 +7,7 @@ "targets": { ".NETCoreApp,Version=v8.0": {}, ".NETCoreApp,Version=v8.0/linux-x64": { - "jackify-engine/0.3.10": { + "jackify-engine/0.3.11": { "dependencies": { "Markdig": "0.40.0", "Microsoft.Extensions.Configuration.Json": "9.0.1", @@ -22,16 +22,16 @@ "SixLabors.ImageSharp": "3.1.6", "System.CommandLine": "2.0.0-beta4.22272.1", "System.CommandLine.NamingConventionBinder": "2.0.0-beta4.22272.1", - "Wabbajack.CLI.Builder": "0.3.10", - "Wabbajack.Downloaders.Bethesda": "0.3.10", - "Wabbajack.Downloaders.Dispatcher": "0.3.10", - "Wabbajack.Hashing.xxHash64": "0.3.10", - "Wabbajack.Networking.Discord": "0.3.10", - "Wabbajack.Networking.GitHub": "0.3.10", - "Wabbajack.Paths.IO": "0.3.10", - "Wabbajack.Server.Lib": "0.3.10", - "Wabbajack.Services.OSIntegrated": "0.3.10", - "Wabbajack.VFS": "0.3.10", + "Wabbajack.CLI.Builder": "0.3.11", + "Wabbajack.Downloaders.Bethesda": "0.3.11", + "Wabbajack.Downloaders.Dispatcher": "0.3.11", + "Wabbajack.Hashing.xxHash64": "0.3.11", + "Wabbajack.Networking.Discord": "0.3.11", + "Wabbajack.Networking.GitHub": "0.3.11", + "Wabbajack.Paths.IO": "0.3.11", + "Wabbajack.Server.Lib": "0.3.11", + "Wabbajack.Services.OSIntegrated": "0.3.11", + "Wabbajack.VFS": "0.3.11", "MegaApiClient": "1.0.0.0", "runtimepack.Microsoft.NETCore.App.Runtime.linux-x64": "8.0.19" }, @@ -1781,7 +1781,7 @@ } } }, - "Wabbajack.CLI.Builder/0.3.10": { + "Wabbajack.CLI.Builder/0.3.11": { "dependencies": { "Microsoft.Extensions.Configuration.Json": "9.0.1", "Microsoft.Extensions.DependencyInjection": "9.0.1", @@ -1791,109 +1791,109 @@ "Microsoft.Extensions.Logging.Abstractions": "9.0.1", "System.CommandLine": "2.0.0-beta4.22272.1", "System.CommandLine.NamingConventionBinder": "2.0.0-beta4.22272.1", - "Wabbajack.Paths": "0.3.10" + "Wabbajack.Paths": "0.3.11" }, "runtime": { "Wabbajack.CLI.Builder.dll": {} } }, - "Wabbajack.Common/0.3.10": { + "Wabbajack.Common/0.3.11": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", "System.Reactive": "6.0.1", - "Wabbajack.DTOs": "0.3.10", - "Wabbajack.Networking.Http": "0.3.10", - "Wabbajack.Paths.IO": "0.3.10" + "Wabbajack.DTOs": "0.3.11", + "Wabbajack.Networking.Http": "0.3.11", + "Wabbajack.Paths.IO": "0.3.11" }, "runtime": { "Wabbajack.Common.dll": {} } }, - "Wabbajack.Compiler/0.3.10": { + "Wabbajack.Compiler/0.3.11": { "dependencies": { "F23.StringSimilarity": "6.0.0", "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Newtonsoft.Json": "13.0.3", "SixLabors.ImageSharp": "3.1.6", - "Wabbajack.Downloaders.Dispatcher": "0.3.10", - "Wabbajack.Installer": "0.3.10", - "Wabbajack.VFS": "0.3.10", + "Wabbajack.Downloaders.Dispatcher": "0.3.11", + "Wabbajack.Installer": "0.3.11", + "Wabbajack.VFS": "0.3.11", "ini-parser-netstandard": "2.5.2" }, "runtime": { "Wabbajack.Compiler.dll": {} } }, - "Wabbajack.Compression.BSA/0.3.10": { + "Wabbajack.Compression.BSA/0.3.11": { "dependencies": { "K4os.Compression.LZ4.Streams": "1.3.8", "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "SharpZipLib": "1.4.2", - "Wabbajack.Common": "0.3.10", - "Wabbajack.DTOs": "0.3.10" + "Wabbajack.Common": "0.3.11", + "Wabbajack.DTOs": "0.3.11" }, "runtime": { "Wabbajack.Compression.BSA.dll": {} } }, - "Wabbajack.Compression.Zip/0.3.10": { + "Wabbajack.Compression.Zip/0.3.11": { "dependencies": { - "Wabbajack.IO.Async": "0.3.10" + "Wabbajack.IO.Async": "0.3.11" }, "runtime": { "Wabbajack.Compression.Zip.dll": {} } }, - "Wabbajack.Configuration/0.3.10": { + "Wabbajack.Configuration/0.3.11": { "runtime": { "Wabbajack.Configuration.dll": {} } }, - "Wabbajack.Downloaders.Bethesda/0.3.10": { + "Wabbajack.Downloaders.Bethesda/0.3.11": { "dependencies": { "LibAES-CTR": "1.1.0", "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "SharpZipLib": "1.4.2", - "Wabbajack.Common": "0.3.10", - "Wabbajack.Downloaders.Interfaces": "0.3.10", - "Wabbajack.Networking.BethesdaNet": "0.3.10" + "Wabbajack.Common": "0.3.11", + "Wabbajack.Downloaders.Interfaces": "0.3.11", + "Wabbajack.Networking.BethesdaNet": "0.3.11" }, "runtime": { "Wabbajack.Downloaders.Bethesda.dll": {} } }, - "Wabbajack.Downloaders.Dispatcher/0.3.10": { + "Wabbajack.Downloaders.Dispatcher/0.3.11": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", "Newtonsoft.Json": "13.0.3", "SixLabors.ImageSharp": "3.1.6", - "Wabbajack.Downloaders.Bethesda": "0.3.10", - "Wabbajack.Downloaders.GameFile": "0.3.10", - "Wabbajack.Downloaders.GoogleDrive": "0.3.10", - "Wabbajack.Downloaders.Http": "0.3.10", - "Wabbajack.Downloaders.IPS4OAuth2Downloader": "0.3.10", - "Wabbajack.Downloaders.Interfaces": "0.3.10", - "Wabbajack.Downloaders.Manual": "0.3.10", - "Wabbajack.Downloaders.MediaFire": "0.3.10", - "Wabbajack.Downloaders.Mega": "0.3.10", - "Wabbajack.Downloaders.ModDB": "0.3.10", - "Wabbajack.Downloaders.Nexus": "0.3.10", - "Wabbajack.Downloaders.VerificationCache": "0.3.10", - "Wabbajack.Downloaders.WabbajackCDN": "0.3.10", - "Wabbajack.Networking.WabbajackClientApi": "0.3.10" + "Wabbajack.Downloaders.Bethesda": "0.3.11", + "Wabbajack.Downloaders.GameFile": "0.3.11", + "Wabbajack.Downloaders.GoogleDrive": "0.3.11", + "Wabbajack.Downloaders.Http": "0.3.11", + "Wabbajack.Downloaders.IPS4OAuth2Downloader": "0.3.11", + "Wabbajack.Downloaders.Interfaces": "0.3.11", + "Wabbajack.Downloaders.Manual": "0.3.11", + "Wabbajack.Downloaders.MediaFire": "0.3.11", + "Wabbajack.Downloaders.Mega": "0.3.11", + "Wabbajack.Downloaders.ModDB": "0.3.11", + "Wabbajack.Downloaders.Nexus": "0.3.11", + "Wabbajack.Downloaders.VerificationCache": "0.3.11", + "Wabbajack.Downloaders.WabbajackCDN": "0.3.11", + "Wabbajack.Networking.WabbajackClientApi": "0.3.11" }, "runtime": { "Wabbajack.Downloaders.Dispatcher.dll": {} } }, - "Wabbajack.Downloaders.GameFile/0.3.10": { + "Wabbajack.Downloaders.GameFile/0.3.11": { "dependencies": { "GameFinder.StoreHandlers.EADesktop": "4.5.0", "GameFinder.StoreHandlers.EGS": "4.5.0", @@ -1903,360 +1903,360 @@ "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "SixLabors.ImageSharp": "3.1.6", - "Wabbajack.Downloaders.Interfaces": "0.3.10", - "Wabbajack.VFS": "0.3.10" + "Wabbajack.Downloaders.Interfaces": "0.3.11", + "Wabbajack.VFS": "0.3.11" }, "runtime": { "Wabbajack.Downloaders.GameFile.dll": {} } }, - "Wabbajack.Downloaders.GoogleDrive/0.3.10": { + "Wabbajack.Downloaders.GoogleDrive/0.3.11": { "dependencies": { "HtmlAgilityPack": "1.11.72", "Microsoft.AspNetCore.Http.Extensions": "2.3.0", "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", - "Wabbajack.Common": "0.3.10", - "Wabbajack.DTOs": "0.3.10", - "Wabbajack.Downloaders.Interfaces": "0.3.10", - "Wabbajack.Networking.Http": "0.3.10", - "Wabbajack.Networking.Http.Interfaces": "0.3.10" + "Wabbajack.Common": "0.3.11", + "Wabbajack.DTOs": "0.3.11", + "Wabbajack.Downloaders.Interfaces": "0.3.11", + "Wabbajack.Networking.Http": "0.3.11", + "Wabbajack.Networking.Http.Interfaces": "0.3.11" }, "runtime": { "Wabbajack.Downloaders.GoogleDrive.dll": {} } }, - "Wabbajack.Downloaders.Http/0.3.10": { + "Wabbajack.Downloaders.Http/0.3.11": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", - "Wabbajack.Common": "0.3.10", - "Wabbajack.DTOs": "0.3.10", - "Wabbajack.Downloaders.Interfaces": "0.3.10", - "Wabbajack.Networking.BethesdaNet": "0.3.10", - "Wabbajack.Networking.Http.Interfaces": "0.3.10", - "Wabbajack.Paths.IO": "0.3.10" + "Wabbajack.Common": "0.3.11", + "Wabbajack.DTOs": "0.3.11", + "Wabbajack.Downloaders.Interfaces": "0.3.11", + "Wabbajack.Networking.BethesdaNet": "0.3.11", + "Wabbajack.Networking.Http.Interfaces": "0.3.11", + "Wabbajack.Paths.IO": "0.3.11" }, "runtime": { "Wabbajack.Downloaders.Http.dll": {} } }, - "Wabbajack.Downloaders.Interfaces/0.3.10": { + "Wabbajack.Downloaders.Interfaces/0.3.11": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", - "Wabbajack.Compression.Zip": "0.3.10", - "Wabbajack.DTOs": "0.3.10", - "Wabbajack.Paths.IO": "0.3.10" + "Wabbajack.Compression.Zip": "0.3.11", + "Wabbajack.DTOs": "0.3.11", + "Wabbajack.Paths.IO": "0.3.11" }, "runtime": { "Wabbajack.Downloaders.Interfaces.dll": {} } }, - "Wabbajack.Downloaders.IPS4OAuth2Downloader/0.3.10": { + "Wabbajack.Downloaders.IPS4OAuth2Downloader/0.3.11": { "dependencies": { "F23.StringSimilarity": "6.0.0", "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", - "Wabbajack.Common": "0.3.10", - "Wabbajack.Downloaders.Interfaces": "0.3.10", - "Wabbajack.Networking.Http": "0.3.10", - "Wabbajack.Networking.Http.Interfaces": "0.3.10" + "Wabbajack.Common": "0.3.11", + "Wabbajack.Downloaders.Interfaces": "0.3.11", + "Wabbajack.Networking.Http": "0.3.11", + "Wabbajack.Networking.Http.Interfaces": "0.3.11" }, "runtime": { "Wabbajack.Downloaders.IPS4OAuth2Downloader.dll": {} } }, - "Wabbajack.Downloaders.Manual/0.3.10": { + "Wabbajack.Downloaders.Manual/0.3.11": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", - "Wabbajack.Common": "0.3.10", - "Wabbajack.Downloaders.Interfaces": "0.3.10" + "Wabbajack.Common": "0.3.11", + "Wabbajack.Downloaders.Interfaces": "0.3.11" }, "runtime": { "Wabbajack.Downloaders.Manual.dll": {} } }, - "Wabbajack.Downloaders.MediaFire/0.3.10": { + "Wabbajack.Downloaders.MediaFire/0.3.11": { "dependencies": { "HtmlAgilityPack": "1.11.72", "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", - "Wabbajack.Common": "0.3.10", - "Wabbajack.Downloaders.Interfaces": "0.3.10", - "Wabbajack.Networking.Http.Interfaces": "0.3.10" + "Wabbajack.Common": "0.3.11", + "Wabbajack.Downloaders.Interfaces": "0.3.11", + "Wabbajack.Networking.Http.Interfaces": "0.3.11" }, "runtime": { "Wabbajack.Downloaders.MediaFire.dll": {} } }, - "Wabbajack.Downloaders.Mega/0.3.10": { + "Wabbajack.Downloaders.Mega/0.3.11": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", "Newtonsoft.Json": "13.0.3", - "Wabbajack.Common": "0.3.10", - "Wabbajack.Downloaders.Interfaces": "0.3.10", - "Wabbajack.Paths.IO": "0.3.10" + "Wabbajack.Common": "0.3.11", + "Wabbajack.Downloaders.Interfaces": "0.3.11", + "Wabbajack.Paths.IO": "0.3.11" }, "runtime": { "Wabbajack.Downloaders.Mega.dll": {} } }, - "Wabbajack.Downloaders.ModDB/0.3.10": { + "Wabbajack.Downloaders.ModDB/0.3.11": { "dependencies": { "HtmlAgilityPack": "1.11.72", "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", "Newtonsoft.Json": "13.0.3", - "Wabbajack.Common": "0.3.10", - "Wabbajack.Downloaders.Interfaces": "0.3.10", - "Wabbajack.Networking.Http": "0.3.10", - "Wabbajack.Networking.Http.Interfaces": "0.3.10" + "Wabbajack.Common": "0.3.11", + "Wabbajack.Downloaders.Interfaces": "0.3.11", + "Wabbajack.Networking.Http": "0.3.11", + "Wabbajack.Networking.Http.Interfaces": "0.3.11" }, "runtime": { "Wabbajack.Downloaders.ModDB.dll": {} } }, - "Wabbajack.Downloaders.Nexus/0.3.10": { + "Wabbajack.Downloaders.Nexus/0.3.11": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", - "Wabbajack.DTOs": "0.3.10", - "Wabbajack.Downloaders.Interfaces": "0.3.10", - "Wabbajack.Hashing.xxHash64": "0.3.10", - "Wabbajack.Networking.Http": "0.3.10", - "Wabbajack.Networking.Http.Interfaces": "0.3.10", - "Wabbajack.Networking.NexusApi": "0.3.10", - "Wabbajack.Paths": "0.3.10" + "Wabbajack.DTOs": "0.3.11", + "Wabbajack.Downloaders.Interfaces": "0.3.11", + "Wabbajack.Hashing.xxHash64": "0.3.11", + "Wabbajack.Networking.Http": "0.3.11", + "Wabbajack.Networking.Http.Interfaces": "0.3.11", + "Wabbajack.Networking.NexusApi": "0.3.11", + "Wabbajack.Paths": "0.3.11" }, "runtime": { "Wabbajack.Downloaders.Nexus.dll": {} } }, - "Wabbajack.Downloaders.VerificationCache/0.3.10": { + "Wabbajack.Downloaders.VerificationCache/0.3.11": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", "Stub.System.Data.SQLite.Core.NetStandard": "1.0.119", - "Wabbajack.DTOs": "0.3.10", - "Wabbajack.Paths.IO": "0.3.10" + "Wabbajack.DTOs": "0.3.11", + "Wabbajack.Paths.IO": "0.3.11" }, "runtime": { "Wabbajack.Downloaders.VerificationCache.dll": {} } }, - "Wabbajack.Downloaders.WabbajackCDN/0.3.10": { + "Wabbajack.Downloaders.WabbajackCDN/0.3.11": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", "Microsoft.Toolkit.HighPerformance": "7.1.2", - "Wabbajack.Common": "0.3.10", - "Wabbajack.Downloaders.Interfaces": "0.3.10", - "Wabbajack.Networking.Http": "0.3.10", - "Wabbajack.RateLimiter": "0.3.10" + "Wabbajack.Common": "0.3.11", + "Wabbajack.Downloaders.Interfaces": "0.3.11", + "Wabbajack.Networking.Http": "0.3.11", + "Wabbajack.RateLimiter": "0.3.11" }, "runtime": { "Wabbajack.Downloaders.WabbajackCDN.dll": {} } }, - "Wabbajack.DTOs/0.3.10": { + "Wabbajack.DTOs/0.3.11": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", - "Wabbajack.Hashing.xxHash64": "0.3.10", - "Wabbajack.Paths": "0.3.10" + "Wabbajack.Hashing.xxHash64": "0.3.11", + "Wabbajack.Paths": "0.3.11" }, "runtime": { "Wabbajack.DTOs.dll": {} } }, - "Wabbajack.FileExtractor/0.3.10": { + "Wabbajack.FileExtractor/0.3.11": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", "OMODFramework": "3.0.1", - "Wabbajack.Common": "0.3.10", - "Wabbajack.Compression.BSA": "0.3.10", - "Wabbajack.Hashing.PHash": "0.3.10", - "Wabbajack.Paths": "0.3.10" + "Wabbajack.Common": "0.3.11", + "Wabbajack.Compression.BSA": "0.3.11", + "Wabbajack.Hashing.PHash": "0.3.11", + "Wabbajack.Paths": "0.3.11" }, "runtime": { "Wabbajack.FileExtractor.dll": {} } }, - "Wabbajack.Hashing.PHash/0.3.10": { + "Wabbajack.Hashing.PHash/0.3.11": { "dependencies": { "BCnEncoder.Net.ImageSharp": "1.1.1", "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Shipwreck.Phash": "0.5.0", "SixLabors.ImageSharp": "3.1.6", - "Wabbajack.Common": "0.3.10", - "Wabbajack.DTOs": "0.3.10", - "Wabbajack.Paths": "0.3.10", - "Wabbajack.Paths.IO": "0.3.10" + "Wabbajack.Common": "0.3.11", + "Wabbajack.DTOs": "0.3.11", + "Wabbajack.Paths": "0.3.11", + "Wabbajack.Paths.IO": "0.3.11" }, "runtime": { "Wabbajack.Hashing.PHash.dll": {} } }, - "Wabbajack.Hashing.xxHash64/0.3.10": { + "Wabbajack.Hashing.xxHash64/0.3.11": { "dependencies": { - "Wabbajack.Paths": "0.3.10", - "Wabbajack.RateLimiter": "0.3.10" + "Wabbajack.Paths": "0.3.11", + "Wabbajack.RateLimiter": "0.3.11" }, "runtime": { "Wabbajack.Hashing.xxHash64.dll": {} } }, - "Wabbajack.Installer/0.3.10": { + "Wabbajack.Installer/0.3.11": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Newtonsoft.Json": "13.0.3", "Octopus.Octodiff": "2.0.548", "SixLabors.ImageSharp": "3.1.6", - "Wabbajack.DTOs": "0.3.10", - "Wabbajack.Downloaders.Dispatcher": "0.3.10", - "Wabbajack.Downloaders.GameFile": "0.3.10", - "Wabbajack.FileExtractor": "0.3.10", - "Wabbajack.Networking.WabbajackClientApi": "0.3.10", - "Wabbajack.Paths": "0.3.10", - "Wabbajack.Paths.IO": "0.3.10", - "Wabbajack.VFS": "0.3.10", + "Wabbajack.DTOs": "0.3.11", + "Wabbajack.Downloaders.Dispatcher": "0.3.11", + "Wabbajack.Downloaders.GameFile": "0.3.11", + "Wabbajack.FileExtractor": "0.3.11", + "Wabbajack.Networking.WabbajackClientApi": "0.3.11", + "Wabbajack.Paths": "0.3.11", + "Wabbajack.Paths.IO": "0.3.11", + "Wabbajack.VFS": "0.3.11", "ini-parser-netstandard": "2.5.2" }, "runtime": { "Wabbajack.Installer.dll": {} } }, - "Wabbajack.IO.Async/0.3.10": { + "Wabbajack.IO.Async/0.3.11": { "runtime": { "Wabbajack.IO.Async.dll": {} } }, - "Wabbajack.Networking.BethesdaNet/0.3.10": { + "Wabbajack.Networking.BethesdaNet/0.3.11": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", - "Wabbajack.DTOs": "0.3.10", - "Wabbajack.Networking.Http": "0.3.10", - "Wabbajack.Networking.Http.Interfaces": "0.3.10" + "Wabbajack.DTOs": "0.3.11", + "Wabbajack.Networking.Http": "0.3.11", + "Wabbajack.Networking.Http.Interfaces": "0.3.11" }, "runtime": { "Wabbajack.Networking.BethesdaNet.dll": {} } }, - "Wabbajack.Networking.Discord/0.3.10": { + "Wabbajack.Networking.Discord/0.3.11": { "dependencies": { "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", - "Wabbajack.Networking.Http.Interfaces": "0.3.10" + "Wabbajack.Networking.Http.Interfaces": "0.3.11" }, "runtime": { "Wabbajack.Networking.Discord.dll": {} } }, - "Wabbajack.Networking.GitHub/0.3.10": { + "Wabbajack.Networking.GitHub/0.3.11": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", "Octokit": "14.0.0", - "Wabbajack.DTOs": "0.3.10", - "Wabbajack.Networking.Http.Interfaces": "0.3.10" + "Wabbajack.DTOs": "0.3.11", + "Wabbajack.Networking.Http.Interfaces": "0.3.11" }, "runtime": { "Wabbajack.Networking.GitHub.dll": {} } }, - "Wabbajack.Networking.Http/0.3.10": { + "Wabbajack.Networking.Http/0.3.11": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Http": "9.0.1", "Microsoft.Extensions.Logging": "9.0.1", - "Wabbajack.Configuration": "0.3.10", - "Wabbajack.Downloaders.Interfaces": "0.3.10", - "Wabbajack.Hashing.xxHash64": "0.3.10", - "Wabbajack.Networking.Http.Interfaces": "0.3.10", - "Wabbajack.Paths": "0.3.10", - "Wabbajack.Paths.IO": "0.3.10" + "Wabbajack.Configuration": "0.3.11", + "Wabbajack.Downloaders.Interfaces": "0.3.11", + "Wabbajack.Hashing.xxHash64": "0.3.11", + "Wabbajack.Networking.Http.Interfaces": "0.3.11", + "Wabbajack.Paths": "0.3.11", + "Wabbajack.Paths.IO": "0.3.11" }, "runtime": { "Wabbajack.Networking.Http.dll": {} } }, - "Wabbajack.Networking.Http.Interfaces/0.3.10": { + "Wabbajack.Networking.Http.Interfaces/0.3.11": { "dependencies": { - "Wabbajack.Hashing.xxHash64": "0.3.10" + "Wabbajack.Hashing.xxHash64": "0.3.11" }, "runtime": { "Wabbajack.Networking.Http.Interfaces.dll": {} } }, - "Wabbajack.Networking.NexusApi/0.3.10": { + "Wabbajack.Networking.NexusApi/0.3.11": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", - "Wabbajack.DTOs": "0.3.10", - "Wabbajack.Networking.Http": "0.3.10", - "Wabbajack.Networking.Http.Interfaces": "0.3.10", - "Wabbajack.Networking.WabbajackClientApi": "0.3.10" + "Wabbajack.DTOs": "0.3.11", + "Wabbajack.Networking.Http": "0.3.11", + "Wabbajack.Networking.Http.Interfaces": "0.3.11", + "Wabbajack.Networking.WabbajackClientApi": "0.3.11" }, "runtime": { "Wabbajack.Networking.NexusApi.dll": {} } }, - "Wabbajack.Networking.WabbajackClientApi/0.3.10": { + "Wabbajack.Networking.WabbajackClientApi/0.3.11": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", "Octokit": "14.0.0", - "Wabbajack.Common": "0.3.10", - "Wabbajack.DTOs": "0.3.10", - "Wabbajack.Paths.IO": "0.3.10", - "Wabbajack.VFS.Interfaces": "0.3.10", + "Wabbajack.Common": "0.3.11", + "Wabbajack.DTOs": "0.3.11", + "Wabbajack.Paths.IO": "0.3.11", + "Wabbajack.VFS.Interfaces": "0.3.11", "YamlDotNet": "16.3.0" }, "runtime": { "Wabbajack.Networking.WabbajackClientApi.dll": {} } }, - "Wabbajack.Paths/0.3.10": { + "Wabbajack.Paths/0.3.11": { "runtime": { "Wabbajack.Paths.dll": {} } }, - "Wabbajack.Paths.IO/0.3.10": { + "Wabbajack.Paths.IO/0.3.11": { "dependencies": { - "Wabbajack.Paths": "0.3.10", + "Wabbajack.Paths": "0.3.11", "shortid": "4.0.0" }, "runtime": { "Wabbajack.Paths.IO.dll": {} } }, - "Wabbajack.RateLimiter/0.3.10": { + "Wabbajack.RateLimiter/0.3.11": { "runtime": { "Wabbajack.RateLimiter.dll": {} } }, - "Wabbajack.Server.Lib/0.3.10": { + "Wabbajack.Server.Lib/0.3.11": { "dependencies": { "FluentFTP": "52.0.0", "Microsoft.Extensions.DependencyInjection": "9.0.1", @@ -2264,58 +2264,58 @@ "Nettle": "3.0.0", "Newtonsoft.Json": "13.0.3", "SixLabors.ImageSharp": "3.1.6", - "Wabbajack.Common": "0.3.10", - "Wabbajack.Networking.Http.Interfaces": "0.3.10", - "Wabbajack.Services.OSIntegrated": "0.3.10" + "Wabbajack.Common": "0.3.11", + "Wabbajack.Networking.Http.Interfaces": "0.3.11", + "Wabbajack.Services.OSIntegrated": "0.3.11" }, "runtime": { "Wabbajack.Server.Lib.dll": {} } }, - "Wabbajack.Services.OSIntegrated/0.3.10": { + "Wabbajack.Services.OSIntegrated/0.3.11": { "dependencies": { "DeviceId": "6.8.0", "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Newtonsoft.Json": "13.0.3", "SixLabors.ImageSharp": "3.1.6", - "Wabbajack.Compiler": "0.3.10", - "Wabbajack.Downloaders.Dispatcher": "0.3.10", - "Wabbajack.Installer": "0.3.10", - "Wabbajack.Networking.BethesdaNet": "0.3.10", - "Wabbajack.Networking.Discord": "0.3.10", - "Wabbajack.VFS": "0.3.10" + "Wabbajack.Compiler": "0.3.11", + "Wabbajack.Downloaders.Dispatcher": "0.3.11", + "Wabbajack.Installer": "0.3.11", + "Wabbajack.Networking.BethesdaNet": "0.3.11", + "Wabbajack.Networking.Discord": "0.3.11", + "Wabbajack.VFS": "0.3.11" }, "runtime": { "Wabbajack.Services.OSIntegrated.dll": {} } }, - "Wabbajack.VFS/0.3.10": { + "Wabbajack.VFS/0.3.11": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", "SixLabors.ImageSharp": "3.1.6", "System.Data.SQLite.Core": "1.0.119", - "Wabbajack.Common": "0.3.10", - "Wabbajack.FileExtractor": "0.3.10", - "Wabbajack.Hashing.PHash": "0.3.10", - "Wabbajack.Hashing.xxHash64": "0.3.10", - "Wabbajack.Paths": "0.3.10", - "Wabbajack.Paths.IO": "0.3.10", - "Wabbajack.VFS.Interfaces": "0.3.10" + "Wabbajack.Common": "0.3.11", + "Wabbajack.FileExtractor": "0.3.11", + "Wabbajack.Hashing.PHash": "0.3.11", + "Wabbajack.Hashing.xxHash64": "0.3.11", + "Wabbajack.Paths": "0.3.11", + "Wabbajack.Paths.IO": "0.3.11", + "Wabbajack.VFS.Interfaces": "0.3.11" }, "runtime": { "Wabbajack.VFS.dll": {} } }, - "Wabbajack.VFS.Interfaces/0.3.10": { + "Wabbajack.VFS.Interfaces/0.3.11": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", - "Wabbajack.DTOs": "0.3.10", - "Wabbajack.Hashing.xxHash64": "0.3.10", - "Wabbajack.Paths": "0.3.10" + "Wabbajack.DTOs": "0.3.11", + "Wabbajack.Hashing.xxHash64": "0.3.11", + "Wabbajack.Paths": "0.3.11" }, "runtime": { "Wabbajack.VFS.Interfaces.dll": {} @@ -2332,7 +2332,7 @@ } }, "libraries": { - "jackify-engine/0.3.10": { + "jackify-engine/0.3.11": { "type": "project", "serviceable": false, "sha512": "" @@ -3021,202 +3021,202 @@ "path": "yamldotnet/16.3.0", "hashPath": "yamldotnet.16.3.0.nupkg.sha512" }, - "Wabbajack.CLI.Builder/0.3.10": { + "Wabbajack.CLI.Builder/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Common/0.3.10": { + "Wabbajack.Common/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Compiler/0.3.10": { + "Wabbajack.Compiler/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Compression.BSA/0.3.10": { + "Wabbajack.Compression.BSA/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Compression.Zip/0.3.10": { + "Wabbajack.Compression.Zip/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Configuration/0.3.10": { + "Wabbajack.Configuration/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Downloaders.Bethesda/0.3.10": { + "Wabbajack.Downloaders.Bethesda/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Downloaders.Dispatcher/0.3.10": { + "Wabbajack.Downloaders.Dispatcher/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Downloaders.GameFile/0.3.10": { + "Wabbajack.Downloaders.GameFile/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Downloaders.GoogleDrive/0.3.10": { + "Wabbajack.Downloaders.GoogleDrive/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Downloaders.Http/0.3.10": { + "Wabbajack.Downloaders.Http/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Downloaders.Interfaces/0.3.10": { + "Wabbajack.Downloaders.Interfaces/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Downloaders.IPS4OAuth2Downloader/0.3.10": { + "Wabbajack.Downloaders.IPS4OAuth2Downloader/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Downloaders.Manual/0.3.10": { + "Wabbajack.Downloaders.Manual/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Downloaders.MediaFire/0.3.10": { + "Wabbajack.Downloaders.MediaFire/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Downloaders.Mega/0.3.10": { + "Wabbajack.Downloaders.Mega/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Downloaders.ModDB/0.3.10": { + "Wabbajack.Downloaders.ModDB/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Downloaders.Nexus/0.3.10": { + "Wabbajack.Downloaders.Nexus/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Downloaders.VerificationCache/0.3.10": { + "Wabbajack.Downloaders.VerificationCache/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Downloaders.WabbajackCDN/0.3.10": { + "Wabbajack.Downloaders.WabbajackCDN/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.DTOs/0.3.10": { + "Wabbajack.DTOs/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.FileExtractor/0.3.10": { + "Wabbajack.FileExtractor/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Hashing.PHash/0.3.10": { + "Wabbajack.Hashing.PHash/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Hashing.xxHash64/0.3.10": { + "Wabbajack.Hashing.xxHash64/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Installer/0.3.10": { + "Wabbajack.Installer/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.IO.Async/0.3.10": { + "Wabbajack.IO.Async/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Networking.BethesdaNet/0.3.10": { + "Wabbajack.Networking.BethesdaNet/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Networking.Discord/0.3.10": { + "Wabbajack.Networking.Discord/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Networking.GitHub/0.3.10": { + "Wabbajack.Networking.GitHub/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Networking.Http/0.3.10": { + "Wabbajack.Networking.Http/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Networking.Http.Interfaces/0.3.10": { + "Wabbajack.Networking.Http.Interfaces/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Networking.NexusApi/0.3.10": { + "Wabbajack.Networking.NexusApi/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Networking.WabbajackClientApi/0.3.10": { + "Wabbajack.Networking.WabbajackClientApi/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Paths/0.3.10": { + "Wabbajack.Paths/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Paths.IO/0.3.10": { + "Wabbajack.Paths.IO/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.RateLimiter/0.3.10": { + "Wabbajack.RateLimiter/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Server.Lib/0.3.10": { + "Wabbajack.Server.Lib/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Services.OSIntegrated/0.3.10": { + "Wabbajack.Services.OSIntegrated/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.VFS/0.3.10": { + "Wabbajack.VFS/0.3.11": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.VFS.Interfaces/0.3.10": { + "Wabbajack.VFS.Interfaces/0.3.11": { "type": "project", "serviceable": false, "sha512": "" diff --git a/jackify/engine/jackify-engine.dll b/jackify/engine/jackify-engine.dll index 66018eb..e75e1f0 100644 Binary files a/jackify/engine/jackify-engine.dll and b/jackify/engine/jackify-engine.dll differ diff --git a/jackify/frontends/cli/menus/additional_menu.py b/jackify/frontends/cli/menus/additional_menu.py index d8c9bfd..990c44b 100644 --- a/jackify/frontends/cli/menus/additional_menu.py +++ b/jackify/frontends/cli/menus/additional_menu.py @@ -8,7 +8,7 @@ import time from jackify.shared.colors import ( COLOR_SELECTION, COLOR_RESET, COLOR_ACTION, COLOR_PROMPT, COLOR_INFO, COLOR_DISABLED ) -from jackify.shared.ui_utils import print_jackify_banner, print_section_header +from jackify.shared.ui_utils import print_jackify_banner, print_section_header, clear_screen class AdditionalMenuHandler: """ @@ -20,9 +20,8 @@ class AdditionalMenuHandler: self.logger = None # Will be set by CLI when needed def _clear_screen(self): - """Clear the terminal screen""" - import os - os.system('cls' if os.name == 'nt' else 'clear') + """Clear the terminal screen with AppImage compatibility""" + clear_screen() def show_additional_tasks_menu(self, cli_instance): """Show the MO2, NXM Handling & Recovery submenu""" diff --git a/jackify/frontends/cli/menus/main_menu.py b/jackify/frontends/cli/menus/main_menu.py index 794552f..99539f0 100644 --- a/jackify/frontends/cli/menus/main_menu.py +++ b/jackify/frontends/cli/menus/main_menu.py @@ -9,7 +9,7 @@ from typing import Optional from jackify.shared.colors import ( COLOR_SELECTION, COLOR_RESET, COLOR_ACTION, COLOR_PROMPT, COLOR_ERROR ) -from jackify.shared.ui_utils import print_jackify_banner +from jackify.shared.ui_utils import print_jackify_banner, clear_screen class MainMenuHandler: """ @@ -22,9 +22,8 @@ class MainMenuHandler: self.dev_mode = dev_mode def _clear_screen(self): - """Clear the terminal screen""" - import os - os.system('cls' if os.name == 'nt' else 'clear') + """Clear the terminal screen with AppImage compatibility""" + clear_screen() def show_main_menu(self, cli_instance) -> str: """ @@ -43,8 +42,8 @@ class MainMenuHandler: print(f"{COLOR_SELECTION}{'-'*22}{COLOR_RESET}") # Standard separator print(f"{COLOR_SELECTION}1.{COLOR_RESET} Modlist Tasks") print(f" {COLOR_ACTION}→ Install & Configure Modlists{COLOR_RESET}") - print(f"{COLOR_SELECTION}2.{COLOR_RESET} Tuxborn Automatic Installer") - print(f" {COLOR_ACTION}→ Simple, fully automated Tuxborn installation{COLOR_RESET}") + print(f"{COLOR_SELECTION}2.{COLOR_RESET} Coming Soon...") + print(f" {COLOR_ACTION}→ More features coming in future releases{COLOR_RESET}") if self.dev_mode: print(f"{COLOR_SELECTION}3.{COLOR_RESET} Hoolamike Tasks") print(f" {COLOR_ACTION}→ Wabbajack alternative: Install Modlists, TTW, etc{COLOR_RESET}") @@ -61,7 +60,13 @@ class MainMenuHandler: if choice == "1": return "wabbajack" elif choice == "2": - return "tuxborn" # Will be handled by TuxbornMenuHandler + # Additional features are coming in future releases + print(f"\n{COLOR_PROMPT}Coming Soon!{COLOR_RESET}") + print(f"More features will be added in future releases.") + print(f"Please use 'Modlist Tasks' for all current functionality.") + print(f"Press Enter to continue...") + input() + continue # Return to main menu if self.dev_mode: if choice == "3": return "hoolamike" diff --git a/jackify/frontends/cli/menus/recovery_menu.py b/jackify/frontends/cli/menus/recovery_menu.py index 3e390e3..0d4b48c 100644 --- a/jackify/frontends/cli/menus/recovery_menu.py +++ b/jackify/frontends/cli/menus/recovery_menu.py @@ -9,7 +9,7 @@ from pathlib import Path from jackify.shared.colors import ( COLOR_SELECTION, COLOR_RESET, COLOR_PROMPT, COLOR_INFO, COLOR_ERROR ) -from jackify.shared.ui_utils import print_jackify_banner, print_section_header +from jackify.shared.ui_utils import print_jackify_banner, print_section_header, clear_screen class RecoveryMenuHandler: """ @@ -21,9 +21,8 @@ class RecoveryMenuHandler: self.logger = logging.getLogger(__name__) def _clear_screen(self): - """Clear the terminal screen""" - import os - os.system('cls' if os.name == 'nt' else 'clear') + """Clear the terminal screen with AppImage compatibility""" + clear_screen() def show_recovery_menu(self, cli_instance): """Show the recovery tools menu.""" diff --git a/jackify/frontends/cli/menus/wabbajack_menu.py b/jackify/frontends/cli/menus/wabbajack_menu.py index db0c3e0..f1f35fa 100644 --- a/jackify/frontends/cli/menus/wabbajack_menu.py +++ b/jackify/frontends/cli/menus/wabbajack_menu.py @@ -8,7 +8,7 @@ import time from jackify.shared.colors import ( COLOR_SELECTION, COLOR_RESET, COLOR_ACTION, COLOR_PROMPT, COLOR_INFO ) -from jackify.shared.ui_utils import print_jackify_banner, print_section_header +from jackify.shared.ui_utils import print_jackify_banner, print_section_header, clear_screen class WabbajackMenuHandler: """ @@ -20,9 +20,8 @@ class WabbajackMenuHandler: self.logger = None # Will be set by CLI when needed def _clear_screen(self): - """Clear the terminal screen""" - import os - os.system('cls' if os.name == 'nt' else 'clear') + """Clear the terminal screen with AppImage compatibility""" + clear_screen() def show_wabbajack_tasks_menu(self, cli_instance): """Show the Modlist and Wabbajack Tasks menu""" diff --git a/jackify/frontends/gui/screens/configure_new_modlist.py b/jackify/frontends/gui/screens/configure_new_modlist.py index 6e4e28a..0fb2a3f 100644 --- a/jackify/frontends/gui/screens/configure_new_modlist.py +++ b/jackify/frontends/gui/screens/configure_new_modlist.py @@ -603,41 +603,75 @@ class ConfigureNewModlistScreen(QWidget): self._safe_append_text("") self._safe_append_text("=== Steam Integration Phase ===") self._safe_append_text("Starting automated Steam setup workflow...") - self._safe_append_text("This will automatically configure Steam integration without manual steps.") # Start automated prefix workflow self._start_automated_prefix_workflow(modlist_name, install_dir, mo2_exe_path, resolution) def _start_automated_prefix_workflow(self, modlist_name, install_dir, mo2_exe_path, resolution): - """Start the automated prefix workflow using AutomatedPrefixService""" + """Start the automated prefix workflow using AutomatedPrefixService in a background thread""" + self._safe_append_text(f"Initializing automated Steam setup for '{modlist_name}'...") + self._safe_append_text("Starting automated Steam shortcut creation and configuration...") + + # Disable the start button to prevent multiple workflows + self.start_btn.setEnabled(False) + + # Create and start the automated prefix thread + class AutomatedPrefixThread(QThread): + progress_update = Signal(str) + workflow_complete = Signal(object) # Will emit the result tuple + error_occurred = Signal(str) + + def __init__(self, modlist_name, install_dir, mo2_exe_path, steamdeck): + super().__init__() + self.modlist_name = modlist_name + self.install_dir = install_dir + self.mo2_exe_path = mo2_exe_path + self.steamdeck = steamdeck + + def run(self): + try: + from jackify.backend.services.automated_prefix_service import AutomatedPrefixService + + # Initialize the automated prefix service + prefix_service = AutomatedPrefixService() + + # Define progress callback for GUI updates + def progress_callback(message): + self.progress_update.emit(message) + + # Run the automated workflow (this contains the blocking operations) + result = prefix_service.run_working_workflow( + self.modlist_name, self.install_dir, self.mo2_exe_path, + progress_callback, steamdeck=self.steamdeck + ) + + # Emit the result + self.workflow_complete.emit(result) + + except Exception as e: + self.error_occurred.emit(str(e)) + + # Detect Steam Deck once + try: + import os + _is_steamdeck = False + if os.path.exists('/etc/os-release'): + with open('/etc/os-release') as f: + if 'steamdeck' in f.read().lower(): + _is_steamdeck = True + except Exception: + _is_steamdeck = False + + # Create and start the thread + self.automated_prefix_thread = AutomatedPrefixThread(modlist_name, install_dir, mo2_exe_path, _is_steamdeck) + self.automated_prefix_thread.progress_update.connect(self._safe_append_text) + self.automated_prefix_thread.workflow_complete.connect(self._on_automated_prefix_complete) + self.automated_prefix_thread.error_occurred.connect(self._on_automated_prefix_error) + self.automated_prefix_thread.start() + + def _on_automated_prefix_complete(self, result): + """Handle completion of the automated prefix workflow""" try: - from jackify.backend.services.automated_prefix_service import AutomatedPrefixService - - self._safe_append_text(f"Initializing automated Steam setup for '{modlist_name}'...") - - # Initialize the automated prefix service - prefix_service = AutomatedPrefixService() - - # Define progress callback for GUI updates - def progress_callback(message): - self._safe_append_text(message) - - # Run the automated workflow - self._safe_append_text("Starting automated Steam shortcut creation and configuration...") - # Detect Steam Deck once and pass through - try: - import os - _is_steamdeck = False - if os.path.exists('/etc/os-release'): - with open('/etc/os-release') as f: - if 'steamdeck' in f.read().lower(): - _is_steamdeck = True - except Exception: - _is_steamdeck = False - result = prefix_service.run_working_workflow( - modlist_name, install_dir, mo2_exe_path, progress_callback, steamdeck=_is_steamdeck - ) - # Handle the result - check for conflicts if isinstance(result, tuple) and len(result) == 4: if result[0] == "CONFLICT": @@ -653,7 +687,9 @@ class ConfigureNewModlistScreen(QWidget): self._safe_append_text(f"New AppID assigned: {new_appid}") # Continue with post-Steam configuration, passing the last timestamp - self.continue_configuration_after_automated_prefix(new_appid, modlist_name, install_dir, last_timestamp) + self.continue_configuration_after_automated_prefix(new_appid, self.modlist_name_edit.text().strip(), + os.path.dirname(self.install_dir_edit.text().strip()) if self.install_dir_edit.text().strip().endswith('ModOrganizer.exe') else self.install_dir_edit.text().strip(), + last_timestamp) else: self._safe_append_text(f"Automated Steam setup failed") self._safe_append_text("Please check the logs for details.") @@ -666,7 +702,8 @@ class ConfigureNewModlistScreen(QWidget): self._safe_append_text(f"New AppID assigned: {new_appid}") # Continue with post-Steam configuration - self.continue_configuration_after_automated_prefix(new_appid, modlist_name, install_dir) + self.continue_configuration_after_automated_prefix(new_appid, self.modlist_name_edit.text().strip(), + os.path.dirname(self.install_dir_edit.text().strip()) if self.install_dir_edit.text().strip().endswith('ModOrganizer.exe') else self.install_dir_edit.text().strip()) else: self._safe_append_text(f"Automated Steam setup failed") self._safe_append_text("Please check the logs for details.") @@ -678,9 +715,14 @@ class ConfigureNewModlistScreen(QWidget): self.start_btn.setEnabled(True) except Exception as e: - self._safe_append_text(f"Error during automated Steam setup: {str(e)}") - self._safe_append_text("Please check the logs for details.") + self._safe_append_text(f"Error handling automated prefix result: {str(e)}") self.start_btn.setEnabled(True) + + def _on_automated_prefix_error(self, error_message): + """Handle error from the automated prefix workflow""" + self._safe_append_text(f"Error during automated Steam setup: {error_message}") + self._safe_append_text("Please check the logs for details.") + self.start_btn.setEnabled(True) def show_shortcut_conflict_dialog(self, conflicts): """Show dialog to resolve shortcut name conflicts""" @@ -1120,6 +1162,9 @@ class ConfigureNewModlistScreen(QWidget): def on_configuration_complete(self, success, message, modlist_name): """Handle configuration completion (same as Tuxborn)""" + # Always re-enable the start button when workflow completes + self.start_btn.setEnabled(True) + if success: # Calculate time taken time_taken = self._calculate_time_taken() @@ -1140,6 +1185,9 @@ class ConfigureNewModlistScreen(QWidget): def on_configuration_error(self, error_message): """Handle configuration error""" + # Re-enable the start button on error + self.start_btn.setEnabled(True) + self._safe_append_text(f"Configuration error: {error_message}") MessageService.critical(self, "Configuration Error", f"Configuration failed: {error_message}", safety_level="medium") @@ -1208,7 +1256,19 @@ class ConfigureNewModlistScreen(QWidget): def cleanup(self): """Clean up any running threads when the screen is closed""" - debug_print("DEBUG: cleanup called - cleaning up ConfigThread") + debug_print("DEBUG: cleanup called - cleaning up threads") + + # Clean up automated prefix thread if running + if hasattr(self, 'automated_prefix_thread') and self.automated_prefix_thread and self.automated_prefix_thread.isRunning(): + debug_print("DEBUG: Terminating AutomatedPrefixThread") + try: + self.automated_prefix_thread.progress_update.disconnect() + self.automated_prefix_thread.workflow_complete.disconnect() + self.automated_prefix_thread.error_occurred.disconnect() + except: + pass + self.automated_prefix_thread.terminate() + self.automated_prefix_thread.wait(2000) # Wait up to 2 seconds # Clean up config thread if running if hasattr(self, 'config_thread') and self.config_thread and self.config_thread.isRunning(): diff --git a/jackify/frontends/gui/screens/tuxborn_installer.py b/jackify/frontends/gui/screens/tuxborn_installer.py index 7ee124a..9cd4422 100644 --- a/jackify/frontends/gui/screens/tuxborn_installer.py +++ b/jackify/frontends/gui/screens/tuxborn_installer.py @@ -1098,7 +1098,6 @@ class TuxbornInstallerScreen(QWidget): # Use automated prefix service instead of manual steps self._safe_append_text("Starting automated Steam setup workflow...") - self._safe_append_text("This will automatically configure Steam integration without manual steps.") # Start automated prefix workflow modlist_name = self.modlist_name_edit.text().strip() @@ -1110,24 +1109,56 @@ class TuxbornInstallerScreen(QWidget): MessageService.critical(self, "Steam Restart Failed", "Failed to restart Steam automatically. Please restart Steam manually, then try again.", safety_level="medium") def _start_automated_prefix_workflow(self, modlist_name, install_dir, mo2_exe_path): - """Start the automated prefix workflow using AutomatedPrefixService""" + """Start the automated prefix workflow using AutomatedPrefixService in a background thread""" + self._safe_append_text(f"Initializing automated Steam setup for '{modlist_name}'...") + self._safe_append_text("Starting automated Steam shortcut creation and configuration...") + + # Create and start the automated prefix thread + class AutomatedPrefixThread(QThread): + progress_update = Signal(str) + workflow_complete = Signal(object) # Will emit the result tuple + error_occurred = Signal(str) + + def __init__(self, modlist_name, install_dir, mo2_exe_path): + super().__init__() + self.modlist_name = modlist_name + self.install_dir = install_dir + self.mo2_exe_path = mo2_exe_path + + def run(self): + try: + from jackify.backend.services.automated_prefix_service import AutomatedPrefixService + + # Initialize the automated prefix service + prefix_service = AutomatedPrefixService() + + # Define progress callback for GUI updates + def progress_callback(message): + self.progress_update.emit(message) + + # Run the automated workflow (this contains the blocking operations) + result = prefix_service.run_working_workflow( + self.modlist_name, self.install_dir, self.mo2_exe_path, progress_callback + ) + + # Emit the result + self.workflow_complete.emit(result) + + except Exception as e: + self.error_occurred.emit(str(e)) + + # Create and start the thread + self.automated_prefix_thread = AutomatedPrefixThread(modlist_name, install_dir, mo2_exe_path) + self.automated_prefix_thread.progress_update.connect(self._safe_append_text) + self.automated_prefix_thread.workflow_complete.connect(self._on_automated_prefix_complete) + self.automated_prefix_thread.error_occurred.connect(self._on_automated_prefix_error) + self.automated_prefix_thread.start() + + def _on_automated_prefix_complete(self, result): + """Handle completion of the automated prefix workflow""" try: - from jackify.backend.services.automated_prefix_service import AutomatedPrefixService - - self._safe_append_text(f"Initializing automated Steam setup for '{modlist_name}'...") - - # Initialize the automated prefix service - prefix_service = AutomatedPrefixService() - - # Define progress callback for GUI updates - def progress_callback(message): - self._safe_append_text(f"{message}") - - # Run the automated workflow - self._safe_append_text("Starting automated Steam shortcut creation and configuration...") - result = prefix_service.run_working_workflow( - modlist_name, install_dir, mo2_exe_path, progress_callback - ) + modlist_name = self.modlist_name_edit.text().strip() + install_dir = self.install_dir_edit.text().strip() # Handle the result - check for conflicts if isinstance(result, tuple) and len(result) == 4: @@ -1175,11 +1206,18 @@ class TuxbornInstallerScreen(QWidget): self.cancel_install_btn.setVisible(False) except Exception as e: - self._safe_append_text(f"Error during automated Steam setup: {str(e)}") - self._safe_append_text("Please check the logs for details.") + self._safe_append_text(f"Error handling automated prefix result: {str(e)}") self.start_btn.setEnabled(True) self.cancel_btn.setVisible(True) self.cancel_install_btn.setVisible(False) + + def _on_automated_prefix_error(self, error_message): + """Handle error from the automated prefix workflow""" + self._safe_append_text(f"Error during automated Steam setup: {error_message}") + self._safe_append_text("Please check the logs for details.") + self.start_btn.setEnabled(True) + self.cancel_btn.setVisible(True) + self.cancel_install_btn.setVisible(False) def show_shortcut_conflict_dialog(self, conflicts): """Show dialog to resolve shortcut name conflicts""" @@ -1649,6 +1687,11 @@ class TuxbornInstallerScreen(QWidget): def on_configuration_complete(self, success, message, modlist_name): """Handle configuration completion on main thread""" + # Always re-enable the start button when workflow completes + self.start_btn.setEnabled(True) + self.cancel_btn.setVisible(True) + self.cancel_install_btn.setVisible(False) + if success: # Calculate time taken time_taken = self._calculate_time_taken() @@ -1689,6 +1732,11 @@ class TuxbornInstallerScreen(QWidget): def on_configuration_error(self, error_message): """Handle configuration error on main thread""" + # Re-enable the start button on error + self.start_btn.setEnabled(True) + self.cancel_btn.setVisible(True) + self.cancel_install_btn.setVisible(False) + self._safe_append_text(f"Configuration failed with error: {error_message}") MessageService.critical(self, "Configuration Error", f"Configuration failed: {error_message}", safety_level="medium") @@ -1755,7 +1803,19 @@ class TuxbornInstallerScreen(QWidget): def cleanup_processes(self): """Clean up any running processes when the window closes or is cancelled""" - debug_print("DEBUG: cleanup_processes called - cleaning up InstallationThread and other processes") + debug_print("DEBUG: cleanup_processes called - cleaning up all threads") + + # Clean up automated prefix thread if running + if hasattr(self, 'automated_prefix_thread') and self.automated_prefix_thread and self.automated_prefix_thread.isRunning(): + debug_print("DEBUG: Terminating AutomatedPrefixThread") + try: + self.automated_prefix_thread.progress_update.disconnect() + self.automated_prefix_thread.workflow_complete.disconnect() + self.automated_prefix_thread.error_occurred.disconnect() + except: + pass + self.automated_prefix_thread.terminate() + self.automated_prefix_thread.wait(2000) # Wait up to 2 seconds # Clean up InstallationThread if running if hasattr(self, 'install_thread') and self.install_thread.isRunning(): diff --git a/jackify/shared/ui_utils.py b/jackify/shared/ui_utils.py index e7bdd70..2ce875f 100644 --- a/jackify/shared/ui_utils.py +++ b/jackify/shared/ui_utils.py @@ -3,6 +3,52 @@ UI Utilities for Jackify Shared UI components and utilities used across frontend interfaces """ +import os +import sys + +def clear_screen(): + """ + Clear the terminal screen with AppImage compatibility. + + This function provides robust screen clearing that works in various environments + including AppImage containers where standard terminal utilities might not work properly. + """ + try: + # Method 1: Try standard os.system approach first + if os.name == 'nt': + # Windows + result = os.system('cls') + else: + # Unix/Linux - try clear command + result = os.system('clear') + + # If os.system failed (non-zero return), try fallback methods + if result != 0: + _clear_screen_fallback() + + except Exception: + # If os.system completely fails, use fallback + _clear_screen_fallback() + +def _clear_screen_fallback(): + """ + Fallback screen clearing methods for environments where os.system doesn't work. + This is particularly useful in AppImage environments. + """ + try: + # Method 2: ANSI escape sequences (works in most terminals) + # \033[H moves cursor to home position (0,0) + # \033[2J clears entire screen + # \033[3J clears scroll buffer (optional, not all terminals support) + print('\033[H\033[2J\033[3J', end='', flush=True) + except Exception: + try: + # Method 3: Alternative ANSI sequence + print('\033c', end='', flush=True) # Full terminal reset + except Exception: + # Method 4: Last resort - print enough newlines to "clear" screen + print('\n' * 50) + def print_jackify_banner(): """Print the Jackify application banner""" print(""" diff --git a/requirements-packaging.txt b/requirements-packaging.txt deleted file mode 100644 index b6bad72..0000000 --- a/requirements-packaging.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Requirements for packaging and distribution -PyInstaller>=6.0.0 -pyinstaller-hooks-contrib>=2023.11 \ No newline at end of file diff --git a/testing/debug_install_dir.py b/testing/debug_install_dir.py deleted file mode 100644 index 897b4a5..0000000 --- a/testing/debug_install_dir.py +++ /dev/null @@ -1,99 +0,0 @@ -#!/usr/bin/env python3 - -import sys -import os -from pathlib import Path - -# Add the src directory to the path -sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..')) - -def simulate_install_dir_processing(): - """Simulate the exact path processing that happens in the Install a Modlist workflow.""" - - # Simulate the context that would be passed to the engine - context = { - 'install_dir': Path("/home/deck/Games/Fallout/WOD"), - 'download_dir': Path("/home/deck/Games/Fallout/Downloads") - } - - print("=== Simulating Install a Modlist workflow path processing ===") - print(f"Original context['install_dir']: {context['install_dir']}") - print(f"Original context['install_dir'] type: {type(context['install_dir'])}") - - # Simulate the path processing from modlist_operations.py lines 615-625 - install_dir_context = context['install_dir'] - print(f"install_dir_context: {install_dir_context}") - print(f"install_dir_context type: {type(install_dir_context)}") - - if isinstance(install_dir_context, tuple): - actual_install_path = Path(install_dir_context[0]) - if install_dir_context[1]: # Second element is True if creation was intended - print(f"Creating install directory as it was marked for creation: {actual_install_path}") - actual_install_path.mkdir(parents=True, exist_ok=True) - else: # Should be a Path object or string already - actual_install_path = Path(install_dir_context) - - print(f"actual_install_path: {actual_install_path}") - print(f"actual_install_path type: {type(actual_install_path)}") - - install_dir_str = str(actual_install_path) - print(f"install_dir_str: {install_dir_str}") - print(f"install_dir_str type: {type(install_dir_str)}") - - # Now simulate what gets passed to the configuration context - config_context = { - 'name': 'WOD', - 'appid': '12345', - 'path': install_dir_str, # This is the key line! - 'mo2_exe_path': '/path/to/mo2.exe', - 'resolution': '1920x1080', - 'skip_confirmation': True, - 'manual_steps_completed': False - } - - print(f"\nconfig_context['path']: {config_context['path']}") - print(f"config_context['path'] type: {type(config_context['path'])}") - - # Check if there's any corruption - if 'D' in config_context['path'] and '/WOD/D/' in config_context['path']: - print("🚨 FOUND THE BUG! The path contains the extra 'D' segment!") - print(f"Expected: /home/deck/Games/Fallout/WOD") - print(f"Actual: {config_context['path']}") - else: - print("✅ Path looks correct - no extra 'D' segment found") - - # Now simulate the Configure New Modlist workflow for comparison - print("\n=== Simulating Configure New Modlist workflow ===") - gui_context = { - 'modlist_name': 'WOD', - 'install_dir': '/home/deck/Games/Fallout/WOD', # Direct from GUI - 'mo2_exe_path': '/path/to/mo2.exe', - 'resolution': '1920x1080' - } - - gui_config_context = { - 'name': gui_context.get('modlist_name', ''), - 'path': gui_context.get('install_dir', ''), # Direct from context - 'mo2_exe_path': gui_context.get('mo2_exe_path', ''), - 'modlist_value': gui_context.get('modlist_value'), - 'modlist_source': gui_context.get('modlist_source'), - 'resolution': gui_context.get('resolution'), - 'skip_confirmation': True, - 'manual_steps_completed': False - } - - print(f"gui_config_context['path']: {gui_config_context['path']}") - print(f"gui_config_context['path'] type: {type(gui_config_context['path'])}") - - # Compare the two paths - print(f"\n=== Comparison ===") - print(f"Install a Modlist path: {config_context['path']}") - print(f"Configure New Modlist path: {gui_config_context['path']}") - print(f"Paths are {'DIFFERENT' if config_context['path'] != gui_config_context['path'] else 'IDENTICAL'}") - -if __name__ == "__main__": - simulate_install_dir_processing() - - - - diff --git a/testing/debug_path_issue.py b/testing/debug_path_issue.py deleted file mode 100644 index ca262a4..0000000 --- a/testing/debug_path_issue.py +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/env python3 - -import sys -import os -from pathlib import Path - -# Add the src directory to the path -sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..')) - -def test_path_construction(): - """Test the exact path construction that's happening in the bug.""" - - # Simulate the path that should be passed - install_dir_str = "/home/deck/Games/Fallout/WOD" - modlist_dir_path = Path(install_dir_str) - - print(f"Original install_dir_str: {install_dir_str}") - print(f"modlist_dir_path: {modlist_dir_path}") - print(f"modlist_dir_path type: {type(modlist_dir_path)}") - - # Simulate the path construction in edit_binary_working_paths - drive_prefix = "Z:" - rel_path = "Stock Game/f4se_loader.exe" - - new_binary_path = f"{drive_prefix}/{modlist_dir_path}/{rel_path}".replace('\\', '/').replace('//', '/') - - print(f"drive_prefix: {drive_prefix}") - print(f"rel_path: {rel_path}") - print(f"new_binary_path: {new_binary_path}") - - # Check if there's any string manipulation happening - print(f"modlist_dir_path string: '{str(modlist_dir_path)}'") - print(f"modlist_dir_path parts: {list(modlist_dir_path.parts)}") - - # Test with the exact path from the ModOrganizer.ini - print("\n--- Testing with actual ModOrganizer.ini path ---") - actual_path = "Z:/home/deck/Games/Fallout/WOD/D/Stock Game/f4se_loader.exe" - print(f"Actual path from ModOrganizer.ini: {actual_path}") - - # Try to reconstruct this path - parts = actual_path.split('/') - print(f"Path parts: {parts}") - - # The issue is that there's a "D" segment that shouldn't be there - if "D" in parts: - d_index = parts.index("D") - print(f"Found 'D' at index {d_index}: {parts[d_index]}") - print(f"Parts before 'D': {parts[:d_index]}") - print(f"Parts after 'D': {parts[d_index+1:]}") - - # Reconstruct without the D - correct_parts = parts[:d_index] + parts[d_index+1:] - correct_path = '/'.join(correct_parts) - print(f"Correct path should be: {correct_path}") - -if __name__ == "__main__": - test_path_construction() - - - -