From 38a3113ab6299e4ba24e87a6876b56b2c4ea9232 Mon Sep 17 00:00:00 2001
From: Gary Talent <gtalent2@gmail.com>
Date: Mon, 22 May 2017 01:37:34 -0500
Subject: [PATCH] Make TileSheet import write tilesheets to ROM FS

---
 .../core/studio/import_tilesheet_wizard.cpp   | 19 ++++++++++++++++--
 .../core/studio/import_tilesheet_wizard.hpp   |  2 +-
 src/nostalgia/studio/lib/project.cpp          | 20 ++++++++++++++-----
 src/nostalgia/studio/lib/project.hpp          | 10 +++++++---
 src/nostalgia/studio/lib/wizard.cpp           |  2 ++
 src/nostalgia/studio/mainwindow.cpp           |  4 ++--
 6 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/src/nostalgia/core/studio/import_tilesheet_wizard.cpp b/src/nostalgia/core/studio/import_tilesheet_wizard.cpp
index 521f379c..83ba8e68 100644
--- a/src/nostalgia/core/studio/import_tilesheet_wizard.cpp
+++ b/src/nostalgia/core/studio/import_tilesheet_wizard.cpp
@@ -46,8 +46,23 @@ int ImportTilesheetWizardPage::accept() {
 	}
 }
 
-int ImportTilesheetWizardPage::importImage(QFile &src, QString tilesetName) {
-	return 1;
+int ImportTilesheetWizardPage::importImage(QFile &srcFile, QString tilesheetName) {
+	auto buffSize = srcFile.size();
+	uint8_t buff[buffSize];
+	if (srcFile.exists()) {
+		srcFile.open(QIODevice::ReadOnly);
+		if (srcFile.read((char*) buff, buffSize) > 0) {
+			int err = 0;
+			m_project->mkdir("/TileSheets");
+			err |= m_project->write("/TileSheets/" + tilesheetName, buff, buffSize);
+			err |= m_project->saveRomFs();
+			return err;
+		} else {
+			return 1;
+		}
+	} else {
+		return 2;
+	}
 }
 
 }
diff --git a/src/nostalgia/core/studio/import_tilesheet_wizard.hpp b/src/nostalgia/core/studio/import_tilesheet_wizard.hpp
index 120f6a89..76891216 100644
--- a/src/nostalgia/core/studio/import_tilesheet_wizard.hpp
+++ b/src/nostalgia/core/studio/import_tilesheet_wizard.hpp
@@ -26,7 +26,7 @@ class ImportTilesheetWizardPage: public studio::WizardFormPage {
 		int accept();
 
 	private:
-		int importImage(QFile &src, QString dest);
+		int importImage(QFile &srcFile, QString dest);
 };
 
 }
diff --git a/src/nostalgia/studio/lib/project.cpp b/src/nostalgia/studio/lib/project.cpp
index d4dfebd0..cd8c3cb9 100644
--- a/src/nostalgia/studio/lib/project.cpp
+++ b/src/nostalgia/studio/lib/project.cpp
@@ -41,7 +41,7 @@ void Project::create() {
 	file.close();
 }
 
-int Project::open() {
+int Project::openRomFs() {
 	QFile file(m_path + ROM_FILE);
 	auto buffSize = file.size();
 	auto buff = new uint8_t[buffSize];
@@ -58,16 +58,26 @@ int Project::open() {
 	}
 }
 
-void Project::save() {
+int Project::saveRomFs() {
+	int err = 0;
 	QFile file(m_path + ROM_FILE);
-	file.open(QIODevice::WriteOnly);
-	file.write((const char*) m_fs->buff(), m_fs->size());
+	err |= file.open(QIODevice::WriteOnly) == false;
+	err |= file.write((const char*) m_fs->buff(), m_fs->size()) == -1;
 	file.close();
+	return err;
 }
 
-FileSystem *Project::romFS() {
+FileSystem *Project::romFs() {
 	return m_fs;
 }
 
+int Project::mkdir(QString path) {
+	return m_fs->mkdir(path.toUtf8().data());
+}
+
+int Project::write(QString path, uint8_t *buff, size_t buffLen) {
+	return m_fs->write(path.toUtf8().data(), buff, buffLen);
+}
+
 }
 }
diff --git a/src/nostalgia/studio/lib/project.hpp b/src/nostalgia/studio/lib/project.hpp
index f50e3a1d..283f543b 100644
--- a/src/nostalgia/studio/lib/project.hpp
+++ b/src/nostalgia/studio/lib/project.hpp
@@ -31,11 +31,15 @@ class Project: public QObject {
 
 		void create();
 
-		int open();
+		int openRomFs();
 
-		void save();
+		int saveRomFs();
 
-		ox::FileSystem *romFS();
+		ox::FileSystem *romFs();
+
+		int mkdir(QString path);
+
+		int write(QString path, uint8_t *buff, size_t buffLen);
 };
 
 }
diff --git a/src/nostalgia/studio/lib/wizard.cpp b/src/nostalgia/studio/lib/wizard.cpp
index b439020d..c9c88fe1 100644
--- a/src/nostalgia/studio/lib/wizard.cpp
+++ b/src/nostalgia/studio/lib/wizard.cpp
@@ -333,6 +333,8 @@ void Wizard::accept() {
 	auto page = dynamic_cast<WizardFormPage*>(currentPage());
 	if (page == nullptr || page->accept() == 0) {
 		QDialog::accept();
+	} else if(m_acceptFunc != nullptr && m_acceptFunc() == 0) {
+		QDialog::accept();
 	}
 }
 
diff --git a/src/nostalgia/studio/mainwindow.cpp b/src/nostalgia/studio/mainwindow.cpp
index aafe8ddb..aafc8d6e 100644
--- a/src/nostalgia/studio/mainwindow.cpp
+++ b/src/nostalgia/studio/mainwindow.cpp
@@ -219,14 +219,14 @@ int MainWindow::writeState(QString path) {
 int MainWindow::openProject(QString projectPath) {
 	auto err = closeProject();
 	auto project = new Project(projectPath);
-	err |= project->open();
+	err |= project->openRomFs();
 	if (err == 0) {
 		if (m_project) {
 			delete m_project;
 			m_project = nullptr;
 		}
 		m_project = project;
-		m_projectExplorer->setModel(new OxFSModel(m_project->romFS()));
+		m_projectExplorer->setModel(new OxFSModel(m_project->romFs()));
 		m_importAction->setEnabled(true);
 		m_state.projectPath = projectPath;
 	}