mirrors/Tachidesk
1
0
Fork 0
mirror of https://github.com/Suwayomi/Tachidesk.git synced 2026-01-16 00:32:37 +01:00
Code Issues Projects Releases Wiki Activity

cleanup directory names (#251)

Browse Source
This commit is contained in:
Aria Moradi
2021-11-15 23:40:49 +03:30
committed by GitHub
parent 0c5f6b432c
commit bd960992bc
4 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Manga.kt
View File

@@ -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)

6
server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/DirName.kt
View File

@@ -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)

12
server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt
View File

@@ -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()

5
server/src/test/kotlin/suwayomi/tachidesk/test/ApplicationTest.kt
View File

@@ -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()