-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Luis Ruiz
committed
Apr 23, 2019
1 parent
77a0370
commit 5b868bc
Showing
15 changed files
with
376 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| #include "stdafx.h" | ||
|
|
||
| #include "DownloadDesktopService.h" | ||
|
|
||
| #include "Agents/NotificationAgent.h" | ||
| #include "Events.h" | ||
| #include "DesktopApp.h" | ||
|
|
||
| #include "DesktopCore\Upgrade\Events.h" | ||
| #include "Toast\ToastEventHandler.h" | ||
| #include "Toast\ToastCommandLineInfo.h" | ||
| #include "Toast\ToastFactory.h" | ||
|
|
||
| #include "DesktopCore\Utils\Patterns\PublisherSubscriber\Broker.h" | ||
|
|
||
| #include <boost\filesystem\operations.hpp> | ||
|
|
||
| namespace desktop { namespace ui { namespace service { | ||
|
|
||
| DownloadDesktopService::DownloadDesktopService(CefRefPtr<CefBrowser> browser, std::unique_ptr<core::service::EncodeStringService> encodeService, | ||
| std::unique_ptr<core::service::ApplicationDataService> applicationService) | ||
| : m_browser(browser) | ||
| , m_encodeService(std::move(encodeService)) | ||
| , m_applicationService(std::move(applicationService)) | ||
| { | ||
| m_subscriber.subscribe([this](const desktop::core::utils::patterns::Event& rawEvt) | ||
| { | ||
| auto evt = static_cast<const events::DownloadStatusEvent&>(rawEvt); | ||
|
|
||
| if (evt.bIsComplete) | ||
| { | ||
| m_path = evt.m_path; | ||
|
|
||
| m_cv.notify_one(); | ||
| } | ||
|
|
||
| }, events::DOWNLOAD_STATUS_EVENT); | ||
|
|
||
| m_subscriber.subscribe([this](const core::utils::patterns::Event& rawEvt) | ||
| { | ||
| auto evt = static_cast<const core::events::DownloadUpgradeEvent&>(rawEvt); | ||
|
|
||
| auto version = m_encodeService->utf8toUtf16(evt.m_version); | ||
|
|
||
| toast::ToastFactory factory; | ||
|
|
||
| auto callback = evt.m_callback; | ||
|
|
||
| auto notification = std::make_unique<core::model::Notification>([callback]() | ||
| { | ||
| return (theApp.m_toastAction == L"accept") ? callback() : true; | ||
| }, []() {return true; }, []() {return true; }); | ||
|
|
||
| m_handler = std::make_shared<toast::ToastEventHandler>(std::move(notification)); | ||
| m_toast = factory.getYesNo(L"Desktop upgrade", L"Version " + version + L" available", L"Download"); | ||
|
|
||
| agent::NotificationAgent::ShowNotificationEvent notificationEvt(m_toast, m_handler); | ||
| core::utils::patterns::Broker::get().publish(notificationEvt); | ||
|
|
||
| }, core::events::DOWNLOAD_UPGRADE_EVENT); | ||
|
|
||
| m_subscriber.subscribe([this](const desktop::core::utils::patterns::Event& rawEvt) | ||
| { | ||
| //m_browser->GetMainFrame()->LoadURL(boost::filesystem::canonical(m_applicationService->getViewerFolder() + "/index.html").string()); | ||
| }, desktop::core::events::UPGRADE_DESKTOP_COMPLETED_EVENT); | ||
| } | ||
|
|
||
| DownloadDesktopService::~DownloadDesktopService() = default; | ||
|
|
||
| std::string DownloadDesktopService::download(const std::string& host, const std::string& url, std::map<std::string, std::string> requestHeaders, const std::string &/*folder*/) const | ||
| { | ||
| auto pos = url.find(host) + host.size(); | ||
|
|
||
| std::string script = "window.location = 'https://" + host + url.substr(pos) + "';"; | ||
|
|
||
| m_browser->GetMainFrame()->ExecuteJavaScript(script, m_browser->GetMainFrame()->GetURL(), 0); | ||
|
|
||
| std::unique_lock<std::mutex> lock(m_mutex); | ||
| m_cv.wait(lock); | ||
|
|
||
| return m_path; | ||
| } | ||
| }}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| #pragma once | ||
|
|
||
| #include "DesktopCore\Utils\Patterns\PublisherSubscriber\Subscriber.h" | ||
|
|
||
| #include "DesktopCore\System\Services\EncodeStringService.h" | ||
| #include "DesktopCore\System\Services\ApplicationDataService.h" | ||
| #include "DesktopCore\Network\Services\IDownloadFileService.h" | ||
|
|
||
| #pragma warning(push) | ||
| #pragma warning(disable : 4100) | ||
| #pragma warning(disable : 4481) | ||
| #include <cef/cef_app.h> | ||
| #pragma warning(pop) | ||
|
|
||
| #include <mutex> | ||
| #include <memory> | ||
| #include <condition_variable> | ||
|
|
||
| namespace ToastPP | ||
| { | ||
| class CToast; | ||
| } | ||
|
|
||
| namespace desktop { | ||
|
|
||
| namespace core { namespace service { | ||
| class HTTPClientService; | ||
| }} | ||
|
|
||
| namespace ui { | ||
|
|
||
| namespace toast | ||
| { | ||
| class ToastEventHandler; | ||
| } | ||
|
|
||
| namespace service { | ||
|
|
||
| namespace cup = core::utils::patterns; | ||
|
|
||
| class DownloadDesktopService : public core::service::IDownloadFileService | ||
| { | ||
| public: | ||
| DownloadDesktopService(CefRefPtr<CefBrowser> browser, | ||
| std::unique_ptr<core::service::EncodeStringService> encodeService = std::make_unique<core::service::EncodeStringService>(), | ||
| std::unique_ptr<core::service::ApplicationDataService> applicationService = std::make_unique<core::service::ApplicationDataService>()); | ||
| ~DownloadDesktopService(); | ||
| std::string download(const std::string& host, const std::string& url, std::map<std::string, std::string> requestHeaders, const std::string &folder) const override; | ||
| private: | ||
| CefRefPtr<CefBrowser> m_browser; | ||
| cup::Subscriber m_subscriber; | ||
|
|
||
| std::string m_path; | ||
|
|
||
| std::unique_ptr<core::service::EncodeStringService> m_encodeService; | ||
| std::unique_ptr<core::service::ApplicationDataService> m_applicationService; | ||
|
|
||
| mutable std::condition_variable m_cv; | ||
| mutable std::mutex m_mutex; | ||
|
|
||
| std::shared_ptr<toast::ToastEventHandler> m_handler; | ||
| std::shared_ptr<ToastPP::CToast> m_toast; | ||
| }; | ||
| }}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.