From f739c542928b04147885f72f0c95305464852653 Mon Sep 17 00:00:00 2001 From: Mitchell Syer Date: Fri, 5 Jan 2024 14:12:35 -0500 Subject: [PATCH] Rename the project (#795) --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- .github/ISSUE_TEMPLATE/feature_request.md | 2 +- .github/workflows/build_push.yml | 6 +- .github/workflows/issue_moderator.yml | 2 +- CHANGELOG-TEMPLATE.md | 4 +- CHANGELOG.md | 590 +++++++++--------- CONTRIBUTING.md | 24 +- README.md | 103 ++- build.gradle.kts | 2 +- scripts/bundler.sh | 42 +- scripts/resources/Suwayomi Launcher.bat | 1 + scripts/resources/Suwayomi Launcher.command | 3 + scripts/resources/Tachidesk Launcher.bat | 1 - scripts/resources/Tachidesk Launcher.command | 3 - scripts/resources/deb/changelog | 4 +- scripts/resources/deb/control | 8 +- scripts/resources/deb/copyright | 2 +- scripts/resources/deb/install | 22 +- scripts/resources/deb/source/include-binaries | 2 +- scripts/resources/msi/suwayomi-server-x64.wxs | 64 ++ scripts/resources/msi/suwayomi-server-x86.wxs | 60 ++ .../resources/msi/tachidesk-server-x64.wxs | 64 -- .../resources/msi/tachidesk-server-x86.wxs | 60 -- ...cher.desktop => suwayomi-launcher.desktop} | 4 +- scripts/resources/pkg/suwayomi-launcher.sh | 3 + scripts/resources/pkg/suwayomi-server.desktop | 8 + scripts/resources/pkg/suwayomi-server.sh | 3 + ...idesk-server.conf => suwayomi-server.conf} | 2 +- ...server.service => suwayomi-server.service} | 10 +- ...rver.sysusers => suwayomi-server.sysusers} | 2 +- ...rver.tmpfiles => suwayomi-server.tmpfiles} | 2 +- scripts/resources/pkg/tachidesk-launcher.sh | 3 - .../resources/pkg/tachidesk-server.desktop | 8 - scripts/resources/pkg/tachidesk-server.sh | 3 - scripts/resources/suwayomi-launcher.sh | 3 + scripts/resources/suwayomi-server.sh | 3 + scripts/resources/tachidesk-launcher.sh | 3 - scripts/resources/tachidesk-server.sh | 3 - server/build.gradle.kts | 4 +- .../global/controller/SettingsController.kt | 4 +- .../tachidesk/global/impl/AppUpdate.kt | 4 +- .../server/TachideskGraphQLContextFactory.kt | 2 +- .../suwayomi/tachidesk/server/JavalinSetup.kt | 4 +- .../suwayomi/tachidesk/server/ServerSetup.kt | 4 +- .../suwayomi/tachidesk/server/util/AppExit.kt | 2 +- .../tachidesk/server/util/AppMutex.kt | 6 +- .../tachidesk/server/util/SystemTray.kt | 2 +- .../server/util/WebInterfaceManager.kt | 8 +- .../tachidesk/test/ApplicationTest.kt | 2 +- settings.gradle.kts | 2 +- 50 files changed, 584 insertions(+), 591 deletions(-) create mode 100644 scripts/resources/Suwayomi Launcher.bat create mode 100644 scripts/resources/Suwayomi Launcher.command delete mode 100644 scripts/resources/Tachidesk Launcher.bat delete mode 100644 scripts/resources/Tachidesk Launcher.command create mode 100644 scripts/resources/msi/suwayomi-server-x64.wxs create mode 100644 scripts/resources/msi/suwayomi-server-x86.wxs delete mode 100755 scripts/resources/msi/tachidesk-server-x64.wxs delete mode 100755 scripts/resources/msi/tachidesk-server-x86.wxs rename scripts/resources/pkg/{tachidesk-launcher.desktop => suwayomi-launcher.desktop} (50%) create mode 100644 scripts/resources/pkg/suwayomi-launcher.sh create mode 100644 scripts/resources/pkg/suwayomi-server.desktop create mode 100644 scripts/resources/pkg/suwayomi-server.sh rename scripts/resources/pkg/systemd/{tachidesk-server.conf => suwayomi-server.conf} (87%) rename scripts/resources/pkg/systemd/{tachidesk-server.service => suwayomi-server.service} (82%) rename scripts/resources/pkg/systemd/{tachidesk-server.sysusers => suwayomi-server.sysusers} (54%) rename scripts/resources/pkg/systemd/{tachidesk-server.tmpfiles => suwayomi-server.tmpfiles} (56%) delete mode 100644 scripts/resources/pkg/tachidesk-launcher.sh delete mode 100644 scripts/resources/pkg/tachidesk-server.desktop delete mode 100644 scripts/resources/pkg/tachidesk-server.sh create mode 100644 scripts/resources/suwayomi-launcher.sh create mode 100644 scripts/resources/suwayomi-server.sh delete mode 100644 scripts/resources/tachidesk-launcher.sh delete mode 100644 scripts/resources/tachidesk-server.sh diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 52841103..3b2133b0 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -23,7 +23,7 @@ Note that the issue will be automatically closed if you do not fill out the titl --- ## Device information -- Tachidesk version: (Example: v0.2.3-r255-win32) +- Suwayomi-Server version: (Example: v1.0.0-r1438-win32) - Server Operating System: (Example: Ubuntu 20.04) - Server Desktop Environment: N/A or (Example: Gnome 40) - Server JVM version: bundled with win32 or (Example: Java 8 Update 281 or OpenJDK 8u281) diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index a59f2812..e6cd027e 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -22,7 +22,7 @@ Note that the issue will be automatically closed if you do not fill out the titl --- -## What feature should be added to Tachidesk? +## What feature should be added to Suwayomi? Explain What the feature is and how it should work in detail. Remove this line after you are done. ## Why/Project's Benefit/Existing Problem diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 29e1d0e1..6719beb7 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -163,7 +163,7 @@ jobs: - name: Checkout Preview branch uses: actions/checkout@v3 with: - repository: "Suwayomi/Tachidesk-Server-preview" + repository: "Suwayomi/Suwayomi-Server-preview" ref: main path: preview token: ${{ secrets.DEPLOY_PREVIEW_TOKEN }} @@ -172,7 +172,7 @@ jobs: id: GenTagName run: | cd release - genTag=$(ls *.jar | sed -e's/Tachidesk-Server-\|.jar//g') + genTag=$(ls *.jar | sed -e's/Suwayomi-Server-\|.jar//g') echo "$genTag" echo "value=$genTag" >> $GITHUB_OUTPUT @@ -196,7 +196,7 @@ jobs: uses: softprops/action-gh-release@v1 with: token: ${{ secrets.DEPLOY_PREVIEW_TOKEN }} - repository: "Suwayomi/Tachidesk-Server-preview" + repository: "Suwayomi/Suwayomi-Server-preview" tag_name: ${{ steps.GenTagName.outputs.value }} files: release/* diff --git a/.github/workflows/issue_moderator.yml b/.github/workflows/issue_moderator.yml index d85732d8..0fcf3c5a 100644 --- a/.github/workflows/issue_moderator.yml +++ b/.github/workflows/issue_moderator.yml @@ -37,7 +37,7 @@ jobs: }, { "type": "body", - "regex": ".*(Tachidesk version|Server Operating System|Server Desktop Environment|Server JVM version|Client Operating System|Client Web Browser):.*(\\(Example:|` +- (r877 [#188](https://github.com/Suwayomi/Suwayomi-Server/pull/188) by @Syer10) `MangaDataClass.genre` changed type to `List` #### Bug fixes - (r899-r901) fix when an external apk is installed and it doesn't have the default tachiyomi-extensions name @@ -624,17 +624,17 @@ - (r902) cleanup print/ln instances - (r906) better handling of uninstalling Extensions -## Tachidesk-WebUI +## Suwayomi-WebUI #### Visible changes - (r770) add support for the new genre type - (r771) set the default value of `showNsfw` to `true` so we won't have visual artifacts with a clean install -- (r774 [#21](https://github.com/Suwayomi/Tachidesk-WebUI/pull/21) by @voltrare) `ReaderNavbar.jsx`: Swap close and retract Navbar buttons -- (r775 [#23](https://github.com/Suwayomi/Tachidesk-WebUI/pull/23) by @voltrare) `yarn.lock`: Fixes version inconsistency after commit 9b866811b -- (r776 [#23](https://github.com/Suwayomi/Tachidesk-WebUI/pull/23) by @voltrare) add margin between Source and Extension cards, make the Search button look nicer +- (r774 [#21](https://github.com/Suwayomi/Suwayomi-WebUI/pull/21) by @voltrare) `ReaderNavbar.jsx`: Swap close and retract Navbar buttons +- (r775 [#23](https://github.com/Suwayomi/Suwayomi-WebUI/pull/23) by @voltrare) `yarn.lock`: Fixes version inconsistency after commit 9b866811b +- (r776 [#23](https://github.com/Suwayomi/Suwayomi-WebUI/pull/23) by @voltrare) add margin between Source and Extension cards, make the Search button look nicer - (r777) add support for installing external APK files - (r778) fix the makeToaster? - (r779) Action button for installing external extension -- (r780 Suwayomi/Tachidesk-WebUI#25) add on hover, active effect to Chapter/Episode card +- (r780 Suwayomi/Suwayomi-WebUI#25) add on hover, active effect to Chapter/Episode card - (r782-r785) updating material-ui to v5 changed the theme - (r785-r788) better `SourceCard` looks on mobile, move `SourceDataClass.isConfigurable` gear button to `SourceMangas` - (r789) implement source configuration @@ -648,7 +648,7 @@ # Server: v0.4.9 + WebUI: r769 -## Tachidesk-Server +## Suwayomi-Server ### Public API #### Non-breaking changes - N/A @@ -677,7 +677,7 @@ - (r873) `publish.yml` and `build_push.yml`: fix oopsies -## Tachidesk-WebUI +## Suwayomi-WebUI #### Visible changes - (r767-r769) Support for hiding NSFW content in settings screen, extensions screen, sources screen @@ -690,14 +690,14 @@ #### Non-code changes - (r42-r45) Change `README.md`: some links and stuff - (r45-r765) Add all of the commit history from when WebUI was separated from Server, jumping from r45 to r765 (r45 is exactly the same as r765) -- (r766) Steal `.gitattributes` from Tachidesk-Server +- (r766) Steal `.gitattributes` from Suwayomi-Server - (r767) Dependency cleanup in `package.json` # Server: v0.4.8 + WebUI: r41 -## Tachidesk-Server +## Suwayomi-Server ### Public API #### Non-breaking changes - Added support for serializing Search Filters @@ -708,19 +708,19 @@ #### Bug fixes - Fixed a bug where backup restore reversed chapter order -- Open Site feature now works properly (https://github.com/Suwayomi/Tachidesk-WebUI/issues/19) +- Open Site feature now works properly (https://github.com/Suwayomi/Suwayomi-WebUI/issues/19) ### Private API - Added `CloudflareInterceptor` from TachiWeb-Server - Restoring backup for mangas in library(merging manga data) is now supported -## Tachidesk-WebUI +## Suwayomi-WebUI #### Visible changes - Better looking manga card titles - Better reader title, next, prev buttons #### Bug fixes -- Open Site feature now works properly (https://github.com/Suwayomi/Tachidesk-WebUI/issues/19) +- Open Site feature now works properly (https://github.com/Suwayomi/Suwayomi-WebUI/issues/19) - Re-ordering categories now works #### Internal changes diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7c906ba8..549f3340 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Contributing ## Where should I start? -Checkout [This Kanban Board](https://github.com/Suwayomi/Tachidesk/projects/1) to see the rough development roadmap. +Checkout [This Kanban Board](https://github.com/Suwayomi/Suwayomi-Server/projects/1) to see the rough development roadmap. ### Important notes - Notify the developers on [Suwayomi discord](https://discord.gg/DDZdqZWaHA) (#tachidesk-server and #tachidesk-webui channels) or open a WIP pull request before starting if you decide to take on working on anything from/not from the roadmap in order to avoid parallel efforts on the same issue/feature. @@ -8,19 +8,19 @@ Checkout [This Kanban Board](https://github.com/Suwayomi/Tachidesk/projects/1) t - We hate big pull requests, make them as small as possible, change one meaningful thing. Spam pull requests, we don't mind. ### Project goals and vision -- Porting Tachiyomi and covering it's features -- Syncing with Tachiyomi, [main issue](https://github.com/Suwayomi/Tachidesk-Server/issues/159) +- Porting Tachiyomi and covering its features +- Syncing with Tachiyomi, [main issue](https://github.com/Suwayomi/Suwayomi-Server/issues/159) - Generally rejecting features that Tachiyomi(main app) doesn't have, - Unless it's something that makes sense for desktop sizes or desktop form factor (keyboard + mouse) - Additional/crazy features can go in forks and alternative clients -- [Tachidesk-WebUI](https://github.com/Suwayomi/Tachidesk-WebUI) should +- [Suwayomi-WebUI](https://github.com/Suwayomi/Suwayomi-WebUI) should - be responsive - support both desktop and mobile form factors well -## How does Tachidesk-Server work? +## How does Suwayomi-Server work? This project has two components: 1. **Server:** contains the implementation of [tachiyomi's extensions library](https://github.com/tachiyomiorg/extensions-lib) and uses an Android compatibility library to run jar libraries converted from apk extensions. All this concludes to serving a GraphQL API. -2. **WebUI:** A React SPA(`create-react-app`) project that works with the server to do the presentation located at https://github.com/Suwayomi/Tachidesk-WebUI +2. **WebUI:** A React SPA(`create-react-app`) project that works with the server to do the presentation located at https://github.com/Suwayomi/Suwayomi-WebUI ### API #### GraphQL @@ -38,8 +38,8 @@ The REST API can be queried at `/api/v1`. An interactive Swagger API explorer is ## Why a web app? This structure is chosen to - Achieve the maximum multi-platform-ness -- Gives the ability to access Tachidesk-Server from a remote client e.g., your phone, tablet or smart TV -- Ease development of user interfaces for Tachidesk +- Gives the ability to access Suwayomi-Server from a remote client e.g., your phone, tablet or smart TV +- Ease development of user interfaces for Suwayomi ## Building from source ### Prerequisites @@ -47,14 +47,14 @@ You need these software packages installed in order to build the project - Java Development Kit and Java Runtime Environment version 8 or newer(both Oracle JDK and OpenJDK works) -### building the full-blown jar (Tachidesk-Server + Tachidesk-WebUI bundle) -Run `./gradlew server:downloadWebUI server:shadowJar`, the resulting built jar file will be `server/build/Tachidesk-Server-vX.Y.Z-rxxx.jar`. +### building the full-blown jar (Suwayomi-Server + Suwayomi-WebUI bundle) +Run `./gradlew server:downloadWebUI server:shadowJar`, the resulting built jar file will be `server/build/Suwayomi-Server-vX.Y.Z-rxxx.jar`. ### building without `webUI` bundled (server only) -Delete `server/src/main/resources/WebUI.zip` if exists from previous runs, then run `./gradlew server:shadowJar`, the resulting built jar file will be `server/build/Tachidesk-Server-vX.Y.Z-rxxx.jar`. +Delete `server/src/main/resources/WebUI.zip` if exists from previous runs, then run `./gradlew server:shadowJar`, the resulting built jar file will be `server/build/Suwayomi-Server-vX.Y.Z-rxxx.jar`. ### building the Windows package -First Build the jar, then cd into the `scripts` directory and run `./windows-bundler.sh win32` or `./windows-bundler.sh win64` depending on the target architecture, the resulting built zip package file will be `server/build/Tachidesk-Server-vX.Y.Z-rxxx-winXX.zip`. +First Build the jar, then cd into the `scripts` directory and run `./windows-bundler.sh win32` or `./windows-bundler.sh win64` depending on the target architecture, the resulting built zip package file will be `server/build/Suwayomi-Server-vX.Y.Z-rxxx-winXX.zip`. ## Running in development mode run `./gradlew :server:run --stacktrace` to run the server diff --git a/README.md b/README.md index ddf3f8cd..6d19f5c4 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -| Build | Stable | Preview | Support Server | -|-------|----------|---------|---------| -| ![CI](https://github.com/Suwayomi/Tachidesk/actions/workflows/build_push.yml/badge.svg) | [![stable release](https://img.shields.io/github/release/Suwayomi/Tachidesk.svg?maxAge=3600&label=download)](https://github.com/Suwayomi/Tachidesk/releases) | [![preview](https://img.shields.io/badge/dynamic/json?url=https://github.com/Suwayomi/Tachidesk-preview/raw/main/index.json&label=download&query=$.latest&color=blue)](https://github.com/Suwayomi/Tachidesk-preview/releases/latest) | [![Discord](https://img.shields.io/discord/801021177333940224.svg?label=discord&labelColor=7289da&color=2c2f33&style=flat)](https://discord.gg/DDZdqZWaHA) | +| Build | Stable | Preview | Support Server | +|-----------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------| +| ![CI](https://github.com/Suwayomi/Suwayomi-Server/actions/workflows/build_push.yml/badge.svg) | [![stable release](https://img.shields.io/github/release/Suwayomi/Suwayomi-Server.svg?maxAge=3600&label=download)](https://github.com/Suwayomi/Suwayomi-Server/releases) | [![preview](https://img.shields.io/badge/dynamic/json?url=https://github.com/Suwayomi/Suwayomi-Server-preview/raw/main/index.json&label=download&query=$.latest&color=blue)](https://github.com/Suwayomi/Suwayomi-Server-preview/releases/latest) | [![Discord](https://img.shields.io/discord/801021177333940224.svg?label=discord&labelColor=7289da&color=2c2f33&style=flat)](https://discord.gg/DDZdqZWaHA) | ## Table of Content -- [What is Tachidesk?](#what-is-tachidesk) -- [Tachidesk client projects](#tachidesk-client-projects) +- [What is Suwayomi?](#what-is-suwayomi) +- [Suwayomi client projects](#Suwayomi-client-projects) * [Is this application usable? Should I test it?](#is-this-application-usable-should-i-test-it) - [Downloading and Running the app](#downloading-and-running-the-app) * [Using Operating System Specific Bundles](#using-operating-system-specific-bundles) @@ -13,13 +13,13 @@ + [Windows](#windows) + [macOS](#macos) + [GNU/Linux](#gnulinux) - * [Other methods of getting Tachidesk](#other-methods-of-getting-tachidesk) + * [Other methods of getting Suwayomi](#other-methods-of-getting-suwayomi) + [Arch Linux](#arch-linux) + [Ubuntu-based distributions](#ubuntu-based-distributions) + [Docker](#docker) * [Advanced Methods](#advanced-methods) + [Running the jar release directly](#running-the-jar-release-directly) - + [Using Tachidesk Remotely](#using-tachidesk-remotely) + + [Using Suwayomi Remotely](#using-suwayomi-remotely) - [Syncing With Tachiyomi](#syncing-with-tachiyomi) - [Troubleshooting and Support](#troubleshooting-and-support) - [Contributing and Technical info](#contributing-and-technical-info) @@ -27,28 +27,28 @@ - [License](#license) -# What is Tachidesk? -drawing +# What is Suwayomi? +drawing A free and open source manga reader server that runs extensions built for [Tachiyomi](https://tachiyomi.org/). -Tachidesk is an independent Tachiyomi compatible software and is **not a Fork of** Tachiyomi. +Suwayomi is an independent Tachiyomi compatible software and is **not a Fork of** Tachiyomi. -Tachidesk-Server is as multi-platform as you can get. Any platform that runs java and/or has a modern browser can run it. This includes Windows, Linux, macOS, chrome OS, etc. Follow [Downloading and Running the app](#downloading-and-running-the-app) for installation instructions. +Suwayomi-Server is as multi-platform as you can get. Any platform that runs java and/or has a modern browser can run it. This includes Windows, Linux, macOS, chrome OS, etc. Follow [Downloading and Running the app](#downloading-and-running-the-app) for installation instructions. Ability to sync with Tachiyomi is a planned feature, for more info look [here](#syncing-with-tachiyomi). -# Tachidesk client projects -**You need a client/user interface app as a front-end for Tachidesk-Server, if you [Directly Download Tachidesk-Server](https://github.com/Suwayomi/Tachidesk-Server/releases/latest) you'll get a bundled version of [Tachidesk-WebUI](https://github.com/Suwayomi/Tachidesk-WebUI) with it.** +# Suwayomi client projects +**You need a client/user interface app as a front-end for Suwayomi-Server, if you [Directly Download Suwayomi-Server](https://github.com/Suwayomi/Suwayomi-Server/releases/latest) you'll get a bundled version of [Suwayomi-WebUI](https://github.com/Suwayomi/Suwayomi-WebUI) with it.** -Here's a list of known clients/user interfaces for Tachidesk-Server: -##### Actively Developed Cients -- [Tachidesk-WebUI](https://github.com/Suwayomi/Tachidesk-WebUI): The web/ElectronJS front-end that Tachidesk-Server ships with by default. -- [Tachidesk-JUI](https://github.com/Suwayomi/Tachidesk-JUI): The native desktop front-end for Tachidesk-Server. Currently the most advanced. +Here's a list of known clients/user interfaces for Suwayomi-Server: +##### Actively Developed Clients +- [Suwayomi-WebUI](https://github.com/Suwayomi/Suwayomi-WebUI): The web/ElectronJS front-end that Suwayomi-Server ships with by default. +- [Tachidesk-JUI](https://github.com/Suwayomi/Tachidesk-JUI): The native desktop front-end for Suwayomi-Server. Currently, the most advanced. - [Tachidesk-qtui](https://github.com/Suwayomi/Tachidesk-qtui): A C++/Qt front-end for mobile devices(Android/linux), feature support is basic. -- [Tachidesk-Sorayomi](https://github.com/Suwayomi/Tachidesk-Sorayomi): A Flutter front-end for Desktop(Linux, windows, etc.), Web and Android with a User Inerface inspired by Tachiyomi. -- [Tachidesk-VaadinUI](https://github.com/Suwayomi/Tachidesk-VaadinUI): A Web front-end for Tachidesk-Server built with Vaadin. -##### Inctive/Abandoned Cients +- [Tachidesk-Sorayomi](https://github.com/Suwayomi/Tachidesk-Sorayomi): A Flutter front-end for Desktop(Linux, windows, etc.), Web and Android with a User Interface inspired by Tachiyomi. +- [Tachidesk-VaadinUI](https://github.com/Suwayomi/Tachidesk-VaadinUI): A Web front-end for Suwayomi-Server built with Vaadin. +##### Inctive/Abandoned Clients - [Equinox](https://github.com/Suwayomi/Equinox): A web user interface made with Vue.js. - [Tachidesk-GTK](https://github.com/mahor1221/Tachidesk-GTK): A native Rust/GTK desktop client. @@ -62,39 +62,32 @@ Here is a list of current features: - Backup and restore support powered by Tachiyomi-compatible Backups - Viewing latest updated chapters. -**Note:** These are capabilities of Tachidesk-Server, the actual working support is provided by each front-end app, checkout their respective readme for more info. +**Note:** These are capabilities of Suwayomi-Server, the actual working support is provided by each front-end app, checkout their respective readme for more info. # Downloading and Running the app ## Using Operating System Specific Bundles -To facilitate the use of Tachidesk we provide bundle releases that include The Java Runtime Environment, ElectronJS and 3 Tachidesk Launcher Scripts. +To facilitate the use of Suwayomi we provide bundle releases that include The Java Runtime Environment, ElectronJS and the Suwayomi-Launcher. -If a bundle for your operating system or cpu architecture is not provided then refer to [Advanced Methods](#advanced-methods) - -#### Launcher Scripts -- `Tachidesk Electron Launcher`: Launches Tachidesk inside Electron as a desktop applicaton -- `Tachidesk Browser Launcher`: Launches Tachidesk in a browser window -- `Tachidesk Debug Launcher`: Launches Tachidesk with debug logs attached. If Tachidesk doesn't work for you, running this can give you insight into why. - -**Node:** Linux launcher scripts are named a bit differently but work the same. +If a bundle for your operating system or cpu architecture is not provided then refer to [Advanced Methods](#advanced-methods) ### Windows -Download the latest `win32`(Windows 32-bit) or `win64`(Windows 64-bit) release from [the releases section](https://github.com/Suwayomi/Tachidesk-Server/releases) or a preview one from [the preview repository](https://github.com/Suwayomi/Tachidesk-Server-preview/releases). +Download the latest `win32`(Windows 32-bit) or `win64`(Windows 64-bit) release from [the releases section](https://github.com/Suwayomi/Suwayomi-Server/releases) or a preview one from [the preview repository](https://github.com/Suwayomi/Suwayomi-Server-preview/releases). -Unzip the downloaded file and double click on one of the launcher scripts. +Unzip the downloaded file and double-click on one of the launcher scripts. ### macOS -Download the latest `macOS-x64`(older macOS systems) or `macOS-arm64`(Apple M1 and newer) release from [the releases section](https://github.com/Suwayomi/Tachidesk-Server/releases) or a preview one from [the preview repository](https://github.com/Suwayomi/Tachidesk-Server-preview/releases). +Download the latest `macOS-x64`(older macOS systems) or `macOS-arm64`(Apple M1 and newer) release from [the releases section](https://github.com/Suwayomi/Suwayomi-Server/releases) or a preview one from [the preview repository](https://github.com/Suwayomi/Suwayomi-Server-preview/releases). -Unzip the downloaded file and double click on one of the launcher scripts. +Unzip the downloaded file and double-click on one of the launcher scripts. ### GNU/Linux -Download the latest `linux-x64`(x86_64) release from [the releases section](https://github.com/Suwayomi/Tachidesk-Server/releases) or a preview one from [the preview repository](https://github.com/Suwayomi/Tachidesk-Server-preview/releases). +Download the latest `linux-x64`(x86_64) release from [the releases section](https://github.com/Suwayomi/Suwayomi-Server/releases) or a preview one from [the preview repository](https://github.com/Suwayomi/Suwayomi-Server-preview/releases). -`tar xvf` the downloaded file and double click on one of the launcher scripts or run them using the terminal. +`tar xvf` the downloaded file and double-click on one of the launcher scripts or run them using the terminal. -## Other methods of getting Tachidesk +## Other methods of getting Suwayomi ### Arch Linux -You can install Tachidesk from the AUR: +You can install Suwayomi from the AUR: ``` yay -S tachidesk ``` @@ -102,20 +95,20 @@ yay -S tachidesk ### Debian/Ubuntu Download the latest deb package from the release section or Install from the MPR ``` -git clone https://mpr.makedeb.org/tachidesk-server.git -cd tachidesk-server +git clone https://mpr.makedeb.org/suwayomi-server.git +cd suwayomi-server makedeb -si ``` ### Ubuntu ``` -sudo add-apt-repository ppa:suwayomi/tachidesk-server +sudo add-apt-repository ppa:suwayomi/suwayomi-server sudo apt update -sudo apt install tachidesk-server +sudo apt install suwayomi-server ``` ### Docker -Check our Official Docker release [Tachidesk Container](https://github.com/orgs/Suwayomi/packages/container/package/tachidesk) for running Tachidesk Server in a docker container. Source code for our container is available at [docker-tachidesk](https://github.com/Suwayomi/docker-tachidesk). By default the server will be running on http://localhost:4567 open this url in your browser. +Check our Official Docker release [Suwayomi Container](https://github.com/orgs/Suwayomi/packages/container/package/tachidesk) for running Suwayomi Server in a docker container. Source code for our container is available at [docker-tachidesk](https://github.com/Suwayomi/docker-tachidesk). By default, the server will be running on http://localhost:4567 open this url in your browser. Install from the command line: ``` @@ -129,35 +122,35 @@ Run Container from the command line: ## Advanced Methods ### Running the jar release directly In order to run the app you need the following: -- The jar release of Tachidesk-Server +- The jar release of Suwayomi-Server - The Java Runtime Environment(JRE) 8 or newer - A Browser like Google Chrome, Firefox, Edge, etc. - ElectronJS (optional) -Download the latest `.jar` release from [the releases section](https://github.com/Suwayomi/Tachidesk-Server/releases) or a preview jar build from [the preview repository](https://github.com/Suwayomi/Tachidesk-preview/releases). +Download the latest `.jar` release from [the releases section](https://github.com/Suwayomi/Suwayomi-Server/releases) or a preview jar build from [the preview repository](https://github.com/Suwayomi/Suwayomi-Server-preview/releases). -Make sure you have The Java Runtime Environment installed on your system, Double click on the jar file or run `java -jar Tachidesk-vX.Y.Z-rxxxx.jar` from a Terminal/Command Prompt window to run the app which will open a new browser window automatically. +Make sure you have The Java Runtime Environment installed on your system, Double-click on the jar file or run `java -jar Suwayomi-Server-vX.Y.Z-rxxxx.jar` from a Terminal/Command Prompt window to run the app which will open a new browser window automatically. -### Using Tachidesk Remotely -You can run Tachidesk on your computer or a server and connect to it remotely through one of our clients or the bundled web interface with a web browser. This method of using Tachidesk is requires a bit of networking/firewall/port forwarding/server configuration/etc. knowledge on your side, if you can run a Minecraft server and configure it, then you are good to go. +### Using Suwayomi Remotely +You can run Suwayomi on your computer or a server and connect to it remotely through one of our clients or the bundled web interface with a web browser. This method of using Suwayomi is requiring a bit of networking/firewall/port forwarding/server configuration/etc. knowledge on your side, if you can run a Minecraft server and configure it, then you are good to go. -Check out [this wiki page](https://github.com/Suwayomi/Tachidesk-Server/wiki/Configuring-Tachidesk-Server) for a guide on configuring Tachidesk-Server. +Check out [this wiki page](https://github.com/Suwayomi/Suwayomi-Server/wiki/Configuring-Tachidesk-Server) for a guide on configuring Suwayomi-Server. -If you face issues with your setup then we are happy to provide help, just join our discord server(a discord badge is on the top of the page, you are just a click clack away!). +If you face issues with your setup then we are happy to provide help, just join our discord server(a discord badge is on the top of the page, you are just a click-clack away!). ## Syncing With Tachiyomi ### The Suwayomi extension and tracker - You can install the `Suwayomi` extension inside tachiyomi. -- The extension will load your Tachidesk library. +- The extension will load your Suwayomi library. - By manipulating extension search filters you can browse your categories. -- You can enable the Suwayomi tracker to track reading progress with your Tachidesk server. - - Note: Tachiyomi [only allowes tracking one way](https://github.com/tachiyomiorg/tachiyomi/issues/1626), meaning that by reading chapters on other Tachidesk clients the last read chapter number will updated on the tracker but tachiyomi won't automatically mark them as read for you. +- You can enable the Suwayomi tracker to track reading progress with your Suwayomi server. + - Note: Tachiyomi [only allows tracking one way](https://github.com/tachiyomiorg/tachiyomi/issues/1626), meaning that by reading chapters on other Suwayomi clients the last read chapter number will update on the tracker but tachiyomi won't automatically mark them as read for you. ### Other methods -Checkout [this issue](https://github.com/Suwayomi/Tachidesk-Server/issues/159) for tracking progress. +Checkout [this issue](https://github.com/Suwayomi/Suwayomi-Server/issues/159) for tracking progress. ## Troubleshooting and Support -See [this troubleshooting wiki page](https://github.com/Suwayomi/Tachidesk/wiki/Troubleshooting). +See [this troubleshooting wiki page](https://github.com/Suwayomi/Suwayomi-Server/wiki/Troubleshooting). ## Contributing and Technical info See [CONTRIBUTING.md](./CONTRIBUTING.md). diff --git a/build.gradle.kts b/build.gradle.kts index 49aa8723..54b15778 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,7 +18,7 @@ allprojects { repositories { mavenCentral() google() - maven("https://github.com/Suwayomi/Tachidesk-Server/raw/android-jar/") + maven("https://github.com/Suwayomi/Suwayomi-Server/raw/android-jar/") maven("https://jitpack.io") } } diff --git a/scripts/bundler.sh b/scripts/bundler.sh index 95d30aff..6758cf06 100755 --- a/scripts/bundler.sh +++ b/scripts/bundler.sh @@ -155,9 +155,9 @@ move_release_to_output_dir() { } download_launcher() { - LAUNCHER_URL=$(curl -s "https://api.github.com/repos/Suwayomi/Tachidesk-Launcher/releases/latest" | grep "browser_download_url" | grep ".jar" | head -n 1 | cut -d '"' -f 4) - curl -L "$LAUNCHER_URL" -o "Tachidesk-Launcher.jar" - mv "Tachidesk-Launcher.jar" "$RELEASE_NAME/Tachidesk-Launcher.jar" + LAUNCHER_URL=$(curl -s "https://api.github.com/repos/Suwayomi/Suwayomi-Launcher/releases/latest" | grep "browser_download_url" | grep ".jar" | head -n 1 | cut -d '"' -f 4) + curl -L "$LAUNCHER_URL" -o "Suwayomi-Launcher.jar" + mv "Suwayomi-Launcher.jar" "$RELEASE_NAME/Suwayomi-Launcher.jar" } download_jre_and_electron() { @@ -183,26 +183,26 @@ copy_linux_package_assets_to() { local output_dir output_dir="$(readlink -e "$1" || exit 1)" - cp "scripts/resources/pkg/tachidesk-server.sh" "$output_dir/" - cp "scripts/resources/pkg/tachidesk-server.desktop" "$output_dir/" - cp "scripts/resources/pkg/tachidesk-launcher.sh" "$output_dir/" - cp "scripts/resources/pkg/tachidesk-launcher.desktop" "$output_dir/" + cp "scripts/resources/pkg/suwayomi-server.sh" "$output_dir/" + cp "scripts/resources/pkg/suwayomi-server.desktop" "$output_dir/" + cp "scripts/resources/pkg/suwayomi-launcher.sh" "$output_dir/" + cp "scripts/resources/pkg/suwayomi-launcher.desktop" "$output_dir/" cp "scripts/resources/pkg/systemd"/* "$output_dir/" cp "server/src/main/resources/icon/faviconlogo-128.png" \ - "$output_dir/tachidesk-server.png" + "$output_dir/suwayomi-server.png" } make_linux_bundle() { - cp "$JAR" "$RELEASE_NAME/bin/Tachidesk-Server.jar" - cp "scripts/resources/tachidesk-launcher.sh" "$RELEASE_NAME/" - cp "scripts/resources/tachidesk-server.sh" "$RELEASE_NAME/" + cp "$JAR" "$RELEASE_NAME/bin/Suwayomi-Server.jar" + cp "scripts/resources/suwayomi-launcher.sh" "$RELEASE_NAME/" + cp "scripts/resources/suwayomi-server.sh" "$RELEASE_NAME/" tar -I "gzip -9" -cvf "$RELEASE" "$RELEASE_NAME/" } make_macos_bundle() { - cp "$JAR" "$RELEASE_NAME/bin/Tachidesk-Server.jar" - cp "scripts/resources/Tachidesk Launcher.command" "$RELEASE_NAME/" + cp "$JAR" "$RELEASE_NAME/bin/Suwayomi-Server.jar" + cp "scripts/resources/Suwayomi Launcher.command" "$RELEASE_NAME/" zip -9 -r "$RELEASE" "$RELEASE_NAME/" } @@ -211,13 +211,13 @@ make_macos_bundle() { # https://www.debian.org/doc/manuals/packaging-tutorial/packaging-tutorial.pdf make_deb_package() { #behind $RELEASE_VERSION is hyphen "-" - local source_dir="tachidesk-server-$RELEASE_VERSION" + local source_dir="suwayomi-server-$RELEASE_VERSION" #behind $RELEASE_VERSION is underscore "_" - local upstream_source="tachidesk-server_$RELEASE_VERSION.orig.tar.gz" + local upstream_source="suwayomi-server_$RELEASE_VERSION.orig.tar.gz" mkdir "$RELEASE_NAME/$source_dir/" - mv "$RELEASE_NAME/Tachidesk-Launcher.jar" "$RELEASE_NAME/$source_dir/Tachidesk-Launcher.jar" - cp "$JAR" "$RELEASE_NAME/$source_dir/Tachidesk-Server.jar" + mv "$RELEASE_NAME/Suwayomi-Launcher.jar" "$RELEASE_NAME/$source_dir/Suwayomi-Launcher.jar" + cp "$JAR" "$RELEASE_NAME/$source_dir/Suwayomi-Server.jar" copy_linux_package_assets_to "$RELEASE_NAME/$source_dir/" tar -I "gzip" -C "$RELEASE_NAME/" -cvf "$upstream_source" "$source_dir" @@ -231,7 +231,7 @@ make_deb_package() { dpkg-buildpackage --no-sign --build=all cd - - local deb="tachidesk-server_$RELEASE_VERSION-1_all.deb" + local deb="suwayomi-server_$RELEASE_VERSION-1_all.deb" mv "$RELEASE_NAME/$deb" "$RELEASE" } @@ -264,8 +264,8 @@ make_windows_bundle() { #WINEARCH=win32 wine "$rcedit" "$RELEASE_NAME/electron/electron.exe" \ # --set-icon "$icon" - cp "$JAR" "$RELEASE_NAME/bin/Tachidesk-Server.jar" - cp "scripts/resources/Tachidesk Launcher.bat" "$RELEASE_NAME" + cp "$JAR" "$RELEASE_NAME/bin/Suwayomi-Server.jar" + cp "scripts/resources/Suwayomi Launcher.bat" "$RELEASE_NAME" zip -9 -r "$RELEASE" "$RELEASE_NAME" } @@ -291,7 +291,7 @@ make_windows_package() { local arch=${OS##*-} wixl -D ProductVersion="$RELEASE_VERSION" -D SourceDir="$RELEASE_NAME" \ - -D Icon="$icon" --arch "$arch" "scripts/resources/msi/tachidesk-server-$arch.wxs" \ + -D Icon="$icon" --arch "$arch" "scripts/resources/msi/suwayomi-server-$arch.wxs" \ "$RELEASE_NAME/jre.wxs" "$RELEASE_NAME/electron.wxs" "$RELEASE_NAME/bin.wxs" -o "$RELEASE" } diff --git a/scripts/resources/Suwayomi Launcher.bat b/scripts/resources/Suwayomi Launcher.bat new file mode 100644 index 00000000..424c5f3d --- /dev/null +++ b/scripts/resources/Suwayomi Launcher.bat @@ -0,0 +1 @@ +start "" jre/bin/javaw -jar Suwayomi-Launcher.jar \ No newline at end of file diff --git a/scripts/resources/Suwayomi Launcher.command b/scripts/resources/Suwayomi Launcher.command new file mode 100644 index 00000000..113a9cad --- /dev/null +++ b/scripts/resources/Suwayomi Launcher.command @@ -0,0 +1,3 @@ +cd "`dirname "$0"`" + +./jre/Contents/Home/bin/java -jar Suwayomi-Launcher.jar \ No newline at end of file diff --git a/scripts/resources/Tachidesk Launcher.bat b/scripts/resources/Tachidesk Launcher.bat deleted file mode 100644 index 05e52cfb..00000000 --- a/scripts/resources/Tachidesk Launcher.bat +++ /dev/null @@ -1 +0,0 @@ -start "" jre/bin/javaw -jar Tachidesk-Launcher.jar \ No newline at end of file diff --git a/scripts/resources/Tachidesk Launcher.command b/scripts/resources/Tachidesk Launcher.command deleted file mode 100644 index dcd19680..00000000 --- a/scripts/resources/Tachidesk Launcher.command +++ /dev/null @@ -1,3 +0,0 @@ -cd "`dirname "$0"`" - -./jre/Contents/Home/bin/java -jar Tachidesk-Launcher.jar \ No newline at end of file diff --git a/scripts/resources/deb/changelog b/scripts/resources/deb/changelog index 278436e4..3ec15568 100644 --- a/scripts/resources/deb/changelog +++ b/scripts/resources/deb/changelog @@ -1,5 +1,5 @@ -tachidesk-server ($pkgver-$pkgrel) unstable; urgency=medium +suwayomi-server ($pkgver-$pkgrel) unstable; urgency=medium - * See CHANGELOG.md on https://github.com/Suwayomi/Tachidesk-Server + * See CHANGELOG.md on https://github.com/Suwayomi/Suwayomi-Server -- Mahor1221 Fri, 14 Jan 2022 00:00:00 +0000 diff --git a/scripts/resources/deb/control b/scripts/resources/deb/control index 4668c392..da7775b9 100644 --- a/scripts/resources/deb/control +++ b/scripts/resources/deb/control @@ -1,14 +1,14 @@ -Source: tachidesk-server +Source: suwayomi-server Section: web Priority: optional Maintainer: Mahor1221 Build-Depends: debhelper-compat (= 13), dh-exec Standards-Version: 4.5.1 -Homepage: https://github.com/Suwayomi/Tachidesk-Server +Homepage: https://github.com/Suwayomi/Suwayomi-Server -Package: tachidesk-server +Package: suwayomi-server Architecture: all Depends: ${misc:Depends}, java8-runtime, libc++-dev Description: Manga Reader A free and open source manga reader server that runs extensions built for Tachiyomi. - Tachidesk is an independent Tachiyomi compatible software and is not a Fork of Tachiyomi. + Suwayomi is an independent Tachiyomi compatible software and is not a Fork of Tachiyomi. diff --git a/scripts/resources/deb/copyright b/scripts/resources/deb/copyright index a815a450..d11b7847 100644 --- a/scripts/resources/deb/copyright +++ b/scripts/resources/deb/copyright @@ -1,7 +1,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: tachidesk-server Upstream-Contact: https://discord.gg/DDZdqZWaHA -Source: https://github.com/Suwayomi/Tachidesk-Server +Source: https://github.com/Suwayomi/Suwayomi-Server Files: * Copyright: Contributors to the Suwayomi project diff --git a/scripts/resources/deb/install b/scripts/resources/deb/install index b1640e3c..dd8bd73b 100755 --- a/scripts/resources/deb/install +++ b/scripts/resources/deb/install @@ -1,13 +1,13 @@ #!/usr/bin/dh-exec -Tachidesk-Server.jar usr/share/java/tachidesk-server/bin/ -Tachidesk-Launcher.jar usr/share/java/tachidesk-server/ -tachidesk-server.png usr/share/pixmaps/ -tachidesk-server.desktop usr/share/applications/ -tachidesk-launcher.desktop usr/share/applications/ -tachidesk-server.service usr/lib/systemd/system/ -tachidesk-server.sysusers => usr/lib/sysusers.d/tachidesk-server.conf -tachidesk-server.tmpfiles => usr/lib/tmpfiles.d/tachidesk-server.conf -tachidesk-server.conf => etc/tachidesk/server.conf -tachidesk-server.sh => usr/bin/tachidesk-server -tachidesk-launcher.sh => usr/bin/tachidesk-launcher +Suwayomi-Server.jar usr/share/java/suwayomi-server/bin/ +Suwayomi-Launcher.jar usr/share/java/suwayomi-server/ +suwayomi-server.png usr/share/pixmaps/ +suwayomi-server.desktop usr/share/applications/ +suwayomi-launcher.desktop usr/share/applications/ +suwayomi-server.service usr/lib/systemd/system/ +suwayomi-server.sysusers => usr/lib/sysusers.d/suwayomi-server.conf +suwayomi-server.tmpfiles => usr/lib/tmpfiles.d/suwayomi-server.conf +suwayomi-server.conf => etc/suwayomi/server.conf +suwayomi-server.sh => usr/bin/suwayomi-server +suwayomi-launcher.sh => usr/bin/suwayomi-launcher diff --git a/scripts/resources/deb/source/include-binaries b/scripts/resources/deb/source/include-binaries index 405559a7..a9bfb2e6 100644 --- a/scripts/resources/deb/source/include-binaries +++ b/scripts/resources/deb/source/include-binaries @@ -1 +1 @@ -tachidesk-server.png +suwayomi-server.png diff --git a/scripts/resources/msi/suwayomi-server-x64.wxs b/scripts/resources/msi/suwayomi-server-x64.wxs new file mode 100644 index 00000000..dcfd3e0e --- /dev/null +++ b/scripts/resources/msi/suwayomi-server-x64.wxs @@ -0,0 +1,64 @@ + + + + + + + + VersionNT64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/scripts/resources/msi/suwayomi-server-x86.wxs b/scripts/resources/msi/suwayomi-server-x86.wxs new file mode 100644 index 00000000..b5ea57ab --- /dev/null +++ b/scripts/resources/msi/suwayomi-server-x86.wxs @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/scripts/resources/msi/tachidesk-server-x64.wxs b/scripts/resources/msi/tachidesk-server-x64.wxs deleted file mode 100755 index 3acad684..00000000 --- a/scripts/resources/msi/tachidesk-server-x64.wxs +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - VersionNT64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/scripts/resources/msi/tachidesk-server-x86.wxs b/scripts/resources/msi/tachidesk-server-x86.wxs deleted file mode 100755 index e4c73475..00000000 --- a/scripts/resources/msi/tachidesk-server-x86.wxs +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/scripts/resources/pkg/tachidesk-launcher.desktop b/scripts/resources/pkg/suwayomi-launcher.desktop similarity index 50% rename from scripts/resources/pkg/tachidesk-launcher.desktop rename to scripts/resources/pkg/suwayomi-launcher.desktop index 8efced5f..3a076d85 100644 --- a/scripts/resources/pkg/tachidesk-launcher.desktop +++ b/scripts/resources/pkg/suwayomi-launcher.desktop @@ -1,8 +1,8 @@ [Desktop Entry] Type=Application -Name=Tachidesk-Launcher +Name=Suwayomi-Launcher Comment=Manga Reader -Exec=/usr/bin/java -jar /usr/share/java/tachidesk-server/Tachidesk-Launcher.jar "\\$@" +Exec=/usr/bin/java -jar /usr/share/java/tachidesk-server/Suwayomi-Launcher.jar "\\$@" Icon=tachidesk-server Terminal=false Categories=Network; diff --git a/scripts/resources/pkg/suwayomi-launcher.sh b/scripts/resources/pkg/suwayomi-launcher.sh new file mode 100644 index 00000000..81967d97 --- /dev/null +++ b/scripts/resources/pkg/suwayomi-launcher.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +exec /usr/bin/java -jar /usr/share/java/tachidesk-server/Suwayomi-Launcher.jar diff --git a/scripts/resources/pkg/suwayomi-server.desktop b/scripts/resources/pkg/suwayomi-server.desktop new file mode 100644 index 00000000..71748e2f --- /dev/null +++ b/scripts/resources/pkg/suwayomi-server.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=Suwayomi-Server +Comment=Manga Reader +Exec=/usr/bin/java -jar /usr/share/java/tachidesk-server/bin/Suwayomi-Server.jar "\\$@" +Icon=suwayomi-server +Terminal=false +Categories=Network; diff --git a/scripts/resources/pkg/suwayomi-server.sh b/scripts/resources/pkg/suwayomi-server.sh new file mode 100644 index 00000000..cf117fa3 --- /dev/null +++ b/scripts/resources/pkg/suwayomi-server.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +exec /usr/bin/java -jar /usr/share/java/tachidesk-server/bin/Suwayomi-Server.jar diff --git a/scripts/resources/pkg/systemd/tachidesk-server.conf b/scripts/resources/pkg/systemd/suwayomi-server.conf similarity index 87% rename from scripts/resources/pkg/systemd/tachidesk-server.conf rename to scripts/resources/pkg/systemd/suwayomi-server.conf index acc64b00..d8289fe5 100644 --- a/scripts/resources/pkg/systemd/tachidesk-server.conf +++ b/scripts/resources/pkg/systemd/suwayomi-server.conf @@ -1,4 +1,4 @@ -TACHIDESK_ROOT_DIR="/var/lib/tachidesk" +TACHIDESK_ROOT_DIR="/var/lib/suwayomi" # Extra arguments passed to the java command # The default value disables the system tray icon, and launching a browser on service start. diff --git a/scripts/resources/pkg/systemd/tachidesk-server.service b/scripts/resources/pkg/systemd/suwayomi-server.service similarity index 82% rename from scripts/resources/pkg/systemd/tachidesk-server.service rename to scripts/resources/pkg/systemd/suwayomi-server.service index 9a6d410f..84b65bdc 100644 --- a/scripts/resources/pkg/systemd/tachidesk-server.service +++ b/scripts/resources/pkg/systemd/suwayomi-server.service @@ -5,12 +5,12 @@ After=network-online.target [Service] Type=simple -User=tachidesk -Group=tachidesk -SyslogIdentifier=tachidesk +User=suwayomi +Group=suwayomi +SyslogIdentifier=suwayomi -EnvironmentFile=/etc/tachidesk/server.conf -ExecStart=/usr/bin/java $JAVA_ARGS -Dsuwayomi.tachidesk.config.server.rootDir="${TACHIDESK_ROOT_DIR}" -jar /usr/share/java/tachidesk-server/bin/Tachidesk-Server.jar +EnvironmentFile=/etc/suwayomi/server.conf +ExecStart=/usr/bin/java $JAVA_ARGS -Dsuwayomi.tachidesk.config.server.rootDir="${TACHIDESK_ROOT_DIR}" -jar /usr/share/java/tachidesk-server/bin/Suwayomi-Server.jar Restart=on-failure ProtectSystem=full diff --git a/scripts/resources/pkg/systemd/tachidesk-server.sysusers b/scripts/resources/pkg/systemd/suwayomi-server.sysusers similarity index 54% rename from scripts/resources/pkg/systemd/tachidesk-server.sysusers rename to scripts/resources/pkg/systemd/suwayomi-server.sysusers index 8a666c24..8af5d493 100644 --- a/scripts/resources/pkg/systemd/tachidesk-server.sysusers +++ b/scripts/resources/pkg/systemd/suwayomi-server.sysusers @@ -1,2 +1,2 @@ #Type Name ID GECOS Home directory Shell -u tachidesk - "Tachidesk Manga Server" /var/lib/tachidesk +u suwayomi - "Suwayomi Manga Server" /var/lib/suwayomi diff --git a/scripts/resources/pkg/systemd/tachidesk-server.tmpfiles b/scripts/resources/pkg/systemd/suwayomi-server.tmpfiles similarity index 56% rename from scripts/resources/pkg/systemd/tachidesk-server.tmpfiles rename to scripts/resources/pkg/systemd/suwayomi-server.tmpfiles index d967daa8..353cac50 100644 --- a/scripts/resources/pkg/systemd/tachidesk-server.tmpfiles +++ b/scripts/resources/pkg/systemd/suwayomi-server.tmpfiles @@ -1,2 +1,2 @@ #Type Path Mode User Group Age Argument -d /var/lib/tachidesk 0755 tachidesk tachidesk +d /var/lib/suwayomi 0755 suwayomi suwayomi diff --git a/scripts/resources/pkg/tachidesk-launcher.sh b/scripts/resources/pkg/tachidesk-launcher.sh deleted file mode 100644 index a6bf45a1..00000000 --- a/scripts/resources/pkg/tachidesk-launcher.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec /usr/bin/java -jar /usr/share/java/tachidesk-server/Tachidesk-Launcher.jar diff --git a/scripts/resources/pkg/tachidesk-server.desktop b/scripts/resources/pkg/tachidesk-server.desktop deleted file mode 100644 index 6e2b5d1a..00000000 --- a/scripts/resources/pkg/tachidesk-server.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Tachidesk-Server -Comment=Manga Reader -Exec=/usr/bin/java -jar /usr/share/java/tachidesk-server/bin/Tachidesk-Server.jar "\\$@" -Icon=tachidesk-server -Terminal=false -Categories=Network; diff --git a/scripts/resources/pkg/tachidesk-server.sh b/scripts/resources/pkg/tachidesk-server.sh deleted file mode 100644 index 4c7790fa..00000000 --- a/scripts/resources/pkg/tachidesk-server.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec /usr/bin/java -jar /usr/share/java/tachidesk-server/bin/Tachidesk-Server.jar diff --git a/scripts/resources/suwayomi-launcher.sh b/scripts/resources/suwayomi-launcher.sh new file mode 100644 index 00000000..db22a9d0 --- /dev/null +++ b/scripts/resources/suwayomi-launcher.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +exec ./jre/bin/java -jar ./Suwayomi-Launcher.jar diff --git a/scripts/resources/suwayomi-server.sh b/scripts/resources/suwayomi-server.sh new file mode 100644 index 00000000..fb1b1933 --- /dev/null +++ b/scripts/resources/suwayomi-server.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +exec ./jre/bin/java -jar ./bin/Suwayomi-Server.jar diff --git a/scripts/resources/tachidesk-launcher.sh b/scripts/resources/tachidesk-launcher.sh deleted file mode 100644 index 0e66d00d..00000000 --- a/scripts/resources/tachidesk-launcher.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec ./jre/bin/java -jar ./Tachidesk-Launcher.jar diff --git a/scripts/resources/tachidesk-server.sh b/scripts/resources/tachidesk-server.sh deleted file mode 100644 index 8281d5d1..00000000 --- a/scripts/resources/tachidesk-server.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec ./jre/bin/java -jar ./bin/Tachidesk-Server.jar diff --git a/server/build.gradle.kts b/server/build.gradle.kts index 4da1cdde..43038adf 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -113,7 +113,7 @@ buildConfig { buildConfigField("String", "WEBUI_TAG", quoteWrap(webUIRevisionTag)) - buildConfigField("String", "GITHUB", quoteWrap("https://github.com/Suwayomi/Tachidesk-Server")) + buildConfigField("String", "GITHUB", quoteWrap("https://github.com/Suwayomi/Suwayomi-Server")) buildConfigField("String", "DISCORD", quoteWrap("https://discord.gg/DDZdqZWaHA")) } @@ -158,7 +158,7 @@ tasks { } register("downloadWebUI") { - src("https://github.com/Suwayomi/Tachidesk-WebUI-preview/releases/download/$webUIRevisionTag/Tachidesk-WebUI-$webUIRevisionTag.zip") + src("https://github.com/Suwayomi/Suwayomi-WebUI-preview/releases/download/$webUIRevisionTag/Suwayomi-WebUI-$webUIRevisionTag.zip") dest("src/main/resources/WebUI.zip") fun shouldOverwrite(): Boolean { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/global/controller/SettingsController.kt b/server/src/main/kotlin/suwayomi/tachidesk/global/controller/SettingsController.kt index dfd37d43..c9ddea29 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/global/controller/SettingsController.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/global/controller/SettingsController.kt @@ -23,7 +23,7 @@ object SettingsController { handler( documentWith = { withOperation { - summary("About Tachidesk") + summary("About Suwayomi-Server") description("Returns some static info about the current app build") } }, @@ -40,7 +40,7 @@ object SettingsController { handler( documentWith = { withOperation { - summary("Tachidesk update check") + summary("Suwayomi-Server update check") description("Check for app updates") } }, diff --git a/server/src/main/kotlin/suwayomi/tachidesk/global/impl/AppUpdate.kt b/server/src/main/kotlin/suwayomi/tachidesk/global/impl/AppUpdate.kt index 0a2d9312..aa2bac5e 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/global/impl/AppUpdate.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/global/impl/AppUpdate.kt @@ -23,8 +23,8 @@ data class UpdateDataClass( ) object AppUpdate { - private const val LATEST_STABLE_CHANNEL_URL = "https://api.github.com/repos/Suwayomi/Tachidesk/releases/latest" - private const val LATEST_PREVIEW_CHANNEL_URL = "https://api.github.com/repos/Suwayomi/Tachidesk-preview/releases/latest" + private const val LATEST_STABLE_CHANNEL_URL = "https://api.github.com/repos/Suwayomi/Suwayomi-Server/releases/latest" + private const val LATEST_PREVIEW_CHANNEL_URL = "https://api.github.com/repos/Suwayomi/Suwayomi-Server-preview/releases/latest" private val json: Json by injectLazy() private val network: NetworkHelper by injectLazy() diff --git a/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/TachideskGraphQLContextFactory.kt b/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/TachideskGraphQLContextFactory.kt index b5bc5ed6..679c1c65 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/TachideskGraphQLContextFactory.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/TachideskGraphQLContextFactory.kt @@ -15,7 +15,7 @@ import io.javalin.http.Context import io.javalin.websocket.WsContext /** - * Custom logic for how Tachidesk should create its context given the [Context] + * Custom logic for how Suwayomi-Server should create its context given the [Context] */ class TachideskGraphQLContextFactory : GraphQLContextFactory { override suspend fun generateContextMap(request: Context): Map<*, Any> = emptyMap() diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/JavalinSetup.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/JavalinSetup.kt index d05513a8..35467ef7 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/server/JavalinSetup.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/server/JavalinSetup.kt @@ -155,13 +155,13 @@ object JavalinSetup { val applicationInfo = Info().apply { version("1.0") - description("Tachidesk Api") + description("Suwayomi-Server Api") } return OpenApiOptions(applicationInfo).apply { path("/api/openapi.json") swagger( SwaggerOptions("/api/swagger-ui").apply { - title("Tachidesk Swagger Documentation") + title("Suwayomi-Server Swagger Documentation") }, ) } diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt index 6761080a..f1b9cbc6 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt @@ -102,7 +102,7 @@ fun applicationSetup() { // gql "notprivacysafe" logs every received request multiple times (received, parsing, validating, executing) setupLogLevelUpdating(serverConfig.gqlDebugLogsEnabled, listOf("graphql", "notprivacysafe"), Level.WARN) - logger.info("Running Tachidesk ${BuildConfig.VERSION} revision ${BuildConfig.REVISION}") + logger.info("Running Suwayomi-Server ${BuildConfig.VERSION} revision ${BuildConfig.REVISION}") logger.debug { "Loaded config:\n" + @@ -196,7 +196,7 @@ fun applicationSetup() { logger.error("Exception while copying Local source's icon", e) } - // fixes #119 , ref: https://github.com/Suwayomi/Tachidesk-Server/issues/119#issuecomment-894681292 , source Id calculation depends on String.lowercase() + // fixes #119 , ref: https://github.com/Suwayomi/Suwayomi-Server/issues/119#issuecomment-894681292 , source Id calculation depends on String.lowercase() Locale.setDefault(Locale.ENGLISH) databaseUp() diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/util/AppExit.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/util/AppExit.kt index 8d7fb3dd..871e6a54 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/server/util/AppExit.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/server/util/AppExit.kt @@ -19,7 +19,7 @@ enum class ExitCode(val code: Int) { } fun shutdownApp(exitCode: ExitCode) { - logger.info("Shutting Down Tachidesk. Goodbye!") + logger.info("Shutting Down Suwayomi-Server. Goodbye!") exitProcess(exitCode.code) } diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/util/AppMutex.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/util/AppMutex.kt index 4478ac4d..ab6813e3 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/server/util/AppMutex.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/server/util/AppMutex.kt @@ -67,9 +67,9 @@ object AppMutex { logger.info("Mutex status is clear, Resuming startup.") } AppMutexState.TachideskInstanceRunning -> { - logger.info("Another instance of Tachidesk is running on $appIP:${serverConfig.port.value}") + logger.info("Another instance of Suwayomi-Server is running on $appIP:${serverConfig.port.value}") - logger.info("Probably user thought tachidesk is closed so, opening webUI in browser again.") + logger.info("Probably user thought Suwayomi-Server is closed so, opening webUI in browser again.") openInBrowser() logger.info("Aborting startup.") @@ -77,7 +77,7 @@ object AppMutex { shutdownApp(MutexCheckFailedTachideskRunning) } AppMutexState.OtherApplicationRunning -> { - logger.error("A non Tachidesk application is running on $appIP:${serverConfig.port.value}, aborting startup.") + logger.error("A non Suwayomi-Server application is running on $appIP:${serverConfig.port.value}, aborting startup.") shutdownApp(MutexCheckFailedAnotherAppRunning) } } diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/util/SystemTray.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/util/SystemTray.kt index fae0835f..e000b261 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/server/util/SystemTray.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/server/util/SystemTray.kt @@ -40,7 +40,7 @@ object SystemTray { mainMenu.add( MenuItem( - "Open Tachidesk", + "Open Suwayomi", ) { openInBrowser() }, diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/util/WebInterfaceManager.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/util/WebInterfaceManager.kt index c00dbe74..f3accc80 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/server/util/WebInterfaceManager.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/server/util/WebInterfaceManager.kt @@ -102,10 +102,10 @@ enum class WebUIFlavor( ) { WEBUI( "WebUI", - "https://github.com/Suwayomi/Tachidesk-WebUI-preview", - "https://raw.githubusercontent.com/Suwayomi/Tachidesk-WebUI/master/versionToServerVersionMapping.json", - "https://api.github.com/repos/Suwayomi/Tachidesk-WebUI-preview/releases/latest", - "Tachidesk-WebUI", + "https://github.com/Suwayomi/Suwayomi-WebUI-preview", + "https://raw.githubusercontent.com/Suwayomi/Suwayomi-WebUI/master/versionToServerVersionMapping.json", + "https://api.github.com/repos/Suwayomi/Suwayomi-WebUI-preview/releases/latest", + "Suwayomi-WebUI", ), CUSTOM( diff --git a/server/src/test/kotlin/suwayomi/tachidesk/test/ApplicationTest.kt b/server/src/test/kotlin/suwayomi/tachidesk/test/ApplicationTest.kt index dc474c68..2d0c3143 100644 --- a/server/src/test/kotlin/suwayomi/tachidesk/test/ApplicationTest.kt +++ b/server/src/test/kotlin/suwayomi/tachidesk/test/ApplicationTest.kt @@ -148,7 +148,7 @@ open class ApplicationTest { } fun databaseSetup() { - // fixes #119 , ref: https://github.com/Suwayomi/Tachidesk-Server/issues/119#issuecomment-894681292 , source Id calculation depends on String.lowercase() + // fixes #119 , ref: https://github.com/Suwayomi/Suwayomi-Server/issues/119#issuecomment-894681292 , source Id calculation depends on String.lowercase() Locale.setDefault(Locale.ENGLISH) // in-memory database, don't discard database between connections/transactions diff --git a/settings.gradle.kts b/settings.gradle.kts index f33b86e7..c56ccc71 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,4 +1,4 @@ -rootProject.name = System.getenv("ProductName") ?: "Tachidesk-Server" +rootProject.name = System.getenv("ProductName") ?: "Suwayomi-Server" include("server")