diff --git a/Telegram/SourceFiles/boxes/dictionaries_manager.cpp b/Telegram/SourceFiles/boxes/dictionaries_manager.cpp index 8b6d062f9..4beab9046 100644 --- a/Telegram/SourceFiles/boxes/dictionaries_manager.cpp +++ b/Telegram/SourceFiles/boxes/dictionaries_manager.cpp @@ -38,48 +38,15 @@ namespace Ui { namespace { using Dictionaries = std::vector; +using namespace Storage::CloudBlob; -struct Available { - int size = 0; - - inline bool operator<(const Available &other) const { - return size < other.size; - } - inline bool operator==(const Available &other) const { - return size == other.size; - } -}; -struct Ready { - inline bool operator<(const Ready &other) const { - return false; - } - inline bool operator==(const Ready &other) const { - return true; - } -}; -struct Active { - inline bool operator<(const Active &other) const { - return false; - } - inline bool operator==(const Active &other) const { - return true; - } -}; using Loading = MTP::DedicatedLoader::Progress; -struct Failed { - inline bool operator<(const Failed &other) const { - return false; - } - inline bool operator==(const Failed &other) const { - return true; - } -}; -using SetState = base::variant< +using DictState = base::variant< Available, Ready, Active, - Loading, - Failed>; + Failed, + Loading>; class Loader : public QObject { public: @@ -87,7 +54,7 @@ public: int id() const; - rpl::producer state() const; + rpl::producer state() const; void destroy(); private: @@ -98,7 +65,7 @@ private: int _id = 0; int _size = 0; - rpl::variable _state; + rpl::variable _state; MTP::WeakInstance _mtproto; std::unique_ptr _implementation; @@ -148,7 +115,7 @@ MTP::DedicatedLoader::Location GetDownloadLocation(int id) { return MTP::DedicatedLoader::Location{ kUsername, i->postId }; } -SetState ComputeState(int id) { +DictState ComputeState(int id) { // if (id == CurrentSetId()) { // return Active(); if (Spellchecker::DictionaryExists(id)) { @@ -157,7 +124,7 @@ SetState ComputeState(int id) { return Available{ GetDownloadSize(id) }; } -QString StateDescription(const SetState &state) { +QString StateDescription(const DictState &state) { return state.match([](const Available &data) { return tr::lng_emoji_set_download(tr::now, lt_size, formatSizeText(data.size)); }, [](const Ready &data) -> QString { @@ -202,7 +169,7 @@ int Loader::id() const { return _id; } -rpl::producer Loader::state() const { +rpl::producer Loader::state() const { return _state.value(); } @@ -210,11 +177,11 @@ void Loader::setImplementation( std::unique_ptr loader) { _implementation = std::move(loader); auto convert = [](auto value) { - return SetState(value); + return DictState(value); }; _state = _implementation->progress( ) | rpl::map([](const Loading &state) { - return SetState(state); + return DictState(state); }); _implementation->failed( ) | rpl::start_with_next([=] { @@ -287,7 +254,7 @@ auto AddButtonWithLoader( )->entity(); const auto buttonState = button->lifetime() - .make_state>(); + .make_state>(); const auto label = Ui::CreateChild( button, @@ -305,7 +272,7 @@ auto AddButtonWithLoader( }, label->lifetime()); buttonState->value( - ) | rpl::start_with_next([=](const SetState &state) { + ) | rpl::start_with_next([=](const DictState &state) { const auto isToggledSet = state.is(); const auto toggled = isToggledSet ? 1. : 0.; const auto over = !button->isDisabled() @@ -326,9 +293,9 @@ auto AddButtonWithLoader( buttonEnabled ) | rpl::then( buttonState->value( - ) | rpl::filter([](const SetState &state) { + ) | rpl::filter([](const DictState &state) { return state.is(); - }) | rpl::map([](const SetState &state) { + }) | rpl::map([](const auto &state) { return false; }) ) @@ -346,15 +313,15 @@ auto AddButtonWithLoader( ) | rpl::map([=](auto enabled) { const auto &state = buttonState->current(); if (enabled && state.is()) { - return SetState(Active()); + return DictState(Active()); } if (!enabled && state.is()) { - return SetState(Ready()); + return DictState(Ready()); } return ComputeState(id); }); }) | rpl::flatten_latest( - ) | rpl::filter([=](const SetState &state) { + ) | rpl::filter([=](const DictState &state) { return !buttonState->current().is() || !state.is(); }); diff --git a/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp b/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp index c7fbb5116..190c7fbc4 100644 --- a/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp +++ b/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp @@ -31,7 +31,9 @@ namespace Ui { namespace Emoji { namespace { -struct Set : public Storage::Blob { +using namespace Storage::CloudBlob; + +struct Set : public Blob { QString previewPath; }; @@ -50,41 +52,7 @@ auto Sets() { return kSets; } -struct Available { - int size = 0; - - inline bool operator<(const Available &other) const { - return size < other.size; - } - inline bool operator==(const Available &other) const { - return size == other.size; - } -}; -struct Ready { - inline bool operator<(const Ready &other) const { - return false; - } - inline bool operator==(const Ready &other) const { - return true; - } -}; -struct Active { - inline bool operator<(const Active &other) const { - return false; - } - inline bool operator==(const Active &other) const { - return true; - } -}; using Loading = MTP::DedicatedLoader::Progress; -struct Failed { - inline bool operator<(const Failed &other) const { - return false; - } - inline bool operator==(const Failed &other) const { - return true; - } -}; using SetState = base::variant< Available, Ready, @@ -224,7 +192,7 @@ bool GoodSetPartName(const QString &name) { } bool UnpackSet(const QString &path, const QString &folder) { - return Storage::UnpackBlob(path, folder, GoodSetPartName); + return UnpackBlob(path, folder, GoodSetPartName); } Loader::Loader(QObject *parent, int id) diff --git a/Telegram/SourceFiles/chat_helpers/spellchecker_common.cpp b/Telegram/SourceFiles/chat_helpers/spellchecker_common.cpp index 38ca1d0b7..fc8cd3bb8 100644 --- a/Telegram/SourceFiles/chat_helpers/spellchecker_common.cpp +++ b/Telegram/SourceFiles/chat_helpers/spellchecker_common.cpp @@ -15,6 +15,8 @@ namespace Spellchecker { namespace { +using namespace Storage::CloudBlob; + // Language With Country. inline auto LWC(QLocale::Country country) { const auto l = QLocale::matchingLocales( @@ -108,7 +110,7 @@ QString DictionariesPath() { bool UnpackDictionary(const QString &path, int langId) { const auto folder = DictPathByLangId(langId); - return Storage::UnpackBlob(path, folder, IsGoodPartName); + return UnpackBlob(path, folder, IsGoodPartName); } bool DictionaryExists(int langId) { diff --git a/Telegram/SourceFiles/chat_helpers/spellchecker_common.h b/Telegram/SourceFiles/chat_helpers/spellchecker_common.h index 5f08db09b..c33e81095 100644 --- a/Telegram/SourceFiles/chat_helpers/spellchecker_common.h +++ b/Telegram/SourceFiles/chat_helpers/spellchecker_common.h @@ -13,7 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL namespace Spellchecker { -struct Dict : public Storage::Blob { +struct Dict : public Storage::CloudBlob::Blob { }; [[nodiscard]] QString DictionariesPath(); diff --git a/Telegram/SourceFiles/storage/storage_cloud_blob.cpp b/Telegram/SourceFiles/storage/storage_cloud_blob.cpp index c394271bb..a90635462 100644 --- a/Telegram/SourceFiles/storage/storage_cloud_blob.cpp +++ b/Telegram/SourceFiles/storage/storage_cloud_blob.cpp @@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/zlib_help.h" -namespace Storage { +namespace Storage::CloudBlob { namespace { @@ -64,4 +64,4 @@ bool UnpackBlob( return true; } -} // namespace Storage +} // namespace Storage::CloudBlob diff --git a/Telegram/SourceFiles/storage/storage_cloud_blob.h b/Telegram/SourceFiles/storage/storage_cloud_blob.h index 064b0cd1a..e34705f2c 100644 --- a/Telegram/SourceFiles/storage/storage_cloud_blob.h +++ b/Telegram/SourceFiles/storage/storage_cloud_blob.h @@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once -namespace Storage { +namespace Storage::CloudBlob { struct Blob { int id = 0; @@ -16,9 +16,44 @@ struct Blob { QString name; }; +struct Available { + int size = 0; + + inline bool operator<(const Available &other) const { + return size < other.size; + } + inline bool operator==(const Available &other) const { + return size == other.size; + } +}; +struct Ready { + inline bool operator<(const Ready &other) const { + return false; + } + inline bool operator==(const Ready &other) const { + return true; + } +}; +struct Active { + inline bool operator<(const Active &other) const { + return false; + } + inline bool operator==(const Active &other) const { + return true; + } +}; +struct Failed { + inline bool operator<(const Failed &other) const { + return false; + } + inline bool operator==(const Failed &other) const { + return true; + } +}; + bool UnpackBlob( const QString &path, const QString &folder, Fn checkNameCallback); -} // namespace Storage +} // namespace Storage::CloudBlob