From 3d3d67dd0cb49c81e4998a566f205edb741410b8 Mon Sep 17 00:00:00 2001 From: ictye <95436661+northgreen@users.noreply.github.com> Date: Sat, 22 Jun 2024 22:54:00 +0800 Subject: [PATCH] Update LICENSE from Ictye Studio License to GPL (#29) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 完善日志系统，增加并完善一个api * 完善ci，新建启动器，优化用户体验 * 嘗試讓他能作爲pip包 * Delete src/ictye_live_dm/logs/latestlog20240202_220712.log * 重構配置部分 * 更新工作流 * 修正一個錯誤 * feat: 初步實現GUI * fix: 優化import * fix: 修正若干問題，添加加載pip模塊的功能 * docs: 創建文檔 * 修正一個失誤 * 更新CI * fix:修正UI的幾個錯誤 * build: 修正構建時建制UI的相關問題 * fix:修改了輸出兩次《宇宙安全生命》（X）的bug --- LICENSE | 138 ++++++++++++++++-- ictye-live-dm/pyproject.toml | 23 ++- .../plugin/bilibili_dm_plugin/config.yaml | 1 - .../src/ictye_live_dm/GUI/Ui_MainWindow.py | 48 ++++-- ictye-live-dm/src/ictye_live_dm/GUI_main.py | 2 +- .../src/{ => ictye_live_dm}/QT-GUI/main.ui | 0 .../src/ictye_live_dm/depends/configs.py | 2 +- .../src/ictye_live_dm/depends/logger.py | 2 +- .../src/ictye_live_dm/http_server.py | 1 - ictye-live-dm/src/ictye_live_dm/main.py | 51 ++----- 10 files changed, 194 insertions(+), 74 deletions(-) delete mode 100644 ictye-live-dm/src/QT-GUI/config/plugin/bilibili_dm_plugin/config.yaml rename ictye-live-dm/src/{ => ictye_live_dm}/QT-GUI/main.ui (100%) diff --git a/LICENSE b/LICENSE index 2d36395..729c797 100644 --- a/LICENSE +++ b/LICENSE @@ -1,11 +1,15 @@ - GNU GENERAL PUBLIC LICENSE + 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 @@ -14,29 +18,35 @@ 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 @@ -47,41 +57,49 @@ 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) @@ -90,16 +108,18 @@ 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)顯示適當的版權聲明，並告訴用戶該作品沒有保固(除非提供保固)，許可人可以根據本許可證轉讓該作品，以及如何查看本許可證的副本。如果界面呈現用戶命令或選項列表，例如菜單，列表中的一個突出項目符合此標準。 - 1. Source Code. 1. 源代碼。 + + 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 @@ -110,6 +130,7 @@ implementation is available to the public in source code form. A (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 @@ -122,13 +143,16 @@ 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. 2. 基本權限。 + + 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 @@ -136,6 +160,7 @@ 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 @@ -146,15 +171,19 @@ 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 @@ -162,7 +191,9 @@ 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; @@ -170,18 +201,24 @@ 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 @@ -189,10 +226,12 @@ terms of section 4, provided that you also meet all of these conditions: 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, @@ -202,15 +241,19 @@ 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 @@ -222,11 +265,13 @@ in one of these ways: 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 @@ -239,13 +284,16 @@ in one of these ways: 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 @@ -258,6 +306,7 @@ 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 @@ -265,6 +314,7 @@ 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 @@ -275,6 +325,7 @@ 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 @@ -282,12 +333,15 @@ 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 @@ -296,32 +350,41 @@ 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 @@ -331,37 +394,46 @@ 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 @@ -370,11 +442,14 @@ 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 @@ -384,6 +459,7 @@ 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 @@ -391,10 +467,13 @@ 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 @@ -404,16 +483,19 @@ 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 @@ -427,6 +509,7 @@ 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 @@ -434,6 +517,7 @@ 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 @@ -448,10 +532,13 @@ 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 @@ -461,7 +548,9 @@ 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 @@ -470,11 +559,14 @@ 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 @@ -483,15 +575,19 @@ 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 @@ -500,7 +596,9 @@ 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 @@ -510,48 +608,64 @@ 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) + Copyright (C) 2024 north + 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) + + Copyright (C) 2024 north 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 diff --git a/ictye-live-dm/pyproject.toml b/ictye-live-dm/pyproject.toml index 447ae4b..e8d44c3 100644 --- a/ictye-live-dm/pyproject.toml +++ b/ictye-live-dm/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["hatchling"] +requires = ["hatchling","hatch-build-scripts","PyQT5"] build-backend = "hatchling.build" [project] @@ -28,9 +28,6 @@ Repository = "https://github.com/northgreen/ictye-live-dm.git" Issues = "https://github.com/northgreen/ictye-live-dm/issues" Homepage = "https://github.com/northgreen/ictye-live-dm" -[tool.hatch.build.targets.wheel] -packages = ["src/ictye_live_dm","src/ictye-live-Danmku/depends"] - [project.optional-dependencies] gui = ["PyQt5"] cli = [ @@ -47,4 +44,20 @@ ictye-live-dm-gui = "ictye_live_dm.GUI_main:main" minversion = 5.0 testpaths ="./tests" asyncio_mode = "auto" -log_cli = true \ No newline at end of file +log_cli = true + +[tool.hatch.build.targets.wheel] +packages = ["src/ictye_live_dm","src/ictye-live-Danmku/depends"] +exclude = [ + "src/ictye_live_dm/QT-GUI/*" +] + +[[tool.hatch.build.hooks.build-scripts.scripts]] +out_dir = ".\\src\\ictye_live_dm\\GUI" +work_dir = ".\\src\\ictye_live_dm\\QT-GUI" +commands = [ + "pyuic5 .\\main.ui -o ..\\GUI\\Ui_MainWindow.py" +] +artifacts = [ + "Ui_MainWindow.py" +] diff --git a/ictye-live-dm/src/QT-GUI/config/plugin/bilibili_dm_plugin/config.yaml b/ictye-live-dm/src/QT-GUI/config/plugin/bilibili_dm_plugin/config.yaml deleted file mode 100644 index 187ca61..0000000 --- a/ictye-live-dm/src/QT-GUI/config/plugin/bilibili_dm_plugin/config.yaml +++ /dev/null @@ -1 +0,0 @@ -session: '' diff --git a/ictye-live-dm/src/ictye_live_dm/GUI/Ui_MainWindow.py b/ictye-live-dm/src/ictye_live_dm/GUI/Ui_MainWindow.py index 2e8f895..12d7945 100644 --- a/ictye-live-dm/src/ictye_live_dm/GUI/Ui_MainWindow.py +++ b/ictye-live-dm/src/ictye_live_dm/GUI/Ui_MainWindow.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file '.\ictye-live-dm\src\QT-GUI\main.ui' +# Form implementation generated from reading ui file '.\main.ui' # # Created by: PyQt5 UI code generator 5.15.10 # @@ -15,9 +15,9 @@ class Ui_Form(object): def setupUi(self, Form): Form.setObjectName("Form") Form.setWindowModality(QtCore.Qt.WindowModal) - Form.resize(710, 499) + Form.resize(729, 499) icon = QtGui.QIcon() - icon.addPixmap(QtGui.QPixmap("icon.ico"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + icon.addPixmap(QtGui.QPixmap(".\\../ictye_live_dm/icon.ico"), QtGui.QIcon.Normal, QtGui.QIcon.Off) Form.setWindowIcon(icon) self.verticalLayout = QtWidgets.QVBoxLayout(Form) self.verticalLayout.setObjectName("verticalLayout") @@ -32,6 +32,7 @@ def setupUi(self, Form): self.startButtoen.setObjectName("startButtoen") self.horizontalLayout.addWidget(self.startButtoen) self.stopButton = QtWidgets.QPushButton(Form) + self.stopButton.setEnabled(True) self.stopButton.setMaximumSize(QtCore.QSize(316, 28)) self.stopButton.setObjectName("stopButton") self.horizontalLayout.addWidget(self.stopButton) @@ -40,8 +41,18 @@ def setupUi(self, Form): self.tabWidget.setObjectName("tabWidget") self.log_Tab = QtWidgets.QWidget() self.log_Tab.setObjectName("log_Tab") - self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.log_Tab) + self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.log_Tab) + self.verticalLayout_4.setObjectName("verticalLayout_4") + self.horizontalLayout_2 = QtWidgets.QHBoxLayout() self.horizontalLayout_2.setObjectName("horizontalLayout_2") + self.totalLogLable = QtWidgets.QLabel(self.log_Tab) + self.totalLogLable.setObjectName("totalLogLable") + self.horizontalLayout_2.addWidget(self.totalLogLable) + self.followCheckBox = QtWidgets.QCheckBox(self.log_Tab) + self.followCheckBox.setMaximumSize(QtCore.QSize(194, 16777215)) + self.followCheckBox.setObjectName("followCheckBox") + self.horizontalLayout_2.addWidget(self.followCheckBox) + self.verticalLayout_4.addLayout(self.horizontalLayout_2) self.logTable = QtWidgets.QTableWidget(self.log_Tab) self.logTable.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers) self.logTable.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection) @@ -59,7 +70,7 @@ def setupUi(self, Form): self.logTable.horizontalHeader().setSortIndicatorShown(False) self.logTable.horizontalHeader().setStretchLastSection(True) self.logTable.verticalHeader().setCascadingSectionResizes(False) - self.horizontalLayout_2.addWidget(self.logTable) + self.verticalLayout_4.addWidget(self.logTable) self.tabWidget.addTab(self.log_Tab, "") self.pluginListPage = QtWidgets.QWidget() self.pluginListPage.setObjectName("pluginListPage") @@ -79,22 +90,31 @@ def setupUi(self, Form): self.verticalLayout_2.addLayout(self.horizontalLayout_4) self.tableWidget = QtWidgets.QTableWidget(self.pluginListPage) self.tableWidget.setObjectName("tableWidget") - self.tableWidget.setColumnCount(0) + self.tableWidget.setColumnCount(3) self.tableWidget.setRowCount(0) + item = QtWidgets.QTableWidgetItem() + self.tableWidget.setHorizontalHeaderItem(0, item) + item = QtWidgets.QTableWidgetItem() + self.tableWidget.setHorizontalHeaderItem(1, item) + item = QtWidgets.QTableWidgetItem() + self.tableWidget.setHorizontalHeaderItem(2, item) + self.tableWidget.horizontalHeader().setCascadingSectionResizes(False) + self.tableWidget.horizontalHeader().setSortIndicatorShown(False) + self.tableWidget.horizontalHeader().setStretchLastSection(True) self.verticalLayout_2.addWidget(self.tableWidget) self.tabWidget.addTab(self.pluginListPage, "") self.setting_Tab = QtWidgets.QWidget() self.setting_Tab.setObjectName("setting_Tab") - self.horizontalLayout_3 = QtWidgets.QHBoxLayout(self.setting_Tab) - self.horizontalLayout_3.setObjectName("horizontalLayout_3") + self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.setting_Tab) + self.verticalLayout_3.setObjectName("verticalLayout_3") self.settingScrollArea = QtWidgets.QScrollArea(self.setting_Tab) self.settingScrollArea.setWidgetResizable(True) self.settingScrollArea.setObjectName("settingScrollArea") self.scrollAreaWidgetContents = QtWidgets.QWidget() - self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 658, 388)) + self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 677, 388)) self.scrollAreaWidgetContents.setObjectName("scrollAreaWidgetContents") self.settingScrollArea.setWidget(self.scrollAreaWidgetContents) - self.horizontalLayout_3.addWidget(self.settingScrollArea) + self.verticalLayout_3.addWidget(self.settingScrollArea) self.tabWidget.addTab(self.setting_Tab, "") self.verticalLayout.addWidget(self.tabWidget) @@ -108,6 +128,8 @@ def retranslateUi(self, Form): self.label.setText(_translate("Form", "本項目由美國聖地亞哥（American Sangdiyagou）獨家贊助研發(x)")) self.startButtoen.setText(_translate("Form", "Start")) self.stopButton.setText(_translate("Form", "Stop")) + self.totalLogLable.setText(_translate("Form", "TextLabel")) + self.followCheckBox.setText(_translate("Form", "Follow newest log")) self.logTable.setSortingEnabled(False) item = self.logTable.horizontalHeaderItem(0) item.setText(_translate("Form", "Time")) @@ -118,5 +140,11 @@ def retranslateUi(self, Form): self.tabWidget.setTabText(self.tabWidget.indexOf(self.log_Tab), _translate("Form", "Log")) self.label_2.setText(_translate("Form", "Total:")) self.pushButton.setText(_translate("Form", "Submit")) + item = self.tableWidget.horizontalHeaderItem(0) + item.setText(_translate("Form", "New Column")) + item = self.tableWidget.horizontalHeaderItem(1) + item.setText(_translate("Form", "Plugin name")) + item = self.tableWidget.horizontalHeaderItem(2) + item.setText(_translate("Form", "Description")) self.tabWidget.setTabText(self.tabWidget.indexOf(self.pluginListPage), _translate("Form", "Plugins")) self.tabWidget.setTabText(self.tabWidget.indexOf(self.setting_Tab), _translate("Form", "Setting")) diff --git a/ictye-live-dm/src/ictye_live_dm/GUI_main.py b/ictye-live-dm/src/ictye_live_dm/GUI_main.py index 475cbe2..bd0d272 100644 --- a/ictye-live-dm/src/ictye_live_dm/GUI_main.py +++ b/ictye-live-dm/src/ictye_live_dm/GUI_main.py @@ -100,7 +100,7 @@ def main(): config.read_default(os.path.dirname(__file__) + "/config/system/config.yaml") # 設定logger - logger.setup_logging(False, form) + logger.setup_logging(window=form) # 啓動伺服器 __server = ServerClass() diff --git a/ictye-live-dm/src/QT-GUI/main.ui b/ictye-live-dm/src/ictye_live_dm/QT-GUI/main.ui similarity index 100% rename from ictye-live-dm/src/QT-GUI/main.ui rename to ictye-live-dm/src/ictye_live_dm/QT-GUI/main.ui diff --git a/ictye-live-dm/src/ictye_live_dm/depends/configs.py b/ictye-live-dm/src/ictye_live_dm/depends/configs.py index 59d2172..c1cb75a 100644 --- a/ictye-live-dm/src/ictye_live_dm/depends/configs.py +++ b/ictye-live-dm/src/ictye_live_dm/depends/configs.py @@ -46,7 +46,7 @@ def __setitem__(self, key, value): self._register[key] = value def set(self, attr: str, default=None): - self._default[attr] = default + self._register[attr] = default def read_default(self, path: str): default = self.__load(path) diff --git a/ictye-live-dm/src/ictye_live_dm/depends/logger.py b/ictye-live-dm/src/ictye_live_dm/depends/logger.py index f5cc883..460ef40 100644 --- a/ictye-live-dm/src/ictye_live_dm/depends/logger.py +++ b/ictye-live-dm/src/ictye_live_dm/depends/logger.py @@ -9,7 +9,7 @@ config = configs.ConfigManager() -def setup_logging(unportable: bool, window=None): +def setup_logging(unportable: bool = False, window=None): """ Setup logging configuration """ diff --git a/ictye-live-dm/src/ictye_live_dm/http_server.py b/ictye-live-dm/src/ictye_live_dm/http_server.py index 61be84a..71db3e3 100644 --- a/ictye-live-dm/src/ictye_live_dm/http_server.py +++ b/ictye-live-dm/src/ictye_live_dm/http_server.py @@ -14,7 +14,6 @@ log = logging.getLogger(__name__) runner: web.TCPSite - def return_file(file: str): async def healder(request): nonlocal file diff --git a/ictye-live-dm/src/ictye_live_dm/main.py b/ictye-live-dm/src/ictye_live_dm/main.py index ba2ee2a..8787b9b 100644 --- a/ictye-live-dm/src/ictye_live_dm/main.py +++ b/ictye-live-dm/src/ictye_live_dm/main.py @@ -5,6 +5,7 @@ import sys import traceback +from . import GUI_main from . import http_server from . import pluginsystem from .depends import logger, configs @@ -79,66 +80,32 @@ def parse_args(): # 获取配置 config = configs.ConfigManager() config.read_default(os.path.dirname(__file__) + "/config/system/config.yaml") - - config.set("gui", gui) + config.set("GUI", gui) if configdir: config.load_config(configdir) if install: print(install) exit(0) - elif gui: - print("starting gui") - os.system("pythonw -m ictye_live_dm.GUI_main") - exit(0) elif _list: - print("\033[33mName", "\t", "Description\033[0m") + print("\033[33mName\033[0m", "\t", "Description") for plugin in pluginsystem.Plugin().list_plugin(): - print(plugin[0], "\t", plugin[1]) + print("\033[33m" + plugin[0] + "\033[0m", "\t", plugin[1]) exit(0) def main(): os.chdir(os.path.dirname(os.path.abspath(__file__))) - # TODO:應把參數解析放到獨立的地方 - parse = argparse.ArgumentParser(description="一個模塊化的彈幕姬框架") - parse.add_argument('-u', '--unportable', action='store_true', help='非便携性启动') - parse.add_argument("-cfg", "--config", default="", help='指定配置目錄') - parse.add_argument('-i', '--install', action="append", default=[], help='安裝插件') - parse.add_argument('-l', '--list', action="store_true", help='列出所有的插件') - parse.add_argument('-g', '--gui', action="store_true", help='启动图形界面') - args = parse.parse_args() - - unportable: bool = args.unportable - """便携启动开关""" - configdir: str = args.config - """配置目錄""" - install: list = args.install - """安裝插件""" - _list: bool = args.list - GUI: bool = args.gui - # 获取配置 - config = configs.ConfigManager() - config.read_default(os.path.dirname(__file__) + "/config/system/config.yaml") - if configdir: - config.load_config(configdir) + parse_args() - if install: - print(install) - exit(0) - elif GUI: - print("starting GUI") - os.system("pythonw -m ictye_live_dm.GUI_main") - exit(0) - elif _list: - print("\033[33mName\033[0m", "\t", "Description") - for plugin in pluginsystem.Plugin().list_plugin(): - print("\033[33m" + plugin[0] + "\033[0m", "\t", plugin[1]) + if configs.ConfigManager()["GUI"]: + print("starting gui") + GUI_main.main() exit(0) # 获取logger - logger.setup_logging(unportable) + logger.setup_logging() loggers = logging.getLogger(__name__) loggers.info("金克拉，你有了吗？")