Add custom open command override
This commit is contained in:
@@ -12,7 +12,8 @@ const appName = "luxtools-client"
|
|||||||
|
|
||||||
// Config stores client configuration loaded from disk.
|
// Config stores client configuration loaded from disk.
|
||||||
type Config struct {
|
type Config struct {
|
||||||
PathMap map[string]string `json:"path_map"`
|
PathMap map[string]string `json:"path_map"`
|
||||||
|
OpenLocationCommand string `json:"open_location_command,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// ConfigPath returns the full path to the config.json file.
|
// ConfigPath returns the full path to the config.json file.
|
||||||
|
|||||||
72
internal/openfolder/custom.go
Normal file
72
internal/openfolder/custom.go
Normal file
@@ -0,0 +1,72 @@
|
|||||||
|
package openfolder
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"os/exec"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
// OpenLocationCustom executes a user-defined command string, substituting %1
|
||||||
|
// with the given path. The command string is split into executable + arguments
|
||||||
|
// using shell-like quoting rules (double quotes are respected).
|
||||||
|
//
|
||||||
|
// Example command: doublecmd.exe -C -T -P L -L "%1"
|
||||||
|
func OpenLocationCustom(command string, path string) error {
|
||||||
|
expanded := strings.ReplaceAll(command, "%1", path)
|
||||||
|
|
||||||
|
args, err := splitCommand(expanded)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if len(args) == 0 {
|
||||||
|
return errors.New("open_location_command: empty command after expansion")
|
||||||
|
}
|
||||||
|
|
||||||
|
return exec.Command(args[0], args[1:]...).Start()
|
||||||
|
}
|
||||||
|
|
||||||
|
// splitCommand splits a command string into tokens, respecting double-quoted
|
||||||
|
// segments. Quotes are removed from the resulting tokens. Backslash escaping
|
||||||
|
// of a double quote (\") inside a quoted segment is supported.
|
||||||
|
func splitCommand(s string) ([]string, error) {
|
||||||
|
var tokens []string
|
||||||
|
var current strings.Builder
|
||||||
|
inQuote := false
|
||||||
|
hasToken := false
|
||||||
|
|
||||||
|
for i := 0; i < len(s); i++ {
|
||||||
|
ch := s[i]
|
||||||
|
|
||||||
|
switch {
|
||||||
|
case ch == '"':
|
||||||
|
inQuote = !inQuote
|
||||||
|
hasToken = true // even empty quotes produce a token part
|
||||||
|
|
||||||
|
case ch == '\\' && inQuote && i+1 < len(s) && s[i+1] == '"':
|
||||||
|
// escaped quote inside a quoted segment
|
||||||
|
current.WriteByte('"')
|
||||||
|
i++ // skip the next quote
|
||||||
|
|
||||||
|
case (ch == ' ' || ch == '\t') && !inQuote:
|
||||||
|
if hasToken {
|
||||||
|
tokens = append(tokens, current.String())
|
||||||
|
current.Reset()
|
||||||
|
hasToken = false
|
||||||
|
}
|
||||||
|
|
||||||
|
default:
|
||||||
|
current.WriteByte(ch)
|
||||||
|
hasToken = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if inQuote {
|
||||||
|
return nil, errors.New("open_location_command: unterminated double quote")
|
||||||
|
}
|
||||||
|
|
||||||
|
if hasToken {
|
||||||
|
tokens = append(tokens, current.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
return tokens, nil
|
||||||
|
}
|
||||||
@@ -60,7 +60,7 @@ var settingsTemplate = template.Must(template.New("settings").Parse(`<!doctype h
|
|||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<h1>Path Aliases</h1>
|
<h1>Path Aliases</h1>
|
||||||
<p class="small">Define aliases like <code>PROJECTS</code> -> <code>/mnt/projects</code>. Use in <code>/open</code> as <code>PROJECTS>my/repo</code>.</p>
|
<p class="small">Define aliases like <code>PROJECTS</code> -> <code>/mnt/projects</code>. Use in <code>/open</code> as <code>PROJECTS>my/repo</code>.</p>
|
||||||
|
|
||||||
<table>
|
<table>
|
||||||
<thead>
|
<thead>
|
||||||
@@ -70,7 +70,19 @@ var settingsTemplate = template.Must(template.New("settings").Parse(`<!doctype h
|
|||||||
</table>
|
</table>
|
||||||
<div style="margin-top: 0.75rem;">
|
<div style="margin-top: 0.75rem;">
|
||||||
<button id="addRow">Add Alias</button>
|
<button id="addRow">Add Alias</button>
|
||||||
<button id="save">Save</button>
|
</div>
|
||||||
|
|
||||||
|
<h2 style="margin-top: 2rem;">Open Location Command</h2>
|
||||||
|
<p class="small">
|
||||||
|
Optionally override the default file manager. Use <code>%1</code> for the resolved path.<br>
|
||||||
|
Example: <code>doublecmd.exe -C -T -P L -L "%1"</code>
|
||||||
|
</p>
|
||||||
|
<div style="max-width: 900px;">
|
||||||
|
<input type="text" id="openCmd" placeholder='e.g. doublecmd.exe -C -T -P L -L "%1"' style="width: 100%; box-sizing: border-box; padding: 0.35rem;">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div style="margin-top: 1rem;">
|
||||||
|
<button id="save">Save All Settings</button>
|
||||||
</div>
|
</div>
|
||||||
<div id="status" class="small"></div>
|
<div id="status" class="small"></div>
|
||||||
|
|
||||||
@@ -148,6 +160,7 @@ var settingsTemplate = template.Must(template.New("settings").Parse(`<!doctype h
|
|||||||
const keys = Object.keys(data.path_map || {}).sort();
|
const keys = Object.keys(data.path_map || {}).sort();
|
||||||
if (keys.length === 0) addRow();
|
if (keys.length === 0) addRow();
|
||||||
for (const k of keys) addRow(k, data.path_map[k]);
|
for (const k of keys) addRow(k, data.path_map[k]);
|
||||||
|
document.getElementById('openCmd').value = data.open_location_command || '';
|
||||||
setStatus('Loaded', false);
|
setStatus('Loaded', false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -155,10 +168,11 @@ var settingsTemplate = template.Must(template.New("settings").Parse(`<!doctype h
|
|||||||
try {
|
try {
|
||||||
const map = collect();
|
const map = collect();
|
||||||
setStatus('Saving...', false);
|
setStatus('Saving...', false);
|
||||||
|
const openCmd = document.getElementById('openCmd').value.trim();
|
||||||
const res = await fetch('/settings/config', {
|
const res = await fetch('/settings/config', {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: { 'Content-Type': 'application/json' },
|
headers: { 'Content-Type': 'application/json' },
|
||||||
body: JSON.stringify({ path_map: map })
|
body: JSON.stringify({ path_map: map, open_location_command: openCmd })
|
||||||
});
|
});
|
||||||
const data = await res.json();
|
const data = await res.json();
|
||||||
if (!data.ok) {
|
if (!data.ok) {
|
||||||
|
|||||||
Reference in New Issue
Block a user