oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

start implementing serializers

Browse Source
This commit is contained in:
itsmattkc
2022-01-12 08:48:31 -08:00
parent d8ccc62d51
commit 4ecce20c35
38 changed files with 2984 additions and 1329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/task/project/load/load.cpp
+33 -72
View File
@@ -21,11 +21,8 @@
#include "load.h"
#include <QApplication>
#include <QFile>
#include <QXmlStreamReader>
#include "common/xmlutils.h"
#include "core.h"
#include "node/project/serializer/serializer.h"
namespace olive {
@@ -36,78 +33,42 @@ ProjectLoadTask::ProjectLoadTask(const QString &filename) :
bool ProjectLoadTask::Run()
{
QFile project_file(GetFilename());
project_ = new Project();
if (project_file.open(QFile::ReadOnly | QFile::Text)) {
QXmlStreamReader reader(&project_file);
project_->set_filename(GetFilename());
uint project_version = 0;
ProjectSerializer::Result result = ProjectSerializer::Load(project_, GetFilename());
while (XMLReadNextStartElement(&reader)) {
if (reader.name() == QStringLiteral("olive")) {
while(XMLReadNextStartElement(&reader)) {
if (reader.name() == QStringLiteral("version")) {
bool ok;
project_version = reader.readElementText().toUInt(&ok);
if (!ok) {
SetError(tr("Failed to parse project version."));
return false;
} else if (project_version > Project::kProjectVersion) {
// Project is newer than we support
SetError(tr("This project is from a newer version of Olive and cannot be opened in this version."));
return false;
} else if (project_version < Project::kProjectMinimumVersion) { // Change this if we drop support for a project version
// Project is older than we support
SetError(tr("This project is from a version of Olive that is no longer supported in this version."));
return false;
}
} else if (reader.name() == QStringLiteral("url")) {
project_saved_url_ = reader.readElementText();
} else if (reader.name() == QStringLiteral("project")) {
if (project_version == 0) {
// Failed to find project version, throw error before we create project
SetError(tr("Failed to find project version."));
return false;
}
project_ = new Project();
project_->set_filename(GetFilename());
project_->Load(&reader, &layout_info_, project_version, &IsCancelled());
// Ensure project is in main thread
project_->moveToThread(qApp->thread());
break;
} else {
reader.skipCurrentElement();
}
}
} else if (reader.name() == QStringLiteral("project")) {
// 0.1 projects use "project" as the root instead of Olive. We don't currently support
// these projects
SetError(tr("This project is from a version of Olive that is no longer supported in this version."));
return false;
} else {
reader.skipCurrentElement();
}
}
project_file.close();
emit ProgressChanged(1);
if (reader.hasError()) {
SetError(reader.errorString());
return false;
} else {
return true;
}
} else {
switch (result.code()) {
case ProjectSerializer::kSuccess:
break;
case ProjectSerializer::kProjectTooOld:
SetError(tr("This project is from a version of Olive that is no longer supported in this version."));
break;
case ProjectSerializer::kProjectTooNew:
SetError(tr("This project is from a newer version of Olive and cannot be opened in this version."));
break;
case ProjectSerializer::kUnknownVersion:
SetError(tr("Failed to determine project version."));
break;
case ProjectSerializer::kFileError:
SetError(tr("Failed to read file \"%1\" for reading.").arg(GetFilename()));
break;
case ProjectSerializer::kXmlError:
SetError(tr("Failed to read XML document. File may be corrupt. Error was: %1").arg(result.GetDetails()));
break;
// Errors that should never be thrown by a load
case ProjectSerializer::kOverwriteError:
SetError(tr("Unknown error."));
break;
}
if (result == ProjectSerializer::kSuccess) {
project_->moveToThread(qApp->thread());
return true;
} else {
delete project_;
return false;
}
}
app/task/project/load/loadbasetask.h
-19
View File
@@ -37,21 +37,6 @@ public:
return project_;
}
MainWindowLayoutInfo GetLoadedLayout() const
{
return layout_info_;
}
/**
* @brief Returns the filename the project was saved as, but not necessarily where it is now
*
* May help for resolving relative paths.
*/
const QString& GetFilenameProjectWasSavedAs() const
{
return project_saved_url_;
}
const QString& GetFilename() const
{
return filename_;
@@ -60,10 +45,6 @@ public:
protected:
Project* project_;
MainWindowLayoutInfo layout_info_;
QString project_saved_url_;
private:
QString filename_;
app/task/project/save/save.cpp
+26 -44
View File
@@ -26,6 +26,7 @@
#include "common/filefunctions.h"
#include "core.h"
#include "node/project/serializer/serializer.h"
namespace olive {
@@ -39,54 +40,35 @@ bool ProjectSaveTask::Run()
{
QString using_filename = override_filename_.isEmpty() ? project_->filename() : override_filename_;
// File to temporarily save to (ensures we can't half-write the user's main file and crash)
QString temp_save = FileFunctions::GetSafeTemporaryFilename(using_filename);
ProjectSerializer::Result result = ProjectSerializer::Save(project_, using_filename);
QFile project_file(temp_save);
bool success = false;
if (project_file.open(QFile::WriteOnly | QFile::Text)) {
QXmlStreamWriter writer(&project_file);
writer.setAutoFormatting(true);
switch (result.code()) {
case ProjectSerializer::kSuccess:
success = true;
break;
case ProjectSerializer::kXmlError:
SetError(tr("Failed to write XML data."));
break;
case ProjectSerializer::kFileError:
SetError(tr("Failed to open file \"%1\" for writing.").arg(result.GetDetails()));
break;
case ProjectSerializer::kOverwriteError:
SetError(tr("Failed to overwrite \"%1\". Project has been saved as \"%2\" instead.")
.arg(using_filename, result.GetDetails()));
success = true;
break;
writer.writeStartDocument();
writer.writeStartElement("olive");
// Version is stored in YYMMDD from whenever the project format was last changed
// Allows easy integer math for checking project versions.
writer.writeTextElement(QStringLiteral("version"), QString::number(Project::kProjectVersion));
writer.writeTextElement("url", using_filename);
writer.writeStartElement(QStringLiteral("project"));
project_->Save(&writer);
writer.writeEndElement(); // project
writer.writeEndElement(); // olive
writer.writeEndDocument();
project_file.close();
if (writer.hasError()) {
SetError(tr("Failed to write XML data"));
return false;
}
// Save was successful, we can now rewrite the original file
if (FileFunctions::RenameFileAllowOverwrite(temp_save, using_filename)) {
return true;
} else {
SetError(tr("Failed to overwrite \"%1\". Project has been saved as \"%2\" instead.")
.arg(using_filename, temp_save));
return false;
}
} else {
SetError(tr("Failed to open temporary file \"%1\" for writing.").arg(temp_save));
return false;
// Errors that should never be thrown by a save
case ProjectSerializer::kProjectTooNew:
case ProjectSerializer::kProjectTooOld:
case ProjectSerializer::kUnknownVersion:
SetError(tr("Unknown error."));
break;
}
return success;
}
}