transittion to magicnumber reader.

Defacto2 · Aug 30, 2024 · 15e8c7c · 15e8c7c
1 parent 4238499
commit 15e8c7c
Show file tree

Hide file tree

Showing 14 changed files with 1,767 additions and 15 deletions.
diff --git a/assets/testdata/EMPTY.ZIP b/assets/testdata/EMPTY.ZIP
diff --git a/assets/testdata/TEST.jar b/assets/testdata/TEST.jar
diff --git a/assets/testdata/TEST.tar.bz2 b/assets/testdata/TEST.tar.bz2
diff --git a/assets/testdata/TESTfree.arc b/assets/testdata/TESTfree.arc
diff --git a/internal/magicnumber/archive.go b/internal/magicnumber/archive.go
@@ -5,17 +5,17 @@ import "bytes"
 // Package file archive.go contains the functions that parse bytes as common file archive,
 // compression and disk image formats.
 
-// Arc matches the FreeArc compression format in the byte slice.
-func Arc(p []byte) bool {
+// ArcFree matches the FreeArc compression format in the byte slice.
+func ArcFree(p []byte) bool {
 	const min = 4
 	if len(p) < min {
 		return false
 	}
 	return bytes.Equal(p[:min], []byte{'A', 'r', 'C', 0x1})
 }
 
-// ArcArk matches the ARChive SEA compression format in the byte slice.
-func ArcArk(p []byte) bool {
+// ArcSEA matches the ARChive SEA compression format in the byte slice.
+func ArcSEA(p []byte) bool {
 	const min = 2
 	if len(p) < min {
 		return false

diff --git a/internal/magicnumber/magicnumber.go b/internal/magicnumber/magicnumber.go
@@ -356,15 +356,14 @@ func Ext() Extension { //nolint:funlen
 		CDNero:                            []string{".nri"},
 		CDPowerISO:                        []string{".daa"},
 		CDAlcohol120:                      []string{".mdf"},
-		// JavaARchive:                       []string{".jar"},
-		WindowsHelpFile:        []string{".hlp"},
-		PortableDocumentFormat: []string{".pdf"},
-		RichTextFormat:         []string{".rtf"},
-		UTF8Text:               []string{".txt"},
-		UTF16Text:              []string{".txt"},
-		UTF32Text:              []string{".txt"},
-		ANSIEscapeText:         []string{".ans"},
-		PlainText:              []string{".txt"},
+		WindowsHelpFile:                   []string{".hlp"},
+		PortableDocumentFormat:            []string{".pdf"},
+		RichTextFormat:                    []string{".rtf"},
+		UTF8Text:                          []string{".txt"},
+		UTF16Text:                         []string{".txt"},
+		UTF32Text:                         []string{".txt"},
+		ANSIEscapeText:                    []string{".ans"},
+		PlainText:                         []string{".txt"},
 	}
 }
 
@@ -428,8 +427,8 @@ func New() Finder { //nolint:funlen
 		X7zCompressArchive:                X7z,
 		XZCompressArchive:                 XZ,
 		ZStandardArchive:                  ZStd,
-		FreeArc:                           Arc,
-		ARChiveSEA:                        ArcArk,
+		FreeArc:                           ArcFree,
+		ARChiveSEA:                        ArcSEA,
 		YoshiLHA:                          LzhLha,
 		ZooArchive:                        Zoo,
 		ArchiveRobertJung:                 Arj,