[olympic] Cleanup

src/olympic/studio/applib/src/main.cpp

@@ -5,7 +5,6 @@
 #include <ctime>
 
 #include <ox/logconn/logconn.hpp>
-#include <ox/logconn/def.hpp>
 #include <ox/std/trace.hpp>
 #include <ox/std/uuid.hpp>
 #include <keel/media.hpp>
@@ -31,21 +30,19 @@ class StudioUIDrawer: public turbine::gl::Drawer {
 
 static int updateHandler(turbine::Context &ctx) noexcept {
 	auto sctx = turbine::applicationData<studio::StudioContext>(ctx);
-	auto ui = dynamic_cast<StudioUI*>(sctx->ui);
+	sctx->ui->update();
-	ui->update();
 	return 16;
 }
 
 static void keyEventHandler(turbine::Context &ctx, turbine::Key key, bool down) noexcept {
 	auto sctx = turbine::applicationData<studio::StudioContext>(ctx);
-	auto ui = dynamic_cast<StudioUI*>(sctx->ui);
+	sctx->ui->handleKeyEvent(key, down);
-	ui->handleKeyEvent(key, down);
 }
 
 static ox::Error runApp(
 		ox::CRStringView appName,
 		ox::CRStringView projectDataDir,
-		ox::UniquePtr<ox::FileSystem> fs) noexcept {
+		ox::UPtr<ox::FileSystem> &&fs) noexcept {
 	oxRequireM(ctx, turbine::init(std::move(fs), appName));
 	turbine::setWindowTitle(*ctx, keelCtx(*ctx).appName);
 	turbine::setUpdateHandler(*ctx, updateHandler);

src/olympic/studio/applib/src/studioapp.cpp

@@ -334,13 +334,15 @@ ox::Error StudioUI::createOpenProject(ox::CRStringView path) noexcept {
 	std::filesystem::create_directories(toStdStringView(path), ec);
 	oxReturnError(OxError(ec.value() != 0, "Could not create project directory"));
 	oxReturnError(openProjectPath(path));
-	return m_project->writeAllTypeDescriptors();
+	return m_project->writeTypeStore();
 }
 
 ox::Error StudioUI::openProjectPath(ox::CRStringView path) noexcept {
 	oxRequireM(fs, keel::loadRomFs(path));
 	oxReturnError(keel::setRomFs(keelCtx(m_ctx), std::move(fs)));
-	m_project = ox::make_unique<studio::Project>(keelCtx(m_ctx), ox::String(path), m_projectDataDir);
+	oxReturnError(
+			ox::make_unique_catch<studio::Project>(keelCtx(m_ctx), ox::String(path), m_projectDataDir)
+			        .moveTo(m_project));
 	auto const sctx = applicationData<studio::StudioContext>(m_ctx);
 	sctx->project = m_project.get();
 	turbine::setWindowTitle(m_ctx, ox::sfmt("{} - {}", keelCtx(m_ctx).appName, m_project->projectPath()));

src/olympic/studio/modlib/include/studio/context.hpp

@@ -11,7 +11,7 @@
 namespace studio {
 
 struct StudioContext {
-	ox::SignalHandler *ui = nullptr;
+	class StudioUI *ui = nullptr;
 	Project *project = nullptr;
 };
 

src/olympic/studio/modlib/include/studio/project.hpp

@@ -56,7 +56,7 @@ class Project {
 		ox::HashMap<ox::String, ox::Vector<ox::String>> m_fileExtFileMap;
 
 	public:
-		explicit Project(keel::Context &ctx, ox::String path, ox::CRStringView projectDataDir) noexcept;
+		explicit Project(keel::Context &ctx, ox::String path, ox::CRStringView projectDataDir);
 
 		ox::Error create() noexcept;
 
@@ -91,7 +91,7 @@ class Project {
 		[[nodiscard]]
 		ox::Vector<ox::String> const&fileList(ox::CRStringView ext) noexcept;
 
-		ox::Error writeAllTypeDescriptors() noexcept;
+		ox::Error writeTypeStore() noexcept;
 
 	private:
 		void buildFileIndex() noexcept;
@@ -131,8 +131,8 @@ ox::Error Project::writeObj(ox::CRStringView path, T const&obj, ox::ClawFormat f
 	}
 	oxRequire(desc, m_typeStore.get<T>());
 	auto const descExists = m_fs.stat(ox::sfmt("{}/{}", m_typeDescPath, buildTypeId(*desc))).error != 0;
-	if (!descExists || ox::defines::Debug) {
+	if (!descExists) {
-		oxReturnError(writeAllTypeDescriptors());
+		oxReturnError(writeTypeStore());
 	}
 	oxReturnError(keel::setAsset(m_ctx, path, obj));
 	fileUpdated.emit(path);

src/olympic/studio/modlib/src/project.cpp

@@ -26,7 +26,7 @@ static void generateTypes(ox::TypeStore &ts) noexcept {
 	}
 }
 
-Project::Project(keel::Context &ctx, ox::String path, ox::CRStringView projectDataDir) noexcept:
+Project::Project(keel::Context &ctx, ox::String path, ox::CRStringView projectDataDir):
 	m_ctx(ctx),
 	m_path(std::move(path)),
 	m_projectDataDir(projectDataDir),
@@ -35,6 +35,9 @@ Project::Project(keel::Context &ctx, ox::String path, ox::CRStringView projectDa
 	m_fs(*m_ctx.rom) {
 	oxTracef("studio", "Project: {}", m_path);
 	generateTypes(m_typeStore);
+	if (ox::defines::Debug) {
+		oxThrowError(writeTypeStore());
+	}
 	buildFileIndex();
 }
 
@@ -70,7 +73,7 @@ ox::Vector<ox::String> const&Project::fileList(ox::CRStringView ext) noexcept {
 	return m_fileExtFileMap[ext];
 }
 
-ox::Error Project::writeAllTypeDescriptors() noexcept {
+ox::Error Project::writeTypeStore() noexcept {
 	// write all descriptors because we don't know which types T depends on
 	oxReturnError(mkdir(m_typeDescPath));
 	for (auto const &t: m_typeStore.typeList()) {