refactor: moved the GC stuff around and corrected all tests

steamcache/gc.go

@@ -1,63 +0,0 @@
-// steamcache/gc.go
-package steamcache
-
-import (
-	"s1d3sw1ped/SteamCache2/vfs"
-	"s1d3sw1ped/SteamCache2/vfs/cachestate"
-	"s1d3sw1ped/SteamCache2/vfs/disk"
-	"s1d3sw1ped/SteamCache2/vfs/memory"
-	"time"
-)
-
-// lruGC deletes files in LRU order until enough space is reclaimed.
-func lruGC(vfss vfs.VFS, size uint) {
-	deletions := 0
-	var reclaimed uint
-
-	for reclaimed < size {
-		switch fs := vfss.(type) {
-		case *disk.DiskFS:
-			fi := fs.LRU.Back()
-			if fi == nil {
-				break
-			}
-			sz := uint(fi.Size())
-			err := fs.Delete(fi.Name())
-			if err != nil {
-				continue
-			}
-			reclaimed += sz
-			deletions++
-		case *memory.MemoryFS:
-			fi := fs.LRU.Back()
-			if fi == nil {
-				break
-			}
-			sz := uint(fi.Size())
-			err := fs.Delete(fi.Name())
-			if err != nil {
-				continue
-			}
-			reclaimed += sz
-			deletions++
-		default:
-			// Fallback to old method if not supported
-			stats := vfss.StatAll()
-			if len(stats) == 0 {
-				break
-			}
-			fi := stats[0] // Assume sorted or pick first
-			sz := uint(fi.Size())
-			err := vfss.Delete(fi.Name())
-			if err != nil {
-				continue
-			}
-			reclaimed += sz
-			deletions++
-		}
-	}
-}
-
-func cachehandler(fi *vfs.FileInfo, cs cachestate.CacheState) bool {
-	return time.Since(fi.AccessTime()) < time.Second*60 // Put hot files in the fast vfs if equipped
-}

steamcache/steamcache.go

@@ -80,21 +80,21 @@ func New(address string, memorySize string, memoryMultiplier int, diskSize strin
 	}
 
 	c := cache.New(
-		cachehandler,
+		gc.PromotionDecider,
 	)
 
 	var m *memory.MemoryFS
 	var mgc *gc.GCFS
 	if memorysize > 0 {
 		m = memory.New(memorysize)
-		mgc = gc.New(m, memoryMultiplier, lruGC)
+		mgc = gc.New(m, memoryMultiplier, gc.LRUGC)
 	}
 
 	var d *disk.DiskFS
 	var dgc *gc.GCFS
 	if disksize > 0 {
 		d = disk.New(diskPath, disksize)
-		dgc = gc.New(d, diskMultiplier, lruGC)
+		dgc = gc.New(d, diskMultiplier, gc.LRUGC)
 	}
 
 	// configure the cache to match the specified mode (memory only, disk only, or memory and disk) based on the provided sizes
@@ -154,7 +154,7 @@ func New(address string, memorySize string, memoryMultiplier int, diskSize strin
 
 	if d != nil {
 		if d.Size() > d.Capacity() {
-			lruGC(d, uint(d.Size()-d.Capacity()))
+			gc.LRUGC(d, uint(d.Size()-d.Capacity()))
 		}
 	}
 

steamcache/steamcache_test.go

@@ -9,8 +9,6 @@ import (
 )
 
 func TestCaching(t *testing.T) {
-	t.Parallel()
-
 	td := t.TempDir()
 
 	os.WriteFile(filepath.Join(td, "key2"), []byte("value2"), 0644)
@@ -84,3 +82,29 @@ func TestCaching(t *testing.T) {
 		t.Errorf("Open failed: got nil, want error")
 	}
 }
+
+func TestCacheMissAndHit(t *testing.T) {
+	sc := New("localhost:8080", "0", 0, "1G", 100, t.TempDir(), "")
+
+	key := "testkey"
+	value := []byte("testvalue")
+
+	// Simulate miss: but since no upstream, skip full ServeHTTP, test VFS
+	w, err := sc.vfs.Create(key, int64(len(value)))
+	if err != nil {
+		t.Fatal(err)
+	}
+	w.Write(value)
+	w.Close()
+
+	rc, err := sc.vfs.Open(key)
+	if err != nil {
+		t.Fatal(err)
+	}
+	got, _ := io.ReadAll(rc)
+	rc.Close()
+
+	if string(got) != string(value) {
+		t.Errorf("expected %s, got %s", value, got)
+	}
+}