Rename to Suwayomi-JUI

This commit is contained in:
Syer10
2024-03-30 16:40:26 -04:00
parent 37f9bdaf8d
commit 0a00f74cde
15 changed files with 48 additions and 48 deletions

View File

@@ -23,7 +23,7 @@ Note that the issue will be automatically closed if you do not fill out the titl
--- ---
## Device information ## Device information
- Tachidesk-JUI version: (Example: v1.3.2) - Suwayomi-JUI version: (Example: v1.3.2)
- Operating System: (Example: Ubuntu 20.04) - Operating System: (Example: Ubuntu 20.04)
- Desktop Environment: (Example: Gnome 40) - Desktop Environment: (Example: Gnome 40)
- Server Type: (Example: Internal) - Server Type: (Example: Internal)

View File

@@ -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-JUI? ## What feature should be added to Suwayomi-JUI?
Explain What the feature is and how it should work in detail. Remove this line after you are done. 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 ## Why/Project's Benefit/Existing Problem

View File

@@ -196,7 +196,7 @@ jobs:
exclude_types: "draft|prerelease" exclude_types: "draft|prerelease"
view_top: 1 view_top: 1
owner: Suwayomi owner: Suwayomi
repo: Tachidesk-JUI-preview repo: Suwayomi-JUI-preview
- name: Prepare build - name: Prepare build
run: | run: |
@@ -211,7 +211,7 @@ jobs:
echo "PREV_RELEASE_SHA=$prev_release_sha" >> $GITHUB_ENV echo "PREV_RELEASE_SHA=$prev_release_sha" >> $GITHUB_ENV
echo "COMMIT_LOGS<<{delimiter} echo "COMMIT_LOGS<<{delimiter}
$(curl -H "Accept: application/vnd.github.v3+json" \ $(curl -H "Accept: application/vnd.github.v3+json" \
"https://api.github.com/repos/suwayomi/tachidesk-jui/compare/$prev_release_sha...$current_sha" \ "https://api.github.com/repos/suwayomi/suwayomi-jui/compare/$prev_release_sha...$current_sha" \
| jq '[.commits[]|{message:(.commit.message | split("\n")), username:.author.login}]' \ | jq '[.commits[]|{message:(.commit.message | split("\n")), username:.author.login}]' \
| jq -r '.[]|"- \(.message | first) (@\(.username))"') | jq -r '.[]|"- \(.message | first) (@\(.username))"')
{delimiter}" >> $GITHUB_ENV {delimiter}" >> $GITHUB_ENV
@@ -220,12 +220,12 @@ jobs:
with: with:
artifacts: "*/binaries/main/*/*.*,*/binaries/main-release/*/*.*,*/jars/*.jar,*/android/build/outputs/apk/release/*.apk" artifacts: "*/binaries/main/*/*.*,*/binaries/main-release/*/*.*,*/jars/*.jar,*/android/build/outputs/apk/release/*.apk"
token: ${{ secrets.DEPLOY_PREVIEW_TOKEN }} token: ${{ secrets.DEPLOY_PREVIEW_TOKEN }}
repo: Tachidesk-JUI-preview repo: Suwayomi-JUI-preview
tag: r${{ env.COMMIT_COUNT }} tag: r${{ env.COMMIT_COUNT }}
name: Tachidesk-JUI Preview r${{ env.COMMIT_COUNT }} name: Suwayomi-JUI Preview r${{ env.COMMIT_COUNT }}
body: | body: |
### Commits ### Commits
https://github.com/Suwayomi/Tachidesk-JUI/compare/${{ env.PREV_RELEASE_SHA }}...${{ env.CURRENT_SHA }} https://github.com/Suwayomi/Suwayomi-JUI/compare/${{ env.PREV_RELEASE_SHA }}...${{ env.CURRENT_SHA }}
${{ env.COMMIT_LOGS }} ${{ env.COMMIT_LOGS }}
@@ -236,4 +236,4 @@ jobs:
with: with:
keep_latest: 15 keep_latest: 15
delete_tags: true delete_tags: true
repo: Suwayomi/Tachidesk-JUI-preview repo: Suwayomi/Suwayomi-JUI-preview

View File

@@ -26,7 +26,7 @@ jobs:
}, },
{ {
"type": "body", "type": "body",
"regex": "(Tachidesk\\-JUI version|Operating System|Desktop Environment|Server Type|Client JVM version|Server JVM version):.*(\\(Example:|<usually).*", "regex": "(Suwayomi\\-JUI version|Operating System|Desktop Environment|Server Type|Client JVM version|Server JVM version):.*(\\(Example:|<usually).*",
"message": "The requested information was not filled out" "message": "The requested information was not filled out"
}, },
{ {

View File

@@ -1,5 +1,5 @@
<component name="ProjectRunConfigurationManager"> <component name="ProjectRunConfigurationManager">
<configuration default="false" name="Tachidesk-JUI Run Debug" type="GradleRunConfiguration" factoryName="Gradle"> <configuration default="false" name="Suwayomi-JUI Run Debug" type="GradleRunConfiguration" factoryName="Gradle">
<ExternalSystemSettings> <ExternalSystemSettings>
<option name="executionName" /> <option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />

View File

@@ -1,14 +1,14 @@
![image](resources/icon.png) ![image](resources/icon.png)
# Tachidesk-JUI # Suwayomi-JUI
A free and open source manga reader to read manga from a [Tachidesk-Server][tachidesk-server] instance. A free and open source manga reader to read manga from a [Suwayomi-Server][tachidesk-server] instance.
Tachidesk-JUI can run Tachidesk-Server on its own on desktop platforms, or connect to an already hosted server. Suwayomi-JUI can run Suwayomi-Server on its own on desktop platforms, or connect to an already hosted server.
Android and any desktop platform that runs Java can run it. On most platforms are binaries available if you don't want to install Java yourself. Android and any desktop platform that runs Java can run it. On most platforms are binaries available if you don't want to install Java yourself.
## Is this application usable? Should I test it? ## Is this application usable? Should I test it?
Here is a list of current features for interaction with Tachidesk-JUI: Here is a list of current features for interaction with Suwayomi-JUI:
- Managing installed Extensions. - Managing installed Extensions.
- Interaction with your library. - Interaction with your library.
@@ -18,14 +18,14 @@ Here is a list of current features for interaction with Tachidesk-JUI:
- Viewing chapter updates - Viewing chapter updates
- Globally search sources - Globally search sources
**Note:** Keep in mind that Tachidesk-JUI and Tachidesk-Server are alpha software, so it can have issues. See [General troubleshooting](#general-troubleshooting) and [Support and help](#support-and-help) if it happens. **Note:** Keep in mind that Suwayomi-JUI is alpha software, so it can have issues. See [General troubleshooting](#general-troubleshooting) and [Support and help](#support-and-help) if it happens.
### Supported Tachidesk versions ### Supported Suwayomi-Server versions
These are the versions of [Tachidesk-Server][tachidesk-server] that JUI supports. These are the versions of [Suwayomi-Server][tachidesk-server] that JUI supports.
#### [Release build][release] #### [Release build][release]
- [Tachidesk-Server][tachidesk-server] v0.7.0+ - [Suwayomi-Server][tachidesk-server] v1.0.0+
#### [Preview build][preview] #### [Preview build][preview]
- [Tachidesk-Server Preview][tachidesk-server-preview] v0.7.0-r1197+ - [Suwayomi-Server Preview][tachidesk-server-preview] v1.0.0-r1498+
## Downloading and Running the app ## Downloading and Running the app
### All Desktop Operating Systems (x64, Java Not Included) ### All Desktop Operating Systems (x64, Java Not Included)
@@ -33,7 +33,7 @@ You should have [Java(JRE or JDK) 17](https://adoptium.net/) or newer.
Download the latest jar release for your OS from [the releases section][release] (Or from [the preview releases][preview]). Download the latest jar release for your OS from [the releases section][release] (Or from [the preview releases][preview]).
Double-click on the jar file or run `java -jar Tachidesk-JUI-os-arch-X.Y.Z.jar` from a Terminal/Command Prompt window to run the app. Double-click on the jar file or run `java -jar Suwayomi-JUI-os-arch-X.Y.Z.jar` from a Terminal/Command Prompt window to run the app.
### Windows (x64, Java 8+ required for server) ### Windows (x64, Java 8+ required for server)
#### Installer #### Installer
@@ -73,14 +73,14 @@ Make sure you have used either an installer, or you have Java 17 installed.
Make sure that if you used an installer, that you have at least Java 8 installed. Make sure that if you used an installer, that you have at least Java 8 installed.
## Support and help ## Support and help
Join Tachidesk's [discord server](https://discord.gg/DDZdqZWaHA) to hang out with the community and receive support and help. Join Suwayomi's [discord server](https://discord.gg/DDZdqZWaHA) to hang out with the community and receive support and help.
## Building from source ## Building from source
### Prerequisite: Software dependencies ### Prerequisite: Software dependencies
You need this software packages installed in order to build this project: You need this software packages installed in order to build this project:
- Java Development Kit and Java Runtime Environment version 17, this can be handled by IntelliJ - Java Development Kit and Java Runtime Environment version 17, this can be handled by IntelliJ
### Building a jar for your OS ### Building a jar for your OS
Run `./gradlew packageUberJarForCurrentOS`, the resulting built jar file will be `build/compose/Tachidesk-JUI-os-arch-X.Y.Z.jar`. Run `./gradlew packageUberJarForCurrentOS`, the resulting built jar file will be `build/compose/Suwayomi-JUI-os-arch-X.Y.Z.jar`.
### Running without package ### Running without package
Run `./gradlew run`, JUI will build and run. Use this for debugging and development purposes. Run `./gradlew run`, JUI will build and run. Use this for debugging and development purposes.
@@ -95,7 +95,7 @@ Feel free to translate the project on [Weblate](https://hosted.weblate.org/proje
</details> </details>
## Credit ## Credit
The `Tachidesk-Server` project is developed by [@AriaMoradi](https://github.com/AriaMoradi) and contributors, a link for [Tachidesk-Server is provided here][tachidesk-server] and is licensed under `Mozilla Public License v2.0`. The `Suwayomi-Server` project is developed by [@AriaMoradi](https://github.com/AriaMoradi) and contributors, a link for [Suwayomi-Server is provided here][tachidesk-server] and is licensed under `Mozilla Public License v2.0`.
Parts of [Tachiyomi-1.x](https://github.com/tachiyomiorg/tachiyomi-1.x) is adopted into this codebase, also licensed under `Mozilla Public License v2.0`. Parts of [Tachiyomi-1.x](https://github.com/tachiyomiorg/tachiyomi-1.x) is adopted into this codebase, also licensed under `Mozilla Public License v2.0`.
@@ -110,7 +110,7 @@ You can obtain a copy of `Mozilla Public License v2.0` from https://mozilla.org/
file, You can obtain one at http://mozilla.org/MPL/2.0/. file, You can obtain one at http://mozilla.org/MPL/2.0/.
[release]: https://github.com/Suwayomi/Tachidesk-JUI/releases [release]: https://github.com/Suwayomi/Suwayomi-JUI/releases
[preview]: https://github.com/Suwayomi/Tachidesk-JUI-preview/releases [preview]: https://github.com/Suwayomi/Suwayomi-JUI-preview/releases
[tachidesk-server]: https://github.com/Suwayomi/Tachidesk-Server [tachidesk-server]: https://github.com/Suwayomi/Suwayomi-Server
[tachidesk-server-preview]: https://github.com/Suwayomi/Tachidesk-Server-preview/releases [tachidesk-server-preview]: https://github.com/Suwayomi/Suwayomi-Server-preview/releases

View File

@@ -3,9 +3,9 @@ import org.gradle.api.JavaVersion
object Config { object Config {
const val migrationCode = 4 const val migrationCode = 4
// Tachidesk-Server version // Suwayomi-Server version
const val tachideskVersion = "v1.0.0" const val tachideskVersion = "v1.0.0"
// Match this to the Tachidesk-Server commit count // Match this to the Suwayomi-Server commit count
const val serverCode = 1498 const val serverCode = 1498
const val preview = false const val preview = false
const val previewCommit = "54df9d634a1e83143a6cacf6206b6504721b6ca8" const val previewCommit = "54df9d634a1e83143a6cacf6206b6504721b6ca8"

View File

@@ -177,11 +177,11 @@ compose.desktop {
) )
packageName = if (!isPreview) { packageName = if (!isPreview) {
"Tachidesk-JUI" "Suwayomi-JUI"
} else { } else {
"Tachidesk-JUI Preview" "Suwayomi-JUI Preview"
} }
description = "Tachidesk-JUI is a Jvm client for a Tachidesk Server" description = "Suwayomi-JUI is a Jvm client for Suwayomi-Server"
copyright = "Mozilla Public License v2.0" copyright = "Mozilla Public License v2.0"
vendor = "Suwayomi" vendor = "Suwayomi"
if (isPreview) { if (isPreview) {

View File

@@ -65,11 +65,11 @@ class UpdateChecker
val newVersion = versionTag.replace("[^\\d.]".toRegex(), "") val newVersion = versionTag.replace("[^\\d.]".toRegex(), "")
return if (BuildKonfig.IS_PREVIEW) { return if (BuildKonfig.IS_PREVIEW) {
// Preview builds: based on releases in "Suwayomi/Tachidesk-JUI-preview" repo // Preview builds: based on releases in "Suwayomi/Suwayomi-JUI-preview" repo
// tagged as something like "r123" // tagged as something like "r123"
newVersion.toInt() > BuildKonfig.PREVIEW_BUILD newVersion.toInt() > BuildKonfig.PREVIEW_BUILD
} else { } else {
// Release builds: based on releases in "Suwayomi/Tachidesk-JUI" repo // Release builds: based on releases in "Suwayomi/Suwayomi-JUI" repo
// tagged as something like "v1.1.2" // tagged as something like "v1.1.2"
newVersion != BuildKonfig.VERSION newVersion != BuildKonfig.VERSION
} }
@@ -77,9 +77,9 @@ class UpdateChecker
companion object { companion object {
private val GITHUB_REPO = if (BuildKonfig.IS_PREVIEW) { private val GITHUB_REPO = if (BuildKonfig.IS_PREVIEW) {
"Suwayomi/Tachidesk-JUI-preview" "Suwayomi/Suwayomi-JUI-preview"
} else { } else {
"Suwayomi/Tachidesk-JUI" "Suwayomi/Suwayomi-JUI"
} }
private val RELEASE_TAG: String by lazy { private val RELEASE_TAG: String by lazy {

View File

@@ -6,14 +6,14 @@
--> -->
<resources> <resources>
<string name="app_name" translatable="false">Tachidesk-JUI</string> <string name="app_name" translatable="false">Suwayomi-JUI</string>
<!-- Main Menu --> <!-- Main Menu -->
<string name="unable_to_start_server">Cannot start server</string> <string name="unable_to_start_server">Cannot start server</string>
<string name="confirm_exit">Confirm exit</string> <string name="confirm_exit">Confirm exit</string>
<string name="confirm_exit_message">Are you sure you want to exit?</string> <string name="confirm_exit_message">Are you sure you want to exit?</string>
<string name="confirm_exit_toast">Press back again to exit</string> <string name="confirm_exit_toast">Press back again to exit</string>
<string name="new_update_title">Tachidesk-JUI update available</string> <string name="new_update_title">Suwayomi-JUI update available</string>
<string name="new_update_message">%1$s is now available!</string> <string name="new_update_message">%1$s is now available!</string>
<!-- Actions --> <!-- Actions -->

View File

@@ -1,3 +1,3 @@
TEAM_ID= TEAM_ID=
BUNDLE_ID=ca.gosyer.jui.Tachidesk-JUI BUNDLE_ID=ca.gosyer.jui.Suwayomi-JUI
APP_NAME=Tachidesk-JUI APP_NAME=Suwayomi-JUI

View File

@@ -17,7 +17,7 @@
058557BA273AAA24004C7B11 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; }; 058557BA273AAA24004C7B11 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; }; 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
2152FB032600AC8F00CF470E /* iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSApp.swift; sourceTree = "<group>"; }; 2152FB032600AC8F00CF470E /* iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSApp.swift; sourceTree = "<group>"; };
7555FF7B242A565900829871 /* .app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; name = .app; path = "Tachidesk-JUI.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 7555FF7B242A565900829871 /* .app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; name = .app; path = "Suwayomi-JUI.app"; sourceTree = BUILT_PRODUCTS_DIR; };
7555FF82242A565900829871 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; }; 7555FF82242A565900829871 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
AB3632DC29227652001CCB65 /* Config.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Config.xcconfig; sourceTree = "<group>"; }; AB3632DC29227652001CCB65 /* Config.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Config.xcconfig; sourceTree = "<group>"; };

View File

@@ -237,7 +237,7 @@ enum class Link(
val icon: LinkIcon, val icon: LinkIcon,
val uri: String, val uri: String,
) { ) {
Github(MR.strings.github, LinkIcon.Resource(MR.images.github), "https://github.com/Suwayomi/Tachidesk-JUI"), Github(MR.strings.github, LinkIcon.Resource(MR.images.github), "https://github.com/Suwayomi/Suwayomi-JUI"),
Discord(MR.strings.discord, LinkIcon.Resource(MR.images.discord), "https://discord.gg/DDZdqZWaHA"), Discord(MR.strings.discord, LinkIcon.Resource(MR.images.discord), "https://discord.gg/DDZdqZWaHA"),
Reddit(MR.strings.reddit, LinkIcon.Resource(MR.images.reddit), "https://reddit.com/r/Tachidesk/"), Reddit(MR.strings.reddit, LinkIcon.Resource(MR.images.reddit), "https://reddit.com/r/Tachidesk/"),
} }

View File

@@ -1,9 +1,9 @@
#!/bin/bash #!/bin/bash
if [[ "$*" == *"preview"* ]]; then if [[ "$*" == *"preview"* ]]; then
name="Tachidesk-JUI-Preview" name="Suwayomi-JUI-Preview"
else else
name="Tachidesk-JUI" name="Suwayomi-JUI"
fi fi
msi="$(find ./ -iname '*.msi' 2>/dev/null)" msi="$(find ./ -iname '*.msi' 2>/dev/null)"

View File

@@ -14,7 +14,7 @@ dependencyResolutionManagement {
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
} }
} }
rootProject.name = "Tachidesk-JUI" rootProject.name = "Suwayomi-JUI"
include("core") include("core")
include("i18n") include("i18n")