Bugfixes (#48)

Author: siper

src/main/kotlin/ru/stersh/bookcrawler/core/Notification.kt

@@ -4,7 +4,7 @@ data class Notification(
     val id: BookId,
     val type: MessageType,
     val title: String,
-    val coverUrl: String,
+    val coverUrl: String?,
     val authors: List<String>,
     val series: Series?,
     val availableActions: List<Action>

src/main/kotlin/ru/stersh/bookcrawler/module/at/Utils.kt

@@ -14,7 +14,13 @@ fun getDecodedText(userId: String, key: String, text: String): String {
     return stringBuilder.toString()
 }
 
+private val StopChars = listOf('?', '!', '/', '\\','*', ':', '<', '>', '"', '|', '+')
+
 fun normalizeBookName(source: String): String {
     val translator = Translator(Schemas.WIKIPEDIA)
-    return translator.translate(source)
+    var newName = translator.translate(source)
+    for (char in StopChars) {
+        newName = newName.replace(char.toString(), "")
+    }
+    return newName
 }

src/main/kotlin/ru/stersh/bookcrawler/module/at/api/At.kt

@@ -171,16 +171,20 @@ object At {
             null
         }
 
-        val coverResponse = client.get(workDetails.coverUrl)
+        val cover = if (workDetails.coverUrl != null) {
+            val coverResponse = client.get(workDetails.coverUrl)
 
-        val coverType = Book.Image.Type.fromContentType(coverResponse.headers["Content-Type"])
-        val coverBytes = coverResponse.readBytes()
+            val coverType = Book.Image.Type.fromContentType(coverResponse.headers["Content-Type"])
+            val coverBytes = coverResponse.readBytes()
 
-        val cover = Book.Image.Raw(
-            bytes = coverBytes,
-            type = coverType,
-            name = "cover"
-        )
+            Book.Image.Raw(
+                bytes = coverBytes,
+                type = coverType,
+                name = "cover"
+            )
+        } else {
+            null
+        }
 
         return Book(
             id = BookId(workId, PROVIDER_NAME),

src/main/kotlin/ru/stersh/bookcrawler/module/at/api/Recommendation.kt

@@ -21,11 +21,11 @@ data class Recommendation(
     @SerialName("coAuthorUserName")
     val coAuthorUserName: String?,
     @SerialName("coverUrl")
-    val coverUrl: String,
+    val coverUrl: String?,
     @SerialName("discount")
     val discount: Float?,
     @SerialName("finishTime")
-    val finishTime: String,
+    val finishTime: String?,
     @SerialName("finished")
     val finished: Boolean,
     @SerialName("format")

src/main/kotlin/ru/stersh/bookcrawler/module/at/api/Work.kt

@@ -29,7 +29,7 @@ data class Work(
     @SerialName("commentCount")
     val commentCount: Long,
     @SerialName("coverUrl")
-    val coverUrl: String,
+    val coverUrl: String?,
     @SerialName("enableRedLine")
     val enableRedLine: Boolean,
     @SerialName("enableTTS")

src/main/kotlin/ru/stersh/bookcrawler/module/at/api/WorkDetails.kt

@@ -43,7 +43,7 @@ data class WorkDetails(
     @SerialName("commentCount")
     val commentCount: Int,
     @SerialName("coverUrl")
-    val coverUrl: String,
+    val coverUrl: String?,
     @SerialName("discount")
     val discount: Float?,
     @SerialName("downloadErrorCode")
@@ -57,7 +57,7 @@ data class WorkDetails(
     @SerialName("finishTime")
     val finishTime: String?,
     @SerialName("firstSubGenreId")
-    val firstSubGenreId: Long,
+    val firstSubGenreId: Long?,
     @SerialName("format")
     val format: String,
     @SerialName("freeChapterCount")
@@ -139,7 +139,7 @@ data class WorkDetails(
     @SerialName("seriesTitle")
     val seriesTitle: String?,
     @SerialName("seriesWorkIds")
-    val seriesWorkIds: List<Int>,
+    val seriesWorkIds: List<Int>?,
     @SerialName("seriesWorkNumber")
     val seriesWorkNumber: Int,
     @SerialName("state")

src/main/kotlin/ru/stersh/bookcrawler/module/litnet/LitnetLibraryCheckTask.kt

@@ -148,7 +148,7 @@ class LitnetLibraryCheckTask : TaskManager.Task {
         for (localId in localLibraryIds) {
             val allSeriesBookResult = runCatching { Litnet.getAllSeriesBooks(localId) }
                 .onFailure {
-                    logger.warn("[Litnet] Filed to get all series books for $localId")
+                    logger.warn("[Litnet] Filed to get all series books for $localId", it)
                 }
 
             val allSeriesBookIds = allSeriesBookResult
@@ -189,7 +189,7 @@ class LitnetLibraryCheckTask : TaskManager.Task {
             val book = Litnet.getBook(bookId)
             BookHandlerManager.onBookCreated(book)
         }.onFailure {
-            logger.warn("[Litnet] Filed to download book $bookId")
+            logger.warn("[Litnet] Filed to download book $bookId", it)
         }
     }
 

src/main/kotlin/ru/stersh/bookcrawler/module/litnet/api/BookDetailsResponse.kt

@@ -6,5 +6,5 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class BookDetailsResponse(
     @SerialName("series")
-    val series: List<SeriesBook>
+    val series: List<SeriesBook>?
 )

src/main/kotlin/ru/stersh/bookcrawler/module/litnet/api/Litnet.kt

@@ -80,7 +80,7 @@ object Litnet {
                 addDefaultParams()
                 parameter("bookId", bookId)
             }
-            .body<ArrayList<Chapter>>()
+            .body<List<Chapter>>()
     }
 
     suspend fun getChapterTexts(chapterIds: List<Long>): List<ChapterText> {
@@ -91,7 +91,7 @@ object Litnet {
                     parameter("chapter_ids[]", it)
                 }
             }
-            .body<ArrayList<ChapterText>>()
+            .body<List<ChapterText>>()
             .map {
                 it.copy(text = decrypt(it.text))
             }
@@ -106,6 +106,7 @@ object Litnet {
             }
             .body<BookDetailsResponse>()
             .series
+            .orEmpty()
     }
 
     suspend fun getBook(bookId: Long): Book {

src/main/kotlin/ru/stersh/bookcrawler/module/telegram/TelegramNotificationHandler.kt

@@ -43,13 +43,22 @@ class TelegramNotificationHandler(
             message.append("__${notification.series.title} (${notification.series.order})__")
         }
 
-        bot.sendPhoto(
-            chatId = ChatId.fromId(chatId),
-            photo = TelegramFile.ByUrl(notification.coverUrl),
-            caption = message.toString(),
-            parseMode = ParseMode.MARKDOWN,
-            replyMarkup = createReplyMarkup(notification.id, notification.availableActions)
-        )
+        if (notification.coverUrl != null) {
+            bot.sendPhoto(
+                chatId = ChatId.fromId(chatId),
+                photo = TelegramFile.ByUrl(notification.coverUrl),
+                caption = message.toString(),
+                parseMode = ParseMode.MARKDOWN,
+                replyMarkup = createReplyMarkup(notification.id, notification.availableActions)
+            )
+        } else {
+            bot.sendMessage(
+                chatId = ChatId.fromId(chatId),
+                text = message.toString(),
+                parseMode = ParseMode.MARKDOWN,
+                replyMarkup = createReplyMarkup(notification.id, notification.availableActions)
+            )
+        }
     }
 
     private fun createReplyMarkup(bookId: BookId, actions: List<Action>): ReplyMarkup? {