From a7f55fd648999f05236b1e37ffeebd7f87a4ea22 Mon Sep 17 00:00:00 2001 From: Acclorite <2ma0bhpk@anonaddy.com> Date: Sun, 16 Nov 2025 11:40:21 +0200 Subject: [PATCH] refactor: error messages in parsers --- .../book_story/data/parser/cover/EpubCoverParser.kt | 4 ++-- .../acclorite/book_story/data/parser/file/EpubFileParser.kt | 5 ++++- .../acclorite/book_story/data/parser/file/Fb2FileParser.kt | 5 ++++- .../acclorite/book_story/data/parser/file/HtmlFileParser.kt | 5 ++++- .../acclorite/book_story/data/parser/file/PdfFileParser.kt | 5 ++++- .../acclorite/book_story/data/parser/file/TxtFileParser.kt | 5 ++++- .../acclorite/book_story/data/parser/text/EpubTextParser.kt | 2 +- .../acclorite/book_story/data/parser/text/HtmlTextParser.kt | 2 +- .../acclorite/book_story/data/parser/text/PdfTextParser.kt | 2 +- .../acclorite/book_story/data/parser/text/TxtTextParser.kt | 2 +- .../acclorite/book_story/data/parser/text/XmlTextParser.kt | 2 +- 11 files changed, 27 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/cover/EpubCoverParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/cover/EpubCoverParser.kt index 3d3ddf27..16bb3fdd 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/cover/EpubCoverParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/cover/EpubCoverParser.kt @@ -77,8 +77,8 @@ class EpubCoverParser @Inject constructor() : CoverParser { } } coverImage - } catch (_: Exception) { - logE(TAG, "Could not parse cover image.") + } catch (e: Exception) { + logE(TAG, "Could not parse cover image with message: ${e.message}.") null } } diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/file/EpubFileParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/file/EpubFileParser.kt index bcd70fa9..438adb24 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/file/EpubFileParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/file/EpubFileParser.kt @@ -11,12 +11,15 @@ import kotlinx.coroutines.withContext import org.jsoup.Jsoup import org.jsoup.parser.Parser import ua.acclorite.book_story.R +import ua.acclorite.book_story.core.log.logE import ua.acclorite.book_story.core.ui.UIText import ua.acclorite.book_story.data.model.file.CachedFile import ua.acclorite.book_story.domain.model.library.Book import java.util.zip.ZipFile import javax.inject.Inject +private const val TAG = "EpubFileParser" + class EpubFileParser @Inject constructor() : FileParser { override suspend fun parse(cachedFile: CachedFile): Book? { @@ -76,7 +79,7 @@ class EpubFileParser @Inject constructor() : FileParser { } book } catch (e: Exception) { - e.printStackTrace() + logE(TAG, "Could not parse file with message: ${e.message}.") null } } diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/file/Fb2FileParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/file/Fb2FileParser.kt index 23740b6a..472c23a6 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/file/Fb2FileParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/file/Fb2FileParser.kt @@ -9,11 +9,14 @@ package ua.acclorite.book_story.data.parser.file import org.jsoup.Jsoup import org.jsoup.parser.Parser import ua.acclorite.book_story.R +import ua.acclorite.book_story.core.log.logE import ua.acclorite.book_story.core.ui.UIText import ua.acclorite.book_story.data.model.file.CachedFile import ua.acclorite.book_story.domain.model.library.Book import javax.inject.Inject +private const val TAG = "Fb2FileParser" + class Fb2FileParser @Inject constructor() : FileParser { override suspend fun parse(cachedFile: CachedFile): Book? { @@ -56,7 +59,7 @@ class Fb2FileParser @Inject constructor() : FileParser { coverImage = null ) } catch (e: Exception) { - e.printStackTrace() + logE(TAG, "Could not parse file with message: ${e.message}.") null } } diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/file/HtmlFileParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/file/HtmlFileParser.kt index e4ddcc96..32228e92 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/file/HtmlFileParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/file/HtmlFileParser.kt @@ -9,11 +9,14 @@ package ua.acclorite.book_story.data.parser.file import org.jsoup.Jsoup import org.jsoup.parser.Parser import ua.acclorite.book_story.R +import ua.acclorite.book_story.core.log.logE import ua.acclorite.book_story.core.ui.UIText import ua.acclorite.book_story.data.model.file.CachedFile import ua.acclorite.book_story.domain.model.library.Book import javax.inject.Inject +private const val TAG = "HtmlFileParser" + class HtmlFileParser @Inject constructor() : FileParser { override suspend fun parse(cachedFile: CachedFile): Book? { @@ -42,7 +45,7 @@ class HtmlFileParser @Inject constructor() : FileParser { coverImage = null ) } catch (e: Exception) { - e.printStackTrace() + logE(TAG, "Could not parse file with message: ${e.message}.") null } } diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/file/PdfFileParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/file/PdfFileParser.kt index b36587ad..561bf116 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/file/PdfFileParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/file/PdfFileParser.kt @@ -10,11 +10,14 @@ import android.app.Application import com.tom_roush.pdfbox.android.PDFBoxResourceLoader import com.tom_roush.pdfbox.pdmodel.PDDocument import ua.acclorite.book_story.R +import ua.acclorite.book_story.core.log.logE import ua.acclorite.book_story.core.ui.UIText import ua.acclorite.book_story.data.model.file.CachedFile import ua.acclorite.book_story.domain.model.library.Book import javax.inject.Inject +private const val TAG = "PdfFileParser" + class PdfFileParser @Inject constructor( private val application: Application ) : FileParser { @@ -47,7 +50,7 @@ class PdfFileParser @Inject constructor( coverImage = null ) } catch (e: Exception) { - e.printStackTrace() + logE(TAG, "Could not parse file with message: ${e.message}.") null } } diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/file/TxtFileParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/file/TxtFileParser.kt index bc6668ff..cf2582fe 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/file/TxtFileParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/file/TxtFileParser.kt @@ -7,11 +7,14 @@ package ua.acclorite.book_story.data.parser.file import ua.acclorite.book_story.R +import ua.acclorite.book_story.core.log.logE import ua.acclorite.book_story.core.ui.UIText import ua.acclorite.book_story.data.model.file.CachedFile import ua.acclorite.book_story.domain.model.library.Book import javax.inject.Inject +private const val TAG = "TxtFileParser" + class TxtFileParser @Inject constructor() : FileParser { override suspend fun parse(cachedFile: CachedFile): Book? { @@ -31,7 +34,7 @@ class TxtFileParser @Inject constructor() : FileParser { coverImage = null ) } catch (e: Exception) { - e.printStackTrace() + logE(TAG, "Could not parse file with message: ${e.message}.") null } } diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/text/EpubTextParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/text/EpubTextParser.kt index 9c8aa722..01b1aeb8 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/text/EpubTextParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/text/EpubTextParser.kt @@ -96,7 +96,7 @@ class EpubTextParser @Inject constructor( logI(TAG, "Successfully finished EPUB parsing.") readerText } catch (e: Exception) { - e.printStackTrace() + logE(TAG, "Could not parse text with message: ${e.message}.") emptyList() } } diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/text/HtmlTextParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/text/HtmlTextParser.kt index 6b33da45..60c2470d 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/text/HtmlTextParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/text/HtmlTextParser.kt @@ -44,7 +44,7 @@ class HtmlTextParser @Inject constructor( logI(TAG, "Successfully finished HTML parsing.") readerText } catch (e: Exception) { - logE(TAG, e.message ?: "") + logE(TAG, "Could not parse text with message: ${e.message}.") emptyList() } } diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/text/PdfTextParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/text/PdfTextParser.kt index 539c696d..39ecd719 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/text/PdfTextParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/text/PdfTextParser.kt @@ -156,7 +156,7 @@ class PdfTextParser @Inject constructor( logI(TAG, "Successfully finished PDF parsing.") readerText } catch (e: Exception) { - logE(TAG, e.message ?: "") + logE(TAG, "Could not parse text with message: ${e.message}.") emptyList() } } diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/text/TxtTextParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/text/TxtTextParser.kt index a7758465..6e171744 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/text/TxtTextParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/text/TxtTextParser.kt @@ -73,7 +73,7 @@ class TxtTextParser @Inject constructor( logI(TAG, "Successfully finished TXT parsing.") readerText } catch (e: Exception) { - logE(TAG, e.message ?: "") + logE(TAG, "Could not parse text with message: ${e.message}.") emptyList() } } diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/text/XmlTextParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/text/XmlTextParser.kt index 749b2bd4..cff0db86 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/text/XmlTextParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/text/XmlTextParser.kt @@ -44,7 +44,7 @@ class XmlTextParser @Inject constructor( logI(TAG, "Successfully finished XML parsing.") readerText } catch (e: Exception) { - logE(TAG, e.message ?: "") + logE(TAG, "Could not parse text with message: ${e.message}.") emptyList() } }