Skip to content

feat: add filtering files being downloaded [#66] #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mcpierce merged 1 commit into from
Jul 9, 2025
Merged

feat: add filtering files being downloaded [#66] #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion androidVariant/src/main/java/org/comixedproject/variant/android/view/server/FileItemView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ fun FileItemViewPreviewDownloading() {
listOf(),
listOf(
DownloadingState(
fileEntry.path,
fileEntry.path, fileEntry.filename,
50, 100
)
),
Expand Down
3 changes: 3 additions & 0 deletions iosVariant/iosVariant/Views/Servers/FileItemView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@ struct FileItemView: View {
DownloadingState(
path: DIRECTORY_LIST.filter { $0.isDirectory == false }.first!
.path,
filename: DIRECTORY_LIST.filter { $0.isDirectory == false }
.first!
.path,
received: 50,
total: 100
)
Expand Down
1 change: 1 addition & 0 deletions shared/src/commonMain/kotlin/org/comixedproject/variant/model/state/DownloadingState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ package org.comixedproject.variant.model.state

data class DownloadingState(
val path: String,
val filename: String,
var received: Long,
var total: Long
)
12 changes: 10 additions & 2 deletions shared/src/commonMain/kotlin/org/comixedproject/variant/viewmodel/VariantViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ open class VariantViewModel(
val password = this.password

viewModelScope.launch(Dispatchers.Main) {
val downloadingState = DownloadingState(path, 0, 0)
val downloadingState = DownloadingState(path, filename, 0, 0)
val state = mutableListOf<DownloadingState>()
state.addAll(_browsingState.value.downloadingState)
state.add(downloadingState)
Expand All @@ -217,7 +217,7 @@ open class VariantViewModel(
output,
onProgress = { received, total ->
viewModelScope.launch(Dispatchers.Main) {
val downloadingState = DownloadingState(path, received, total)
val downloadingState = DownloadingState(path, filename, received, total)
val state =
_browsingState.value.downloadingState.filter { !(it.path == path) }
.toMutableList()
Expand Down Expand Up @@ -259,8 +259,16 @@ open class VariantViewModel(
Log.debug(TAG, "Loading library contents: ${_libraryDirectory}")

val path = File(_libraryDirectory)
val ignored = this._browsingState.value.downloadingState.map { it.filename }.toList()
val contents =
path.directoryFiles()
.filter {
if (!ignored.contains(it.name)) {
true
} else {
false
}
}
.filter { !it.isDirectory }
.filter { it.size.toLong() > 0L }
.filter { it.extension.equals("cbz") || it.extension.equals("cbr") }
Expand Down