flik/termora
1
0
Fork 0
mirror of https://github.com/TermoraDev/termora.git synced 2026-01-16 02:12:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: SFTP drag and drop upload (#578)

Browse Source
This commit is contained in:
hstyi
2025-05-13 13:50:08 +08:00
committed by GitHub
parent 891ccb901b
commit 563143645e
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/kotlin/app/termora/sftp/FileSystemViewTable.kt
View File

@@ -233,7 +233,7 @@ class FileSystemViewTable(
val localTarget = sftpPanel.getLocalTarget() val localTarget = sftpPanel.getLocalTarget()
val table = localTarget.getData(SFTPDataProviders.FileSystemViewTable) ?: return false val table = localTarget.getData(SFTPDataProviders.FileSystemViewTable) ?: return false
// 委托最左侧的本地文件系统传输 // 委托最左侧的本地文件系统传输
table.transfer(paths, true, targetWorkdir) table.transfer(paths, true, targetWorkdir, fileSystemViewPanel)
return true return true
} }
return false return false
@@ -681,12 +681,13 @@ class FileSystemViewTable(
private fun transfer( private fun transfer(
files: List<FileObject>, files: List<FileObject>,
fromLocalSystem: Boolean = false, fromLocalSystem: Boolean = false,
targetWorkdir: FileObject? = null targetWorkdir: FileObject? = null,
target: FileSystemViewPanel? = null,
) { ) {
assertEventDispatchThread() assertEventDispatchThread()
val target = sftpPanel.getTarget(table) ?: return val target = (target ?: sftpPanel.getTarget(table)) ?: return
val table = target.getData(SFTPDataProviders.FileSystemViewTable) ?: return val table = target.getData(SFTPDataProviders.FileSystemViewTable) ?: return
var isApplyAll = false var isApplyAll = false
var lastAction = Action.Overwrite var lastAction = Action.Overwrite
@@ -712,7 +713,7 @@ class FileSystemViewTable(
coroutineScope.launch { coroutineScope.launch {
try { try {
doTransfer(file, lastAction, fromLocalSystem, targetWorkdir) doTransfer(file, lastAction, fromLocalSystem, targetWorkdir, target)
} catch (e: Exception) { } catch (e: Exception) {
if (log.isErrorEnabled) { if (log.isErrorEnabled) {
log.error(e.message, e) log.error(e.message, e)
@@ -863,10 +864,11 @@ class FileSystemViewTable(
file: FileObject, file: FileObject,
action: Action, action: Action,
fromLocalSystem: Boolean, fromLocalSystem: Boolean,
targetWorkdir: FileObject? targetWorkdir: FileObject?,
target: FileSystemViewPanel? = null
) { ) {
val sftpPanel = this.sftpPanel val sftpPanel = this.sftpPanel
val target = sftpPanel.getTarget(table) ?: return val target = (target ?: sftpPanel.getTarget(table)) ?: return
/** /**
* 定义一个添加器，它可以自动的判断导入/拖拽行为 * 定义一个添加器，它可以自动的判断导入/拖拽行为