X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=CollectionReader.cpp;h=2f4a3cd94da33960f636589caa3c920ff2f880f3;hb=f986eb900eaf15a3c46404f6156b24eb03fc7fbe;hp=f58e5bc7e2fae72df140313f52a09fc3f9f84a2d;hpb=ee4c05de3061d1d7abfd1710823442cbc0cfbf46;p=ecparse.git

diff --git a/CollectionReader.cpp b/CollectionReader.cpp
index f58e5bc..2f4a3cd 100644
--- a/CollectionReader.cpp
+++ b/CollectionReader.cpp
@@ -4,6 +4,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <stdint.h>
 #include "CollectionReader.h"
 #include "GlobalSettings.h"
 
@@ -22,6 +23,67 @@ bool CollectionReader::isLineBreakPresent() {
 	return indexOfLineBreak != (size_t) -1;
 }
 
+StringTag* CollectionReader::readStringTag(bool header) {
+	if (header) {
+		uint16_t unknown = 0;
+		if (!ensureBufferCapacity(2)) {
+			return NULL;
+		}
+		growingBuffer.read(&unknown, 2);
+	}
+	uint8_t tagName = 0;
+	if (!ensureBufferCapacity(1)) {
+		return NULL;
+	}
+	growingBuffer.read(&tagName, 1);
+	GlobalSettings::isVerbose() && fprintf(stderr, "[%s:%d] read tag name %d.\n", __FILE__, __LINE__, tagName);
+	uint16_t tagLength = 0;
+	if (!ensureBufferCapacity(2)) {
+		return NULL;
+	}
+	growingBuffer.read(&tagLength, 2);
+	GlobalSettings::isVerbose() && fprintf(stderr, "[%s:%d] read tag length %d.\n", __FILE__, __LINE__, tagLength);
+	char* tagValue = (char*) malloc(tagLength + 1);
+	if (!ensureBufferCapacity(tagLength)) {
+		return NULL;
+	}
+	growingBuffer.read(tagValue, tagLength);
+	tagValue[tagLength] = '\0';
+	StringTag* stringTag = new StringTag(tagName, tagValue);
+	free(tagValue);
+	return stringTag;
+}
+
+BlobTag* CollectionReader::readBlobTag(bool header) {
+	if (header) {
+		uint16_t unknown = 0;
+		if (!ensureBufferCapacity(2)) {
+			return NULL;
+		}
+		growingBuffer.read(&unknown, 2);
+	}
+	uint8_t tagName = 0;
+	if (!ensureBufferCapacity(1)) {
+		return NULL;
+	}
+	growingBuffer.read(&tagName, 1);
+	GlobalSettings::isVerbose() && fprintf(stderr, "[%s:%d] read tag name %d.\n", __FILE__, __LINE__, tagName);
+	uint32_t tagLength = 0;
+	if (!ensureBufferCapacity(4)) {
+		return NULL;
+	}
+	growingBuffer.read(&tagLength, 4);
+	GlobalSettings::isVerbose() && fprintf(stderr, "[%s:%d] read tag length %d.\n", __FILE__, __LINE__, tagLength);
+	void* tagValue = (char*) malloc(tagLength);
+	if (!ensureBufferCapacity(tagLength)) {
+		return NULL;
+	}
+	growingBuffer.read(tagValue, tagLength);
+	BlobTag* blobTag = new BlobTag(tagName, tagValue, tagLength);
+	free(tagValue);
+	return blobTag;
+}
+
 ED2KLink* CollectionReader::getNextLink() {
 	if (readerInput->isEOF() && !growingBuffer.getRemaining()) {
 		GlobalSettings::isVerbose() && fprintf(stderr, "[%s:%d] readInput EOF reached.\n", __FILE__, __LINE__);
@@ -67,6 +129,40 @@ ED2KLink* CollectionReader::getNextLink() {
 		free(line);
 		return ed2kLink;
 	} else {
+		/* read header */
+		if (!ensureBufferCapacity(4)) {
+			return NULL;
+		}
+		uint32_t headerTagCount = 0;
+		growingBuffer.read(&headerTagCount, 4);
+		GlobalSettings::isVerbose() && fprintf(stderr, "[%s:%d] will read %d header tags.\n", __FILE__, __LINE__, headerTagCount);
+		for (uint32_t headerTagIndex = 0; headerTagIndex < headerTagCount; headerTagIndex++) {
+			uint8_t tagType = 0;
+			if (!ensureBufferCapacity(1)) {
+				return NULL;
+			}
+			growingBuffer.read(&tagType, 1);
+			GlobalSettings::isVerbose() && fprintf(stderr, "[%s:%d] read tag type %d.\n", __FILE__, __LINE__, tagType);
+			if (tagType == 0x02) {
+				StringTag* stringTag = readStringTag(true);
+				if (stringTag->getId() == 0x01) {
+					GlobalSettings::isVerbose() && fprintf(stderr, "[%s:%d] FT_FILENAME: “%s”\n", __FILE__, __LINE__, (char*) stringTag->getValue());
+				} else if (stringTag->getId() == 0x31) {
+					GlobalSettings::isVerbose() && fprintf(stderr, "[%s:%d] FT_COLLECTIONAUTHOR: “%s”\n", __FILE__, __LINE__, (char*) stringTag->getValue());
+				} else {
+					GlobalSettings::isVerbose() && fprintf(stderr, "[%s:%d] unknown string in header: “%s”\n", __FILE__, __LINE__, (char*) stringTag->getValue());
+				}
+			} else if (tagType == 0x07) {
+				BlobTag* blobTag = readBlobTag(true);
+				if (blobTag->getId() == 0x32) {
+					GlobalSettings::isVerbose() && fprintf(stderr, "[%s:%d] FT_COLLECTIONAUTHORKEY: %d bytes.\n", __FILE__, __LINE__, blobTag->getSize());
+				} else {
+					GlobalSettings::isVerbose() && fprintf(stderr, "[%s:%d] unknown block in header: %d bytes.\n", __FILE__, __LINE__, blobTag->getSize());
+				}
+			} else {
+				GlobalSettings::isVerbose() && fprintf(stderr, "[%s:%d] unknown tag type: %02x.\n", __FILE__, __LINE__, tagType);
+			}
+		}
 	}
 	return NULL;
 }