From b3bddfd992c33a02628d4a5d0586774228776dc9 Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Sat, 25 May 2024 22:56:20 +0300
Subject: initial VFS

---
 internal/types/entry.go | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

(limited to 'internal/types')

diff --git a/internal/types/entry.go b/internal/types/entry.go
index 611cee1..55391de 100644
--- a/internal/types/entry.go
+++ b/internal/types/entry.go
@@ -4,7 +4,6 @@ import (
 	"crypto/sha256"
 	"encoding/json"
 	"fmt"
-	"os"
 	"strings"
 	"sync"
 
@@ -38,6 +37,7 @@ type Entry struct {
 	Body   string   `json:"body"`
 	Shared []Shared `json:"shared,omitempty"`
 	Epoch  int      `json:"epoch,omitempty"`
+	vfs    internal.VFS
 
 	// The checksum of the whole entry, can change depending on the state.
 	checksum      string
@@ -57,24 +57,34 @@ func NewEntry(bytes []byte) (Entry, error) {
 	return e, nil
 }
 
-// Beware , this is only from a shallow copy!
-func NewEntryFromCopy(other Entry) Entry {
-	e := other
-	e.initialize()
-	return e
-}
+func NewEntryFromFile(filePath string, vfsToUse ...internal.VFS) (Entry, error) {
+	var (
+		bytes []byte
+		err   error
+		vfs   internal.VFS = internal.RealFS{}
+	)
+
+	if len(vfsToUse) > 0 {
+		vfs = vfsToUse[0]
+	}
 
-func NewEntryFromFile(filePath string) (Entry, error) {
-	bytes, err := os.ReadFile(filePath)
+	bytes, err = vfs.ReadFile(filePath)
 	if err != err {
 		return Entry{}, err
 	}
 	return NewEntry(bytes)
 }
 
+func NewEntryFromCopy(other Entry) (Entry, error) {
+	var e Entry
+	e.initialize()
+	return e.Update(other)
+}
+
 func (e *Entry) initialize() {
 	e.mu = &sync.Mutex{}
 	e.checksumDirty = true
+	e.vfs = internal.RealFS{}
 }
 
 func (e Entry) Equals(other Entry) bool {
@@ -158,7 +168,7 @@ func (e Entry) SaveFile(filePath string) error {
 		return err
 	}
 
-	return internal.SaveFile(filePath, jsonStr)
+	return e.vfs.SaveFile(filePath, jsonStr)
 }
 
 func (e Entry) String() string {
-- 
cgit v1.2.3