First pass VN

src/dawntools/util/File.cpp

@@ -22,13 +22,17 @@ bool_t File::open(enum FileMode mode) {
 
   if(this->file == NULL) return false;
 
-  fseek(this->file, 0, SEEK_END);
+  if(mode == FILE_MODE_READ) {
-  this->length = ftell(this->file);
+    fseek(this->file, 0, SEEK_END);
-  fseek(this->file, 0, SEEK_SET);
+    this->length = ftell(this->file);
+    fseek(this->file, 0, SEEK_SET);
 
-  if(this->length <= 0) {
+    if(this->length <= 0) {
-    this->close();
+      this->close();
-    return false;
+      return false;
+    }
+  } else {
+    this->length = 0;
   }
 
   return true;
@@ -80,7 +84,7 @@ bool_t File::writeString(std::string in) {
 
   const char_t *strOut = in.c_str();
   // TODO: Validate write length.
-  fwrite(strOut, sizeof(char_t), in.size(), this->file);
+  this->length = fwrite(strOut, sizeof(char_t), in.size(), this->file);
   return true;
 }
 

src/dawntools/visualnovel/vnscenegen/VnSceneGen.cpp

@@ -192,39 +192,23 @@ std::string parseEvent(xml_t *evt, struct HeaderInformation *header) {
   return buffer;
 }
 
-int oldmain(int32_t argc, char *args[]) {
+int32_t VnSceneGen::start() {
-  if(argc != 3) {
+  if(this->args.size() != 3) {
     std::cout << "Invalid number of args passed to VNScene Generator" << std::endl;
     return 1;
   }
 
   // Open input file.
-  char fileIn[FILENAME_MAX];
+  File file(this->args[1]);
-  fileNormalizeSlashes(args[1]);
+  std::string buffer;
-  sprintf(fileIn, "%s", args[1]);
+  if(!file.readString(&buffer)) {
-  FILE *fin = fopen(fileIn, "rb");
+    std::cout << "Failed to read scene " << file.filename << std::endl;
-  if(fin == NULL) {
-    std::cout << "Failed to open input file " << fileIn << std::endl;
     return 1;
   }
 
-  // Tell file len
-  auto len = assetReadString(fin, NULL);
-
-  // Read data.
-  char *buffer = (char *)malloc(sizeof(char) * (len + 1));
-  if(buffer == NULL) {
-    std::cout << "Failed to create temporary memory." << std::endl;
-    fclose(fin);
-    return 1;
-  }
-  assetReadString(fin, buffer);
-  fclose(fin);
-
   // Parse XML
   xml_t xml;
-  xmlLoad(&xml, buffer);
+  xmlLoad(&xml, (char*)buffer.c_str());
-  free(buffer);
 
   // First, read the header information
   struct HeaderInformation header;
@@ -322,26 +306,16 @@ int oldmain(int32_t argc, char *args[]) {
 
   // Finished with XML data, now we can write data out.
   xmlDispose(&xml);
-  
+
-  char fileOut[FILENAME_MAX];
+  File fileOut(this->args[2] + ".hpp");
-  fileNormalizeSlashes(args[2]);
+  if(!fileOut.mkdirp()) {
-  sprintf(fileOut, "%s.hpp", args[2]);
+    std::cout << "Failed to make scene output dir" << std::endl;
-  fileMkdirp(fileOut);
+    return 1;
-  FILE *fout = fopen(fileOut, "wb");
+  }
-  if(fout == NULL) {
+  if(!fileOut.writeString(bufferOut)) {
-    std::cout << "Failed to open output file." << std::endl;
+    std::cout << "Failed to generate scene " << fileOut.filename << std::endl;
     return 1;
   }
 
-  // Buffer out data.
-  const char *bufferOutStr = bufferOut.c_str();
-  fwrite(bufferOutStr, sizeof(char), strlen(bufferOutStr), fout);
-  fclose(fout);
-  std::cout << "Generated Scene " << fileOut << std::endl;
-
-  return 0;
-}
-
-int32_t VnSceneGen::start() {
   return 0;
 }

src/dawntools/visualnovel/vnscenegen/VnSceneGen.hpp

@@ -6,6 +6,7 @@
 #pragma once
 #include "util/DawnTool.hpp"
 #include "util/Xml.hpp"
+#include "util/File.hpp"
 #include "../../util/file.hpp"
 #include "../../util/xml.hpp"
 #include <iostream>