aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/file_uploader.hpp2
-rw-r--r--include/rclone_uploader.hpp2
-rw-r--r--src/utils/rclone_uploader.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/include/file_uploader.hpp b/include/file_uploader.hpp
index 6e46a8a..e8b0540 100644
--- a/include/file_uploader.hpp
+++ b/include/file_uploader.hpp
@@ -7,7 +7,7 @@
class FileUploader {
public:
virtual ~FileUploader() = default;
- virtual bool uploadFile(const std::string& filepath, const std::string& remotePath) = 0;
+ virtual std::string uploadFile(const std::string& filepath, const std::string& remotePath) = 0; // expects public url
virtual bool testConnection() = 0;
};
diff --git a/include/rclone_uploader.hpp b/include/rclone_uploader.hpp
index 03e54fe..d9dc737 100644
--- a/include/rclone_uploader.hpp
+++ b/include/rclone_uploader.hpp
@@ -9,7 +9,7 @@ class RcloneUploader : public FileUploader {
public:
~RcloneUploader();
RcloneUploader(const std::string& cdnEndpoint, const std::string& sourceName);
- bool uploadFile(const std::string& filepath, const std::string& remotePath) override;
+ std::string uploadFile(const std::string& filepath, const std::string& remotePath) override;
bool testConnection() override;
private:
diff --git a/src/utils/rclone_uploader.cpp b/src/utils/rclone_uploader.cpp
index 5a02697..dd918d4 100644
--- a/src/utils/rclone_uploader.cpp
+++ b/src/utils/rclone_uploader.cpp
@@ -20,10 +20,10 @@ RcloneUploader::RcloneUploader(const std::string& cdnEndpoint,
}
}
-bool RcloneUploader::uploadFile(const std::string& filepath, const std::string& remotePath=""){
+std::string RcloneUploader::uploadFile(const std::string& filepath, const std::string& remotePath=""){
std::string command = "rclone copy \"" + filepath + "\" " + sourceName + ":" + remotePath + " 2>/dev/null 1>/dev/null";
int result = std::system(command.c_str());
- return result == 0;
+ return "";
}
bool RcloneUploader::testConnection(){
send patches to the email below
yukais@pinapelz.com
include the subject [PATCH repo_name]
pinapelz.com
homepage