fix(add): files were being not being compared after base64 encoding during addtion

Author: S4tvara

cmd/add.go

@@ -230,12 +230,25 @@ Examples:
 			}
 
 			// Create and store the file manifest
+			// Separate directory from filename in destination
+			// If pair.Destination ends with a filename (from directory expansion),
+			// we need to extract the directory part and filename separately
+			destDir := filepath.Dir(pair.Destination)
+			destFileName := filepath.Base(pair.Destination)
+
+			// If the destination is just a filename (no directory), set destDir to empty
+			if destDir == "." {
+				destDir = ""
+			} else if destDir != "" && !strings.HasSuffix(destDir, "/") {
+				destDir = destDir + "/"
+			}
+
 			fileManifest := &config.FileManifest{
-				FilePath:    filepath.Base(pair.Source),
+				FilePath:    destFileName,
 				Size:        sizeInBytes,
 				ModTime:     fileInfo.ModTime().Format(time.RFC3339),
 				Chunks:      chunkRefs,
-				Destination: pair.Destination,
+				Destination: destDir,
 				AddedAt:     time.Now().UTC(),
 				Tags:        tags, // Include tags in the manifest
 			}
@@ -244,11 +257,11 @@ Examples:
 			err = manifest.StoreFileManifest(vaultRoot, filepath.Base(pair.Source), fileManifest)
 			if err != nil {
 				if err.Error() == "skipped" {
-					errorMsg := fmt.Sprintf("✗ '%s': skipped", fileManifest.Destination+filepath.Base(pair.Source))
+					errorMsg := fmt.Sprintf("✗ '%s': skipped", fileManifest.Destination+fileManifest.FilePath)
 					fmt.Println(errorMsg)
 					continue
 				}
-				errorMsg := fmt.Sprintf("✗ %s: manifest storage failed - %v", filepath.Base(pair.Source), err)
+				errorMsg := fmt.Sprintf("✗ %s: manifest storage failed - %v", fileManifest.FilePath, err)
 				fmt.Println(errorMsg)
 				failedFiles = append(failedFiles, errorMsg)
 				continue

cmd/get.go

@@ -279,18 +279,6 @@ Example:
 					return fmt.Errorf("failed to decrypt chunk %s: %v", chunkHash, err)
 				}
 
-				// Verify chunk integrity if not skipped
-				skipVerify, _ := cmd.Flags().GetBool(skipVerification)
-				if !skipEncryption && !skipVerify && chunkRef.Hash != "" {
-					if err := verifyChunkWithRetry(ctx, chunkRef, decryptedData, 3); err != nil {
-						progressMgr.PrintVerbose("Chunk %s failed integrity verification: %v\n", chunkHash, err)
-						return fmt.Errorf("chunk %s integrity verification failed after retries: %v", chunkHash, err)
-					}
-					progressMgr.PrintVerbose("Chunk %s integrity verified successfully\n", chunkHash)
-				} else if skipVerify {
-					progressMgr.PrintVerbose("Skipping integrity verification for chunk %s (--skip-verification flag used)\n", chunkHash)
-				}
-
 				// The original data was base64-encoded before encryption. Decode back to bytes.
 				decodedBytes, err := base64.StdEncoding.DecodeString(decryptedData)
 				if err != nil {
@@ -315,6 +303,17 @@ Example:
 				chunkData = decompressedData
 			}
 
+			skipVerify, _ := cmd.Flags().GetBool(skipVerification)
+			if !skipEncryption && !skipVerify && chunkRef.Hash != "" {
+				if err := verifyChunkWithRetry(ctx, chunkRef, string(chunkData), 3); err != nil {
+					progressMgr.PrintVerbose("Chunk %s failed integrity verification: %v\n", chunkHash, err)
+					return fmt.Errorf("chunk %s integrity verification failed after retries: %v", chunkHash, err)
+				}
+				progressMgr.PrintVerbose("Chunk %s integrity verified successfully\n", chunkHash)
+			} else if skipVerify {
+				progressMgr.PrintVerbose("Skipping integrity verification for chunk %s (--skip-verification flag used)\n", chunkHash)
+			}
+
 			// Write the chunk to the output file
 			bytesWritten, err := outputFile.Write(chunkData)
 			if err != nil {