Merge remote-tracking branch 'origin/normalize_fields'

A2-ai · Aug 15, 2024 · 79e92cd · 79e92cd
2 parents 5062d1c + bf52428
commit 79e92cd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/internal/config/main.go b/internal/config/main.go
@@ -8,7 +8,9 @@ import (
 )
 
 type Config struct {
-	StorageDir string `yaml:"storage-dir"`
+	StorageDir  string `yaml:"storage_dir"`
+	Permissions int    `yaml:"permissions"`
+	Group       string `yaml:"group"`
 }
 
 var ConfigFileName = "dvs.yaml"
@@ -38,6 +40,9 @@ func Write(config Config, dir string) error {
 	}
 	defer dvsFile.Close()
 
+	config.Permissions = 664
+	config.Group = ""
+
 	// Convert config to YAML
 	configYaml, err := yaml.Marshal(config)
 	if err != nil {

diff --git a/internal/meta/file.go b/internal/meta/file.go
@@ -8,8 +8,8 @@ import (
 
 type Metadata struct {
 	FileHash  string    `json:"blake3_checksum"`
-	FileSize  uint64    `json:"file_size_bytes"`
-	Timestamp time.Time `json:"timestamp"`
+	FileSize  uint64    `json:"size"`
+	Timestamp time.Time `json:"add_time"`
 	Message   string    `json:"message"`
 	SavedBy   string    `json:"saved_by"`
 }