mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-11-10 11:08:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor cleanup

Browse Source
This commit is contained in:
arkon
2022-08-31 14:43:58 -04:00
parent d4b764fa31
commit c39a1b7867
8 changed files with 31 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt
View File

@@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit
class DownloadCache(
private val context: Context,
private val provider: DownloadProvider,
private val sourceManager: SourceManager,
private val sourceManager: SourceManager = Injekt.get(),
private val preferences: PreferencesHelper = Injekt.get(),
) {

14
app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
View File

@@ -20,7 +20,6 @@ import logcat.LogPriority
import rx.Observable
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
import uy.kohesive.injekt.injectLazy
/**
* This class is used to manage chapter downloads in the application. It must be instantiated once
@@ -32,11 +31,10 @@ import uy.kohesive.injekt.injectLazy
class DownloadManager(
private val context: Context,
private val getCategories: GetCategories = Injekt.get(),
private val sourceManager: SourceManager = Injekt.get(),
private val preferences: PreferencesHelper = Injekt.get(),
) {
private val sourceManager: SourceManager by injectLazy()
private val preferences: PreferencesHelper by injectLazy()
/**
* Downloads provider, used to retrieve the folders where the chapters are or should be stored.
*/
@@ -45,12 +43,12 @@ class DownloadManager(
/**
* Cache of downloaded chapters.
*/
private val cache = DownloadCache(context, provider, sourceManager)
private val cache = DownloadCache(context, provider)
/**
* Downloader whose only task is to download chapters.
*/
private val downloader = Downloader(context, provider, cache, sourceManager)
private val downloader = Downloader(context, provider, cache)
/**
* Queue to delay the deletion of a list of chapters until triggered.
@@ -112,7 +110,7 @@ class DownloadManager(
download?.let { queue.remove(it) }
queue.add(0, toAdd)
reorderQueue(queue)
if (isPaused()) {
if (downloader.isPaused()) {
if (DownloadService.isRunning(context)) {
downloader.start()
} else {
@@ -121,8 +119,6 @@ class DownloadManager(
}
}
fun isPaused() = downloader.isPaused()
/**
* Reorders the download queue.
*

11
app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
View File

@@ -34,7 +34,8 @@ import rx.Observable
import rx.android.schedulers.AndroidSchedulers
import rx.schedulers.Schedulers
import rx.subscriptions.CompositeSubscription
import uy.kohesive.injekt.injectLazy
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
import java.io.BufferedOutputStream
import java.io.File
import java.util.zip.CRC32
@@ -59,13 +60,11 @@ class Downloader(
private val context: Context,
private val provider: DownloadProvider,
private val cache: DownloadCache,
private val sourceManager: SourceManager,
private val sourceManager: SourceManager = Injekt.get(),
private val chapterCache: ChapterCache = Injekt.get(),
private val preferences: PreferencesHelper = Injekt.get(),
) {
private val chapterCache: ChapterCache by injectLazy()
private val preferences: PreferencesHelper by injectLazy()
/**
* Store for persisting downloads across restarts.
*/