diff --git a/external/aos_core_lib_cpp b/external/aos_core_lib_cpp index 2ddba726..9ea1bbef 160000 --- a/external/aos_core_lib_cpp +++ b/external/aos_core_lib_cpp @@ -1 +1 @@ -Subproject commit 2ddba726723cf9240611b653f856f534133757a5 +Subproject commit 9ea1bbefe83d86f07b9f273081d18721a29e64dc diff --git a/include/downloader/downloader.hpp b/include/downloader/downloader.hpp index 65698911..a601f49b 100644 --- a/include/downloader/downloader.hpp +++ b/include/downloader/downloader.hpp @@ -33,10 +33,13 @@ class Downloader : public aos::downloader::DownloaderItf { * * @param url URL. * @param path path to file. - * @param contentType content type. + * @param targetType target type. + * @param targetID target ID. + * @param version version. * @return Error. */ - Error Download(const String& url, const String& path, aos::downloader::DownloadContent contentType) override; + Error Download(const String& url, const String& path, cloudprotocol::DownloadTarget targetType, + const String& targetID = "", const String& version = "") override; private: constexpr static std::chrono::milliseconds cDelay {1000}; diff --git a/src/downloader/downloader.cpp b/src/downloader/downloader.cpp index c9e1428f..7d6b739c 100644 --- a/src/downloader/downloader.cpp +++ b/src/downloader/downloader.cpp @@ -28,9 +28,13 @@ Downloader::~Downloader() mCondVar.notify_all(); } -Error Downloader::Download(const String& url, const String& path, aos::downloader::DownloadContent contentType) +Error Downloader::Download(const String& url, const String& path, cloudprotocol::DownloadTarget targetType, + const String& targetID, const String& version) { - LOG_DBG() << "Start download: url=" << url << ", path=" << path << ", contentType=" << contentType; + (void)targetID; + (void)version; + + LOG_DBG() << "Start download: url=" << url << ", path=" << path << ", contentType=" << targetType; return RetryDownload(url, path); } diff --git a/tests/downloader/downloader_test.cpp b/tests/downloader/downloader_test.cpp index 304d79b5..a96bfebc 100644 --- a/tests/downloader/downloader_test.cpp +++ b/tests/downloader/downloader_test.cpp @@ -63,7 +63,7 @@ TEST_F(DownloaderTest, Download) StartServer(); auto err = mDownloader.Download( - "http://localhost:8000/test_file.dat", mFilePath.c_str(), aos::downloader::DownloadContentEnum::eService); + "http://localhost:8000/test_file.dat", mFilePath.c_str(), aos::cloudprotocol::DownloadTargetEnum::eService); EXPECT_EQ(err, aos::ErrorEnum::eNone); EXPECT_TRUE(std::filesystem::exists(mFilePath)); @@ -79,7 +79,7 @@ TEST_F(DownloaderTest, Download) TEST_F(DownloaderTest, DownloadFileScheme) { auto err = mDownloader.Download( - "file://test_file.dat", mFilePath.c_str(), aos::downloader::DownloadContentEnum::eService); + "file://test_file.dat", mFilePath.c_str(), aos::cloudprotocol::DownloadTargetEnum::eService); EXPECT_EQ(err, aos::ErrorEnum::eNone); EXPECT_TRUE(std::filesystem::exists(mFilePath));