From 7cba183debcf2cefd90b4c1e7a630fb0c2152d06 Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Sat, 5 Aug 2023 11:51:26 +0200
Subject: (semi-)proper error handling in matroska

---
 remuxer/src/import/mod.rs        | 5 ++++-
 remuxer/src/import/seek_index.rs | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'remuxer/src')

diff --git a/remuxer/src/import/mod.rs b/remuxer/src/import/mod.rs
index 309357b..ade1fe0 100644
--- a/remuxer/src/import/mod.rs
+++ b/remuxer/src/import/mod.rs
@@ -32,7 +32,9 @@ pub fn import_metadata(input: &mut EbmlReader) -> Result<MatroskaMetadata> {
         let item = match item {
             Ok(item) => item,
             Err(e) => {
-                warn!("{e}");
+                if !matches!(e, jellymatroska::error::Error::Io(_)) {
+                    warn!("{e}");
+                }
                 break;
             }
         };
@@ -129,6 +131,7 @@ fn import_read_segment(segment: &mut Unflatten) -> Result<MatroskaMetadata> {
                                 }
                             }
                         }
+                        MatroskaTag::Crc32(_) => {}
                         _ => debug!("(rst) tag ignored: {item:?}"),
                     }
                 }
diff --git a/remuxer/src/import/seek_index.rs b/remuxer/src/import/seek_index.rs
index efd2a78..ca1ca1e 100644
--- a/remuxer/src/import/seek_index.rs
+++ b/remuxer/src/import/seek_index.rs
@@ -36,7 +36,9 @@ pub fn import_seek_index(input: &mut EbmlReader) -> Result<BTreeMap<u64, SeekInd
         let item = match item {
             Ok(item) => item,
             Err(e) => {
-                warn!("{e}");
+                if !matches!(e, jellymatroska::error::Error::Io(_)) {
+                    warn!("{e}");
+                }
                 break;
             }
         };
@@ -110,7 +112,8 @@ fn import_seek_index_segment(
                                 let block = Block::parse(&buf)?;
                                 trace!(
                                     "simple block: track={} tso={}",
-                                    block.track, block.timestamp_off
+                                    block.track,
+                                    block.timestamp_off
                                 );
                                 trace!("{pts} {}", block.timestamp_off);
                                 seek_index
-- 
cgit v1.2.3-70-g09d2