diff options
author | dec05eba <dec05eba@protonmail.com> | 2020-11-19 17:03:49 +0100 |
---|---|---|
committer | dec05eba <dec05eba@protonmail.com> | 2020-11-19 17:03:49 +0100 |
commit | d5da6e47e14831b865d418faa32f32df4de5af42 (patch) | |
tree | cf14a47cba90642c50dbba6af0922c26c9cb266c /include | |
parent | 9134914f6065c0b248dd1b4317dbf9b16f5f52b5 (diff) |
Matrix: fix too long path in event cache, bug when not using error handler..
Diffstat (limited to 'include')
-rw-r--r-- | include/DownloadUtils.hpp | 3 | ||||
-rw-r--r-- | include/Path.hpp | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/DownloadUtils.hpp b/include/DownloadUtils.hpp index 3eff519..6d96cd6 100644 --- a/include/DownloadUtils.hpp +++ b/include/DownloadUtils.hpp @@ -1,5 +1,6 @@ #pragma once +#include "Path.hpp" #include <string> #include <vector> #include <functional> @@ -21,7 +22,7 @@ namespace QuickMedia { using DownloadErrorHandler = std::function<bool(std::string&)>; DownloadResult download_to_string(const std::string &url, std::string &result, const std::vector<CommandArg> &additional_args, bool use_tor, bool use_browser_useragent = false, bool fail_on_error = true); - DownloadResult download_to_string_cache(const std::string &url, std::string &result, const std::vector<CommandArg> &additional_args, bool use_tor, bool use_browser_useragent = false, DownloadErrorHandler error_handler = nullptr); + DownloadResult download_to_string_cache(const std::string &url, std::string &result, const std::vector<CommandArg> &additional_args, bool use_tor, bool use_browser_useragent = false, DownloadErrorHandler error_handler = nullptr, Path cache_path = ""); DownloadResult download_to_file(const std::string &url, const std::string &destination_filepath, const std::vector<CommandArg> &additional_args, bool use_tor, bool use_browser_useragent = false); DownloadResult download_to_json(const std::string &url, rapidjson::Document &result, const std::vector<CommandArg> &additional_args, bool use_tor, bool use_browser_useragent = false, bool fail_on_error = true); }
\ No newline at end of file diff --git a/include/Path.hpp b/include/Path.hpp index 46c8dee..19c8eb9 100644 --- a/include/Path.hpp +++ b/include/Path.hpp @@ -37,6 +37,13 @@ namespace QuickMedia { return ""; } + Path parent() { + size_t slash_index = data.rfind('/'); + if(slash_index != std::string::npos || slash_index == 0) + return Path(data.substr(0, slash_index)); + return Path("/"); + } + std::string data; }; }
\ No newline at end of file |