Bug fixes. Added support of correct extracting divided files

BinaryData.cpp

@@ -43,7 +43,7 @@ namespace LOTRO_DAT {
         try {
             long long ans = 0;
 
-            if (pos + T >= size_)
+            if (pos + T > size_)
                 throw DatException("Bad BinaryData::ToNumber(). Reached end of BinaryData!", DATA_EXCEPTION);
 
             for (int i = T - 1; i >= 0; i--)
@@ -148,7 +148,6 @@ namespace LOTRO_DAT {
 		fopen_s(&f, filename, "wb");
 		if (f == nullptr) {
 			throw DatException("Bad BinaryData::WriteToFile() - unable to open output file", EXPORT_EXCEPTION);
-			return false;
 		}
 
 		fwrite(data(), size(), 1, f);
@@ -184,6 +183,17 @@ namespace LOTRO_DAT {
 		return;
 	}
 
+    BinaryData BinaryData::CutData(long long first, long long last) {
+        if (last < 0)
+            last = size();
+
+        if (last > size())
+            throw DatException("Bad BinaryData::CutData() - parameter 'last' is out of range");
+
+        BinaryData newdata(unsigned(last - first));
+        memcpy(newdata.data(), data() + first, newdata.size());
+        return newdata;
+    }
 
     template long long BinaryData::ToNumber<1>(long long const&) const;
     template long long BinaryData::ToNumber<2>(long long const&) const;

BinaryData.h

@@ -41,6 +41,8 @@ namespace LOTRO_DAT
 
         BinaryData& operator=(const BinaryData& data);
 
+        BinaryData CutData(long long first = 0, long long last = -1);
+
 		bool WriteToFile(const char *filename) const;
 		bool WriteToFile(const std::string &filename) const;
 

SubDirectory.cpp

@@ -89,7 +89,8 @@ void LOTRO_DAT::SubDirectory::MakeDictionary(std::unordered_map<long long, Subfi
     for (Subfile &i : subfiles_) {
         //if (dict.count(i.file_id()) != 0 && dict[i.file_id()]->file_offset() != i.file_offset())
         //    throw DatException("Bad SubDirectory::MakeDictionary() - found 2 files with different offset!!!", SUBFILE_EXCEPTION);
-        if (dict.count(i.file_id()) == 0 || dict[i.file_id()]->timestamp() < i.timestamp())
+        if (dict.count(i.file_id()) == 0 || dict[i.file_id()]->timestamp() < i.timestamp()
+            || (dict[i.file_id()]->timestamp() == i.timestamp() && dict[i.file_id()]->size1() < i.size1()))
 			dict[i.file_id()] = &i;
     }
     for (SubDirectory &i : subdirs_)

Subfile.cpp

@@ -20,7 +20,7 @@ LOTRO_DAT::Subfile::Subfile() {
 
 LOTRO_DAT::Subfile::Subfile(DatFile *dat, long long unknown0, long long unknown1, long long file_id, long long file_offset, long long size1,
                             long long timestamp, long long version, long long size2) :
-        dat_(dat), unknown0_(unknown0), unknown1_(unknown1), file_id_(file_id), file_offset_(file_offset + 8),
+        dat_(dat), unknown0_(unknown0), unknown1_(unknown1), file_id_(file_id), file_offset_(file_offset),
         size1_(size1), timestamp_(timestamp), version_(version), size2_(size2) {
 
     if (size1_ > MAXSIZE)
@@ -75,7 +75,7 @@ LOTRO_DAT::EXTENSION LOTRO_DAT::Subfile::GetExtension() const {
 
     BinaryData header(64);
     try {
-        dat_->ReadData(header, 64, (unsigned) file_offset_);
+        dat_->ReadData(header, 64, (unsigned) file_offset_ + 8);
     } catch (DatException &e) {
         if (e.type() == READ_EXCEPTION) {
             std::string err =
@@ -136,7 +136,8 @@ std::string LOTRO_DAT::Subfile::ExtensionToString(LOTRO_DAT::EXTENSION ext) cons
 
 bool LOTRO_DAT::Subfile::ExportFile(const char *filename, Database *db) const {
 	try {
-		BinaryData data;
+        BinaryData data;
+
 		switch (ext_)
 		{
 		case LOTRO_DAT::TXT:
@@ -158,7 +159,8 @@ bool LOTRO_DAT::Subfile::ExportFile(const char *filename, Database *db) const {
 		}
 
 		if (db == nullptr) {
-			return data.WriteToFile(std::string(filename) + std::string(ExtensionToString(ext_)));
+            std::string s = std::string(filename) + std::string(ExtensionToString(ext_));
+			return data.WriteToFile(s);
 		} else {
             db->PushBinaryFile(file_id_, data);
             return true;
@@ -175,15 +177,31 @@ bool LOTRO_DAT::Subfile::ExportFileAsTXT(const char *filename, Database *db) con
     throw DatException("ExportAsTXT function is not implemented yet", EXPORT_EXCEPTION);
 }
 
+LOTRO_DAT::BinaryData LOTRO_DAT::Subfile::GetFileData() const {
+    BinaryData data((unsigned)size1());
+    if (size2() >= size1() + 8) {
+        dat_->ReadData(data, size1(), file_offset() + 8);
+        return data;
+    }
+
+    long long first_block_size = size2() - 8 - 4;
+
+    dat_->ReadData(data, first_block_size, file_offset() + 8);
+
+    BinaryData newFragmentOffset(4);
+    dat_->ReadData(newFragmentOffset, 4, file_offset() + size2() - 4);
+    long long part_offset = newFragmentOffset.ToNumber<4>(0);
+
+    dat_->ReadData(data, size1() - first_block_size, part_offset, first_block_size);
+    return data;
+}
+
 const LOTRO_DAT::BinaryData LOTRO_DAT::Subfile::PrepareAsJPG() const {
-    BinaryData data((unsigned) size1_ - 24);
-    dat_->ReadData(data, (unsigned) size1_ - 24, (unsigned) file_offset_ + 24);
-	return data;
+    return GetFileData().CutData(24);
 }
 
 const LOTRO_DAT::BinaryData LOTRO_DAT::Subfile::PrepareAsDDS() const {
-    BinaryData data((unsigned) size1_);
-    dat_->ReadData(data, (unsigned) size1_, file_offset_);
+    BinaryData data = GetFileData();
     if (compressed_)
         data.DecompressData(4);
 
@@ -291,9 +309,7 @@ const LOTRO_DAT::BinaryData LOTRO_DAT::Subfile::PrepareAsDDS() const {
 }
 
 const LOTRO_DAT::BinaryData LOTRO_DAT::Subfile::PrepareAsOGG() const {
-    BinaryData data((unsigned) size1_ - 8);
-    dat_->ReadData(data, (unsigned) size1_ - 8, (unsigned) file_offset_ + 8);
-	return data;
+    return GetFileData().CutData(8);
 }
 
 const LOTRO_DAT::BinaryData LOTRO_DAT::Subfile::PrepareAsFont() const {
@@ -301,9 +317,7 @@ const LOTRO_DAT::BinaryData LOTRO_DAT::Subfile::PrepareAsFont() const {
 }
 
 const LOTRO_DAT::BinaryData LOTRO_DAT::Subfile::PrepareAsWAV() const {
-    BinaryData data((unsigned) size1_ - 8);
-    dat_->ReadData(data, (unsigned) size1_ - 8, (unsigned) file_offset_ + 8);
-	return data;
+    return GetFileData().CutData(8);
 }
 
 const LOTRO_DAT::BinaryData LOTRO_DAT::Subfile::PrepareAsUnk() const {

Subfile.h

@@ -68,7 +68,9 @@ namespace LOTRO_DAT
 
 		EXTENSION GetExtension() const;
 		std::string ExtensionToString(LOTRO_DAT::EXTENSION ext) const;
-		const BinaryData PrepareAsTXT() const;
+
+		BinaryData GetFileData() const;
+
 		const BinaryData PrepareAsJPG() const;
 		const BinaryData PrepareAsDDS() const;
 		const BinaryData PrepareAsOGG() const;

test.cpp

@@ -18,17 +18,17 @@ int main() {
     std::string filename = "client_local_English.dat";
 
     bool exportTextsToFiles = false; // Not implemented yet - do not turn to true;
-    bool exportImagesToFiles = false;
+    bool exportImagesToFiles = true;
     bool exportFontsToFiles = false; // Not implemented yet - do not turn to true;
     bool exportSoundsToFiles = false;
-    bool exportTexturesToFiles = false;
+    bool exportTexturesToFiles = true;
     bool exportUnknownToFiles = false; // Not implemented yet - do not turn to true;
 
     bool exportTextsToDb = false; // Not implemented yet - do not turn to true;
     bool exportImagesToDb = true;
     bool exportFontsToDb = false; // Not implemented yet - do not turn to true;
-    bool exportSoundsToDb = true;
-    bool exportTexturesToDb = true;
+    bool exportSoundsToDb = false;
+    bool exportTexturesToDb = false;
     bool exportUnknownToDb = false; // Not implemented yet - do not turn to true;
 
 	// There is no need to touch something else
@@ -82,7 +82,7 @@ int main() {
 	std::cout << "Writing unordered dictionary:\n";
 	FILE *f;
 	fopen_s(&f, (output_dir + "dict.txt").c_str(), "w");
-	fprintf(f, "file_id | offset | extension\n");
+	fprintf(f, "file_id offset size size2 extension\n");
 	for (auto i : a.dictionary()) {
 		std::string extension = "unk";
 		EXTENSION ext = i.second->ext();
@@ -92,7 +92,8 @@ int main() {
 		if (ext == WAV) extension = "wav";
 		if (ext == OGG) extension = "ogg";
 		if (ext == FONT) extension = "font";
-		fprintf(f, "%lld %lld %s\n", i.second->file_id(), i.second->file_offset(), extension.c_str());
+		fprintf(f, "%lld %lld %lld %lld %s\n", i.second->file_id(), i.second->file_offset()
+                , i.second->size1(), i.second->size2(), extension.c_str());
 	}
 	fclose(f);