From 7a1d15b52a4cc400c64f8a77983448ea67c33c43 Mon Sep 17 00:00:00 2001 From: Lonny Wong Date: Sat, 31 Aug 2024 12:03:26 +0800 Subject: [PATCH] optimize debug log --- tssh/trzsz.go | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/tssh/trzsz.go b/tssh/trzsz.go index bfdacb8..7d7fe19 100644 --- a/tssh/trzsz.go +++ b/tssh/trzsz.go @@ -156,6 +156,23 @@ func enableTrzsz(args *sshArgs, ss *sshClientSession) error { return fmt.Errorf("get terminal size failed: %v", err) } + // custom configuration + defaultUploadPath := getExOptionConfig(args, "DefaultUploadPath") + if defaultUploadPath == "" { + defaultUploadPath = userConfig.defaultUploadPath + } + defaultDownloadPath := args.DownloadPath + if defaultDownloadPath == "" { + defaultDownloadPath = getExOptionConfig(args, "DefaultDownloadPath") + if defaultDownloadPath == "" { + defaultDownloadPath = userConfig.defaultDownloadPath + } + } + dragFileUploadCommand := getExOptionConfig(args, "DragFileUploadCommand") + if dragFileUploadCommand == "" { + dragFileUploadCommand = userConfig.dragFileUploadCommand + } + // create a TrzszFilter to support trzsz ( trz / tsz ) // // os.Stdin ┌────────┐ os.Stdin ┌─────────────┐ ServerIn ┌────────┐ @@ -185,27 +202,9 @@ func enableTrzsz(args *sshArgs, ss *sshClientSession) error { }) // setup trzsz config - defaultUploadPath := getExOptionConfig(args, "DefaultUploadPath") - if defaultUploadPath == "" { - defaultUploadPath = userConfig.defaultUploadPath - } trzszFilter.SetDefaultUploadPath(defaultUploadPath) - - downloadPath := args.DownloadPath - if downloadPath == "" { - downloadPath = getExOptionConfig(args, "DefaultDownloadPath") - if downloadPath == "" { - downloadPath = userConfig.defaultDownloadPath - } - } - trzszFilter.SetDefaultDownloadPath(downloadPath) - - dragFileUploadCommand := getExOptionConfig(args, "DragFileUploadCommand") - if dragFileUploadCommand == "" { - dragFileUploadCommand = userConfig.dragFileUploadCommand - } + trzszFilter.SetDefaultDownloadPath(defaultDownloadPath) trzszFilter.SetDragFileUploadCommand(dragFileUploadCommand) - trzszFilter.SetProgressColorPair(userConfig.progressColorPair) // setup tunnel connect