refactor

modules/Ollama/src/Ollama.cpp

@@ -8,15 +8,17 @@ Ollama::Ollama(Archimedes::App* a, void* h) : Archimedes::Module(a, h) {
     name = "Ollama";
 
     ImguiModule* im = new ImguiModule(a, h);
-    deps[im->getName()] = im;
+    deps[*im] = im;
 }
 
 Ollama::~Ollama() {
-    if(curl) {
-        curl_easy_cleanup(curl);
-        curl = nullptr;
+    if(app) {
+        if(curl) {
+            curl_easy_cleanup(curl);
+            curl = nullptr;
+        }
+        curl_global_cleanup();
     }
-    curl_global_cleanup();
 }
 
 static size_t WriteCallback(void* contents, size_t size, size_t nmemb, std::ostream* userp) 
@@ -27,7 +29,7 @@ static size_t WriteCallback(void* contents, size_t size, size_t nmemb, std::ostr
 
 void Ollama::onLoad() {
     
-    ImguiModule* im = (ImguiModule*) moduleInstances["ImguiModule"];
+    ImguiModule* im; { im = (ImguiModule*) moduleInstances[ImguiModule()]; }
 
     if(!im) {
         std::cout << "No ImguiModule for Ollama!\n";
@@ -109,7 +111,7 @@ void Ollama::run() {
 
         if(code != CURLE_OK) {
             std::cerr << "curl_easy_perform() failed!: " << curl_easy_strerror(code) << std::endl;
-            app->stopModule(getName());
+            app->stopModule(name);
             return;
         } else {
             jsonObj = nlohmann::json::parse(response);

modules/Ollama/src/Ollama.h

@@ -8,6 +8,7 @@ class Ollama : public Archimedes::Module {
     public:
         Ollama(Archimedes::App*, void*);
 
+        Ollama() { name = "Ollama"; }
         ~Ollama();
 
         void onLoad();