KotatsuApp/Kotatsu
2
0
Fork 0
Code Issues 124 Pull Requests Packages Projects Releases 163 Wiki Activity

Tracker improvements

Browse Source
This commit is contained in:
Koitharu
2024-04-13 13:57:11 +03:00
parent bddb8431c5
commit 4b30905f9c
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/debug/res/layout/item_track_debug.xml
View File

@@ -28,6 +28,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:drawablePadding="8dp"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:textAppearance="?attr/textAppearanceTitleSmall" android:textAppearance="?attr/textAppearanceTitleSmall"
@@ -43,7 +44,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:drawablePadding="8dp"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:textAppearance="?attr/textAppearanceBodySmall" android:textAppearance="?attr/textAppearanceBodySmall"

2
app/src/main/kotlin/org/koitharu/kotatsu/tracker/domain/Tracker.kt
View File

@@ -28,7 +28,7 @@ class Tracker @Inject constructor(
suspend fun getTracks(limit: Int): List<TrackingItem> { suspend fun getTracks(limit: Int): List<TrackingItem> {
repository.updateTracks() repository.updateTracks()
return repository.getTracks(0, limit).map { return repository.getTracks(offset = 0, limit = limit).map {
val categoryId = repository.getCategoryId(it.manga.id) val categoryId = repository.getCategoryId(it.manga.id)
TrackingItem( TrackingItem(
tracking = it, tracking = it,

2
app/src/main/kotlin/org/koitharu/kotatsu/tracker/domain/TrackingRepository.kt
View File

@@ -82,7 +82,7 @@ class TrackingRepository @Inject constructor(
} }
suspend fun getTracks(offset: Int, limit: Int): List<MangaTracking> { suspend fun getTracks(offset: Int, limit: Int): List<MangaTracking> {
return db.getTracksDao().findAll(offset, limit).map { return db.getTracksDao().findAll(offset = offset, limit = limit).map {
MangaTracking( MangaTracking(
manga = it.manga.toManga(emptySet()), manga = it.manga.toManga(emptySet()),
lastChapterId = it.track.lastChapterId, lastChapterId = it.track.lastChapterId,

7
app/src/main/kotlin/org/koitharu/kotatsu/tracker/work/TrackWorker.kt
View File

@@ -83,10 +83,10 @@ class TrackWorker @AssistedInject constructor(
private val notificationManager by lazy { NotificationManagerCompat.from(applicationContext) } private val notificationManager by lazy { NotificationManagerCompat.from(applicationContext) }
override suspend fun doWork(): Result { override suspend fun doWork(): Result {
trySetForeground() val isForeground = trySetForeground()
logger.log("doWork(): attempt $runAttemptCount") logger.log("doWork(): attempt $runAttemptCount")
return try { return try {
doWorkImpl(isFullRun = TAG_ONESHOT in tags) doWorkImpl(isFullRun = isForeground && TAG_ONESHOT in tags)
} catch (e: CancellationException) { } catch (e: CancellationException) {
throw e throw e
} catch (e: Throwable) { } catch (e: Throwable) {
@@ -368,8 +368,7 @@ class TrackWorker @AssistedInject constructor(
const val WORKER_NOTIFICATION_ID = 35 const val WORKER_NOTIFICATION_ID = 35
const val TAG = "tracking" const val TAG = "tracking"
const val TAG_ONESHOT = "tracking_oneshot" const val TAG_ONESHOT = "tracking_oneshot"
const val MAX_PARALLELISM = 3 const val MAX_PARALLELISM = 6
const val MAX_ATTEMPTS = 3
const val DATA_KEY_SUCCESS = "success" const val DATA_KEY_SUCCESS = "success"
const val DATA_KEY_FAILED = "failed" const val DATA_KEY_FAILED = "failed"
val BATCH_SIZE = if (BuildConfig.DEBUG) 20 else 46 val BATCH_SIZE = if (BuildConfig.DEBUG) 20 else 46