Rename *Zipped to *Zip

mmalecot · Feb 3, 2024 · 7d74e23 · 7d74e23
1 parent ea38536
commit 7d74e23
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,8 +30,12 @@
 - Rename `BittorrentFile` to `Bittorrent`
 - Rename `DebianBinaryPackage` to `DebianPackage`
 - Rename `DigitalAssetExchange` to `CollaborativeDesignActivity`
+- Rename `FictionbookZipped` to `FictionbookZip`
 - Rename `Iff8BitSampledVoice` to `EightBitSampledVoice`
+- Rename `KeyholeMarkupLanguageZipped` to `KeyholeMarkupLanguageZip`
 - Rename `MpegDashManifest` to `MpegDashMpd`
+- Rename `MusicxmlZipped` to `MusicxmlZip`
+- Rename `UniversalSceneDescriptionZipped` to `UniversalSceneDescriptionZip`
 
 ## Fixes
 
@@ -162,7 +166,7 @@
 
 ## Improvements
 
-- Detect FictionBook Zipped (FBZ) only with files in the root of the archive
+- Detect FictionBook ZIP (FBZ) only with files in the root of the archive
 
 ## New formats support
 
@@ -183,7 +187,7 @@
 - Standard for the Exchange of Product model data (STEP)
 - Universal Scene Description ASCII (USDA)
 - Universal Scene Description Binary (USDC)
-- Universal Scene Description Zipped (USDZ)
+- Universal Scene Description ZIP (USDZ)
 - Virtual Reality Modeling Language (VRML)
 - Windows Media Playlist (WPL)
 
@@ -356,7 +360,7 @@
 - Canon Raw (CRW)
 - Design Web Format (DWF)
 - FictionBook (FB2)
-- FictionBook Zipped (FBZ)
+- FictionBook ZIP (FBZ)
 - Flexible and Interoperable Data Transfer (FIT)
 - Game Gear ROM (GG)
 - JPEG 2000 Codestream (J2C)
@@ -575,7 +579,7 @@
 - Keyhole Markup Language (KML)
 - Lua Script
 - MusicXML
-- MusicXML Zipped (MXL)
+- MusicXML ZIP (MXL)
 - Perl Script
 - Plain Text (TXT)
 - Python Script
@@ -660,7 +664,7 @@
 - Dynamic Link Library (DLL)
 - Encapsulated PostScript (EPS)
 - Enterprise Application Archive (EAR)
-- Keyhole Markup Language Zipped (KMZ)
+- Keyhole Markup Language ZIP (KMZ)
 - LLVM Bitcode (BC)
 - Lua Bytecode
 - MPEG-1/2 Audio Layer 1 (MP1)

diff --git a/README.md b/README.md
@@ -221,7 +221,7 @@ identification.
 - Broad Band eBook (BBeB)
 - Electronic Publication (EPUB)
 - FictionBook (FB2)
-- FictionBook Zipped (FBZ)
+- FictionBook ZIP (FBZ)
 - Microsoft Reader (LIT)
 - Mobipocket (MOBI)
 
@@ -270,7 +270,7 @@ identification.
 - GPS Exchange Format (GPX)
 - Geography Markup Language (GML)
 - Keyhole Markup Language (KML)
-- Keyhole Markup Language Zipped (KMZ)
+- Keyhole Markup Language ZIP (KMZ)
 - Shapefile (SHP)
 - Training Center XML (TCX)
 
@@ -399,7 +399,7 @@ identification.
 - Universal 3D (U3D)
 - Universal Scene Description ASCII (USDA)
 - Universal Scene Description Binary (USDC)
-- Universal Scene Description Zipped (USDZ)
+- Universal Scene Description ZIP (USDZ)
 - Virtual Reality Modeling Language (VRML)
 - openNURBS (3DM)
 
@@ -435,7 +435,7 @@ identification.
 - Microsoft Project Plan (MPP)
 - Microsoft Visual Studio Solution (SLN)
 - MusicXML
-- MusicXML Zipped (MXL)
+- MusicXML ZIP (MXL)
 - Ogg Multiplexed Media (OGX)
 - PCAP Dump (PCAP)
 - PCAP Next Generation Dump (PCAPNG)

diff --git a/src/formats.rs b/src/formats.rs
@@ -755,8 +755,8 @@ formats! {
     extension = "fb2"
     kind = Ebook
 
-    format = FictionbookZipped
-    name = "FictionBook Zipped"
+    format = FictionbookZip
+    name = "FictionBook ZIP"
     short_name = "FBZ"
     media_type = "application/x-fbz"
     extension = "fbz"
@@ -1145,8 +1145,8 @@ formats! {
     extension = "kml"
     kind = Geospatial
 
-    format = KeyholeMarkupLanguageZipped
-    name = "Keyhole Markup Language Zipped"
+    format = KeyholeMarkupLanguageZip
+    name = "Keyhole Markup Language ZIP"
     short_name = "KMZ"
     media_type = "application/vnd.google-earth.kmz"
     extension = "kmz"
@@ -1662,8 +1662,8 @@ formats! {
     extension = "musicxml"
     kind = Other
 
-    format = MusicxmlZipped
-    name = "MusicXML Zipped"
+    format = MusicxmlZip
+    name = "MusicXML ZIP"
     short_name = "MXL"
     media_type = "application/vnd.recordare.musicxml"
     extension = "mxl"
@@ -2704,8 +2704,8 @@ formats! {
     extension = "usdc"
     kind = Model
 
-    format = UniversalSceneDescriptionZipped
-    name = "Universal Scene Description Zipped"
+    format = UniversalSceneDescriptionZip
+    name = "Universal Scene Description ZIP"
     short_name = "USDZ"
     media_type = "model/vnd.usdz+zip"
     extension = "usdz"

diff --git a/src/lib.rs b/src/lib.rs
@@ -155,14 +155,14 @@ identification.
   * [Design Web Format XPS (DWFX)](`FileFormat::DesignWebFormatXps`)
   * [Electronic Publication (EPUB)](`FileFormat::ElectronicPublication`)
   * [Enterprise Application Archive (EAR)](`FileFormat::EnterpriseApplicationArchive`)
-  * [FictionBook Zipped (FBZ)](`FileFormat::FictionbookZipped`)
+  * [FictionBook ZIP (FBZ)](`FileFormat::FictionbookZip`)
   * [Flash CS5 Project (FLA)](`FileFormat::FlashCs5Project`)
   * [Fusion 360 (F3D)](`FileFormat::Fusion360`)
   * [InDesign Markup Language (IDML)](`FileFormat::IndesignMarkupLanguage`)
   * [Java Archive (JAR)](`FileFormat::JavaArchive`)
-  * [Keyhole Markup Language Zipped (KMZ)](`FileFormat::KeyholeMarkupLanguageZipped`)
+  * [Keyhole Markup Language ZIP (KMZ)](`FileFormat::KeyholeMarkupLanguageZip`)
   * [Microsoft Visual Studio Extension (VSIX)](`FileFormat::MicrosoftVisualStudioExtension`)
-  * [MusicXML Zipped (MXL)](`FileFormat::MusicxmlZipped`)
+  * [MusicXML ZIP (MXL)](`FileFormat::MusicxmlZip`)
   * [Office Open XML Document (DOCX)](`FileFormat::OfficeOpenXmlDocument`)
   * [Office Open XML Drawing (VSDX)](`FileFormat::OfficeOpenXmlDrawing`)
   * [Office Open XML Presentation (PPTX)](`FileFormat::OfficeOpenXmlPresentation`)
@@ -193,7 +193,7 @@ identification.
   * [Sun XML Writer (SXW)](`FileFormat::SunXmlWriter`)
   * [Sun XML Writer Global (SGW)](`FileFormat::SunXmlWriterGlobal`)
   * [Sun XML Writer Template (STW)](`FileFormat::SunXmlWriterTemplate`)
-  * [Universal Scene Description Zipped (USDZ)](`FileFormat::UniversalSceneDescriptionZipped`)
+  * [Universal Scene Description ZIP (USDZ)](`FileFormat::UniversalSceneDescriptionZip`)
   * [Web Application Archive (WAR)](`FileFormat::WebApplicationArchive`)
   * [Windows App Bundle (APPXBUNDLE)](`FileFormat::WindowsAppBundle`)
   * [Windows App Package (APPX)](`FileFormat::WindowsAppPackage`)

diff --git a/src/readers.rs b/src/readers.rs
@@ -882,7 +882,7 @@ impl crate::FileFormat {
                 "META-INF/application.xml" => return Ok(Self::EnterpriseApplicationArchive),
                 "META-INF/mozilla.rsa" => return Ok(Self::Xpinstall),
                 "WEB-INF/web.xml" => return Ok(Self::WebApplicationArchive),
-                "doc.kml" => return Ok(Self::KeyholeMarkupLanguageZipped),
+                "doc.kml" => return Ok(Self::KeyholeMarkupLanguageZip),
                 "extension.vsixmanifest" => return Ok(Self::MicrosoftVisualStudioExtension),
                 "mimetype" if compressed_size == uncompressed_size => {
                     // Seeks to the filename of the local file header.
@@ -942,7 +942,7 @@ impl crate::FileFormat {
                         "application/vnd.oasis.opendocument.text-template" => {
                             Self::OpendocumentTextTemplate
                         }
-                        "application/vnd.recordare.musicxml" => Self::MusicxmlZipped,
+                        "application/vnd.recordare.musicxml" => Self::MusicxmlZip,
                         "application/vnd.sun.xml.calc" => Self::SunXmlCalc,
                         "application/vnd.sun.xml.calc.template" => Self::SunXmlCalcTemplate,
                         "application/vnd.sun.xml.draw" => Self::SunXmlDraw,
@@ -965,7 +965,7 @@ impl crate::FileFormat {
                     } else if filename.starts_with("dwf/") {
                         return Ok(Self::DesignWebFormatXps);
                     } else if filename.ends_with(".fb2") && !filename.contains('/') {
-                        return Ok(Self::FictionbookZipped);
+                        return Ok(Self::FictionbookZip);
                     } else if filename.starts_with("FusionAssetName[Active]/") {
                         return Ok(Self::Fusion360);
                     } else if filename.starts_with("Payload/") && filename.contains(".app/") {
@@ -989,7 +989,7 @@ impl crate::FileFormat {
                         || filename.ends_with(".usdc"))
                         && !filename.contains('/')
                     {
-                        return Ok(Self::UniversalSceneDescriptionZipped);
+                        return Ok(Self::UniversalSceneDescriptionZip);
                     }
                 }
             }

diff --git a/tests/ebook.rs b/tests/ebook.rs
@@ -28,9 +28,9 @@ fn test_fictionbook_2() {
 
 #[cfg(feature = "reader-zip")]
 #[test]
-fn test_fictionbook_zipped() {
+fn test_fictionbook_zip() {
     let fmt = FileFormat::from_file("fixtures/ebook/sample.fbz").unwrap();
-    assert_eq!(fmt, FileFormat::FictionbookZipped);
+    assert_eq!(fmt, FileFormat::FictionbookZip);
 }
 
 #[test]

diff --git a/tests/geospatial.rs b/tests/geospatial.rs
@@ -47,9 +47,9 @@ fn test_keyhole_markup_language_2() {
 
 #[cfg(feature = "reader-zip")]
 #[test]
-fn test_keyhole_markup_language_zipped() {
+fn test_keyhole_markup_language_zip() {
     let fmt = FileFormat::from_file("fixtures/geospatial/sample.kmz").unwrap();
-    assert_eq!(fmt, FileFormat::KeyholeMarkupLanguageZipped);
+    assert_eq!(fmt, FileFormat::KeyholeMarkupLanguageZip);
 }
 
 #[test]

diff --git a/tests/model.rs b/tests/model.rs
@@ -300,9 +300,9 @@ fn test_universal_scene_description_binary() {
 
 #[cfg(feature = "reader-zip")]
 #[test]
-fn test_universal_scene_description_zipped() {
+fn test_universal_scene_description_zip() {
     let fmt = FileFormat::from_file("fixtures/model/sample.usdz").unwrap();
-    assert_eq!(fmt, FileFormat::UniversalSceneDescriptionZipped);
+    assert_eq!(fmt, FileFormat::UniversalSceneDescriptionZip);
 }
 
 #[test]

diff --git a/tests/other.rs b/tests/other.rs
@@ -218,9 +218,9 @@ fn test_musicxml_2() {
 
 #[cfg(feature = "reader-zip")]
 #[test]
-fn test_musicxml_zipped() {
+fn test_musicxml_zip() {
     let fmt = FileFormat::from_file("fixtures/other/sample.mxl").unwrap();
-    assert_eq!(fmt, FileFormat::MusicxmlZipped);
+    assert_eq!(fmt, FileFormat::MusicxmlZip);
 }
 
 #[test]