v0.6.0: strengthen backup integrity

internal/manifest/jsonl.go

@@ -40,6 +40,7 @@ func LoadJSONL(dir string) *jsonlManifest {
 	type entryWithID struct {
 		ID       string `json:"id"`
 		Filename string `json:"filename"`
+		Path     string `json:"path,omitempty"`
 		Size     int64  `json:"size"`
 		Cloud    string `json:"cloud"`
 		Exported int64  `json:"exported"`
@@ -51,8 +52,13 @@ func LoadJSONL(dir string) *jsonlManifest {
 		}
 		var raw entryWithID
 		if json.Unmarshal([]byte(line), &raw) == nil && raw.ID != "" {
+			if raw.Path == "" {
+				raw.Path = raw.Filename
+			}
 			m.entries[raw.ID] = Entry{
+				ID:       raw.ID,
 				Filename: raw.Filename,
+				Path:     raw.Path,
 				Size:     raw.Size,
 				Cloud:    raw.Cloud,
 				Exported: raw.Exported,
@@ -70,18 +76,25 @@ func (m *jsonlManifest) Has(id string) bool {
 }
 
 func (m *jsonlManifest) Add(id string, filename string, size int64, cloud string) {
+	m.AddEntry(newEntry(id, filename, size, cloud))
+}
+
+func (m *jsonlManifest) AddEntry(entry Entry) {
 	m.mu.Lock()
 	defer m.mu.Unlock()
-	entry := newEntry(id, filename, size, cloud)
-	m.entries[id] = entry
+	if entry.Path == "" {
+		entry.Path = entry.Filename
+	}
+	m.entries[entry.ID] = entry
 	if m.file != nil {
 		data, _ := json.Marshal(struct {
 			ID       string `json:"id"`
 			Filename string `json:"filename"`
+			Path     string `json:"path,omitempty"`
 			Size     int64  `json:"size"`
 			Cloud    string `json:"cloud"`
 			Exported int64  `json:"exported"`
-		}{ID: id, Filename: entry.Filename, Size: entry.Size, Cloud: entry.Cloud, Exported: entry.Exported})
+		}{ID: entry.ID, Filename: entry.Filename, Path: entry.Path, Size: entry.Size, Cloud: entry.Cloud, Exported: entry.Exported})
 		m.file.Write(data)
 		m.file.Write([]byte("\n"))
 	}