revert 30e804709f

revert Enhance FileInfo structure and DiskFS functionality

- Added CTime (creation time) and AccessCount fields to FileInfo struct for better file metadata tracking.
- Updated NewFileInfo and NewFileInfoFromOS functions to initialize new fields.
- Enhanced DiskFS to maintain access counts and file metadata, including flushing to JSON files.
- Modified Open and Create methods to increment access counts and set creation times appropriately.
- Updated garbage collection logic to utilize real access counts for files.

vfs/disk/disk.go

@@ -3,10 +3,8 @@ package disk
 
 import (
 	"container/list"
-	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"s1d3sw1ped/SteamCache2/steamcache/logger"
@@ -58,17 +56,12 @@ var _ vfs.VFS = (*DiskFS)(nil)
 type DiskFS struct {
 	root string
 
-	info         map[string]*vfs.FileInfo
-	capacity     int64
-	size         int64
-	mu           sync.RWMutex
-	keyLocks     sync.Map // map[string]*sync.RWMutex
-	LRU          *lruList
-	accessCounts map[string]int64 // key: filename, value: access count
-	fileMeta     map[string]struct {
-		AccessCount int64
-		CTime       int64
-	} // key: filename
+	info     map[string]*vfs.FileInfo
+	capacity int64
+	size     int64
+	mu       sync.RWMutex
+	keyLocks sync.Map // map[string]*sync.RWMutex
+	LRU      *lruList
 }
 
 // lruList for LRU eviction
@@ -136,17 +129,12 @@ func new(root string, capacity int64, skipinit bool) *DiskFS {
 	}
 
 	dfs := &DiskFS{
-		root:         root,
-		info:         make(map[string]*vfs.FileInfo),
-		capacity:     capacity,
-		mu:           sync.RWMutex{},
-		keyLocks:     sync.Map{},
-		LRU:          newLruList(),
-		accessCounts: make(map[string]int64),
-		fileMeta: make(map[string]struct {
-			AccessCount int64
-			CTime       int64
-		}),
+		root:     root,
+		info:     make(map[string]*vfs.FileInfo),
+		capacity: capacity,
+		mu:       sync.RWMutex{},
+		keyLocks: sync.Map{},
+		LRU:      newLruList(),
 	}
 
 	os.MkdirAll(dfs.root, 0755)
@@ -294,15 +282,6 @@ func (d *DiskFS) Create(key string, size int64) (io.WriteCloser, error) {
 			diskWriteBytes.Add(float64(n))
 			diskSizeBytes.Set(float64(d.Size()))
 
-			// On new file, set access count to 1
-			finfo.AccessCount = 1
-			finfo.CTime = time.Now()
-			d.fileMeta[key] = struct {
-				AccessCount int64
-				CTime       int64
-			}{1, finfo.CTime.Unix()}
-			flushFileMeta(d.root, d.fileMeta)
-
 			return nil
 		},
 		key:  key,
@@ -372,10 +351,6 @@ func (d *DiskFS) Delete(key string) error {
 
 	diskSizeBytes.Set(float64(d.Size()))
 
-	delete(d.accessCounts, key)
-	delete(d.fileMeta, key)
-	flushFileMeta(d.root, d.fileMeta)
-
 	return nil
 }
 
@@ -406,17 +381,9 @@ func (d *DiskFS) Open(key string) (io.ReadCloser, error) {
 		return nil, vfserror.ErrNotFound
 	}
 	fi.ATime = time.Now()
-	fi.AccessCount++ // Increment access count
 	d.LRU.MoveToFront(key)
 	d.mu.Unlock()
 
-	fi.AccessCount++
-	d.fileMeta[key] = struct {
-		AccessCount int64
-		CTime       int64
-	}{fi.AccessCount, fi.CTime.Unix()}
-	flushFileMeta(d.root, d.fileMeta)
-
 	path := filepath.Join(d.root, key)
 	path = strings.ReplaceAll(path, "\\", "/") // Ensure forward slashes for consistency
 	file, err := os.Open(path)
@@ -494,22 +461,3 @@ func (d *DiskFS) StatAll() []*vfs.FileInfo {
 
 	return files
 }
-
-func flushAccessCounts(root string, counts map[string]int64) {
-	path := filepath.Join(root, "access_counts.json")
-	data, _ := json.MarshalIndent(counts, "", "  ")
-	_ = ioutil.WriteFile(path, data, 0644)
-}
-
-func flushFileMeta(root string, meta map[string]struct {
-	AccessCount int64
-	CTime       int64
-}) {
-	path := filepath.Join(root, "filemeta.json")
-	if len(meta) == 0 {
-		_ = os.Remove(path)
-		return
-	}
-	data, _ := json.MarshalIndent(meta, "", "  ")
-	_ = ioutil.WriteFile(path, data, 0644)
-}

vfs/fileinfo.go

@@ -7,35 +7,27 @@ import (
 )
 
 type FileInfo struct {
-	name        string
-	size        int64
-	MTime       time.Time
-	ATime       time.Time
-	CTime       time.Time // Creation time
-	AccessCount int64
+	name  string
+	size  int64
+	MTime time.Time
+	ATime time.Time
 }
 
 func NewFileInfo(key string, size int64, modTime time.Time) *FileInfo {
-	now := time.Now()
 	return &FileInfo{
-		name:        key,
-		size:        size,
-		MTime:       modTime,
-		ATime:       now,
-		CTime:       now,
-		AccessCount: 0,
+		name:  key,
+		size:  size,
+		MTime: modTime,
+		ATime: time.Now(),
 	}
 }
 
 func NewFileInfoFromOS(f os.FileInfo, key string) *FileInfo {
-	now := time.Now()
 	return &FileInfo{
-		name:        key,
-		size:        f.Size(),
-		MTime:       f.ModTime(),
-		ATime:       now,
-		CTime:       now, // Will be overwritten if loaded from disk
-		AccessCount: 0,
+		name:  key,
+		size:  f.Size(),
+		MTime: f.ModTime(),
+		ATime: time.Now(),
 	}
 }
 

vfs/gc/gc.go

@@ -308,23 +308,25 @@ func getAllFiles(vfss vfs.VFS) []fileInfoWithMetadata {
 	case *disk.DiskFS:
 		allFiles := fs.StatAll()
 		for _, fi := range allFiles {
+			// For disk, we can't easily track access count, so we'll use 1 as default
 			files = append(files, fileInfoWithMetadata{
 				Name:        fi.Name(),
 				Size:        fi.Size(),
 				MTime:       fi.ModTime(),
 				ATime:       fi.AccessTime(),
-				AccessCount: fi.AccessCount, // Use real access count
+				AccessCount: 1,
 			})
 		}
 	case *memory.MemoryFS:
 		allFiles := fs.StatAll()
 		for _, fi := range allFiles {
+			// For memory, we can't easily track access count, so we'll use 1 as default
 			files = append(files, fileInfoWithMetadata{
 				Name:        fi.Name(),
 				Size:        fi.Size(),
 				MTime:       fi.ModTime(),
 				ATime:       fi.AccessTime(),
-				AccessCount: fi.AccessCount, // Use real access count
+				AccessCount: 1,
 			})
 		}
 	}

vfs/memory/memory.go

@@ -149,6 +149,15 @@ func (m *MemoryFS) getKeyLock(key string) *sync.RWMutex {
 }
 
 func (m *MemoryFS) Create(key string, size int64) (io.WriteCloser, error) {
+	m.mu.RLock()
+	if m.capacity > 0 {
+		if m.size+size > m.capacity {
+			m.mu.RUnlock()
+			return nil, vfserror.ErrDiskFull
+		}
+	}
+	m.mu.RUnlock()
+
 	keyMu := m.getKeyLock(key)
 	keyMu.Lock()
 	defer keyMu.Unlock()
@@ -160,19 +169,18 @@ func (m *MemoryFS) Create(key string, size int64) (io.WriteCloser, error) {
 		onClose: func() error {
 			data := buf.Bytes()
 			m.mu.Lock()
-			defer m.mu.Unlock()
 			if f, exists := m.files[key]; exists {
 				m.size -= int64(len(f.data))
 				m.LRU.Remove(key)
 			}
 			fi := vfs.NewFileInfo(key, int64(len(data)), time.Now())
-			fi.CTime = time.Now() // Set creation time
 			m.files[key] = &file{
-				data:     data,
 				fileinfo: fi,
+				data:     data,
 			}
 			m.LRU.Add(key, fi)
 			m.size += int64(len(data))
+			m.mu.Unlock()
 
 			memoryWriteBytes.Add(float64(len(data)))
 			memorySizeBytes.Set(float64(m.Size()))
@@ -224,7 +232,6 @@ func (m *MemoryFS) Open(key string) (io.ReadCloser, error) {
 		return nil, vfserror.ErrNotFound
 	}
 	f.fileinfo.ATime = time.Now()
-	f.fileinfo.AccessCount++ // Increment access count
 	m.LRU.MoveToFront(key)
 	dataCopy := make([]byte, len(f.data))
 	copy(dataCopy, f.data)