X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=CollectionReader.h;h=023b226cfd7ca86a17b25302587c6983b82b6f59;hb=refs%2Fheads%2Fmaster;hp=6e8f373414878fe18289c80e9cfec554d54ef250;hpb=8c428eac937ccba2a2bb459ce9999a1adba5e6c0;p=ecparse.git diff --git a/CollectionReader.h b/CollectionReader.h index 6e8f373..023b226 100644 --- a/CollectionReader.h +++ b/CollectionReader.h @@ -4,11 +4,13 @@ #pragma once +#include #include "ReaderInput.h" #include "ED2KLink.h" #include "GrowingBuffer.h" #include "StringTag.h" #include "BlobTag.h" +#include "HashTag.h" class CollectionReader { @@ -24,15 +26,18 @@ private: bool ensureBufferCapacity(size_t byteCount); void readMoreBytes(); - BlobTag* readBlobTag(bool hader); - StringTag* readStringTag(bool header); + BlobTag* readBlobTag(bool header = false); + StringTag* readStringTag(bool header = false); + HashTag* readHashTag(); private: ReaderInput* readerInput; GrowingBuffer growingBuffer; - int version; + uint32_t version; bool firstLink; bool isTextCollection; + uint32_t fileCollectionCount; + uint32_t collectionFileIndex; };