Atte149/book-story
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: move parsers

Browse source
This commit is contained in:
Acclorite 2025-11-07 09:09:12 +02:00
parent 24d3e3ba0a
commit c76f7f38d5
No known key found for this signature in database
GPG key ID: 6E54C611F6EE8593
19 changed files with 29 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/ua/acclorite/book_story/data/di/RepositoryModule.kt
View file

@ -22,10 +22,10 @@ import ua.acclorite.book_story.data.mapper.file.FileMapper
import ua.acclorite.book_story.data.mapper.file.FileMapperImpl
import ua.acclorite.book_story.data.mapper.history.HistoryMapper
import ua.acclorite.book_story.data.mapper.history.HistoryMapperImpl
import ua.acclorite.book_story.data.parser.FileParser
import ua.acclorite.book_story.data.parser.FileParserImpl
import ua.acclorite.book_story.data.parser.TextParser
import ua.acclorite.book_story.data.parser.TextParserImpl
import ua.acclorite.book_story.data.parser.file.FileParser
import ua.acclorite.book_story.data.parser.file.FileParserImpl
import ua.acclorite.book_story.data.parser.text.TextParser
import ua.acclorite.book_story.data.parser.text.TextParserImpl
import ua.acclorite.book_story.data.repository.BookRepositoryImpl
import ua.acclorite.book_story.data.repository.CategoryRepositoryImpl
import ua.acclorite.book_story.data.repository.ColorPresetRepositoryImpl

2
app/src/main/java/ua/acclorite/book_story/data/parser/DocumentParser.kt → app/src/main/java/ua/acclorite/book_story/data/parser/document/DocumentParser.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only
*/
package ua.acclorite.book_story.data.parser
package ua.acclorite.book_story.data.parser.document
import android.graphics.Bitmap
import android.graphics.BitmapFactory

4
app/src/main/java/ua/acclorite/book_story/data/parser/MarkdownParser.kt → app/src/main/java/ua/acclorite/book_story/data/parser/document/MarkdownParser.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only
*/
package ua.acclorite.book_story.data.parser
package ua.acclorite.book_story.data.parser.document
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.LinkAnnotation
@ -30,7 +30,7 @@ class MarkdownParser @Inject constructor(
private val commonmarkParser: Parser
) {
/**
* Parses markdown text to [androidx.compose.ui.text.AnnotatedString].
* Parses markdown text to [AnnotatedString].
*
* @return Parsed annotated string.
*/

3
app/src/main/java/ua/acclorite/book_story/data/parser/epub/EpubFileParser.kt → app/src/main/java/ua/acclorite/book_story/data/parser/file/EpubFileParser.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only
*/
package ua.acclorite.book_story.data.parser.epub
package ua.acclorite.book_story.data.parser.file
import android.graphics.Bitmap
import android.graphics.BitmapFactory
@ -16,7 +16,6 @@ import ua.acclorite.book_story.R
import ua.acclorite.book_story.core.ui.UIText
import ua.acclorite.book_story.data.model.common.BookWithCover
import ua.acclorite.book_story.data.model.file.CachedFile
import ua.acclorite.book_story.data.parser.FileParser
import ua.acclorite.book_story.domain.model.library.Book
import java.io.File
import java.net.URLDecoder

3
app/src/main/java/ua/acclorite/book_story/data/parser/fb2/Fb2FileParser.kt → app/src/main/java/ua/acclorite/book_story/data/parser/file/Fb2FileParser.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only
*/
package ua.acclorite.book_story.data.parser.fb2
package ua.acclorite.book_story.data.parser.file
import org.jsoup.Jsoup
import org.jsoup.parser.Parser
@ -12,7 +12,6 @@ import ua.acclorite.book_story.R
import ua.acclorite.book_story.core.ui.UIText
import ua.acclorite.book_story.data.model.common.BookWithCover
import ua.acclorite.book_story.data.model.file.CachedFile
import ua.acclorite.book_story.data.parser.FileParser
import ua.acclorite.book_story.domain.model.library.Book
import javax.inject.Inject

2
app/src/main/java/ua/acclorite/book_story/data/parser/FileParser.kt → app/src/main/java/ua/acclorite/book_story/data/parser/file/FileParser.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only
*/
package ua.acclorite.book_story.data.parser
package ua.acclorite.book_story.data.parser.file
import ua.acclorite.book_story.data.model.common.BookWithCover
import ua.acclorite.book_story.data.model.file.CachedFile

7
app/src/main/java/ua/acclorite/book_story/data/parser/FileParserImpl.kt → app/src/main/java/ua/acclorite/book_story/data/parser/file/FileParserImpl.kt
View file

@ -4,16 +4,11 @@
* SPDX-License-Identifier: GPL-3.0-only
*/
package ua.acclorite.book_story.data.parser
package ua.acclorite.book_story.data.parser.file
import android.util.Log
import ua.acclorite.book_story.data.model.common.BookWithCover
import ua.acclorite.book_story.data.model.file.CachedFile
import ua.acclorite.book_story.data.parser.epub.EpubFileParser
import ua.acclorite.book_story.data.parser.fb2.Fb2FileParser
import ua.acclorite.book_story.data.parser.html.HtmlFileParser
import ua.acclorite.book_story.data.parser.pdf.PdfFileParser
import ua.acclorite.book_story.data.parser.txt.TxtFileParser
import javax.inject.Inject
private const val FILE_PARSER = "File Parser"

3
app/src/main/java/ua/acclorite/book_story/data/parser/html/HtmlFileParser.kt → app/src/main/java/ua/acclorite/book_story/data/parser/file/HtmlFileParser.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only
*/
package ua.acclorite.book_story.data.parser.html
package ua.acclorite.book_story.data.parser.file
import org.jsoup.Jsoup
import org.jsoup.parser.Parser
@ -12,7 +12,6 @@ import ua.acclorite.book_story.R
import ua.acclorite.book_story.core.ui.UIText
import ua.acclorite.book_story.data.model.common.BookWithCover
import ua.acclorite.book_story.data.model.file.CachedFile
import ua.acclorite.book_story.data.parser.FileParser
import ua.acclorite.book_story.domain.model.library.Book
import javax.inject.Inject

3
app/src/main/java/ua/acclorite/book_story/data/parser/pdf/PdfFileParser.kt → app/src/main/java/ua/acclorite/book_story/data/parser/file/PdfFileParser.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only
*/
package ua.acclorite.book_story.data.parser.pdf
package ua.acclorite.book_story.data.parser.file
import android.app.Application
import com.tom_roush.pdfbox.android.PDFBoxResourceLoader
@ -13,7 +13,6 @@ import ua.acclorite.book_story.R
import ua.acclorite.book_story.core.ui.UIText
import ua.acclorite.book_story.data.model.common.BookWithCover
import ua.acclorite.book_story.data.model.file.CachedFile
import ua.acclorite.book_story.data.parser.FileParser
import ua.acclorite.book_story.domain.model.library.Book
import javax.inject.Inject

3
app/src/main/java/ua/acclorite/book_story/data/parser/txt/TxtFileParser.kt → app/src/main/java/ua/acclorite/book_story/data/parser/file/TxtFileParser.kt
View file

@ -4,13 +4,12 @@
* SPDX-License-Identifier: GPL-3.0-only
*/
package ua.acclorite.book_story.data.parser.txt
package ua.acclorite.book_story.data.parser.file
import ua.acclorite.book_story.R
import ua.acclorite.book_story.core.ui.UIText
import ua.acclorite.book_story.data.model.common.BookWithCover
import ua.acclorite.book_story.data.model.file.CachedFile
import ua.acclorite.book_story.data.parser.FileParser
import ua.acclorite.book_story.domain.model.library.Book
import javax.inject.Inject

5
app/src/main/java/ua/acclorite/book_story/data/parser/epub/EpubTextParser.kt → app/src/main/java/ua/acclorite/book_story/data/parser/text/EpubTextParser.kt
View file

@ -6,7 +6,7 @@
@file:OptIn(ExperimentalCoroutinesApi::class)
package ua.acclorite.book_story.data.parser.epub
package ua.acclorite.book_story.data.parser.text
import android.util.Log
import androidx.core.net.toUri
@ -22,8 +22,7 @@ import ua.acclorite.book_story.core.data.ExtensionsData
import ua.acclorite.book_story.core.helpers.addAll
import ua.acclorite.book_story.core.helpers.containsVisibleText
import ua.acclorite.book_story.data.model.file.CachedFile
import ua.acclorite.book_story.data.parser.DocumentParser
import ua.acclorite.book_story.data.parser.TextParser
import ua.acclorite.book_story.data.parser.document.DocumentParser
import ua.acclorite.book_story.domain.model.reader.ReaderText
import java.io.File
import java.net.URLDecoder

5
app/src/main/java/ua/acclorite/book_story/data/parser/html/HtmlTextParser.kt → app/src/main/java/ua/acclorite/book_story/data/parser/text/HtmlTextParser.kt
View file

@ -4,15 +4,14 @@
* SPDX-License-Identifier: GPL-3.0-only
*/
package ua.acclorite.book_story.data.parser.html
package ua.acclorite.book_story.data.parser.text
import android.util.Log
import kotlinx.coroutines.yield
import org.jsoup.Jsoup
import org.jsoup.parser.Parser
import ua.acclorite.book_story.data.model.file.CachedFile
import ua.acclorite.book_story.data.parser.DocumentParser
import ua.acclorite.book_story.data.parser.TextParser
import ua.acclorite.book_story.data.parser.document.DocumentParser
import ua.acclorite.book_story.domain.model.reader.ReaderText
import javax.inject.Inject

5
app/src/main/java/ua/acclorite/book_story/data/parser/pdf/PdfTextParser.kt → app/src/main/java/ua/acclorite/book_story/data/parser/text/PdfTextParser.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only
*/
package ua.acclorite.book_story.data.parser.pdf
package ua.acclorite.book_story.data.parser.text
import android.app.Application
import android.util.Log
@ -14,8 +14,7 @@ import com.tom_roush.pdfbox.text.PDFTextStripper
import kotlinx.coroutines.yield
import ua.acclorite.book_story.core.helpers.clearAllMarkdown
import ua.acclorite.book_story.data.model.file.CachedFile
import ua.acclorite.book_story.data.parser.MarkdownParser
import ua.acclorite.book_story.data.parser.TextParser
import ua.acclorite.book_story.data.parser.document.MarkdownParser
import ua.acclorite.book_story.domain.model.reader.ReaderText
import javax.inject.Inject

2
app/src/main/java/ua/acclorite/book_story/data/parser/TextParser.kt → app/src/main/java/ua/acclorite/book_story/data/parser/text/TextParser.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only
*/
package ua.acclorite.book_story.data.parser
package ua.acclorite.book_story.data.parser.text
import ua.acclorite.book_story.data.model.file.CachedFile
import ua.acclorite.book_story.domain.model.reader.ReaderText

7
app/src/main/java/ua/acclorite/book_story/data/parser/TextParserImpl.kt → app/src/main/java/ua/acclorite/book_story/data/parser/text/TextParserImpl.kt
View file

@ -4,17 +4,12 @@
* SPDX-License-Identifier: GPL-3.0-only
*/
package ua.acclorite.book_story.data.parser
package ua.acclorite.book_story.data.parser.text
import android.util.Log
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import ua.acclorite.book_story.data.model.file.CachedFile
import ua.acclorite.book_story.data.parser.epub.EpubTextParser
import ua.acclorite.book_story.data.parser.html.HtmlTextParser
import ua.acclorite.book_story.data.parser.pdf.PdfTextParser
import ua.acclorite.book_story.data.parser.txt.TxtTextParser
import ua.acclorite.book_story.data.parser.xml.XmlTextParser
import ua.acclorite.book_story.domain.model.reader.ReaderText
import javax.inject.Inject

5
app/src/main/java/ua/acclorite/book_story/data/parser/txt/TxtTextParser.kt → app/src/main/java/ua/acclorite/book_story/data/parser/text/TxtTextParser.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only
*/
package ua.acclorite.book_story.data.parser.txt
package ua.acclorite.book_story.data.parser.text
import android.util.Log
import kotlinx.coroutines.Dispatchers
@ -12,8 +12,7 @@ import kotlinx.coroutines.withContext
import kotlinx.coroutines.yield
import ua.acclorite.book_story.core.helpers.clearAllMarkdown
import ua.acclorite.book_story.data.model.file.CachedFile
import ua.acclorite.book_story.data.parser.MarkdownParser
import ua.acclorite.book_story.data.parser.TextParser
import ua.acclorite.book_story.data.parser.document.MarkdownParser
import ua.acclorite.book_story.domain.model.reader.ReaderText
import javax.inject.Inject

5
app/src/main/java/ua/acclorite/book_story/data/parser/xml/XmlTextParser.kt → app/src/main/java/ua/acclorite/book_story/data/parser/text/XmlTextParser.kt
View file

@ -4,15 +4,14 @@
* SPDX-License-Identifier: GPL-3.0-only
*/
package ua.acclorite.book_story.data.parser.xml
package ua.acclorite.book_story.data.parser.text
import android.util.Log
import kotlinx.coroutines.yield
import org.jsoup.Jsoup
import org.jsoup.parser.Parser
import ua.acclorite.book_story.data.model.file.CachedFile
import ua.acclorite.book_story.data.parser.DocumentParser
import ua.acclorite.book_story.data.parser.TextParser
import ua.acclorite.book_story.data.parser.document.DocumentParser
import ua.acclorite.book_story.domain.model.reader.ReaderText
import javax.inject.Inject

4
app/src/main/java/ua/acclorite/book_story/data/repository/BookRepositoryImpl.kt
View file

@ -12,8 +12,8 @@ import ua.acclorite.book_story.core.CoverImage
import ua.acclorite.book_story.data.local.room.BookDatabase
import ua.acclorite.book_story.data.mapper.book.BookMapper
import ua.acclorite.book_story.data.mapper.file.FileMapper
import ua.acclorite.book_story.data.parser.FileParser
import ua.acclorite.book_story.data.parser.TextParser
import ua.acclorite.book_story.data.parser.file.FileParser
import ua.acclorite.book_story.data.parser.text.TextParser
import ua.acclorite.book_story.domain.model.file.File
import ua.acclorite.book_story.domain.model.library.Book
import ua.acclorite.book_story.domain.model.reader.ReaderText

2
app/src/main/java/ua/acclorite/book_story/data/repository/FileSystemRepositoryImpl.kt
View file

@ -13,7 +13,7 @@ import ua.acclorite.book_story.data.local.room.BookDatabase
import ua.acclorite.book_story.data.mapper.file.FileMapper
import ua.acclorite.book_story.data.model.common.BookWithCover
import ua.acclorite.book_story.data.model.file.CachedFile
import ua.acclorite.book_story.data.parser.FileParser
import ua.acclorite.book_story.data.parser.file.FileParser
import ua.acclorite.book_story.domain.model.file.File
import ua.acclorite.book_story.domain.repository.FileSystemRepository
import ua.acclorite.book_story.domain.service.FileProvider