optimize debug log

trzsz · Aug 31, 2024 · 7a1d15b · 7a1d15b
1 parent 9ee1df2
commit 7a1d15b
Showing 1 changed file with 18 additions and 19 deletions.
diff --git 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