Merge pull request #136 from nlnwa/fix/validate-panic

fix: validate panics if record with error
nlnwa · May 15, 2024 · 64cc03e · 64cc03e
2 parents e0de5be + e6c813f
commit 64cc03e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/cmd/validate/validate.go b/cmd/validate/validate.go
@@ -134,16 +134,18 @@ func validateFile(fileSystem afero.Fs, file string) filewalker.Result {
 		if err == io.EOF {
 			break
 		}
-		if warcRecord.Type() == gowarc.Warcinfo {
-			warcInfoId = warcRecord.WarcHeader().GetId(gowarc.WarcRecordID)
-		}
+
 		result.IncrRecords()
 		result.IncrProcessed()
 		if err != nil {
 			result.AddError(fmt.Errorf("rec num: %d, offset: %d, cause: %w", result.Records(), currentOffset, err))
 			break
 		}
 
+		if warcRecord.Type() == gowarc.Warcinfo {
+			warcInfoId = warcRecord.WarcHeader().GetId(gowarc.WarcRecordID)
+		}
+
 		err = warcRecord.ValidateDigest(validation)
 		if err != nil {
 			result.AddError(fmt.Errorf("rec num: %d, offset: %d, cause: %w", result.Records(), currentOffset, err))

diff --git a/cmd/validate/validate_test.go b/cmd/validate/validate_test.go
@@ -10,10 +10,5 @@ import (
 func TestValidateSamsungFileWithError(t *testing.T) {
 	testDataDir := filepath.Join("..", "..", "testdata")
 	warcWithErrors := filepath.Join(testDataDir, "samsung-with-error", "rec-33318048d933-20240317162652059-0.warc.gz")
-	defer func() {
-		if r := recover(); r == nil {
-			t.Errorf("validateFile did not panic")
-		}
-	}()
 	_ = validateFile(afero.NewOsFs(), warcWithErrors)
 }