fixup! Add IStreamReader::getSize

Author: mgautierfr

src/buffer_reader.cpp

@@ -44,6 +44,11 @@ zsize_t BufferReader::size() const
   return source.size();
 }
 
+size_t BufferReader::getMemorySize() const
+{
+  return source.size().v;
+}
+
 offset_t BufferReader::offset() const
 {
   return offset_t((offset_type)(static_cast<const void*>(source.data(offset_t(0)))));

src/buffer_reader.h

@@ -31,6 +31,7 @@ class LIBZIM_PRIVATE_API BufferReader : public Reader {
     virtual ~BufferReader() {};
 
     zsize_t size() const override;
+    size_t getMemorySize() const override;
     offset_t offset() const override;
 
     const Buffer get_buffer(offset_t offset, zsize_t size) const override;

src/cluster.cpp

@@ -201,11 +201,11 @@ size_t zim::ClusterMemorySize::get_cluster_size(const Cluster& cluster) {
     auto base_struct = sizeof(Cluster);
     auto offsets_size = sizeof(offset_t) * cluster.m_blobOffsets.size();
     auto readers_size = cluster.m_blobOffsets.back().v / 2;
-    cluster.m_streamSize = cluster.m_reader->getSize();
+    cluster.m_streamSize = cluster.m_reader->getMemorySize();
     cluster.m_memorySize = base_struct + offsets_size + readers_size + cluster.m_streamSize;
     std::cout << cluster.m_memorySize << " = base:" << base_struct <<" offsets:" << offsets_size <<" readers:" << readers_size <<" input:" << cluster.m_streamSize << std::endl;
   }
-  auto streamSize = cluster.m_reader->getSize();
+  auto streamSize = cluster.m_reader->getMemorySize();
   if (streamSize != cluster.m_streamSize) {
     std::cerr << "WARNING: stream size have changed from " << cluster.m_streamSize << " to " << streamSize << std::endl;
     std::cerr << "Please open an issue on https://github.com/openzim/libzim/issues with this message and the zim file you use" << std::endl;

src/decoderstreamreader.h

@@ -50,8 +50,8 @@ class DecoderStreamReader : public IStreamReader
     Decoder::stream_end_decode(&m_decoderState);
   }
 
-  size_t getSize() const override {
-    return m_encodedDataReader->size().v + m_encodedDataChunk.size().v + Decoder::state_size(m_decoderState);
+  size_t getMemorySize() const override {
+    return m_encodedDataReader->getMemorySize() + m_encodedDataChunk.size().v + Decoder::state_size(m_decoderState);
   }
 
 private: // functions

src/file_reader.h

@@ -34,6 +34,7 @@ class LIBZIM_PRIVATE_API BaseFileReader : public Reader {
       : _offset(offset), _size(size) {}
     ~BaseFileReader() = default;
     zsize_t size() const override { return _size; };
+    size_t getMemorySize() const override { return 0; };
     offset_t offset() const override { return _offset; };
 
     virtual const Buffer get_mmap_buffer(offset_t offset,

src/istreamreader.h

@@ -59,8 +59,8 @@ class LIBZIM_PRIVATE_API IStreamReader
   // Reads a blob of the specified size from the stream
   virtual std::unique_ptr<const Reader> sub_reader(zsize_t size);
 
-  // Get the total size of the reader
-  virtual size_t getSize() const = 0;
+  // Get the total size occuped by the reader
+  virtual size_t getMemorySize() const = 0;
 
 private: // virtual methods
   // Reads exactly 'nbytes' bytes into the provided buffer 'buf'

src/rawstreamreader.h

@@ -35,8 +35,8 @@ class RawStreamReader : public IStreamReader
       m_readerPos(0)
   {}
 
-  size_t getSize() const override {
-    return m_reader->size().v;
+  size_t getMemorySize() const override {
+    return m_reader->getMemorySize();
   }
 
   void readImpl(char* buf, zsize_t nbytes) override

src/reader.h

@@ -36,6 +36,7 @@ class LIBZIM_PRIVATE_API Reader {
   public:
     Reader() {};
     virtual zsize_t size() const = 0;
+    virtual size_t getMemorySize() const = 0;
     virtual ~Reader() {};
 
     void read(char* dest, offset_t offset, zsize_t size) const {

test/istreamreader.cpp

@@ -35,7 +35,7 @@ using namespace zim;
 class InfiniteZeroStream : public IStreamReader
 {
   void readImpl(char* buf, zim::zsize_t nbytes) override { memset(buf, 0, nbytes.v); }
-  size_t getSize() const override {
+  size_t getMemorySize() const override {
     return 0;
   }
 };
@@ -50,7 +50,7 @@ class InfiniteIncreasingStream: public IStreamReader
     }
   }
 
-  size_t getSize() const override {
+  size_t getMemorySize() const override {
     return 0;
   }
 };