switch to makefile instead, reuse threads

This commit is contained in:
msqr1
2024-02-03 22:19:17 -08:00
parent 076e9f65a2
commit 70b7d2c21b
13 changed files with 167 additions and 155 deletions

View File

@@ -1,4 +1,5 @@
#include "genericModel.h"
genericModel::genericModel(const std::string& storepath, const std::string &id, int index) : storepath(storepath), id(id), index(index) {
fs::current_path("/opfs", tank);
if(tank.value() != 0) {
@@ -25,16 +26,12 @@ bool genericModel::checkModel() {
file.read(&oldid[0], size);
return id.compare(oldid) == 0 ? true : false;
}
void genericModel::afterFetch(int memAddr, size_t size) {
// FIXME: Recognizer reuse this thread if possible
std::thread t{[this, memAddr, size](){
char* modelData = reinterpret_cast<char*>(memAddr);
if(!extractModel(modelData, size)) {
free(modelData);
void genericModel::afterFetch() {
thrd.setTask1([this](){
if(!extractModel()) {
fireEv("_continue", "Unable to extract model", index);
return;
}
free(modelData);
std::ofstream idFile("id");
if(!idFile.is_open()) {
fs::current_path("/opfs");
@@ -45,16 +42,15 @@ void genericModel::afterFetch(int memAddr, size_t size) {
idFile << id;
idFile.close();
load(false);
}};
t.detach();
});
}
bool genericModel::extractModel(const char* fileBuf, size_t size) {
bool genericModel::extractModel() {
std::string path{};
archive* src {archive_read_new()};
archive_entry* entry {};
archive_read_support_filter_all(src);
archive_read_support_format_all(src);
archive_read_open_memory(src, fileBuf, size);
archive_read_open_filename(src, "m0dEl.tzst", 10240);
if(archive_errno(src) != 0) return false;
while (archive_read_next_header(src, &entry) == ARCHIVE_OK) {
path = archive_entry_pathname(entry);