hook up to remote connections, and now secondary sort by match len

Author: sawka

frontend/app/view/preview/preview.tsx

@@ -1087,90 +1087,29 @@ const SpecializedView = memo(({ parentRef, model }: SpecializedViewProps) => {
     return <SpecializedViewComponent model={model} parentRef={parentRef} />;
 });
 
-const mockFileSuggestions: SuggestionType[] = [
-    {
-        type: "file",
-        suggestionid: "1",
-        "file:name": "document.txt",
-        "file:path": "/home/user/document.txt",
-        icon: "file",
-        iconcolor: "#4A90E2",
-        "file:mimetype": "text/plain",
-    },
-    {
-        type: "file",
-        suggestionid: "2",
-        "file:name": "presentation.pptx",
-        "file:path": "/home/user/presentation.pptx",
-        icon: "file-powerpoint",
-        iconcolor: "#D04423",
-        "file:mimetype": "application/vnd.ms-powerpoint",
-    },
-    {
-        type: "file",
-        suggestionid: "3",
-        "file:name": "spreadsheet.xlsx",
-        "file:path": "/home/user/spreadsheet.xlsx",
-        icon: "file-excel",
-        iconcolor: "#107C41",
-        "file:mimetype": "application/vnd.ms-excel",
-    },
-    {
-        type: "file",
-        suggestionid: "4",
-        "file:name": "image.png",
-        "file:path": "/home/user/image.png",
-        icon: "file-image",
-        iconcolor: "#E44D26",
-        "file:mimetype": "image/png",
-    },
-    {
-        type: "file",
-        suggestionid: "5",
-        "file:name": "notes.md",
-        "file:path": "/home/user/notes.md",
-        icon: "file-alt",
-        iconcolor: "#777",
-        "file:mimetype": "text/markdown",
-    },
-];
-
 const fetchSuggestions = async (
-    cwd: string,
+    model: PreviewModel,
     query: string,
     reqContext: SuggestionRequestContext
 ): Promise<FetchSuggestionsResponse> => {
-    return RpcApi.FetchSuggestionsCommand(TabRpcClient, {
-        suggestiontype: "file",
-        "file:cwd": cwd,
-        query: query,
-        widgetid: reqContext.widgetid,
-        reqnum: reqContext.reqnum,
-    });
-};
-
-const mockFetchSuggestions = async (
-    query: string,
-    reqCtx: SuggestionRequestContext
-): Promise<FetchSuggestionsResponse> => {
-    console.log("mock-suggestions", query);
-    return new Promise((resolve) => {
-        setTimeout(() => {
-            if (query == null || !query.trim()) {
-                resolve({ suggestions: mockFileSuggestions, reqnum: reqCtx.reqnum });
-            } else {
-                resolve({
-                    suggestions: mockFileSuggestions.filter((file) => {
-                        if (file["file:name"] == null) {
-                            return false;
-                        }
-                        return file["file:name"].toLowerCase().includes(query.toLowerCase());
-                    }),
-                    reqnum: reqCtx.reqnum,
-                });
-            }
-        }, 200);
-    });
+    const fileInfo = await globalStore.get(model.statFile);
+    if (fileInfo == null) {
+        return null;
+    }
+    const conn = await globalStore.get(model.connection);
+    return await RpcApi.FetchSuggestionsCommand(
+        TabRpcClient,
+        {
+            suggestiontype: "file",
+            "file:cwd": fileInfo.dir,
+            query: query,
+            widgetid: reqContext.widgetid,
+            reqnum: reqContext.reqnum,
+        },
+        {
+            route: makeConnRoute(conn),
+        }
+    );
 };
 
 function PreviewView({
@@ -1193,11 +1132,7 @@ function PreviewView({
         model.handleOpenFile(s["file:path"]);
     };
     const fetchSuggestionsFn = async (query, ctx) => {
-        const fileInfo = await globalStore.get(model.statFile);
-        if (fileInfo == null) {
-            return null;
-        }
-        return await fetchSuggestions(fileInfo.dir, query, ctx);
+        return await fetchSuggestions(model, query, ctx);
     };
     return (
         <>

pkg/suggestion/suggestion.go

@@ -172,6 +172,7 @@ func FetchSuggestions(ctx context.Context, data wshrpc.FetchSuggestionsData) (*w
 	type scoredEntry struct {
 		ent       fs.DirEntry
 		score     int
+		fileName  string
 		positions []int
 	}
 	var scoredEntries []scoredEntry
@@ -201,20 +202,23 @@ func FetchSuggestions(ctx context.Context, data wshrpc.FetchSuggestionsData) (*w
 				continue
 			}
 			score = result.Score
-			entry := scoredEntry{ent: de, score: score}
+			entry := scoredEntry{ent: de, score: score, fileName: fileName}
 			if positions != nil {
 				entry.positions = *positions
 			}
 			scoredEntries = append(scoredEntries, entry)
 		} else {
-			scoredEntries = append(scoredEntries, scoredEntry{ent: de, score: score})
+			scoredEntries = append(scoredEntries, scoredEntry{ent: de, score: score, fileName: fileName})
 		}
 	}
 
 	// Sort entries by descending score (better matches first).
 	if searchTerm != "" {
 		sort.Slice(scoredEntries, func(i, j int) bool {
-			return scoredEntries[i].score > scoredEntries[j].score
+			if scoredEntries[i].score != scoredEntries[j].score {
+				return scoredEntries[i].score > scoredEntries[j].score
+			}
+			return len(scoredEntries[i].fileName) < len(scoredEntries[j].fileName)
 		})
 	}
 

pkg/wshrpc/wshremote/wshremote.go

@@ -19,6 +19,7 @@ import (
 
 	"github.com/wavetermdev/waveterm/pkg/remote/connparse"
 	"github.com/wavetermdev/waveterm/pkg/remote/fileshare/wshfs"
+	"github.com/wavetermdev/waveterm/pkg/suggestion"
 	"github.com/wavetermdev/waveterm/pkg/util/fileutil"
 	"github.com/wavetermdev/waveterm/pkg/util/iochan/iochantypes"
 	"github.com/wavetermdev/waveterm/pkg/util/tarcopy"
@@ -801,6 +802,10 @@ func (*ServerImpl) RemoteInstallRcFilesCommand(ctx context.Context) error {
 	return wshutil.InstallRcFiles()
 }
 
+func (*ServerImpl) FetchSuggestionsCommand(ctx context.Context, data wshrpc.FetchSuggestionsData) (*wshrpc.FetchSuggestionsResponse, error) {
+	return suggestion.FetchSuggestions(ctx, data)
+}
+
 func logPrintfDev(format string, args ...interface{}) {
 	if wavebase.IsDevMode() {
 		log.Printf(format, args...)

pkg/wshrpc/wshserver/wshserver.go

@@ -26,7 +26,6 @@ import (
 	"github.com/wavetermdev/waveterm/pkg/remote"
 	"github.com/wavetermdev/waveterm/pkg/remote/conncontroller"
 	"github.com/wavetermdev/waveterm/pkg/remote/fileshare"
-	"github.com/wavetermdev/waveterm/pkg/suggestion"
 	"github.com/wavetermdev/waveterm/pkg/telemetry"
 	"github.com/wavetermdev/waveterm/pkg/telemetry/telemetrydata"
 	"github.com/wavetermdev/waveterm/pkg/util/envutil"
@@ -862,7 +861,3 @@ func (ws *WshServer) PathCommand(ctx context.Context, data wshrpc.PathCommandDat
 	}
 	return path, nil
 }
-
-func (ws *WshServer) FetchSuggestionsCommand(ctx context.Context, data wshrpc.FetchSuggestionsData) (*wshrpc.FetchSuggestionsResponse, error) {
-	return suggestion.FetchSuggestions(ctx, data)
-}