Merge pull request #12 from taooceros/remote_label

Use Remote Label if possible
taooceros · Apr 6, 2024 · 07e2f4b · 07e2f4b
2 parents df8d300 + d523f30
commit 07e2f4b
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 17 deletions.
diff --git a/.github/workflows/build dotnet.yml b/.github/workflows/build dotnet.yml
@@ -11,17 +11,17 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Setup .NET
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 5.0.x
+        dotnet-version: 7.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
       run: dotnet build --no-restore -c Release
     - name: Upload Artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: Flow.Plugin.VSCodeWorkSpace
         path: Output/Release/
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@
 bin/
 obj/
 Output/
+install.nu
diff --git a/Main.cs b/Main.cs
@@ -41,7 +41,8 @@ public List<Result> Query(Query query)
             // User defined extra workspaces
             if (defaultInstalce != null)
             {
-                workspaces.AddRange(_settings.CustomWorkspaces.Select(uri => VSCodeWorkspacesApi.ParseVSCodeUri(uri, defaultInstalce)));
+                workspaces.AddRange(_settings.CustomWorkspaces.Select(uri =>
+                    VSCodeWorkspacesApi.ParseVSCodeUri(uri, defaultInstalce)));
             }
 
             // Search opened workspaces
@@ -84,7 +85,8 @@ public List<Result> Query(Query query)
                                 {
                                     FileName = a.VSCodeInstance.ExecutablePath,
                                     UseShellExecute = true,
-                                    Arguments = $"--new-window --enable-proposed-api ms-vscode-remote.remote-ssh --remote ssh-remote+{((char)34) + a.Host + ((char)34)}",
+                                    Arguments =
+                                        $"--new-window --enable-proposed-api ms-vscode-remote.remote-ssh --remote ssh-remote+{((char)34) + a.Host + ((char)34)}",
                                     WindowStyle = ProcessWindowStyle.Hidden,
                                 };
                                 Process.Start(process);
@@ -106,7 +108,8 @@ public List<Result> Query(Query query)
                 });
             }
 
-            if (query.ActionKeyword == string.Empty || (query.ActionKeyword != string.Empty && query.Search != string.Empty))
+            if (query.ActionKeyword == string.Empty ||
+                (query.ActionKeyword != string.Empty && query.Search != string.Empty))
             {
                 results = results.Where(r =>
                 {
@@ -126,10 +129,13 @@ private Result CreateWorkspaceResult(VSCodeWorkspace ws)
 
             if (ws.TypeWorkspace != TypeWorkspace.Local)
             {
-                title = $"{title}{(ws.ExtraInfo != null ? $" - {ws.ExtraInfo}" : string.Empty)} ({typeWorkspace})";
+                title = ws.Lable != null
+                    ? $"{ws.Lable}"
+                    : $"{title}{(ws.ExtraInfo != null ? $" - {ws.ExtraInfo}" : string.Empty)} ({typeWorkspace})";
             }
 
-            var tooltip = $"{Resources.Workspace}{(ws.TypeWorkspace != TypeWorkspace.Local ? $" {Resources.In} {typeWorkspace}" : string.Empty)}: {SystemPath.RealPath(ws.RelativePath)}";
+            var tooltip =
+                $"{Resources.Workspace}{(ws.TypeWorkspace != TypeWorkspace.Local ? $" {Resources.In} {typeWorkspace}" : string.Empty)}: {SystemPath.RealPath(ws.RelativePath)}";
 
             return new Result
             {
@@ -166,6 +172,7 @@ private Result CreateWorkspaceResult(VSCodeWorkspace ws)
                         string msg = Resources.OpenFail;
                         _context.API.ShowMsg(name, msg, string.Empty);
                     }
+
                     return false;
                 },
                 ContextData = ws,
@@ -220,7 +227,8 @@ public List<Result> LoadContextMenus(Result selectedResult)
                     ContextData = ws,
                 });
             }
+
             return results;
         }
     }
-}
+}
diff --git a/WorkspacesHelper/VSCodeWorkspace.cs b/WorkspacesHelper/VSCodeWorkspace.cs
@@ -15,6 +15,8 @@ public record VSCodeWorkspace
         public PathString RelativePath { get; init; }
 
         public PathString FolderName { get; init; }
+
+        public string Lable { get; init; }
 
         public string ExtraInfo { get; init; }
 

diff --git a/WorkspacesHelper/VSCodeWorkspacesApi.cs b/WorkspacesHelper/VSCodeWorkspacesApi.cs
@@ -7,6 +7,7 @@
 using System.IO;
 using System.Linq;
 using System.Text.Json;
+using System.Text.RegularExpressions;
 using Flow.Plugin.VSCodeWorkspaces.VSCodeHelper;
 using Microsoft.Data.Sqlite;
 
@@ -50,6 +51,8 @@ public static VSCodeWorkspace ParseVSCodeUri(string uri, VSCodeInstance vscodeIn
             return null;
         }
 
+        public Regex workspaceLabelParser = new Regex("(.+?)(\\[.+\\])");
+
         public List<VSCodeWorkspace> Workspaces
         {
             get
@@ -99,7 +102,8 @@ public List<VSCodeWorkspace> Workspaces
                     }
 
                     // for vscode v1.64.0 or later
-                    using var connection = new SqliteConnection($"Data Source={vscodeInstance.AppData}/User/globalStorage/state.vscdb;mode=readonly;cache=shared;");
+                    using var connection = new SqliteConnection(
+                        $"Data Source={vscodeInstance.AppData}/User/globalStorage/state.vscdb;mode=readonly;cache=shared;");
                     connection.Open();
                     var command = connection.CreateCommand();
                     command.CommandText = "SELECT value FROM ItemTable where key = 'history.recentlyOpenedPathsList'";
@@ -115,17 +119,26 @@ public List<VSCodeWorkspace> Workspaces
                             if (!entry.TryGetProperty("folderUri", out var folderUri))
                                 continue;
                             var workspaceUri = folderUri.GetString();
-                            var uri = ParseVSCodeUri(workspaceUri, vscodeInstance);
-                            if (uri == null)
+                            var workspace = ParseVSCodeUri(workspaceUri, vscodeInstance);
+                            if (workspace == null)
                                 continue;
-                            results.Add(uri);
+
+                            if (entry.TryGetProperty("label", out var label))
+                            {
+                                var labelString = label.GetString()!;
+                                var matchGroup = workspaceLabelParser.Match(labelString);
+                                workspace = workspace with {
+                                    Lable = $"{matchGroup.Groups[2]} {matchGroup.Groups[1]}"
+                                };
+                            }
+
+                            results.Add(workspace);
                         }
                     }
-
                 }
 
                 return results;
             }
         }
     }
-}
+}
diff --git a/plugin.json b/plugin.json
@@ -4,7 +4,7 @@
   "ActionKeyword": "{",
   "Name": "VS Code Workspaces",
   "Author": "ricardosantos9521",
-  "Version": "1.3.0",
+  "Version": "1.3.1",
   "Language": "csharp",
   "Website": "https://github.com/taooceros/Flow.Plugin.VSCodeWorkspace",
   "ExecuteFileName": "Flow.Plugin.VSCodeWorkspaces.dll",
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,3 +4,4 @@ @@
     bin/
     obj/
     Output/
+    install.nu