From 97550b83dc4cc7e565ecc645bf4ddb1e771f70de Mon Sep 17 00:00:00 2001 From: Hepatica Date: Sat, 10 Aug 2024 06:22:48 +0200 Subject: [PATCH] Problem with unzip --- SpCloudMain/Controllers/PublishController.cpp | 3 ++- SpCloudMain/Service/CommandService.cpp | 1 - SpCloudMain/Service/FileProcessingService.cpp | 5 ++++- SpCloudMain/SpCloudMain.cpp | 6 +++++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/SpCloudMain/Controllers/PublishController.cpp b/SpCloudMain/Controllers/PublishController.cpp index 713c9b7..3647795 100644 --- a/SpCloudMain/Controllers/PublishController.cpp +++ b/SpCloudMain/Controllers/PublishController.cpp @@ -15,7 +15,8 @@ private: FileProcessingService file_processing; //std::string publish_app_path = "/mnt/c/Users/Danil/SpCloudApp";//Todo change to linux path - std::string publish_app_path = "/home/danilt2000/SpCloud/SpCloudApp";//Todo change to linux path + //std::string publish_app_path = "/home/danilt2000/SpCloudMain/SpCloudApp";//Todo change to linux path + std::string publish_app_path = "/home/danilt2000/SpCloud/";//Todo change to linux path //std::string publish_app_path = "C:/Temps/";// Todo delete if not needed public: diff --git a/SpCloudMain/Service/CommandService.cpp b/SpCloudMain/Service/CommandService.cpp index 1b7610f..244441c 100644 --- a/SpCloudMain/Service/CommandService.cpp +++ b/SpCloudMain/Service/CommandService.cpp @@ -1,4 +1,3 @@ -#pragma once #include class CommandService diff --git a/SpCloudMain/Service/FileProcessingService.cpp b/SpCloudMain/Service/FileProcessingService.cpp index ea76b52..7bbcfc6 100644 --- a/SpCloudMain/Service/FileProcessingService.cpp +++ b/SpCloudMain/Service/FileProcessingService.cpp @@ -3,7 +3,7 @@ #include #include #include - +#include #include "CommandService.cpp" class FileProcessingService @@ -18,6 +18,7 @@ public: std::ofstream ofs(filename, std::ios::binary); if (!ofs) return false; ofs << content; + return ofs.good(); } @@ -25,11 +26,13 @@ public: std::filesystem::create_directories(path); } + void unzip(const std::string& file_path, const std::string& final_files_directory) { create_directory(final_files_directory); //Windows version //std::string command = R"(powershell -Command "& \"C:\Program Files\WinRAR\WinRAR.exe\" x \")" + file_path + R"(\" \")" + final_files_directory + R"(\")"; + std::cout << "unzip start\n"; //Linux version //std::string command = "unzip " + file_path + " -d " + final_files_directory; diff --git a/SpCloudMain/SpCloudMain.cpp b/SpCloudMain/SpCloudMain.cpp index a3a170a..68a56c4 100644 --- a/SpCloudMain/SpCloudMain.cpp +++ b/SpCloudMain/SpCloudMain.cpp @@ -5,7 +5,8 @@ #include "SpCloudMain.h" #include "httplib.h" - +#include "spdlog.h" +#include "basic_file_sink.h" #include "Controllers/PublishController.cpp" //#include "Service/AuthorizationService.cpp" //#include "Service/FileProcessingService.cpp" @@ -14,12 +15,15 @@ using namespace std; int main() { + std::cout << "SpCloud start\n"; httplib::Server svr; svr.Get("/ping", [](const httplib::Request& req, httplib::Response& res) { + std::cout << "Ping-\n"; + res.set_content("Pong", "text/plain"); httplib::Headers test = req.headers;