From 290bc4f516b547f53a6defb332e38b65bf9d5e58 Mon Sep 17 00:00:00 2001
From: vintagepc <vintagepc@local>
Date: Fri, 10 Jan 2020 21:17:59 -0500
Subject: [PATCH] Added directory support to FlashAir upload

---
 src/slic3r/Utils/FlashAir.cpp | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/slic3r/Utils/FlashAir.cpp b/src/slic3r/Utils/FlashAir.cpp
index 79f3f2c2bd..25ffbc7743 100644
--- a/src/slic3r/Utils/FlashAir.cpp
+++ b/src/slic3r/Utils/FlashAir.cpp
@@ -79,7 +79,7 @@ bool FlashAir::upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, Error
 
 	const auto upload_filename = upload_data.upload_path.filename();
 	const auto upload_parent_path = upload_data.upload_path.parent_path();
-
+    //const auto upload_set_dir = upload_da
 	wxString test_msg;
 	if (! test(test_msg)) {
 		error_fn(std::move(test_msg));
@@ -88,7 +88,14 @@ bool FlashAir::upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, Error
 
 	bool res = false;
 
+    std::string strDest = upload_parent_path.string();
+    if (strDest.front()!='/') // Needs a leading / else root uploads fail.
+    {
+        strDest.insert(0,"/");
+    }
+
 	auto urlPrepare = make_url("upload.cgi", "WRITEPROTECT=ON&FTIME", timestamp_str());
+    auto urlSetDir = make_url("upload.cgi","UPDIR",strDest);
 	auto urlUpload = make_url("upload.cgi");
 
 	BOOST_LOG_TRIVIAL(info) << boost::format("%1%: Uploading file %2% at %3% / %4%, filename: %5%")
@@ -101,7 +108,7 @@ bool FlashAir::upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, Error
 	// set filetime for upload and make card writeprotect to prevent filesystem damage
 	auto httpPrepare = Http::get(std::move(urlPrepare));
 	httpPrepare.on_error([&](std::string body, std::string error, unsigned status) {
-			BOOST_LOG_TRIVIAL(error) << boost::format("%1%: Error prepareing upload: %2%, HTTP %3%, body: `%4%`") % name % error % status % body;
+            BOOST_LOG_TRIVIAL(error) << boost::format("%1%: Error preparing upload: %2%, HTTP %3%, body: `%4%`") % name % error % status % body;
 			error_fn(format_error(body, error, status));
 			res = false;
 		})
@@ -120,6 +127,26 @@ bool FlashAir::upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, Error
 	}
 	
 	// start file upload
+    auto httpDir = Http::get(std::move(urlSetDir));
+    httpDir.on_error([&](std::string body, std::string error, unsigned status) {
+            BOOST_LOG_TRIVIAL(error) << boost::format("%1%: Error setting upload dir: %2%, HTTP %3%, body: `%4%`") % name % error % status % body;
+            error_fn(format_error(body, error, status));
+            res = false;
+        })
+        .on_complete([&, this](std::string body, unsigned) {
+            BOOST_LOG_TRIVIAL(debug) << boost::format("%1%: Got dir select result: %2%") % name % body;
+            res = boost::icontains(body, "SUCCESS");
+            if (! res) {
+                BOOST_LOG_TRIVIAL(error) << boost::format("%1%: Request completed but no SUCCESS message was received.") % name;
+                error_fn(format_error(body, L("Unknown error occured"), 0));
+            }
+        })
+        .perform_sync();
+
+    if(! res ) {
+        return res;
+    }
+
 	auto http = Http::post(std::move(urlUpload));
 	http.form_add_file("file", upload_data.source_path.string(), upload_filename.string())
 		.on_complete([&](std::string body, unsigned status) {