initial VFS

2 files changed, 29 insertions, 31 deletions

diff --git a/internal/server/handler/handler.go b/internal/server/handler/handler.go
index 25a4b49..6549c9f 100644
--- a/internal/server/handler/handler.go
+++ b/internal/server/handler/handler.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"os"
 	"regexp"
 
 	"codeberg.org/snonux/gos/internal/config/server"
@@ -26,7 +25,6 @@ func New(conf server.ServerConfig) Handler {
 	}
 }
 
-// TODO: Use repository.Repository to store the file to the file system
 func (h Handler) Submit(w http.ResponseWriter, r *http.Request) error {
 	if r.Method != "POST" {
 		return fmt.Errorf("expexted POST request")
@@ -64,7 +62,7 @@ func (h Handler) Get(w http.ResponseWriter, r *http.Request) error {
 		return fmt.Errorf("invalid id %s", id)
 	}
 
-	data, err := os.ReadFile(fmt.Sprintf("%s/%s", h.conf.DataDir, id))
+	data, err := repository.Instance(h.conf.DataDir).Get(id)
 	if err != err {
 		return err
 	}
@@ -103,7 +101,7 @@ func (h Handler) mergeFromPartner(partner string) error {
 	}
 
 	for _, pair := range pairs {
-		if repo.HasEntry(pair) {
+		if repo.HasSameEntry(pair) {
 			continue
 		}
 
diff --git a/internal/server/repository/repository.go b/internal/server/repository/repository.go
index 2c6b132..029ca53 100644
--- a/internal/server/repository/repository.go
+++ b/internal/server/repository/repository.go
@@ -3,13 +3,10 @@ package repository
 import (
 	"encoding/json"
 	"fmt"
-	"log"
-	"os"
-	"path/filepath"
-	"strings"
 	"sync"
 	"time"
 
+	"codeberg.org/snonux/gos/internal"
 	"codeberg.org/snonux/gos/internal/types"
 )
 
@@ -27,6 +24,7 @@ type Repository struct {
 	dataDir string
 	entries map[string]types.Entry
 	mu      *sync.Mutex
+	vfs     internal.VFS
 }
 
 func Instance(dataDir string) *Repository {
@@ -35,6 +33,7 @@ func Instance(dataDir string) *Repository {
 			dataDir: dataDir,
 			entries: make(map[string]types.Entry),
 			mu:      &sync.Mutex{},
+			vfs:     internal.RealFS{},
 		}
 	})
 	return instance
@@ -48,26 +47,20 @@ func (r Repository) add(entry types.Entry) {
 
 // Load repository into memory
 func (r Repository) load() error {
-	visit := func() filepath.WalkFunc {
-		return func(path string, info os.FileInfo, err error) error {
-			if err != nil {
-				log.Println(err)
-				return nil
-			}
-			if info.IsDir() || !strings.HasSuffix(path, ".json") {
-				return nil
-			}
-
-			entry, err := types.NewEntryFromFile(path)
-			if err != err {
-				return err
-			}
-			r.add(entry)
-			return nil
+	filePaths, err := r.vfs.FindFiles(r.dataDir)
+	if err != nil {
+		return err
+	}
+
+	for _, filePath := range filePaths {
+		entry, err := types.NewEntryFromFile(filePath)
+		if err != err {
+			return err
 		}
+		r.add(entry)
 	}
 
-	return filepath.Walk(r.dataDir, visit())
+	return nil
 }
 
 func (r Repository) List() ([]byte, error) {
@@ -86,7 +79,11 @@ func (r Repository) List() ([]byte, error) {
 	return json.Marshal(pairs)
 }
 
-func (r Repository) HasEntry(pair EntryPair) bool {
+func (r Repository) Get(id string) ([]byte, error) {
+	return r.vfs.ReadFile(fmt.Sprintf("%s/%s", r.dataDir, id))
+}
+
+func (r Repository) HasSameEntry(pair EntryPair) bool {
 	r.mu.Lock()
 	defer r.mu.Unlock()
 
@@ -101,17 +98,20 @@ func (r Repository) entryPath(entry types.Entry) string {
 	return fmt.Sprintf("%s/%s/%s.json", r.dataDir, time.Now().Format("2006"), entry.ID)
 }
 
-func (r Repository) Merge(newEntry types.Entry) error {
+func (r Repository) Merge(otherEntry types.Entry) error {
 	r.mu.Lock()
 	defer r.mu.Unlock()
 
-	entry, ok := r.entries[newEntry.ID]
+	entry, ok := r.entries[otherEntry.ID]
 	if !ok {
-		entry = types.NewEntryFromCopy(newEntry)
+		var err error
+		if entry, err = types.NewEntryFromCopy(otherEntry); err != nil {
+			return err
+		}
 	}
 
-	entry, _ = entry.Update(newEntry)
-	r.entries[newEntry.ID] = entry
+	entry, _ = entry.Update(otherEntry)
+	r.entries[otherEntry.ID] = entry
 
 	// TODO: Only save to file when actually changed
 	return entry.SaveFile(r.entryPath(entry))