From 8d5744a2cf89751ad00e5133dc38d5951b689835 Mon Sep 17 00:00:00 2001
From: Aria Moradi <aria.moradi007@gmail.com>
Date: Thu, 4 Feb 2021 04:27:25 +0330
Subject: [PATCH] fix chapter naming, db naming

---
 .../ir/armor/tachidesk/database/DBMangaer.kt  |  2 +-
 .../kotlin/ir/armor/tachidesk/util/Manga.kt   | 16 ------------
 .../kotlin/ir/armor/tachidesk/util/Page.kt    | 26 ++++++++++++++++++-
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/server/src/main/kotlin/ir/armor/tachidesk/database/DBMangaer.kt b/server/src/main/kotlin/ir/armor/tachidesk/database/DBMangaer.kt
index 169a55bd..0a5d0a87 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/database/DBMangaer.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/database/DBMangaer.kt
@@ -16,7 +16,7 @@ import org.jetbrains.exposed.sql.transactions.transaction
 
 object DBMangaer {
     val db by lazy {
-        Database.connect("jdbc:h2:${Config.dataRoot}/database.h2", "org.h2.Driver")
+        Database.connect("jdbc:h2:${Config.dataRoot}/database", "org.h2.Driver")
     }
 }
 
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/util/Manga.kt b/server/src/main/kotlin/ir/armor/tachidesk/util/Manga.kt
index e4e0a085..c7020656 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/util/Manga.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/util/Manga.kt
@@ -10,11 +10,9 @@ import ir.armor.tachidesk.Config
 import ir.armor.tachidesk.database.dataclass.MangaDataClass
 import ir.armor.tachidesk.database.table.MangaStatus
 import ir.armor.tachidesk.database.table.MangaTable
-import ir.armor.tachidesk.database.table.SourceTable
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.jetbrains.exposed.sql.update
-import java.io.File
 import java.io.InputStream
 
 fun getManga(mangaId: Int, proxyThumbnail: Boolean = true): MangaDataClass {
@@ -122,17 +120,3 @@ fun getThumbnail(mangaId: Int): Pair<InputStream, String> {
         throw Exception("request error! ${response.code}")
     }
 }
-
-fun getMangaDir(mangaId: Int): String {
-    val mangaEntry = transaction { MangaTable.select { MangaTable.id eq mangaId }.firstOrNull()!! }
-    val sourceId = mangaEntry[MangaTable.sourceReference].value
-    val sourceEntry = transaction { SourceTable.select { SourceTable.id eq sourceId }.firstOrNull()!! }
-
-    val mangaTitle = mangaEntry[MangaTable.title]
-    val sourceName = sourceEntry[SourceTable.name]
-
-    val mangaDir = "${Config.mangaRoot}/$sourceName/$mangaTitle"
-    // make sure dirs exist
-    File(mangaDir).mkdirs()
-    return mangaDir
-}
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/util/Page.kt b/server/src/main/kotlin/ir/armor/tachidesk/util/Page.kt
index 942316ab..14ddb494 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/util/Page.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/util/Page.kt
@@ -6,9 +6,12 @@ package ir.armor.tachidesk.util
 
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.online.HttpSource
+import ir.armor.tachidesk.Config
 import ir.armor.tachidesk.database.table.ChapterTable
 import ir.armor.tachidesk.database.table.MangaTable
 import ir.armor.tachidesk.database.table.PageTable
+import ir.armor.tachidesk.database.table.SourceTable
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
 import org.jetbrains.exposed.sql.and
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
@@ -45,7 +48,7 @@ fun getPageImage(mangaId: Int, chapterId: Int, index: Int): Pair<InputStream, St
         }
     }
 
-    val saveDir = getMangaDir(mangaId) + "/" + chapterEntry[ChapterTable.chapter_number]
+    val saveDir = getChapterDir(mangaId, chapterId)
     File(saveDir).mkdirs()
     var filePath = "$saveDir/$index."
 
@@ -79,3 +82,24 @@ fun getPageImage(mangaId: Int, chapterId: Int, index: Int): Pair<InputStream, St
         throw Exception("request error! ${response.code}")
     }
 }
+
+fun getChapterDir(mangaId: Int, chapterId: Int): String {
+    val mangaEntry = transaction { MangaTable.select { MangaTable.id eq mangaId }.firstOrNull()!! }
+    val sourceId = mangaEntry[MangaTable.sourceReference].value
+    val source = getHttpSource(sourceId)
+    val sourceEntry = transaction { SourceTable.select { SourceTable.id eq sourceId }.firstOrNull()!! }
+    val chapterEntry = transaction { ChapterTable.select { ChapterTable.id eq chapterId }.firstOrNull()!! }
+
+    val chapterDir = when {
+        chapterEntry[ChapterTable.scanlator] != null -> "${chapterEntry[ChapterTable.scanlator]}_${chapterEntry[ChapterTable.name]}"
+        else -> chapterEntry[ChapterTable.name]
+    }
+
+    val mangaTitle = mangaEntry[MangaTable.title]
+    val sourceName = source.toString()
+
+    val mangaDir = "${Config.mangaRoot}/$sourceName/$mangaTitle/$chapterDir"
+    // make sure dirs exist
+    File(mangaDir).mkdirs()
+    return mangaDir
+}