refactor+fix: add new tests for Resource models and fix issues

Signed-off-by: flow <flowlnlnln@gmail.com>
This commit is contained in:
flow
2022-08-12 17:09:56 -03:00
parent e7cf9932a9
commit c3ceefbafb
9 changed files with 314 additions and 159 deletions

View File

@ -17,7 +17,7 @@ class BasicFolderLoadTask : public Task
Q_OBJECT
public:
struct Result {
QMap<QString, Resource*> resources;
QMap<QString, Resource::Ptr> resources;
};
using ResultPtr = std::shared_ptr<Result>;
@ -27,6 +27,10 @@ public:
public:
BasicFolderLoadTask(QDir dir) : Task(nullptr, false), m_dir(dir), m_result(new Result) {}
[[nodiscard]] bool canAbort() const override { return true; }
bool abort() override { m_aborted = true; return true; }
void executeTask() override
{
m_dir.refresh();
@ -35,10 +39,15 @@ public:
m_result->resources.insert(resource->internal_id(), resource);
}
emitSucceeded();
if (m_aborted)
emitAborted();
else
emitSucceeded();
}
private:
QDir m_dir;
ResultPtr m_result;
bool m_aborted = false;
};

View File

@ -497,6 +497,12 @@ void LocalModParseTask::processAsLitemod()
zip.close();
}
bool LocalModParseTask::abort()
{
m_aborted = true;
return true;
}
void LocalModParseTask::executeTask()
{
switch(m_type)
@ -513,5 +519,9 @@ void LocalModParseTask::executeTask()
default:
break;
}
emitSucceeded();
if (m_aborted)
emitAborted();
else
emitSucceeded();
}

View File

@ -20,6 +20,9 @@ public:
return m_result;
}
[[nodiscard]] bool canAbort() const override { return true; }
bool abort() override;
LocalModParseTask(int token, ResourceType type, const QFileInfo & modFile);
void executeTask() override;
@ -35,4 +38,6 @@ private:
ResourceType m_type;
QFileInfo m_modFile;
ResultPtr m_result;
bool m_aborted = false;
};