From 12eb0e85e2b67eefa72e102ad550e7cf3bbda4fc Mon Sep 17 00:00:00 2001
From: sorubedo <zhanrenhangg@gmail.com>
Date: Mon, 15 Jun 2026 20:59:08 +0800
Subject: [PATCH] fix(ftp): add cwd_list option and filter path-separated
 entries

---
 drivers/ftp/driver.go | 27 +++++++++++++++++++++++++--
 drivers/ftp/meta.go   |  1 +
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/drivers/ftp/driver.go b/drivers/ftp/driver.go
index 4845337861..0d3e803e03 100644
--- a/drivers/ftp/driver.go
+++ b/drivers/ftp/driver.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"io"
 	stdpath "path"
+	"strings"
 
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
 	"github.com/OpenListTeam/OpenList/v4/internal/errs"
@@ -51,13 +52,35 @@ func (d *FTP) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]m
 	if err := d.login(); err != nil {
 		return nil, err
 	}
-	entries, err := d.conn.List(encode(dir.GetPath(), d.Encoding))
+
+	path := encode(dir.GetPath(), d.Encoding)
+
+	var entries []*ftp.Entry
+	var err error
+
+	if d.CwdList {
+		origDir, cwdErr := d.conn.CurrentDir()
+		if cwdErr != nil {
+			return nil, cwdErr
+		}
+		if cwdErr = d.conn.ChangeDir(path); cwdErr != nil {
+			return nil, cwdErr
+		}
+		entries, err = d.conn.List("")
+		if restoreErr := d.conn.ChangeDir(origDir); restoreErr != nil {
+			d.conn = nil
+		}
+	} else {
+		entries, err = d.conn.List(path)
+	}
+
 	if err != nil {
 		return nil, err
 	}
+
 	res := make([]model.Obj, 0)
 	for _, entry := range entries {
-		if entry.Name == "." || entry.Name == ".." {
+		if entry.Name == "." || entry.Name == ".." || strings.Contains(entry.Name, "/") {
 			continue
 		}
 		name := decode(entry.Name, d.Encoding)
diff --git a/drivers/ftp/meta.go b/drivers/ftp/meta.go
index 0ec0e735eb..6dc0d2cb61 100644
--- a/drivers/ftp/meta.go
+++ b/drivers/ftp/meta.go
@@ -27,6 +27,7 @@ type Addition struct {
 	Encoding string `json:"encoding" required:"true"`
 	Username string `json:"username" required:"true"`
 	Password string `json:"password" required:"true"`
+	CwdList  bool   `json:"cwd_list" type:"bool" default:"false" help:"enter directory before listing"`
 	driver.RootPath
 }