This commit is contained in:
msqr1
2024-03-26 22:04:02 -07:00
parent df6b240bde
commit 7b595ec0ee
21 changed files with 328 additions and 6300 deletions

View File

@@ -1,10 +1,9 @@
#include "genericModel.h"
genericModel::genericModel(int index, bool normalMdl, std::string storepath, std::string id) : index{index}, normalMdl{normalMdl}, storepath{std::move(storepath)}, id{std::move(id)}, entry{archive_entry_new()} {
blocker.lock();
blocker.acquire();
}
void genericModel::extractAndLoad(int tarStart, int tarSize) {
emscripten_console_log("Untaring");
static fs::path path{};
static int fd{};
func = [this, tarStart, tarSize](){
@@ -12,7 +11,6 @@ void genericModel::extractAndLoad(int tarStart, int tarSize) {
archive_read_support_format_tar(src);
archive_read_open_memory(src, reinterpret_cast<void*>(tarStart), tarSize);
if(archive_errno(src) != 0) {
emscripten_console_logf("Unable to open tar in WASM memory: %s", archive_error_string(src));
free(reinterpret_cast<void*>(tarStart));
fireEv(index, "Unable to open tar in WASM memory");
return;
@@ -32,14 +30,12 @@ void genericModel::extractAndLoad(int tarStart, int tarSize) {
}
fd = creat(path.c_str(),0777);
if(fd == -1) {
emscripten_console_log("Unable to create model files");
fireEv(index, "Unable to create model files");
return;
}
archive_read_data_into_fd(src, fd);
close(fd);
if(archive_errno(src) != 0) {
emscripten_console_logf("Cannot write into model files: %s", archive_error_string(src));
fireEv(index, "Cannot write into model files");
return;
}
@@ -49,14 +45,13 @@ void genericModel::extractAndLoad(int tarStart, int tarSize) {
archive_read_free(src);
if(normalMdl) mdl = vosk_model_new(storepath.c_str());
else vosk_spk_model_new(storepath.c_str());
emscripten_console_log("Model loaded!");
if(normalMdl ? std::get<0>(mdl) == nullptr : std::get<1>(mdl) == nullptr) fireEv(index, "Unable to load model for recognition");
else fireEv(index, "0");
};
std::thread t{[this](){
func();
blocker.lock();
blocker.unlock();
blocker.acquire();
blocker.release();
func();
}};
t.detach();