From bd960992bc62e2257b3ebc5f73628d0a75b0f6da Mon Sep 17 00:00:00 2001
From: Aria Moradi <aria.moradi007@gmail.com>
Date: Mon, 15 Nov 2021 23:40:49 +0330
Subject: [PATCH] cleanup directory names (#251)

---
 .../kotlin/suwayomi/tachidesk/manga/impl/Manga.kt    |  4 ++--
 .../suwayomi/tachidesk/manga/impl/util/DirName.kt    |  6 +++---
 .../kotlin/suwayomi/tachidesk/server/ServerSetup.kt  | 12 +++++-------
 .../suwayomi/tachidesk/test/ApplicationTest.kt       |  5 ++---
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Manga.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Manga.kt
index 1ec9d7f0..09257619 100644
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Manga.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Manga.kt
@@ -164,7 +164,7 @@ object Manga {
 
     private val applicationDirs by DI.global.instance<ApplicationDirs>()
     suspend fun getMangaThumbnail(mangaId: Int, useCache: Boolean): Pair<InputStream, String> {
-        val saveDir = applicationDirs.mangaThumbnailsRoot
+        val saveDir = applicationDirs.thumbnailsRoot
         val fileName = mangaId.toString()
 
         val mangaEntry = transaction { MangaTable.select { MangaTable.id eq mangaId }.first() }
@@ -204,7 +204,7 @@ object Manga {
     }
 
     private fun clearMangaThumbnail(mangaId: Int) {
-        val saveDir = applicationDirs.mangaThumbnailsRoot
+        val saveDir = applicationDirs.thumbnailsRoot
         val fileName = mangaId.toString()
 
         clearCachedImage(saveDir, fileName)
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
index acef7f3d..a49fad04 100644
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/DirName.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/DirName.kt
@@ -28,7 +28,7 @@ fun getMangaDir(mangaId: Int): String {
     val sourceDir = source.toString()
     val mangaDir = SafePath.buildValidFilename(mangaEntry[MangaTable.title])
 
-    return "${applicationDirs.mangaRoot}/$sourceDir/$mangaDir"
+    return "${applicationDirs.mangaDownloadsRoot}/$sourceDir/$mangaDir"
 }
 
 fun getChapterDir(mangaId: Int, chapterId: Int): String {
@@ -54,8 +54,8 @@ fun updateMangaDownloadDir(mangaId: Int, newTitle: String): Boolean {
 
     val newMangaDir = SafePath.buildValidFilename(newTitle)
 
-    val oldDir = "${applicationDirs.mangaRoot}/$sourceDir/$mangaDir"
-    val newDir = "${applicationDirs.mangaRoot}/$sourceDir/$newMangaDir"
+    val oldDir = "${applicationDirs.mangaDownloadsRoot}/$sourceDir/$mangaDir"
+    val newDir = "${applicationDirs.mangaDownloadsRoot}/$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
index d7116b41..4bb42aa7 100644
--- a/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt
@@ -35,10 +35,9 @@ class ApplicationDirs(
     val dataRoot: String = ApplicationRootDir
 ) {
     val extensionsRoot = "$dataRoot/extensions"
-    val mangaThumbnailsRoot = "$dataRoot/manga-thumbnails"
-    val animeThumbnailsRoot = "$dataRoot/anime-thumbnails"
-    val mangaRoot = "$dataRoot/manga"
-    val localMangaRoot = "$dataRoot/manga-local"
+    val thumbnailsRoot = "$dataRoot/thumbnails"
+    val mangaDownloadsRoot = "$dataRoot/downloads"
+    val localMangaRoot = "$dataRoot/local"
     val webUIRoot = "$dataRoot/webUI"
 }
 
@@ -69,9 +68,8 @@ fun applicationSetup() {
         applicationDirs.dataRoot,
         applicationDirs.extensionsRoot,
         applicationDirs.extensionsRoot + "/icon",
-        applicationDirs.mangaThumbnailsRoot,
-        applicationDirs.animeThumbnailsRoot,
-        applicationDirs.mangaRoot,
+        applicationDirs.thumbnailsRoot,
+        applicationDirs.mangaDownloadsRoot,
         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
index ee3039a2..48683209 100644
--- a/server/src/test/kotlin/suwayomi/tachidesk/test/ApplicationTest.kt
+++ b/server/src/test/kotlin/suwayomi/tachidesk/test/ApplicationTest.kt
@@ -74,9 +74,8 @@ open class ApplicationTest {
                 applicationDirs.dataRoot,
                 applicationDirs.extensionsRoot,
                 applicationDirs.extensionsRoot + "/icon",
-                applicationDirs.mangaThumbnailsRoot,
-                applicationDirs.animeThumbnailsRoot,
-                applicationDirs.mangaRoot,
+                applicationDirs.thumbnailsRoot,
+                applicationDirs.mangaDownloadsRoot,
                 applicationDirs.localMangaRoot,
             ).forEach {
                 File(it).mkdirs()