From 7b8081a79fb3db4a76f9e4cca8f8a88e6e7f873c Mon Sep 17 00:00:00 2001 From: Genny Date: Wed, 15 Sep 2021 22:16:30 -0500 Subject: Reading, fix writing, monocommit --- src/block/extension/mod.rs | 62 ++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 29 deletions(-) (limited to 'src/block/extension/mod.rs') diff --git a/src/block/extension/mod.rs b/src/block/extension/mod.rs index 66a39b0..d0e57c6 100644 --- a/src/block/extension/mod.rs +++ b/src/block/extension/mod.rs @@ -1,39 +1,43 @@ +mod application; mod graphiccontrol; pub use graphiccontrol::{DisposalMethod, GraphicControl}; +pub use self::application::Application; + pub enum Extension { - GraphicControl(GraphicControl), - Looping(u16) - // Comment - // Plain Text - // Generic Application + GraphicControl(GraphicControl), + Looping(u16), + Comment(Vec), // Plain Text + Application(Application), } impl From<&Extension> for Box<[u8]> { - fn from(ext: &Extension) -> Self { - let mut vec = vec![]; - vec.push(0x21); // Push the extension introducer + fn from(ext: &Extension) -> Self { + let mut vec = vec![]; + vec.push(0x21); // Push the extension introducer - match ext { - Extension::GraphicControl(gc) => { - vec.push(0xF9); // Graphic control label - vec.push(0x04); // Block size for this extension is always 4 - vec.push(gc.packed); - vec.extend_from_slice(&gc.delay_time.to_le_bytes()); - vec.push(gc.transparency_index); - }, - Extension::Looping(count) => { - vec.push(0xFF); // Application extension label - vec.push(0x0B); // 11 bytes in this block - vec.extend_from_slice(b"NETSCAPE2.0"); // App. ident. and "auth code" - vec.push(0x03); // Sub-block length - vec.push(0x01); // Identifies netscape looping extension - vec.extend_from_slice(&count.to_le_bytes()); - } - } + match ext { + Extension::GraphicControl(gc) => { + vec.push(0xF9); // Graphic control label + vec.push(0x04); // Block size for this extension is always 4 + vec.push(gc.packed); + vec.extend_from_slice(&gc.delay_time.to_le_bytes()); + vec.push(gc.transparency_index); + } + Extension::Looping(count) => { + vec.push(0xFF); // Application extension label + vec.push(0x0B); // 11 bytes in this block + vec.extend_from_slice(b"NETSCAPE2.0"); // App. ident. and "auth code" + vec.push(0x03); // Sub-block length + vec.push(0x01); // Identifies netscape looping extension + vec.extend_from_slice(&count.to_le_bytes()); + } + Extension::Comment(_) => todo!(), + Extension::Application(_) => todo!(), + } - vec.push(0x00); // Zero-length data block indicates end of extension - vec.into_boxed_slice() - } -} \ No newline at end of file + vec.push(0x00); // Zero-length data block indicates end of extension + vec.into_boxed_slice() + } +} -- cgit 1.4.1-3-g733a5