Small code improvements

Database.cpp

@@ -8,6 +8,7 @@
 #include <cstring>
 
 namespace LOTRO_DAT {
+
     Database::Database() {
         db_ = nullptr;
         query_size_ = 0;
@@ -24,9 +25,8 @@ namespace LOTRO_DAT {
     }
 
     Database::~Database() {
-        if (query_size_ != 0) {
-            ExecSql("END_TRANSACTION");
-        }
+        if (query_size_ != 0)
+            ExecSql("END TRANSACTION");
 
         if (db_ != nullptr) {
             sqlite3_finalize(insert_text_);
@@ -40,8 +40,8 @@ namespace LOTRO_DAT {
     void Database::InitDatabase(const char *filename) {
         if (sqlite3_open(filename, &db_) != SQLITE_OK) {
             sqlite3_close(db_);
-            throw DatException("Bad Database::InitDatabase() - sqlite3_open returned an error...",
-                                          DATABASE_EXCEPTION);
+            throw DatException("Bad Database::InitDatabase() - sqlite3_open returned an error..."
+                    , DATABASE_EXCEPTION);
         }
 
         ExecSql(CreateBinaryTableCommand_);
@@ -63,10 +63,11 @@ namespace LOTRO_DAT {
 
     void Database::ExecSql(const char *sql) {
         char *error;
-        if (sqlite3_exec(db_, sql, nullptr, nullptr, &error) != SQLITE_OK)
+        if (sqlite3_exec(db_, sql, nullptr, nullptr, &error) != SQLITE_OK) {
+            fprintf(stderr, "SQLite3 error: %s\n", sqlite3_errmsg(db_));
             throw DatException((std::string("Bad Database::ExecSql() - unable to perform request")
-                                           + std::string(sql) + std::string(". Database returned message: ")
-                                           + std::string(error)).c_str(), DATABASE_EXCEPTION);
+                                + std::string(sql)).c_str(), DATABASE_EXCEPTION);
+        }
     }
 
     void Database::PushTextFile(long long file_id, long long gossip_id, char *text, char *args, int dat_id) {
@@ -78,12 +79,12 @@ namespace LOTRO_DAT {
         sqlite3_bind_text(insert_text_, 3, text, sizeof(text), SQLITE_TRANSIENT);
         sqlite3_bind_text(insert_text_, 4, args, sizeof(args), SQLITE_TRANSIENT);
 
-        char *error;
         if (sqlite3_step(insert_text_) != SQLITE_OK) {
-            throw DatException((std::string("Bad Database::PushTextFile() - unable to perform operation")
-                                + std::string(". Database returned message: ")
-                                + std::string(error)).c_str(), DATABASE_EXCEPTION);
+            fprintf(stderr, "SQLite3 error: %s\n", sqlite3_errmsg(db_));
+            throw DatException((std::string("Bad Database::PushTextFile() - unable to perform push operation")).c_str(),
+                               DATABASE_EXCEPTION);
         }
+
         sqlite3_reset(insert_text_);
 
         query_size_++;
@@ -102,7 +103,6 @@ namespace LOTRO_DAT {
         sqlite3_bind_int(insert_binary_, 1, (int)file_id);
         sqlite3_bind_blob(insert_binary_, 2, data.data(), data.size(), SQLITE_TRANSIENT);
 
-        char *error;
         if (sqlite3_step(insert_binary_) != SQLITE_DONE) {
             fprintf(stderr, "SQLite3 error: %s\n", sqlite3_errmsg(db_));
             throw DatException(std::string("Bad Database::PushTextFile() - unable to perform operation").c_str()
@@ -118,6 +118,6 @@ namespace LOTRO_DAT {
     }
 
     //BinaryData &Database::GetBinaryFile(long long file_id) {
-    //    return <#initializer#>;
+    //
     //}
 }

SubDirectory.cpp

@@ -55,6 +55,7 @@ void LOTRO_DAT::SubDirectory::MakeSubDirectories() {
                             dat_
                     )
             );
+
         } catch (...) {
             fprintf(stderr, "Making SubDirectory at offset %lld failed, continuing\n",  data.ToNumber<4>(i + 4));
         }
@@ -69,17 +70,17 @@ void LOTRO_DAT::SubDirectory::MakeSubFiles() {
         if (data.ToNumber<4>(i + 8) < 0x32 || data.ToNumber<4>(i + 12) < 0x32)
             continue;
         subfiles_.emplace_back(
-                Subfile(
-                        dat_,
-                        data.ToNumber<4>(i), // unknown0
-                        data.ToNumber<4>(i + 4), // unknown1
-                        data.ToNumber<4>(i + 8), // file_id
-                        data.ToNumber<4>(i + 12), // file_offset
-                        data.ToNumber<4>(i + 16), // size1
-                        data.ToNumber<4>(i + 20), // timestamp
-                        data.ToNumber<4>(i + 24), // version
-                        data.ToNumber<4>(i + 28) // size2
-                )
+            Subfile(
+                    dat_,
+                    data.ToNumber<4>(i), // unknown0
+                    data.ToNumber<4>(i + 4), // unknown1
+                    data.ToNumber<4>(i + 8), // file_id
+                    data.ToNumber<4>(i + 12), // file_offset
+                    data.ToNumber<4>(i + 16), // size1
+                    data.ToNumber<4>(i + 20), // timestamp
+                    data.ToNumber<4>(i + 24), // version
+                    data.ToNumber<4>(i + 28) // size2
+            )
         );
     }
 }

test.cpp

@@ -17,11 +17,19 @@ int main() {
     std::string path = "E:\\SteamLibrary\\steamapps\\common\\Lord of the Rings Online\\";
     std::string filename = "client_local_English.dat";
 
-    bool exportTextsToDb = false; // Not implemented - do not turn to true;
+    bool exportTextsToFiles = false; // Not implemented yet - do not turn to true;
+    bool exportImagesToFiles = false;
+    bool exportFontsToFiles = false; // Not implemented yet - do not turn to true;
+    bool exportSoundsToFiles = false;
+    bool exportTexturesToFiles = false;
+    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 - do not turn to true;
+    bool exportFontsToDb = false; // Not implemented yet - do not turn to true;
     bool exportSoundsToDb = true;
     bool exportTexturesToDb = true;
+    bool exportUnknownToDb = false; // Not implemented yet - do not turn to true;
 
 	// There is no need to touch something else
 
@@ -57,12 +65,14 @@ int main() {
     Database *texts = nullptr;
     Database *fonts = nullptr;
     Database *textures = nullptr;
+    Database *unknown = nullptr;
 
     if (exportImagesToDb) images = new Database(output_dir + std::string("Images.db"));
     if (exportSoundsToDb) sounds = new Database(output_dir + std::string("Sounds.db"));
     if (exportTextsToDb) texts = new Database(output_dir + std::string("Texts.db"));
     if (exportFontsToDb) fonts = new Database(output_dir + std::string("Fonts.db"));
     if (exportTexturesToDb) textures= new Database(output_dir + std::string("Textures.db"));
+    if (exportUnknownToDb) textures= new Database(output_dir + std::string("Unknown.db"));
 
 	std::cerr << "Starting search...\n";
 	DatFile a(path + filename);
@@ -95,39 +105,45 @@ int main() {
 		EXTENSION ext = i.second->ext();
         if (ext == TXT) {
         	txt_all++;
-            //txt_suc += i.second->ExportFile((output_dir + txt_dir + std::to_string(i.second->file_id())).c_str(), texts);
+            if (exportTextsToDb) txt_suc += i.second->ExportFile((output_dir + txt_dir + std::to_string(i.second->file_id())).c_str(), texts);
+            if (exportTextsToFiles) txt_suc += i.second->ExportFile((output_dir + txt_dir + std::to_string(i.second->file_id())).c_str());
         }
 
         if (ext == JPG) {
             jpg_all++;
-            jpg_suc += i.second->ExportFile((output_dir + jpg_dir + std::to_string(i.second->file_id())).c_str(), images);
+            if (exportImagesToDb) jpg_suc += i.second->ExportFile((output_dir + jpg_dir + std::to_string(i.second->file_id())).c_str(), images);
+            if (exportImagesToFiles) jpg_suc += i.second->ExportFile((output_dir + jpg_dir + std::to_string(i.second->file_id())).c_str());
         }
 
         if (ext == DDS) {
             dds_all++;
-            dds_suc += i.second->ExportFile((output_dir + dds_dir + std::to_string(i.second->file_id())).c_str(), textures);
+            if (exportTexturesToDb) dds_suc += i.second->ExportFile((output_dir + dds_dir + std::to_string(i.second->file_id())).c_str(), textures);
+            if (exportTexturesToFiles) dds_suc += i.second->ExportFile((output_dir + dds_dir + std::to_string(i.second->file_id())).c_str());
         }
 
         if (ext == WAV) {
             wav_all++;
-            wav_suc += i.second->ExportFile((output_dir + wav_dir + std::to_string(i.second->file_id())).c_str(), sounds);
+            if (exportSoundsToDb) wav_suc += i.second->ExportFile((output_dir + wav_dir + std::to_string(i.second->file_id())).c_str(), sounds);
+            if (exportSoundsToFiles) wav_suc += i.second->ExportFile((output_dir + wav_dir + std::to_string(i.second->file_id())).c_str());
         }
 
         if (ext == OGG) {
             ogg_all++;
-            ogg_suc += i.second->ExportFile((output_dir + ogg_dir + std::to_string(i.second->file_id())).c_str(), sounds);
+            if (exportSoundsToDb) ogg_suc += i.second->ExportFile((output_dir + ogg_dir + std::to_string(i.second->file_id())).c_str(), sounds);
+            if (exportSoundsToFiles) ogg_suc += i.second->ExportFile((output_dir + ogg_dir + std::to_string(i.second->file_id())).c_str());
         }
 
         if (ext == FONT) {
             font_all++;
-            //font_suc += i.second->ExportFile((output_dir + font_dir + std::to_string(i.second->file_id())).c_str(), fonts);
+            if (exportFontsToDb) font_suc += i.second->ExportFile((output_dir + font_dir + std::to_string(i.second->file_id())).c_str(), fonts);
+            if (exportFontsToFiles) font_suc += i.second->ExportFile((output_dir + font_dir + std::to_string(i.second->file_id())).c_str());
         }
 
         if (ext == UNKNOWN)
         {
-            //cout << " - unk\n";
             unk_all++;
-            //unk_suc += i.second->ExportFile((output_dir + unk_dir + std::to_string(i.second->file_id())).c_str());
+            if (exportUnknownToDb) unk_suc += i.second->ExportFile((output_dir + unk_dir + std::to_string(i.second->file_id())).c_str(), unknown);
+            if (exportUnknownToFiles) unk_suc += i.second->ExportFile((output_dir + unk_dir + std::to_string(i.second->file_id())).c_str());
         }
 
 		counter++;
@@ -145,7 +161,7 @@ int main() {
 		<< "Fonts " << font_all << std::endl
 		<< "Unknown: " << unk_all << std::endl;
 
-	std::cerr << "Total exported:" << std::endl;
+	std::cerr << "Total exported (counted both to files and databases):" << std::endl;
 	std::cerr << "Txt: " << txt_suc << std::endl
 		<< "JPG: " << jpg_suc << std::endl
 		<< "DDS: " << dds_suc << std::endl