malhuda/ab-download-manager
1
0
Fork 0
mirror of https://github.com/amir1376/ab-download-manager.git synced 2025-02-20 11:43:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix add multiple download page bug that when save mode is set to SameLocation not works as expected (#326)

Browse Source
This commit is contained in:
AmirHossein Abdolmotallebi 2024-12-27 22:27:36 +03:30 committed by GitHub
parent c91cbb0dbb
commit 8fd5e72eca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
desktop/app/src/main/kotlin/com/abdownloadmanager/desktop/pages/addDownload/multiple/AddMultiDownloadComponent.kt
View File

@ -180,10 +180,12 @@ class AddMultiDownloadComponent(
private fun getFolderForItem( private fun getFolderForItem(
categorySelectionMode: CategorySelectionMode?, categorySelectionMode: CategorySelectionMode?,
allInSameLocation: Boolean,
url: String, url: String,
fleName: String, fleName: String,
defaultFolder: String, defaultFolder: String,
): String { ): String {
if (allInSameLocation) return defaultFolder
return when (categorySelectionMode) { return when (categorySelectionMode) {
CategorySelectionMode.Auto -> { CategorySelectionMode.Auto -> {
downloadSystem.categoryManager downloadSystem.categoryManager
@ -209,7 +211,8 @@ class AddMultiDownloadComponent(
fun requestAddDownloads( fun requestAddDownloads(
queueId: Long?, queueId: Long?,
) { ) {
val categorySelectionMode = when (saveMode.value) { val saveMode = saveMode.value
val categorySelectionMode = when (saveMode) {
EachFileInTheirOwnCategory -> CategorySelectionMode.Auto EachFileInTheirOwnCategory -> CategorySelectionMode.Auto
AllInOneCategory -> selectedCategory.value?.let { AllInOneCategory -> selectedCategory.value?.let {
CategorySelectionMode.Fixed(it.id) CategorySelectionMode.Fixed(it.id)
@ -233,7 +236,8 @@ class AddMultiDownloadComponent(
categorySelectionMode = categorySelectionMode, categorySelectionMode = categorySelectionMode,
url = it.credentials.value.link, url = it.credentials.value.link,
fleName = it.name.value, fleName = it.name.value,
defaultFolder = it.folder.value defaultFolder = it.folder.value,
allInSameLocation = saveMode == InSameLocation
), ),
name = it.name.value, name = it.name.value,
link = it.credentials.value.link, link = it.credentials.value.link,
@ -248,7 +252,7 @@ class AddMultiDownloadComponent(
categorySelectionMode = categorySelectionMode categorySelectionMode = categorySelectionMode
) )
val folder = folder.value val folder = folder.value
if (saveMode.value == InSameLocation) { if (this.saveMode.value == InSameLocation) {
addToLastUsedLocations(folder) addToLastUsedLocations(folder)
} }
requestClose() requestClose()