Merge branch 'download-model-fix' into 'master'

quickfix for issue with SSL verification See merge request machine-learning/dorado!113
nanoporetech · Oct 5, 2022 · 4b67720 · 4b67720
2 parents 3e893dc + aa3b5d2
commit 4b67720
Showing 1 changed file with 19 additions and 7 deletions.
diff --git a/dorado/cli/download.cpp b/dorado/cli/download.cpp
@@ -75,20 +75,32 @@ int download(int argc, char* argv[]) {
         return 1;
     }
 
+    try {
+        fs::remove(directory / "tmp");
+    } catch (std::filesystem::filesystem_error const& e) {
+        std::cerr << "> error: " << e.code().message() << std::endl;
+        return 1;
+    }
+
     httplib::Client http(basecaller::URL_ROOT);
+    http.enable_server_certificate_verification(false);
     http.set_follow_location(true);
 
     for (const auto& [model, url] : basecaller::models) {
         if (selected_model == "all" || selected_model == model) {
             std::cerr << " - downloading " << model;
             auto res = http.Get(url.c_str());
-            std::cerr << " [" << res->status << "]" << std::endl;
-            fs::path archive(directory / (model + ".zip"));
-            std::ofstream ofs(archive.string());
-            ofs << res->body;
-            ofs.close();
-            elz::extractZip(archive, directory);
-            fs::remove(archive);
+            if (res != nullptr) {
+                std::cerr << " [" << res->status << "]" << std::endl;
+                fs::path archive(directory / (model + ".zip"));
+                std::ofstream ofs(archive.string());
+                ofs << res->body;
+                ofs.close();
+                elz::extractZip(archive, directory);
+                fs::remove(archive);
+            } else {
+                std::cerr << "Failed to download " << model << std::endl;
+            }
         }
     }