Add configurable mount query
This commit is contained in:
@@ -37,7 +37,7 @@ type fileNode struct {
|
||||
|
||||
func runMountCommand(args []string, cfg config, password string) error {
|
||||
fsFlags := flag.NewFlagSet("mount", flag.ExitOnError)
|
||||
query := fsFlags.String("query", "*", "Docspell item query to expose")
|
||||
query := fsFlags.String("query", cfg.MountQuery, "Docspell item query to expose")
|
||||
limit := fsFlags.Int("limit", 1000, "number of items to fetch per API request")
|
||||
authHeader := fsFlags.String("auth-header", defaultDocspellAuthHeader, "HTTP header used for the Docspell auth token")
|
||||
if err := fsFlags.Parse(args); err != nil {
|
||||
@@ -86,6 +86,7 @@ func runMountCommand(args []string, cfg config, password string) error {
|
||||
}
|
||||
|
||||
func startMountInBackground(args []string, mountPoint string, quiet bool) error {
|
||||
mountPoint = cleanMountPath(mountPoint)
|
||||
if isMounted(mountPoint) {
|
||||
if !quiet {
|
||||
fmt.Printf("Already mounted at %s\n", mountPoint)
|
||||
@@ -94,8 +95,13 @@ func startMountInBackground(args []string, mountPoint string, quiet bool) error
|
||||
}
|
||||
cmd := exec.Command(os.Args[0], append([]string{"mount"}, args...)...)
|
||||
cmd.Env = append(os.Environ(), "DOCSPELL_IMPORT_MOUNT_FOREGROUND=1")
|
||||
cmd.Stdout = nil
|
||||
cmd.Stderr = nil
|
||||
logFile, err := mountLogFile()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer logFile.Close()
|
||||
cmd.Stdout = logFile
|
||||
cmd.Stderr = logFile
|
||||
if err := cmd.Start(); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -153,23 +159,42 @@ func runGetURLCommand(args []string, cfg config, password string) error {
|
||||
}
|
||||
|
||||
func ensureMounted(cfg config, password string) (string, error) {
|
||||
mountPoint := cfg.MountPath
|
||||
mountPoint := cleanMountPath(cfg.MountPath)
|
||||
if mountPoint == "" {
|
||||
return "", fmt.Errorf("MountPath missing in config")
|
||||
}
|
||||
if isMounted(mountPoint) {
|
||||
if isStaleMount(mountPoint) {
|
||||
_ = unmount(mountPoint)
|
||||
} else {
|
||||
return mountPoint, nil
|
||||
}
|
||||
}
|
||||
if isMounted(mountPoint) {
|
||||
return mountPoint, nil
|
||||
}
|
||||
if err := startMountInBackground([]string{mountPoint}, mountPoint, true); err != nil {
|
||||
return "", err
|
||||
}
|
||||
for i := 0; i < 50; i++ {
|
||||
for i := 0; i < 300; i++ {
|
||||
if isMounted(mountPoint) {
|
||||
return mountPoint, nil
|
||||
}
|
||||
time.Sleep(100 * time.Millisecond)
|
||||
}
|
||||
return "", fmt.Errorf("mount did not become ready at %s", mountPoint)
|
||||
return "", fmt.Errorf("mount did not become ready at %s; see %s", mountPoint, mountLogPath())
|
||||
}
|
||||
|
||||
func isStaleMount(mountPoint string) bool {
|
||||
_, err := os.ReadDir(mountPoint)
|
||||
return err != nil && strings.Contains(err.Error(), "transport endpoint is not connected")
|
||||
}
|
||||
|
||||
func unmount(mountPoint string) error {
|
||||
if err := exec.Command("fusermount", "-u", mountPoint).Run(); err == nil {
|
||||
return nil
|
||||
}
|
||||
return exec.Command("fusermount3", "-u", mountPoint).Run()
|
||||
}
|
||||
|
||||
func isMounted(mountPoint string) bool {
|
||||
@@ -177,16 +202,43 @@ func isMounted(mountPoint string) bool {
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
mountPoint, _ = filepath.Abs(mountPoint)
|
||||
mountPoint = cleanMountPath(mountPoint)
|
||||
for _, line := range strings.Split(string(data), "\n") {
|
||||
fields := strings.Fields(line)
|
||||
if len(fields) >= 2 && fields[1] == mountPoint {
|
||||
if len(fields) >= 2 && cleanMountPath(fields[1]) == mountPoint {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func cleanMountPath(path string) string {
|
||||
if path == "" {
|
||||
return ""
|
||||
}
|
||||
abs, err := filepath.Abs(path)
|
||||
if err != nil {
|
||||
return filepath.Clean(path)
|
||||
}
|
||||
return filepath.Clean(abs)
|
||||
}
|
||||
|
||||
func mountLogPath() string {
|
||||
cacheDir, err := os.UserCacheDir()
|
||||
if err != nil || cacheDir == "" {
|
||||
return filepath.Join(os.TempDir(), "docspell-import-mount.log")
|
||||
}
|
||||
return filepath.Join(cacheDir, "docspell-import", "mount.log")
|
||||
}
|
||||
|
||||
func mountLogFile() (*os.File, error) {
|
||||
path := mountLogPath()
|
||||
if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return os.OpenFile(path, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644)
|
||||
}
|
||||
|
||||
func itemIDFromURLOrID(s string) string {
|
||||
s = strings.TrimSpace(s)
|
||||
if idx := strings.LastIndex(s, "/app/item/"); idx >= 0 {
|
||||
@@ -241,9 +293,6 @@ func buildMountTree(ctx context.Context, client *DocspellClient, items []SearchI
|
||||
byID := &dirNode{name: "by-id", children: map[string]fs.Node{}}
|
||||
root.children["by-id"] = byID
|
||||
for _, item := range items {
|
||||
if full, err := client.GetItem(ctx, item.ID); err == nil {
|
||||
item = *full
|
||||
}
|
||||
folderName := "No Folder"
|
||||
if item.Folder != nil && item.Folder.Name != "" {
|
||||
folderName = item.Folder.Name
|
||||
|
||||
Reference in New Issue
Block a user