Rename "mangaDownloadsRoot" to "downloadRoot"

Suwayomi · Jul 13, 2023 · 98095db · 98095db
1 parent f3d2955
commit 98095db
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/DirName.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/DirName.kt
@@ -49,7 +49,7 @@ fun getThumbnailDownloadPath(mangaId: Int): String {
 }
 
 fun getChapterDownloadPath(mangaId: Int, chapterId: Int): String {
-    return applicationDirs.mangaDownloadsRoot + "/" + getChapterDir(mangaId, chapterId)
+    return applicationDirs.downloadsRoot + "/" + getChapterDir(mangaId, chapterId)
 }
 
 fun getChapterCbzPath(mangaId: Int, chapterId: Int): String {
@@ -70,8 +70,8 @@ fun updateMangaDownloadDir(mangaId: Int, newTitle: String): Boolean {
 
     val newMangaDir = SafePath.buildValidFilename(newTitle)
 
-    val oldDir = "${applicationDirs.mangaDownloadsRoot}/$sourceDir/$mangaDir"
-    val newDir = "${applicationDirs.mangaDownloadsRoot}/$sourceDir/$newMangaDir"
+    val oldDir = "${applicationDirs.downloadsRoot}/$sourceDir/$mangaDir"
+    val newDir = "${applicationDirs.downloadsRoot}/$sourceDir/$newMangaDir"
 
     val oldDirFile = File(oldDir)
     val newDirFile = File(newDir)

diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt
@@ -42,15 +42,15 @@ class ApplicationDirs(
 ) {
     val cacheRoot = System.getProperty("java.io.tmpdir") + "/tachidesk"
     val extensionsRoot = "$dataRoot/extensions"
-    val mangaDownloadsRoot = serverConfig.downloadsPath.ifBlank { "$dataRoot/downloads" }
+    val downloadsRoot = serverConfig.downloadsPath.ifBlank { "$dataRoot/downloads" }
     val localMangaRoot = "$dataRoot/local"
     val webUIRoot = "$dataRoot/webUI"
     val automatedBackupRoot = serverConfig.backupPath.ifBlank { "$dataRoot/backups" }
 
     val tempThumbnailCacheRoot = "$tempRoot/thumbnails"
     val tempMangaCacheRoot = "$tempRoot/manga-cache"
 
-    val thumbnailDownloadsRoot = "$mangaDownloadsRoot/thumbnails"
+    val thumbnailDownloadsRoot = "$downloadsRoot/thumbnails"
 }
 
 val serverConfig: ServerConfig by lazy { GlobalConfigManager.module() }
@@ -94,7 +94,7 @@ fun applicationSetup() {
         applicationDirs.extensionsRoot,
         applicationDirs.extensionsRoot + "/icon",
         applicationDirs.tempThumbnailCacheRoot,
-        applicationDirs.mangaDownloadsRoot,
+        applicationDirs.downloadsRoot,
         applicationDirs.localMangaRoot
     ).forEach {
         File(it).mkdirs()

diff --git a/server/src/test/kotlin/suwayomi/tachidesk/test/ApplicationTest.kt b/server/src/test/kotlin/suwayomi/tachidesk/test/ApplicationTest.kt
@@ -75,7 +75,7 @@ open class ApplicationTest {
                 applicationDirs.extensionsRoot,
                 applicationDirs.extensionsRoot + "/icon",
                 applicationDirs.tempThumbnailCacheRoot,
-                applicationDirs.mangaDownloadsRoot,
+                applicationDirs.downloadsRoot,
                 applicationDirs.localMangaRoot
             ).forEach {
                 File(it).mkdirs()