feature(TheatreFile::Load,Theatre): improved filepath-related code

Author: Electron7-7

Nostalgia/theatre/theatre.cpp

@@ -70,15 +70,13 @@ void Theatre::LoadTheatreData(Shared<TheatreFile::TheatreData> inData)
     mInitStatus = OK;
 }
 
-Error Theatre::LoadFile(Sarg inFilePath)
+Error Theatre::LoadFile(std::string inFilePath)
 {
     Shutdown();
-    FileData theatre_file{};
-    if(not print_error_enum(theatre_file.LoadFile(inFilePath))
-        or not print_error_enum(TheatreFile::Load(theatre_file, m_pInitialState)))
+    if(not print_error_enum(TheatreFile::Load(inFilePath, m_pInitialState)))
         { return mInitStatus = ERR_INIT_FAILED; }
+    mTheatreFileDirectory = FileSystem::GetDir(inFilePath, true);
     mWasLoadedFromFile = true;
-    mTheatreFileDirectory = FileSystem::GetDir(theatre_file.filepath(), true);
     mName  = m_pInitialState->name;
     mIndex = m_pInitialState->index;
     return mInitStatus = OK;

Nostalgia/theatre/theatre.hpp

@@ -26,7 +26,7 @@ class Theatre
 
     virtual void  LoadTheatreData(Shared<TheatreFile::TheatreData> inTheatreData);
     virtual Error LoadData(Farg<FileData> inData);
-    virtual Error LoadFile(Sarg inFilePath);
+    virtual Error LoadFile(std::string inFilePath);
     virtual Error Save(Sarg inOutputFilePath, FileOverwriteAction = RENAME);
     virtual bool  Startup();
     virtual bool  Shutdown();

Nostalgia/theatre/theatre_file.cpp

@@ -10,9 +10,14 @@ bool TheatreFile::gDebugPrintLexerLogs{false},
 static void sDebugPrintLexerLogs(Farg<TokenArray>);
 static void sDebugPrintParserLogs(Farg<std::vector<ThingData>>);
 
-Error TheatreFile::Load(Sarg inPathToFile,
-    Shared<TheatreData>& outData)
-{ return Load(FileData{inPathToFile}, outData); }
+Error TheatreFile::Load(std::string& ioPathToFile, Shared<TheatreData>& outData)
+{
+    FileData theatre_file{};
+    if(not theatre_file.LoadFile(ioPathToFile))
+        { return ERR_FILE_LOAD; }
+    ioPathToFile = theatre_file.filepath();
+    return Load(theatre_file, outData);
+}
 
 Error TheatreFile::Load(Farg<FileData> inFileData,
     Shared<TheatreData>& outData)

Nostalgia/theatre/theatre_file.hpp

@@ -56,7 +56,8 @@ namespace TheatreFile
 
     Error Lex(Farg<FileData> inFileData, TokenArray& outTokens);
     Error Parse(Farg<TokenArray> inTokens, Shared<TheatreData>& outData);
-    Error Load(Sarg inPathToFile, Shared<TheatreData>& outData);
+    // `ioFilepath` will be changed if needed, according to the file lookup code in `FileData::LoadFile`
+    Error Load(std::string& ioFilepath, Shared<TheatreData>& outData);
     Error Load(Farg<FileData> inFileData, Shared<TheatreData>& outData);
 }