From 50bfe78aed8ea2a90eded038646d887e5481fe18 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Mon, 20 May 2019 08:00:07 -0700 Subject: [PATCH] refactor(tray): improve error handling and add debug logs --- src/modules/sni/item.cpp | 118 ++++++++++++++++++++++++++------------- 1 file changed, 80 insertions(+), 38 deletions(-) diff --git a/src/modules/sni/item.cpp b/src/modules/sni/item.cpp index 9dc463d0..8149c350 100644 --- a/src/modules/sni/item.cpp +++ b/src/modules/sni/item.cpp @@ -1,6 +1,32 @@ -#include "modules/sni/item.hpp" #include #include +#include "modules/sni/item.hpp" + +template <> +struct fmt::formatter : formatter { + template + auto format(const Glib::ustring& value, FormatContext& ctx) { + return formatter::format(value, ctx); + } +}; + +template <> +struct fmt::formatter : formatter { + bool is_printable(const Glib::VariantBase& value) { + auto type = value.get_type_string(); + /* Print only primitive (single character excluding 'v') and short complex types */ + return (type.length() == 1 && islower(type[0]) && type[0] != 'v') || value.get_size() <= 32; + } + + template + auto format(const Glib::VariantBase& value, FormatContext& ctx) { + if (is_printable(value)) { + return formatter::format(value.print(), ctx); + } else { + return formatter::format(value.get_type_string(), ctx); + } + } +}; namespace waybar::modules::SNI { @@ -54,8 +80,7 @@ void Item::proxyReady(Glib::RefPtr& result) { // this->event_box.set_tooltip_text(this->title); } catch (const Glib::Error& err) { - spdlog::error( - "Failed to create DBus Proxy for {} {}: {}", bus_name, object_path, err.what().raw()); + spdlog::error("Failed to create DBus Proxy for {} {}: {}", bus_name, object_path, err.what()); } catch (const std::exception& err) { spdlog::error("Failed to create DBus Proxy for {} {}: {}", bus_name, object_path, err.what()); } @@ -67,41 +92,57 @@ T get_variant(Glib::VariantBase& value) { } void Item::setProperty(const Glib::ustring& name, Glib::VariantBase& value) { - if (name == "Category") { - category = get_variant(value); - } else if (name == "Id") { - id = get_variant(value); - } else if (name == "Title") { - title = get_variant(value); - } else if (name == "Status") { - status = get_variant(value); - } else if (name == "WindowId") { - window_id = get_variant(value); - } else if (name == "IconName") { - icon_name = get_variant(value); - } else if (name == "IconPixmap") { - icon_pixmap = this->extractPixBuf(value.gobj()); - } else if (name == "OverlayIconName") { - overlay_icon_name = get_variant(value); - } else if (name == "OverlayIconPixmap") { - // TODO: overlay_icon_pixmap - } else if (name == "AttentionIconName") { - attention_icon_name = get_variant(value); - } else if (name == "AttentionIconPixmap") { - // TODO: attention_icon_pixmap - } else if (name == "AttentionMovieName") { - attention_movie_name = get_variant(value); - } else if (name == "ToolTip") { - // TODO: tooltip - } else if (name == "IconThemePath") { - icon_theme_path = get_variant(value); - if (!icon_theme_path.empty()) { - icon_theme->set_search_path({icon_theme_path}); + try { + spdlog::trace("Set tray item property: {}.{} = {}", id.empty() ? bus_name : id, name, value); + + if (name == "Category") { + category = get_variant(value); + } else if (name == "Id") { + id = get_variant(value); + } else if (name == "Title") { + title = get_variant(value); + } else if (name == "Status") { + status = get_variant(value); + } else if (name == "WindowId") { + window_id = get_variant(value); + } else if (name == "IconName") { + icon_name = get_variant(value); + } else if (name == "IconPixmap") { + icon_pixmap = this->extractPixBuf(value.gobj()); + } else if (name == "OverlayIconName") { + overlay_icon_name = get_variant(value); + } else if (name == "OverlayIconPixmap") { + // TODO: overlay_icon_pixmap + } else if (name == "AttentionIconName") { + attention_icon_name = get_variant(value); + } else if (name == "AttentionIconPixmap") { + // TODO: attention_icon_pixmap + } else if (name == "AttentionMovieName") { + attention_movie_name = get_variant(value); + } else if (name == "ToolTip") { + // TODO: tooltip + } else if (name == "IconThemePath") { + icon_theme_path = get_variant(value); + if (!icon_theme_path.empty()) { + icon_theme->set_search_path({icon_theme_path}); + } + } else if (name == "Menu") { + menu = get_variant(value); + } else if (name == "ItemIsMenu") { + item_is_menu = get_variant(value); } - } else if (name == "Menu") { - menu = get_variant(value); - } else if (name == "ItemIsMenu") { - item_is_menu = get_variant(value); + } catch (const Glib::Error& err) { + spdlog::warn("Failed to set tray item property: {}.{}, value = {}, err = {}", + id.empty() ? bus_name : id, + name, + value, + err.what()); + } catch (const std::exception& err) { + spdlog::warn("Failed to set tray item property: {}.{}, value = {}, err = {}", + id.empty() ? bus_name : id, + name, + value, + err.what()); } } @@ -135,7 +176,7 @@ void Item::processUpdatedProperties(Glib::RefPtr& _result) { this->updateImage(); // this->event_box.set_tooltip_text(this->title); } catch (const Glib::Error& err) { - spdlog::warn("Failed to update properties: {}", err.what().raw()); + spdlog::warn("Failed to update properties: {}", err.what()); } catch (const std::exception& err) { spdlog::warn("Failed to update properties: {}", err.what()); } @@ -143,6 +184,7 @@ void Item::processUpdatedProperties(Glib::RefPtr& _result) { void Item::onSignal(const Glib::ustring& sender_name, const Glib::ustring& signal_name, const Glib::VariantContainerBase& arguments) { + spdlog::trace("Tray item '{}' got signal {}", id, signal_name); if (!update_pending_ && signal_name.compare(0, 3, "New") == 0) { /* Debounce signals and schedule update of all properties. * Based on behavior of Plasma dataengine for StatusNotifierItem.