Merge pull request Place1#7 from vincentbitter/Path-issues

Path issues
halkeye · Dec 10, 2019 · 271f737 · 271f737
2 parents 4c89f9a + 4883ae0
commit 271f737
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/internal/services/devices.go b/internal/services/devices.go
@@ -2,6 +2,7 @@ package services
 
 import (
 	"fmt"
+	"os"
 	"net"
 	"sync"
 	"time"
@@ -67,7 +68,11 @@ func (d *DeviceManager) AddDevice(user string, name string, publicKey string) (*
 }
 
 func (d *DeviceManager) ListDevices(user string) ([]*storage.Device, error) {
-	return d.storage.List(user + "/")
+	prefix := ""
+	if (user != "") {
+		prefix = user + string(os.PathSeparator)
+	}
+	return d.storage.List(prefix)
 }
 
 func (d *DeviceManager) DeleteDevice(user string, name string) error {

diff --git a/internal/storage/disk.go b/internal/storage/disk.go
@@ -50,6 +50,7 @@ func (s *DiskStorage) List(prefix string) ([]*Device, error) {
 			return nil
 		}
 		p := strings.TrimPrefix(path, s.directory)
+		p = strings.TrimPrefix(p, string(os.PathSeparator))
 		if strings.HasPrefix(p, prefix) {
 			files = append(files, path)
 		}
@@ -58,6 +59,8 @@ func (s *DiskStorage) List(prefix string) ([]*Device, error) {
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to list storage directory")
 	}
+	logrus.Debugf("Found files: %+v", files)
+
 	devices := []*Device{}
 	for _, file := range files {
 		bytes, err := ioutil.ReadFile(file)
@@ -73,6 +76,7 @@ func (s *DiskStorage) List(prefix string) ([]*Device, error) {
 		}
 		devices = append(devices, device)
 	}
+	logrus.Debugf("Found devices: %+v", devices)
 	return devices, nil
 }