From 172ad82aa50747918b8b0452fa09f319b6f1b0ad Mon Sep 17 00:00:00 2001
From: Mike Welsh <mwelsh@gmail.com>
Date: Sat, 22 May 2021 19:23:34 -0700
Subject: [PATCH] core: Add SwfMovie::uncompressed_len

---
 core/src/avm1/globals/movie_clip.rs            |  4 ++--
 core/src/avm1/globals/movie_clip_loader.rs     |  4 ++--
 .../avm2/globals/flash/display/loaderinfo.rs   |  6 ++----
 core/src/tag_utils.rs                          | 18 +++++++++++-------
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/core/src/avm1/globals/movie_clip.rs b/core/src/avm1/globals/movie_clip.rs
index c6cf273c8..c85c6ea9c 100644
--- a/core/src/avm1/globals/movie_clip.rs
+++ b/core/src/avm1/globals/movie_clip.rs
@@ -769,7 +769,7 @@ fn get_bytes_loaded<'gc>(
     let bytes_loaded = if movie_clip.is_root() {
         movie_clip
             .movie()
-            .map(|mv| mv.header().uncompressed_len())
+            .map(|mv| mv.uncompressed_len())
             .unwrap_or_default()
     } else {
         movie_clip.tag_stream_len() as u32
@@ -787,7 +787,7 @@ fn get_bytes_total<'gc>(
     let bytes_total = if movie_clip.is_root() {
         movie_clip
             .movie()
-            .map(|mv| mv.header().uncompressed_len())
+            .map(|mv| mv.uncompressed_len())
             .unwrap_or_default()
     } else {
         movie_clip.tag_stream_len() as u32
diff --git a/core/src/avm1/globals/movie_clip_loader.rs b/core/src/avm1/globals/movie_clip_loader.rs
index 57b2734fc..db751eefe 100644
--- a/core/src/avm1/globals/movie_clip_loader.rs
+++ b/core/src/avm1/globals/movie_clip_loader.rs
@@ -114,7 +114,7 @@ pub fn get_progress<'gc>(
                 "bytesLoaded",
                 movieclip
                     .movie()
-                    .map(|mv| (mv.header().uncompressed_len()).into())
+                    .map(|mv| (mv.uncompressed_len()).into())
                     .unwrap_or(Value::Undefined),
                 Attribute::empty(),
             );
@@ -123,7 +123,7 @@ pub fn get_progress<'gc>(
                 "bytesTotal",
                 movieclip
                     .movie()
-                    .map(|mv| (mv.header().uncompressed_len()).into())
+                    .map(|mv| (mv.uncompressed_len()).into())
                     .unwrap_or(Value::Undefined),
                 Attribute::empty(),
             );
diff --git a/core/src/avm2/globals/flash/display/loaderinfo.rs b/core/src/avm2/globals/flash/display/loaderinfo.rs
index 7832599f5..8946656ba 100644
--- a/core/src/avm2/globals/flash/display/loaderinfo.rs
+++ b/core/src/avm2/globals/flash/display/loaderinfo.rs
@@ -107,11 +107,9 @@ pub fn bytes_total<'gc>(
     if let Some(this) = this {
         if let Some(loader_stream) = this.as_loader_stream() {
             match &*loader_stream {
-                LoaderStream::Stage => {
-                    return Ok(activation.context.swf.compressed_length().into())
-                }
+                LoaderStream::Stage => return Ok(activation.context.swf.compressed_len().into()),
                 LoaderStream::Swf(movie, _) => {
-                    return Ok(movie.compressed_length().into());
+                    return Ok(movie.compressed_len().into());
                 }
             }
         }
diff --git a/core/src/tag_utils.rs b/core/src/tag_utils.rs
index 54a682ec2..ed4c6a73f 100644
--- a/core/src/tag_utils.rs
+++ b/core/src/tag_utils.rs
@@ -34,7 +34,7 @@ pub struct SwfMovie {
     encoding: &'static swf::Encoding,
 
     /// The compressed length of the entire datastream
-    compressed_length: usize,
+    compressed_len: usize,
 }
 
 impl SwfMovie {
@@ -47,7 +47,7 @@ impl SwfMovie {
             loader_url: None,
             parameters: Vec::new(),
             encoding: swf::UTF_8,
-            compressed_length: 0,
+            compressed_len: 0,
         }
     }
 
@@ -64,7 +64,7 @@ impl SwfMovie {
             loader_url: source.loader_url.clone(),
             parameters: source.parameters.clone(),
             encoding: source.encoding,
-            compressed_length: source.compressed_length,
+            compressed_len: source.compressed_len,
         }
     }
 
@@ -86,7 +86,7 @@ impl SwfMovie {
         url: Option<String>,
         loader_url: Option<String>,
     ) -> Result<Self, Error> {
-        let compressed_length = swf_data.len();
+        let compressed_len = swf_data.len();
         let swf_buf = swf::read::decompress_swf(swf_data)?;
         let encoding = swf::SwfStr::encoding_for_version(swf_buf.header.version());
         Ok(Self {
@@ -96,7 +96,7 @@ impl SwfMovie {
             loader_url,
             parameters: Vec::new(),
             encoding,
-            compressed_length,
+            compressed_len,
         })
     }
 
@@ -149,8 +149,12 @@ impl SwfMovie {
         self.parameters.extend(params);
     }
 
-    pub fn compressed_length(&self) -> usize {
-        self.compressed_length
+    pub fn compressed_len(&self) -> usize {
+        self.compressed_len
+    }
+
+    pub fn uncompressed_len(&self) -> u32 {
+        self.header.uncompressed_len()
     }
 
     pub fn avm_type(&self) -> AvmType {