blankie
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Happy linter

This commit is contained in:
Viktar Lukashonak 2022-12-10 16:48:22 +03:00
parent 57ad7f9536
commit 272c638f7e
No known key found for this signature in database
GPG Key ID: 08A413AA87200A6F
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/modules/clock.cpp
View File

@ -5,8 +5,8 @@
#include <ctime> #include <ctime>
#include <iomanip> #include <iomanip>
#include <sstream>
#include <regex> #include <regex>
#include <sstream>
#include <type_traits> #include <type_traits>
#include "util/ustring_clen.hpp" #include "util/ustring_clen.hpp"
@ -76,8 +76,11 @@ waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
} }
if (config_["format-calendar-weeks"].isString()) { if (config_["format-calendar-weeks"].isString()) {
weeks_format_ = std::regex_replace(config_["format-calendar-weeks"].asString(), std::regex("\\{\\}"), (first_day_of_week() == date::Monday) ? "{:%V}" : "{:%U}"); weeks_format_ =
weeks_format_left_gaps = std::regex_replace(weeks_format_, std::regex(".*<b>|</b>.*|\\{.?+\\}"), "").length(); std::regex_replace(config_["format-calendar-weeks"].asString(), std::regex("\\{\\}"),
(first_day_of_week() == date::Monday) ? "{:%V}" : "{:%U}");
weeks_format_left_gaps =
std::regex_replace(weeks_format_, std::regex(".*<b>|</b>.*|\\{.?+\\}"), "").length();
} else { } else {
weeks_format_ = ""; weeks_format_ = "";
} }
@ -192,7 +195,6 @@ auto waybar::modules::Clock::calendar_text(const waybar_time& wtime) -> std::str
std::stringstream os; std::stringstream os;
enum class WeeksSide { enum class WeeksSide {
LEFT, LEFT,
RIGHT, RIGHT,
@ -213,7 +215,7 @@ auto waybar::modules::Clock::calendar_text(const waybar_time& wtime) -> std::str
weekdays_header(first_dow, os); weekdays_header(first_dow, os);
// First week day prefixed with spaces if needed. // First week day prefixed with spaces if needed.
date::sys_days print_wd{ym/1}; date::sys_days print_wd{ym / 1};
auto wd{date::weekday{print_wd}}; auto wd{date::weekday{print_wd}};
auto empty_days = (wd - first_dow).count(); auto empty_days = (wd - first_dow).count();
@ -231,14 +233,14 @@ auto waybar::modules::Clock::calendar_text(const waybar_time& wtime) -> std::str
for (auto d{date::day{1}}; d <= last_day; ++d, ++wd) { for (auto d{date::day{1}}; d <= last_day; ++d, ++wd) {
if (wd != first_dow) { if (wd != first_dow) {
os << ' '; os << ' ';
} else if (unsigned(d)!= 1) { } else if (unsigned(d) != 1) {
if (weeks_pos == WeeksSide::RIGHT) { if (weeks_pos == WeeksSide::RIGHT) {
os << ' ' << fmt::format(weeks_format_, print_wd); os << ' ' << fmt::format(weeks_format_, print_wd);
} }
os << '\n'; os << '\n';
print_wd = {ym/d}; print_wd = {ym / d};
if (weeks_pos == WeeksSide::LEFT) { if (weeks_pos == WeeksSide::LEFT) {
os << fmt::format(weeks_format_, print_wd) << ' '; os << fmt::format(weeks_format_, print_wd) << ' ';