{#if result?.status}
@@ -145,6 +185,7 @@
.controls {
margin-top: 0.5rem;
display: flex;
+ gap: 0.2rem;
align-items: center;
grid-column: 1 / 3;
}
diff --git a/frontend/wailsjs/go/app/App.d.ts b/frontend/wailsjs/go/app/App.d.ts
index 565eb1a..bc85840 100755
--- a/frontend/wailsjs/go/app/App.d.ts
+++ b/frontend/wailsjs/go/app/App.d.ts
@@ -40,6 +40,8 @@ export function OpenConnection(arg1:string):Promise
;
export function OpenDatabase(arg1:string,arg2:string):Promise;
+export function OpenShellScript():Promise;
+
export function PerformDump(arg1:string):Promise;
export function PerformFindExport(arg1:string,arg2:string,arg3:string,arg4:string):Promise;
@@ -62,6 +64,8 @@ export function ReportSharedStateVariable(arg1:string,arg2:string):Promise
export function SaveQuery(arg1:string):Promise;
+export function SaveShellScript(arg1:string,arg2:string,arg3:string,arg4:string,arg5:boolean):Promise;
+
export function SavedQueries():Promise;
export function Settings():Promise;
diff --git a/frontend/wailsjs/go/app/App.js b/frontend/wailsjs/go/app/App.js
index aee0d09..581ca98 100755
--- a/frontend/wailsjs/go/app/App.js
+++ b/frontend/wailsjs/go/app/App.js
@@ -70,6 +70,10 @@ export function OpenDatabase(arg1, arg2) {
return window['go']['app']['App']['OpenDatabase'](arg1, arg2);
}
+export function OpenShellScript() {
+ return window['go']['app']['App']['OpenShellScript']();
+}
+
export function PerformDump(arg1) {
return window['go']['app']['App']['PerformDump'](arg1);
}
@@ -114,6 +118,10 @@ export function SaveQuery(arg1) {
return window['go']['app']['App']['SaveQuery'](arg1);
}
+export function SaveShellScript(arg1, arg2, arg3, arg4, arg5) {
+ return window['go']['app']['App']['SaveShellScript'](arg1, arg2, arg3, arg4, arg5);
+}
+
export function SavedQueries() {
return window['go']['app']['App']['SavedQueries']();
}
diff --git a/internal/app/host_shell.go b/internal/app/host_shell.go
index 9a4a9ad..5675e60 100644
--- a/internal/app/host_shell.go
+++ b/internal/app/host_shell.go
@@ -20,6 +20,13 @@ type ExecuteShellScriptResult struct {
ErrorDescription string `json:"errorDescription"`
}
+type SaveShellScriptResult struct {
+ Host Host `json:"host"`
+ Fname string `json:"filename"`
+ ErrorTitle string `json:"errorTitle"`
+ ErrorDescription string `json:"errorDescription"`
+}
+
func (a *App) ExecuteShellScript(hostKey, dbKey, collKey, script string) (result ExecuteShellScriptResult) {
if !a.Env.HasMongoShell {
result.ErrorTitle = "mongosh not found"
@@ -27,8 +34,40 @@ func (a *App) ExecuteShellScript(hostKey, dbKey, collKey, script string) (result
return
}
+ saveRes := a.SaveShellScript(hostKey, dbKey, collKey, script, true)
+ if (saveRes.ErrorTitle != "") || (saveRes.ErrorDescription != "") {
+ result.ErrorTitle = saveRes.ErrorTitle
+ result.ErrorDescription = saveRes.ErrorDescription
+ return
+ }
+
+ var outbuf, errbuf strings.Builder
+ cmd := exec.Command("mongosh", "--file", saveRes.Fname, saveRes.Host.URI)
+ cmd.Stdout = &outbuf
+ cmd.Stderr = &errbuf
+ err := cmd.Run()
+
+ if exiterr, ok := err.(*exec.ExitError); ok {
+ result.Status = exiterr.ExitCode()
+ } else if err != nil {
+ runtime.LogWarningf(a.ctx, "Shell: failed to execute: mongosh --file %s: %s", saveRes.Fname, err.Error())
+ result.ErrorTitle = "mongosh failure"
+ result.ErrorDescription = err.Error()
+ return
+ } else {
+ result.Status = 0
+ }
+
+ os.Remove(saveRes.Fname)
+ result.Output = outbuf.String()
+ result.Stderr = errbuf.String()
+ return
+}
+
+func (a *App) SaveShellScript(hostKey, dbKey, collKey, script string, temp bool) (result SaveShellScriptResult) {
hosts, err := a.Hosts()
if err != nil {
+ runtime.LogWarningf(a.ctx, "Shell: could not get hosts: %s", err.Error())
result.ErrorTitle = "Could not get hosts"
result.ErrorDescription = err.Error()
return
@@ -36,10 +75,12 @@ func (a *App) ExecuteShellScript(hostKey, dbKey, collKey, script string) (result
host, hostFound := hosts[hostKey]
if !hostFound {
+ runtime.LogWarningf(a.ctx, "Shell: host %s does not exist", host)
result.ErrorTitle = "The specified host does not seem to exist"
return
}
+ result.Host = host
id, err := uuid.NewRandom()
if err != nil {
runtime.LogErrorf(a.ctx, "Shell: failed to generate a UUID: %s", err.Error())
@@ -48,14 +89,35 @@ func (a *App) ExecuteShellScript(hostKey, dbKey, collKey, script string) (result
return
}
- dirname := path.Join(a.Env.DataDirectory, "Shell Scripts")
- fname := path.Join(dirname, fmt.Sprintf("%s.mongosh.js", id.String()))
+ if temp {
+ dirname, err := os.MkdirTemp(os.TempDir(), "rolens-script")
+ if err != nil {
+ runtime.LogErrorf(a.ctx, "Shell: failed to create temporary directory: %s", err.Error())
+ result.ErrorTitle = "Could not generate temporary directory for script"
+ result.ErrorDescription = err.Error()
+ return
+ }
+ result.Fname = path.Join(dirname, fmt.Sprintf("%s.mongosh.js", id.String()))
+ } else {
+ result.Fname, err = runtime.SaveFileDialog(a.ctx, runtime.SaveDialogOptions{
+ DefaultFilename: "New Script.js",
+ DefaultDirectory: path.Join(a.Env.DataDirectory, "Shell Scripts"),
+ Title: "Save MongoDB Shell Script",
+ CanCreateDirectories: true,
+ Filters: []runtime.FileFilter{
+ {
+ DisplayName: "MongoDB Shell Script (*.js)",
+ Pattern: "*.js",
+ },
+ },
+ })
- if err := os.MkdirAll(dirname, os.ModePerm); err != nil {
- runtime.LogWarningf(a.ctx, "Shell: failed to mkdir %s", err.Error())
- result.ErrorTitle = "Could not create temporary directory"
- result.ErrorDescription = err.Error()
- return
+ if err != nil {
+ runtime.LogErrorf(a.ctx, "Shell: failed to save script: %s", err.Error())
+ result.ErrorTitle = "Could not save shell script"
+ result.ErrorDescription = err.Error()
+ return
+ }
}
scriptHeader := fmt.Sprintf("// Namespace: %s.%s\n", dbKey, collKey)
@@ -77,35 +139,46 @@ func (a *App) ExecuteShellScript(hostKey, dbKey, collKey, script string) (result
scriptHeader = scriptHeader + fmt.Sprintf("coll = db.getCollection('%s');\n", collKey)
}
- scriptHeader = scriptHeader + "\n// Start of user script\n"
- script = scriptHeader + script
+ scriptHeader = scriptHeader + "\n"
+ script = scriptHeader + strings.TrimLeft(strings.TrimRight(script, " \t\n"), "\n")
- if err := os.WriteFile(fname, []byte(script), os.ModePerm); err != nil {
- runtime.LogWarningf(a.ctx, "Shell: failed to write script to %s", err.Error())
+ if err := os.WriteFile(result.Fname, []byte(script), os.ModePerm); err != nil {
+ runtime.LogWarningf(a.ctx, "Shell: failed to write script to %s: %s", result.Fname, err.Error())
result.ErrorTitle = "Could not create temporary script file"
result.ErrorDescription = err.Error()
return
}
- var outbuf, errbuf strings.Builder
- cmd := exec.Command("mongosh", "--file", fname, host.URI)
- cmd.Stdout = &outbuf
- cmd.Stderr = &errbuf
- err = cmd.Run()
-
- if exiterr, ok := err.(*exec.ExitError); ok {
- result.Status = exiterr.ExitCode()
- } else if err != nil {
- runtime.LogWarningf(a.ctx, "Shell: failed to execute: mongosh --file %s: %s", fname, err.Error())
- result.ErrorTitle = "mongosh failure"
- result.ErrorDescription = err.Error()
- return
- } else {
- result.Status = 0
- }
-
- os.Remove(fname)
- result.Output = outbuf.String()
- result.Stderr = errbuf.String()
return
}
+
+func (a *App) OpenShellScript() string {
+ dir := path.Join(a.Env.DataDirectory, "Shell Scripts")
+ os.MkdirAll(dir, os.ModePerm)
+
+ fname, err := runtime.OpenFileDialog(a.ctx, runtime.OpenDialogOptions{
+ DefaultDirectory: path.Join(a.Env.DataDirectory, "Shell Scripts"),
+ Title: "Load a MongoDB Shell Script",
+ CanCreateDirectories: true,
+ Filters: []runtime.FileFilter{
+ {
+ DisplayName: "MongoDB Shell Script (*.js)",
+ Pattern: "*.js",
+ },
+ },
+ })
+
+ if err != nil {
+ runtime.LogWarningf(a.ctx, "Shell: error opening script: %s", err.Error())
+ return ""
+ }
+
+ script, err := os.ReadFile(fname)
+
+ if err != nil {
+ runtime.LogWarningf(a.ctx, "Shell: error reading script %s: %s", fname, err.Error())
+ return ""
+ }
+
+ return string(script)
+}