Replace Book kind with Ebook

mmalecot · Jan 30, 2024 · afd9026 · afd9026
1 parent e4975f0
commit afd9026
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,13 +4,15 @@
 
 - Add `Compressed` kind
 - Add `Diagram` kind
+- Add `Ebook` kind
 - Add `Formula` kind
 - Add `Metadata` kind
 - Add `Other` kind
 - Add `Presentation` kind
 - Add `Spreadsheet` kind
 - Change `FileFormat::from_bytes` argument type
 - Drop `Application` kind
+- Drop `Book` kind
 - Drop `Certificate` kind
 - Drop `Compression` kind
 - Drop `Syndication` kind

diff --git a/README.md b/README.md
@@ -143,15 +143,6 @@ identification.
 - Waveform Audio (WAV)
 - Windows Media Audio (WMA)
 
-### Book
-
-- Broad Band eBook (BBeB)
-- Electronic Publication (EPUB)
-- FictionBook (FB2)
-- FictionBook Zipped (FBZ)
-- Microsoft Reader (LIT)
-- Mobipocket (MOBI)
-
 ### Compressed
 
 - BZip3 (BZ3)
@@ -225,6 +216,15 @@ identification.
 - Uniform Office Format Text (UOT)
 - WordPerfect Document (WPD)
 
+### Ebook
+
+- Broad Band eBook (BBeB)
+- Electronic Publication (EPUB)
+- FictionBook (FB2)
+- FictionBook Zipped (FBZ)
+- Microsoft Reader (LIT)
+- Mobipocket (MOBI)
+
 ### Executable
 
 - Commodore 64 Program (PRG)

diff --git a/fixtures/book/sample.epub → fixtures/ebook/sample.epub b/fixtures/book/sample.epub → fixtures/ebook/sample.epub
diff --git a/fixtures/book/sample.fbz → fixtures/ebook/sample.fbz b/fixtures/book/sample.fbz → fixtures/ebook/sample.fbz
diff --git a/fixtures/book/sample.lit → fixtures/ebook/sample.lit b/fixtures/book/sample.lit → fixtures/ebook/sample.lit
diff --git a/fixtures/book/sample.lrf → fixtures/ebook/sample.lrf b/fixtures/book/sample.lrf → fixtures/ebook/sample.lrf
diff --git a/fixtures/book/sample.mobi → fixtures/ebook/sample.mobi b/fixtures/book/sample.mobi → fixtures/ebook/sample.mobi
diff --git a/fixtures/book/sample1.fb2 → fixtures/ebook/sample1.fb2 b/fixtures/book/sample1.fb2 → fixtures/ebook/sample1.fb2
diff --git a/fixtures/book/sample2.fb2 → fixtures/ebook/sample2.fb2 b/fixtures/book/sample2.fb2 → fixtures/ebook/sample2.fb2
diff --git a/src/formats.rs b/src/formats.rs
@@ -415,7 +415,7 @@ formats! {
     short_name = "BBeB"
     media_type = "application/x-lrf"
     extension = "lrf"
-    kind = Book
+    kind = Ebook
 
     format = Bzip
     name = "bzip"
@@ -650,7 +650,7 @@ formats! {
     short_name = "EPUB"
     media_type = "application/epub+zip"
     extension = "epub"
-    kind = Book
+    kind = Ebook
 
     format = EmbeddedOpentype
     name = "Embedded OpenType"
@@ -747,14 +747,14 @@ formats! {
     short_name = "FB2"
     media_type = "application/x-fb2+xml"
     extension = "fb2"
-    kind = Book
+    kind = Ebook
 
     format = FictionbookZipped
     name = "FictionBook Zipped"
     short_name = "FBZ"
     media_type = "application/x-fbz"
     extension = "fbz"
-    kind = Book
+    kind = Ebook
 
     format = Filmbox
     name = "Filmbox"
@@ -1418,7 +1418,7 @@ formats! {
     short_name = "LIT"
     media_type = "application/x-ms-reader"
     extension = "lit"
-    kind = Book
+    kind = Ebook
 
     format = MicrosoftSoftwareInstaller
     name = "Microsoft Software Installer"
@@ -1509,7 +1509,7 @@ formats! {
     short_name = "MOBI"
     media_type = "application/x-mobipocket-ebook"
     extension = "mobi"
-    kind = Book
+    kind = Ebook
 
     format = Model3dAscii
     name = "Model 3D ASCII"

diff --git a/src/lib.rs b/src/lib.rs
@@ -329,8 +329,6 @@ pub enum Kind {
     Archive,
     /// Musics, sound effects, and spoken audio recordings.
     Audio,
-    /// Electronic books.
-    Book,
     /// Compressed single files or streams.
     Compressed,
     /// Organized collections of data.
@@ -341,6 +339,8 @@ pub enum Kind {
     Disk,
     /// Word processing and desktop publishing documents.
     Document,
+    /// Electronic books.
+    Ebook,
     /// Machine-executable code, virtual machine code and shared libraries.
     Executable,
     /// Typefaces used for displaying text on screen or in print.

diff --git a/tests/book.rs → tests/ebook.rs b/tests/book.rs → tests/ebook.rs
@@ -2,45 +2,45 @@ use file_format::FileFormat;
 
 #[test]
 fn test_broad_band_ebook() {
-    let fmt = FileFormat::from_file("fixtures/book/sample.lrf").unwrap();
+    let fmt = FileFormat::from_file("fixtures/ebook/sample.lrf").unwrap();
     assert_eq!(fmt, FileFormat::BroadBandEbook);
 }
 
 #[cfg(feature = "reader-zip")]
 #[test]
 fn test_electronic_publication() {
-    let fmt = FileFormat::from_file("fixtures/book/sample.epub").unwrap();
+    let fmt = FileFormat::from_file("fixtures/ebook/sample.epub").unwrap();
     assert_eq!(fmt, FileFormat::ElectronicPublication);
 }
 
 #[test]
 fn test_fictionbook_1() {
-    let fmt = FileFormat::from_file("fixtures/book/sample1.fb2").unwrap();
+    let fmt = FileFormat::from_file("fixtures/ebook/sample1.fb2").unwrap();
     assert_eq!(fmt, FileFormat::Fictionbook);
 }
 
 #[cfg(feature = "reader-xml")]
 #[test]
 fn test_fictionbook_2() {
-    let fmt = FileFormat::from_file("fixtures/book/sample2.fb2").unwrap();
+    let fmt = FileFormat::from_file("fixtures/ebook/sample2.fb2").unwrap();
     assert_eq!(fmt, FileFormat::Fictionbook);
 }
 
 #[cfg(feature = "reader-zip")]
 #[test]
 fn test_fictionbook_zipped() {
-    let fmt = FileFormat::from_file("fixtures/book/sample.fbz").unwrap();
+    let fmt = FileFormat::from_file("fixtures/ebook/sample.fbz").unwrap();
     assert_eq!(fmt, FileFormat::FictionbookZipped);
 }
 
 #[test]
 fn test_microsoft_reader() {
-    let fmt = FileFormat::from_file("fixtures/book/sample.lit").unwrap();
+    let fmt = FileFormat::from_file("fixtures/ebook/sample.lit").unwrap();
     assert_eq!(fmt, FileFormat::MicrosoftReader);
 }
 
 #[test]
 fn test_mobipocket() {
-    let fmt = FileFormat::from_file("fixtures/book/sample.mobi").unwrap();
+    let fmt = FileFormat::from_file("fixtures/ebook/sample.mobi").unwrap();
     assert_eq!(fmt, FileFormat::Mobipocket);
 }