IndexedCapturingReader.IsValidIndex uses Stream.Length if available

#122
drewnoakes · Feb 8, 2018 · 457c501 · 457c501
1 parent 4fadf7f
commit 457c501
Showing 1 changed file with 35 additions and 11 deletions.
diff --git a/MetadataExtractor/IO/IndexedCapturingReader.cs b/MetadataExtractor/IO/IndexedCapturingReader.cs
@@ -41,6 +41,7 @@ public sealed class IndexedCapturingReader : IndexedReader
         private readonly List<byte[]> _chunks = new List<byte[]>();
         private bool _isStreamFinished;
         private int _streamLength;
+        private bool _streamLengthRead;
         private bool _streamLengthThrewException;
 
         public IndexedCapturingReader([NotNull] Stream stream, int chunkLength = DefaultChunkLength, bool isMotorolaByteOrder = true)
@@ -68,24 +69,42 @@ public override long Length
         {
             get
             {
-                if (!_streamLengthThrewException)
-                {
-                    try
-                    {
-                        return _stream.Length;
-                    }
-                    catch (NotSupportedException)
-                    {
-                        _streamLengthThrewException = true;
-                    }
-                }
+                if (TryGetStreamLength(out var streamLength))
+                    return streamLength;
 
                 IsValidIndex(int.MaxValue, 1);
                 Debug.Assert(_isStreamFinished);
                 return _streamLength;
             }
         }
 
+        private bool TryGetStreamLength(out long streamLength)
+        {
+            if (_streamLengthRead)
+            {
+                streamLength = _streamLength;
+                return true;
+            }
+
+            if (!_streamLengthThrewException)
+            {
+                try
+                {
+                    _streamLength = checked((int)_stream.Length);
+                    streamLength = _streamLength;
+                    _streamLengthRead = true;
+                    return true;
+                }
+                catch (NotSupportedException)
+                {
+                    _streamLengthThrewException = true;
+                }
+            }
+
+            streamLength = default;
+            return false;
+        }
+
         /// <summary>Ensures that the buffered bytes extend to cover the specified index. If not, an attempt is made
         /// to read to that point.</summary>
         /// <remarks>If the stream ends before the point is reached, a <see cref="BufferBoundsException"/> is raised.</remarks>
@@ -119,6 +138,10 @@ protected override bool IsValidIndex(int index, int bytesRequested)
                 return false;
 
             var endIndex = (int)endIndexLong;
+
+            if (TryGetStreamLength(out var streamLength))
+                return endIndex < streamLength;
+
             if (_isStreamFinished)
                 return endIndex < _streamLength;
 
@@ -139,6 +162,7 @@ protected override bool IsValidIndex(int index, int bytesRequested)
                         // the stream has ended, which may be ok
                         _isStreamFinished = true;
                         _streamLength = _chunks.Count * _chunkLength + totalBytesRead;
+                        _streamLengthRead = true;
                         // check we have enough bytes for the requested index
                         if (endIndex >= _streamLength)
                         {