From 02d5beb23391c07ce9e06f305fa63d2abb25852c Mon Sep 17 00:00:00 2001 From: kosette <35268640+Kosette@users.noreply.github.com> Date: Fri, 4 Oct 2024 16:51:00 +0800 Subject: [PATCH] update windows installer manifest add gtk4.14 base image --- .github/workflows/build_image.yaml | 54 ++- .github/workflows/build_linux.yml | 29 +- .github/workflows/build_windows.yml | 46 +- Cargo.lock | 32 +- docker/Dockerfile | 3 +- installer/LICENSE.txt | 674 ++++++++++++++++++++++++++++ installer/tsukimi_installer.nsi | 150 +++++++ installer/version.txt | 1 + src/ui/mpv/control_sidebar.rs | 15 +- src/ui/mpv/page.rs | 6 +- src/ui/provider/descriptor.rs | 2 +- src/ui/style.css | 2 +- tsukimi_installer.nsi | 81 ---- 13 files changed, 931 insertions(+), 164 deletions(-) create mode 100644 installer/LICENSE.txt create mode 100644 installer/tsukimi_installer.nsi create mode 100644 installer/version.txt delete mode 100644 tsukimi_installer.nsi diff --git a/.github/workflows/build_image.yaml b/.github/workflows/build_image.yaml index cc258c04..d7ebccc7 100644 --- a/.github/workflows/build_image.yaml +++ b/.github/workflows/build_image.yaml @@ -1,4 +1,4 @@ -name: Build and Push Ubuntu-rust-gtk4 +name: Build and Push ubuntu-rust-gtk4 on: workflow_dispatch: # push: @@ -20,8 +20,20 @@ jobs: include: - platform: amd64 arch: amd64 + codename: oracular + gtk: 416 - platform: arm64 arch: arm64v8 + codename: oracular + gtk: 416 + - platform: amd64 + arch: amd64 + codename: noble + gtk: 414 + - platform: arm64 + arch: arm64v8 + codename: noble + gtk: 414 steps: - uses: actions/checkout@v4 @@ -43,16 +55,17 @@ jobs: run: | echo "OWNER=${GITHUB_REPOSITORY_OWNER@L}" >> ${GITHUB_ENV} - - name: Build and push for ${{ matrix.platform }} + - name: Build and push ${{ matrix.platform }} uses: docker/build-push-action@v6 with: context: docker platforms: linux/${{ matrix.platform }} push: true tags: | - ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:${{ matrix.platform }} + ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:gtk${{ matrix.gtk }}-${{ matrix.platform }} build-args: | ARCH=${{ matrix.arch }} + CODENAME=${{ matrix.codename }} provenance: false merge: @@ -71,34 +84,29 @@ jobs: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Metadata - id: date - run: | - echo "OWNER=${GITHUB_REPOSITORY_OWNER@L}" >> ${GITHUB_ENV} - echo "date=$(date --rfc-3339=date)" >> ${GITHUB_OUTPUT} - - - name: Create multi-arch manifest for latest tag + - name: Create multi-arch manifest for gtk4.16/latest run: | docker manifest create ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:latest \ - ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:amd64 \ - ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:arm64 + ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:gtk416-amd64 \ + ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:gtk416-arm64 docker manifest annotate ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:latest \ - ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:amd64 --arch amd64 + ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:gtk416-amd64 --arch amd64 docker manifest annotate ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:latest \ - ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:arm64 --arch arm64 + ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:gtk416-arm64 --arch arm64 docker manifest push ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:latest - - name: Create multi-arch manifest for date tag + - name: Create multi-arch manifest for gtk4.14 run: | - docker manifest create ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:${{ steps.date.outputs.date }} \ - ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:amd64 \ - ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:arm64 - docker manifest annotate ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:${{ steps.date.outputs.date }} \ - ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:amd64 --arch amd64 - docker manifest annotate ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:${{ steps.date.outputs.date }} \ - ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:arm64 --arch arm64 - docker manifest push ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:${{ steps.date.outputs.date }} + docker manifest create ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:gtk414-latest \ + ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:gtk414-amd64 \ + ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:gtk414-arm64 + docker manifest annotate ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:gtk414-latest \ + ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:gtk414-amd64 --arch amd64 + docker manifest annotate ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:gtk414-latest \ + ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:gtk414-arm64 --arch arm64 + docker manifest push ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:gtk414-latest - name: Check push run: | docker buildx imagetools inspect ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:latest + docker buildx imagetools inspect ghcr.io/${{ env.OWNER }}/ubuntu-rust-gtk4:gtk414-latest diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index 6f494a8b..b10769e0 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -9,15 +9,15 @@ on: - ".gitignore" - LICENSE - "*.md" - pull_request: - branches: - - "dev" - paths-ignore: - - "docs/**" - - "**/.gitignore" - - "**/.dockerignore" - - LICENSE - - "**/*.md" + # pull_request: + # branches: + # - "dev" + # paths-ignore: + # - "docs/**" + # - "**/.gitignore" + # - "**/.dockerignore" + # - LICENSE + # - "**/*.md" jobs: build: @@ -27,8 +27,8 @@ jobs: include: - platform: amd64 arch: x86_64 - - platform: arm64 - arch: aarch64 + # - platform: arm64 + # arch: aarch64 steps: - uses: actions/checkout@v4 @@ -43,9 +43,9 @@ jobs: run: | echo "user=${GITHUB_REPOSITORY_OWNER@L}" >> ${GITHUB_ENV} - - name: Build Rust project + - name: Build tsukimi for ${{ matrix.platform }} run: | - docker run --rm --platform linux/${{matrix.platform}} -v ${{ github.workspace }}:/app ghcr.io/${{ env.user }}/ubuntu-rust-gtk4:latest + docker run --rm --platform linux/${{matrix.platform}} -v ${{ github.workspace }}:/app -v ./docker/entrypoint.sh:/entrypoint.sh ghcr.io/${{ env.user }}/ubuntu-rust-gtk4:latest sudo cp target/release/tsukimi . sudo cp target/debian/*.deb . sudo cp -r i18n/locale . @@ -56,5 +56,6 @@ jobs: name: tsukimi-${{matrix.arch}}-linux path: | tsukimi - moe.*.xml + *.deb + moe*.xml locale/ diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index adbd3825..ace59828 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -9,14 +9,14 @@ on: - ".gitignore" - LICENSE - "**/*.md" - pull_request: - branches: - - "dev" - paths-ignore: - - "docs/**" - - ".gitignore" - - LICENSE - - "**/*.md" + # pull_request: + # branches: + # - "dev" + # paths-ignore: + # - "docs/**" + # - ".gitignore" + # - LICENSE + # - "**/*.md" env: CARGO_TERM_COLOR: always @@ -29,16 +29,12 @@ jobs: strategy: matrix: include: - - arch: x86_64-windows-gnu - os: windows-latest - target: x86_64-pc-windows-gnu - artifact: tsukimi.exe - msystem: mingw64 - env: x86_64 - - arch: ucrt-x86_64-windows-gnu + # - arch: x86_64-windows-gnu + # os: windows-latest + # msystem: mingw64 + # env: x86_64 + - arch: ucrt64-x86_64-windows-gnu os: windows-latest - target: x86_64-pc-windows-gnu - artifact: tsukimi.exe msystem: ucrt64 env: ucrt-x86_64 @@ -70,13 +66,13 @@ jobs: mingw-w64-${{ matrix.env }}-gst-libav curl - - name: Build tsukimi-${{ matrix.target }} + - name: Build tsukimi-${{ matrix.arch }} if: ${{ !startsWith(github.ref, 'refs/tags/') }} shell: msys2 {0} run: | export PATH="/c/Users/runneradmin/.cargo/bin:$PATH" rustup default stable-gnu - cargo build --release --locked -F console + cargo build --release --locked - name: Prepare Package if: ${{ !startsWith(github.ref, 'refs/tags/') }} @@ -84,7 +80,7 @@ jobs: run: | mkdir artifact && cd artifact mkdir tsukimi-x86_64-windows-gnu/ && cd tsukimi-x86_64-windows-gnu/ && mkdir bin/ && mkdir share/ && mkdir lib/ - cp $GITHUB_WORKSPACE/target/release/${{ matrix.artifact }} bin/ + cp $GITHUB_WORKSPACE/target/release/tsukimi.exe bin/ cp /${{ matrix.msystem }}/bin/gdbus.exe bin/ cp -r /${{ matrix.msystem }}/lib/gdk-pixbuf-2.0 lib/ @@ -122,6 +118,14 @@ jobs: ldd bin/tsukimi.exe | grep '\/${{ matrix.msystem }}.*\.dll' -o | xargs -I{} cp -n "{}" bin/ find lib/ -type f -name "*.dll" -exec ldd "{}" \; | grep '\/${{ matrix.msystem }}.*\.dll' -o | xargs -I{} cp -n "{}" bin/ + - name: Create NSIS installer + if: ${{ !startsWith(github.ref, 'refs/tags/') }} + shell: powershell + run: | + cp ./installer/* artifact + makensis /V4 artifact/tsukimi_installer.nsi + rm artifact/tsukimi_installer.nsi + - name: Build Thin Package if: ${{ !startsWith(github.ref, 'refs/tags/') }} shell: powershell @@ -135,6 +139,7 @@ jobs: run: | cd artifact sha512sum *.7z > tsukimi.sha512sum + sha512sum *.exe >> tsukimi.sha512sum - name: Upload artifact if: ${{ !startsWith(github.ref, 'refs/tags/') }} @@ -143,6 +148,7 @@ jobs: name: tsukimi-${{matrix.arch}} path: | artifact/*.7z + artifact/*.exe artifact/*.sha512sum compression-level: 0 retention-days: 3 diff --git a/Cargo.lock b/Cargo.lock index e3fcb6b8..6c0507a2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] @@ -1056,9 +1056,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "gio" @@ -1365,9 +1365,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.5" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" [[package]] name = "heck" @@ -1584,9 +1584,9 @@ checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" [[package]] name = "indexmap" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", "hashbrown", @@ -1605,9 +1605,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "is_terminal_polyfill" @@ -2049,9 +2049,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.4" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] @@ -2878,9 +2878,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "temp-dir" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" +checksum = "bc1ee6eef34f12f765cb94725905c6312b6610ab2b0940889cfe58dae7bc3c72" [[package]] name = "tempfile" @@ -3168,9 +3168,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" diff --git a/docker/Dockerfile b/docker/Dockerfile index b3629137..4921e8a4 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,7 @@ ARG ARCH=amd64 +ARG CODENAME=oracular -FROM $ARCH/ubuntu:oracular +FROM $ARCH/ubuntu:$CODENAME ENV CARGO_TERM_COLOR=always \ CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse \ diff --git a/installer/LICENSE.txt b/installer/LICENSE.txt new file mode 100644 index 00000000..e72bfdda --- /dev/null +++ b/installer/LICENSE.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. \ No newline at end of file diff --git a/installer/tsukimi_installer.nsi b/installer/tsukimi_installer.nsi new file mode 100644 index 00000000..67aba3e1 --- /dev/null +++ b/installer/tsukimi_installer.nsi @@ -0,0 +1,150 @@ +; Tsukimi Installer Script +; 基本设置 +!include "MUI2.nsh" +!include "FileFunc.nsh" + +; 定义版本号 +!define /file VERSION "version.txt" + +Name "Tsukimi" +OutFile "tsukimi-x86_64-windows-gnu-v${VERSION}-installer.exe" +InstallDir "$LOCALAPPDATA\Tsukimi" +RequestExecutionLevel user + +; 获取安装大小 +VIProductVersion "${VERSION}" +VIAddVersionKey "ProductName" "Tsukimi" +VIAddVersionKey "FileVersion" "${VERSION}" +VIAddVersionKey "ProductVersion" "${VERSION}" +VIAddVersionKey "LegalCopyright" "© 2024 tsukinaha" +VIAddVersionKey "FileDescription" "Tsukimi Installer" + +; 定义宏以检查并卸载之前的安装 +!macro CheckAndUninstallPrevious + IfFileExists "$INSTDIR\uninstall.exe" 0 continue_install + MessageBox MB_OKCANCEL|MB_ICONINFORMATION "$(PreviousInstallDetected)" IDOK uninstall + Abort ; 如果用户选择取消，则中止安装 + uninstall: + ; 执行卸载操作 + ExecWait '"$INSTDIR\uninstall.exe" /S _?=$INSTDIR' $0 + ${If} $0 != 0 + MessageBox MB_OK|MB_ICONSTOP "$(UninstallFailed)" + Abort + ${EndIf} + continue_install: +!macroend + +; 界面设置 +!define MUI_ABORTWARNING + +!insertmacro MUI_PAGE_WELCOME +!insertmacro MUI_PAGE_LICENSE "LICENSE.txt" +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_COMPONENTS +!insertmacro MUI_PAGE_INSTFILES +!insertmacro MUI_PAGE_FINISH + +!insertmacro MUI_UNPAGE_WELCOME +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_INSTFILES +!insertmacro MUI_UNPAGE_FINISH + +; 语言文件 +!insertmacro MUI_LANGUAGE "English" +!insertmacro MUI_LANGUAGE "SimpChinese" + +; 自定义字符串 +LangString PreviousInstallDetected ${LANG_ENGLISH} "An old version of Tsukimi has been detected. Click 'OK' to upgrade, or 'Cancel' to exit." +LangString PreviousInstallDetected ${LANG_SIMPCHINESE} "检测到旧版本的Tsukimi。点击'确定'进行升级安装，或点击'取消'退出。" + +LangString UninstallFailed ${LANG_ENGLISH} "Uninstallation of the old version failed. Please uninstall manually and try again." +LangString UninstallFailed ${LANG_SIMPCHINESE} "卸载旧版本失败。请手动卸载后再试。" + +LangString SecTsukimiName ${LANG_ENGLISH} "Tsukimi" +LangString SecTsukimiName ${LANG_SIMPCHINESE} "Tsukimi" + +LangString SecTsukimiDesc ${LANG_ENGLISH} "Install Tsukimi application." +LangString SecTsukimiDesc ${LANG_SIMPCHINESE} "安装Tsukimi应用程序。" + +LangString SecDesktopShortcutName ${LANG_ENGLISH} "Desktop Shortcut" +LangString SecDesktopShortcutName ${LANG_SIMPCHINESE} "桌面快捷方式" + +LangString SecDesktopShortcutDesc ${LANG_ENGLISH} "Create a shortcut for Tsukimi on the desktop." +LangString SecDesktopShortcutDesc ${LANG_SIMPCHINESE} "在桌面上创建Tsukimi的快捷方式。" + +LangString UninstallQuestion ${LANG_ENGLISH} "Are you sure you want to completely remove Tsukimi and all of its components?" +LangString UninstallQuestion ${LANG_SIMPCHINESE} "您确定要完全移除 Tsukimi 及其所有组件吗？" + +; 安装区段 +Section "$(SecTsukimiName)" SecTsukimi + SectionIn RO + SetOutPath "$INSTDIR" + + ; 复制所有文件 + File /r "tsukimi-x86_64-windows-gnu\*.*" + + ; 创建卸载程序 + WriteUninstaller "$INSTDIR\uninstall.exe" + + ; 创建开始菜单快捷方式 + CreateDirectory "$SMPROGRAMS\Tsukimi" + CreateShortcut "$SMPROGRAMS\Tsukimi\Tsukimi.lnk" "$INSTDIR\bin\tsukimi.exe" + CreateShortcut "$SMPROGRAMS\Tsukimi\Uninstall Tsukimi.lnk" "$INSTDIR\uninstall.exe" + + ; 写入卸载信息到注册表 + WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tsukimi" "DisplayName" "Tsukimi" + WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tsukimi" "UninstallString" '"$INSTDIR\uninstall.exe"' + WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tsukimi" "DisplayIcon" "$INSTDIR\bin\tsukimi.exe" + WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tsukimi" "Publisher" "tsukinaha" + WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tsukimi" "DisplayVersion" "${VERSION}" + WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tsukimi" "NoModify" 1 + WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tsukimi" "NoRepair" 1 + + ; 获取安装大小 + ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2 + IntFmt $0 "0x%08X" $0 + WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tsukimi" "EstimatedSize" "$0" +SectionEnd + +Section "$(SecDesktopShortcutName)" SecDesktopShortcut + CreateShortcut "$DESKTOP\Tsukimi.lnk" "$INSTDIR\bin\tsukimi.exe" +SectionEnd + +; 描述 +!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN + !insertmacro MUI_DESCRIPTION_TEXT ${SecTsukimi} $(SecTsukimiDesc) + !insertmacro MUI_DESCRIPTION_TEXT ${SecDesktopShortcut} $(SecDesktopShortcutDesc) +!insertmacro MUI_FUNCTION_DESCRIPTION_END + +; 卸载区段 +Section "Uninstall" + ; 删除安装的文件 + RMDir /r "$INSTDIR" + + ; 删除开始菜单快捷方式 + Delete "$SMPROGRAMS\Tsukimi\Tsukimi.lnk" + Delete "$SMPROGRAMS\Tsukimi\Uninstall Tsukimi.lnk" + RMDir "$SMPROGRAMS\Tsukimi" + + ; 删除桌面快捷方式 + Delete "$DESKTOP\Tsukimi.lnk" + + ; 删除注册表项 + DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tsukimi" +SectionEnd + +; 安装程序初始化函数 +Function .onInit + ; 设置默认语言为英语 + !insertmacro MUI_LANGDLL_DISPLAY + + ; 检查并卸载之前的安装 + !insertmacro CheckAndUninstallPrevious +FunctionEnd + +; 卸载程序初始化函数 +Function un.onInit + !insertmacro MUI_UNGETLANGUAGE + MessageBox MB_YESNO|MB_ICONQUESTION "$(UninstallQuestion)" IDYES +2 + Abort +FunctionEnd diff --git a/installer/version.txt b/installer/version.txt new file mode 100644 index 00000000..2b3d2e2d --- /dev/null +++ b/installer/version.txt @@ -0,0 +1 @@ +0.14.0.0 \ No newline at end of file diff --git a/src/ui/mpv/control_sidebar.rs b/src/ui/mpv/control_sidebar.rs index b84f3644..5806eead 100644 --- a/src/ui/mpv/control_sidebar.rs +++ b/src/ui/mpv/control_sidebar.rs @@ -67,7 +67,7 @@ mod imp { pub sub_border_color: TemplateChild, #[template_child] pub sub_background_color: TemplateChild, - + #[template_child] pub sub_offset_adj: TemplateChild, #[template_child] @@ -208,7 +208,8 @@ impl MPVControlSidebar { "value", ) .build(); - imp.buffer_switchrow.set_active(SETTINGS.mpv_show_buffer_speed()); + imp.buffer_switchrow + .set_active(SETTINGS.mpv_show_buffer_speed()); SETTINGS .bind( "mpv-show-buffer-speed", @@ -228,7 +229,9 @@ impl MPVControlSidebar { where V: SetData, { - if let Some(player) = self.player() { player.set_property(property, value) } + if let Some(player) = self.player() { + player.set_property(property, value) + } } #[template_callback] @@ -289,7 +292,9 @@ impl MPVControlSidebar { #[template_callback] pub fn on_buffer_speed(&self, _param: glib::ParamSpec, switch: adw::SwitchRow) { - SETTINGS.set_mpv_show_buffer_speed(switch.is_active()).unwrap(); + SETTINGS + .set_mpv_show_buffer_speed(switch.is_active()) + .unwrap(); } #[template_callback] @@ -424,7 +429,7 @@ impl MPVControlSidebar { self.set_mpv_property("af", "pan=[stereo|c0=c1|c1=c0]"); return; } - + let channel = match combo.selected() { 1 => "auto-safe", 2 => "mono", diff --git a/src/ui/mpv/page.rs b/src/ui/mpv/page.rs index eceefc2a..1c418e26 100644 --- a/src/ui/mpv/page.rs +++ b/src/ui/mpv/page.rs @@ -726,7 +726,7 @@ impl MPVPage { let is_threshold = (old_x - x).abs() > 3.0 || (old_y - y).abs() > 3.0; if is_threshold { - if !self.toolbar_revealed(){ + if !self.toolbar_revealed() { self.set_reveal_overlay(true); } @@ -834,7 +834,9 @@ impl MPVPage { let cursor = if reveal { gtk::gdk::Cursor::from_name("default", None) } else { - let Some(pixbuf) = gtk::gdk_pixbuf::Pixbuf::new(gtk::gdk_pixbuf::Colorspace::Rgb, true, 8, 1, 1) else { + let Some(pixbuf) = + gtk::gdk_pixbuf::Pixbuf::new(gtk::gdk_pixbuf::Colorspace::Rgb, true, 8, 1, 1) + else { return; }; pixbuf.fill(0); diff --git a/src/ui/provider/descriptor.rs b/src/ui/provider/descriptor.rs index 964c7919..60e97965 100644 --- a/src/ui/provider/descriptor.rs +++ b/src/ui/provider/descriptor.rs @@ -32,7 +32,7 @@ impl DescriptorType { impl std::fmt::Display for DescriptorType { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - let str = match *self { + let str = match self { DescriptorType::String => "String".to_string(), DescriptorType::Regex => "Regex".to_string(), }; diff --git a/src/ui/style.css b/src/ui/style.css index b8094667..95cca148 100644 --- a/src/ui/style.css +++ b/src/ui/style.css @@ -64,7 +64,7 @@ child { .tu-listview > row { margin: 10px; - border-radius:10px; + border-radius: 10px; } /* Starring */ diff --git a/tsukimi_installer.nsi b/tsukimi_installer.nsi deleted file mode 100644 index 6f4d94d6..00000000 --- a/tsukimi_installer.nsi +++ /dev/null @@ -1,81 +0,0 @@ -; Define installer name -Name "Tsukimi Installer" - -; Define output file -OutFile "tsukimi-x86_64-windows-gnu-installer.exe" - -; Default installation directory (in user's personal folder) -InstallDir "$LOCALAPPDATA\Tsukimi" - -; Store previous installation location -Var PreviousInstallDir - -; Pages -Page directory -Page components -Page instfiles - -; Uninstaller pages -UninstPage uninstConfirm -UninstPage instfiles - -; Main installation section -Section "Tsukimi Main Program" SecMain - SectionIn RO - SetOutPath "$INSTDIR" - - ; Copy entire tsukimi folder - File /r "tsukimi-x86_64-windows-gnu\*.*" - - ; Create start menu shortcut - CreateDirectory "$SMPROGRAMS\Tsukimi" - CreateShortCut "$SMPROGRAMS\Tsukimi\Tsukimi.lnk" "$INSTDIR\bin\tsukimi.exe" - - ; Create uninstaller - WriteUninstaller "$INSTDIR\Uninstall.exe" - - ; Write installation info to registry (current user only) - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tsukimi" "DisplayName" "Tsukimi" - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tsukimi" "UninstallString" '"$INSTDIR\Uninstall.exe"' - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tsukimi" "InstallLocation" "$INSTDIR" - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tsukimi" "Publisher" "tsukinaha" - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tsukimi" "DisplayVersion" "0.14.0" - WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tsukimi" "NoModify" 1 - WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tsukimi" "NoRepair" 1 -SectionEnd - -; Desktop shortcut section -Section "Create Desktop Shortcut" SecDesktopShortcut - CreateShortCut "$DESKTOP\Tsukimi.lnk" "$INSTDIR\bin\tsukimi.exe" -SectionEnd - -; Uninstall section -Section "Uninstall" - ; Remove installed files - RMDir /r "$INSTDIR" - - ; Remove start menu shortcut - Delete "$SMPROGRAMS\Tsukimi\Tsukimi.lnk" - RMDir "$SMPROGRAMS\Tsukimi" - - ; Remove desktop shortcut - Delete "$DESKTOP\Tsukimi.lnk" - - ; Remove uninstaller - Delete "$INSTDIR\Uninstall.exe" - - ; Remove registry keys (current user only) - DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tsukimi" -SectionEnd - -; Function to detect previous installation -Function .onInit - ; Try to read previous installation directory - ReadRegStr $PreviousInstallDir HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tsukimi" "InstallLocation" - StrCmp $PreviousInstallDir "" done - - ; If a previous installation is found, set the installation directory to the previous one - StrCpy $INSTDIR $PreviousInstallDir - - done: -FunctionEnd \ No newline at end of file