feat: Improve Sunshine compatibility#67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ReenigneArcher merged 2 commits into from
Jul 19, 2024
Merged

feat: Improve Sunshine compatibility #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8048f3
feat: Improve Sunshine compatibility
FrogTheFrog Jul 19, 2024
f0f4867
OMG
FrogTheFrog Jul 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/common/file_settings_persistence.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ namespace display_device {
return false;
}

std::ranges::copy(data, std::ostreambuf_iterator<char> { stream });
std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> { stream });
return true;
}
catch (const std::exception &error) {
Expand Down
3 changes: 2 additions & 1 deletion src/common/include/display_device/logging.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,8 @@ namespace display_device {
debug,
info,
warning,
error
error,
fatal
};

/**
Expand Down
72 changes: 34 additions & 38 deletions src/common/logging.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
#if !defined(_MSC_VER) && !defined(_POSIX_THREAD_SAFE_FUNCTIONS)
#define _POSIX_THREAD_SAFE_FUNCTIONS // For localtime_r
#endif

// class header include
#include "display_device/logging.h"

Expand All@@ -8,14 +12,30 @@
#include <mutex>

namespace display_device {
namespace {
std::tm
threadSafeLocaltime(const std::time_t &time) {
#if defined(_MSC_VER) // MSVCRT (2005+): std::localtime is threadsafe
const auto tm_ptr { std::localtime(&time) };
#else // POSIX
std::tm buffer;
const auto tm_ptr { localtime_r(&time, &buffer) };
#endif // _MSC_VER
if (tm_ptr) {
return *tm_ptr;
}
return {};
}
} // namespace

Logger &
Logger::get() {
static Logger instance; // GCOVR_EXCL_BR_LINE for some reason...
return instance;
}

void
Logger::setLogLevel(LogLevel log_level) {
Logger::setLogLevel(const LogLevel log_level) {
m_enabled_log_level = log_level;
}

Expand DownExpand Up@@ -44,45 +64,18 @@ namespace display_device {

std::stringstream stream;
{
// Time (limited by GCC 11, so it's not pretty and no timezones are supported...)
// Time (limited by GCC 10, so it's not pretty...)
{
static const auto get_time { []() {
static const auto to_year_month_day { [](const auto &now) {
return std::chrono::year_month_day { std::chrono::time_point_cast<std::chrono::days>(now) };
} };
static const auto to_hour_minute_second { [](const auto &now) {
const auto start_of_day { std::chrono::floor<std::chrono::days>(now) };
const auto time_since_start_of_day { std::chrono::round<std::chrono::seconds>(now - start_of_day) };
return std::chrono::hh_mm_ss { time_since_start_of_day };
} };
static const auto to_milliseconds { [](const auto &now) {
const auto now_ms { std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()) };
const auto time_s { std::chrono::duration_cast<std::chrono::seconds>(now.time_since_epoch()) };
return now_ms - time_s;
} };

const auto now { std::chrono::system_clock::now() };
return std::make_tuple(to_year_month_day(now), to_hour_minute_second(now), to_milliseconds(now));
} };

const auto [year_month_day, hh_mm_ss, ms] { get_time() };
const auto old_flags { stream.flags() }; // Save formatting flags so that they can be restored...
const auto now { std::chrono::system_clock::now() };
const auto now_ms { std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()) };
const auto now_s { std::chrono::duration_cast<std::chrono::seconds>(now_ms) };

const std::time_t time { std::chrono::system_clock::to_time_t(now) };
const auto localtime { threadSafeLocaltime(time) };
const auto now_decimal_part { now_ms - now_s };

stream << "[";
stream << std::setfill('0') << std::setw(2) << static_cast<int>(year_month_day.year());
stream << "-";
stream << std::setfill('0') << std::setw(2) << static_cast<unsigned>(year_month_day.month());
stream << "-";
stream << std::setfill('0') << std::setw(2) << static_cast<unsigned>(year_month_day.day());
stream << " ";
stream << std::setfill('0') << std::setw(2) << hh_mm_ss.hours().count();
stream << ":";
stream << std::setfill('0') << std::setw(2) << hh_mm_ss.minutes().count();
stream << ":";
stream << std::setfill('0') << std::setw(2) << hh_mm_ss.seconds().count();
stream << ".";
stream << std::setfill('0') << std::setw(3) << ms.count();
stream << "] ";
const auto old_flags { stream.flags() }; // Save formatting flags so that they can be restored...
stream << std::put_time(&localtime, "[%Y-%m-%d %H:%M:%S.") << std::setfill('0') << std::setw(3) << now_decimal_part.count() << "] ";
stream.flags(old_flags);
}

Expand All@@ -103,6 +96,9 @@ namespace display_device {
case LogLevel::error:
stream << "ERROR: ";
break;
case LogLevel::fatal:
stream << "FATAL: ";
break;
}

// Value
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/general/test_file_settings_persistence.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@ TEST_F_S(Store, FileOverwritten) {

{
std::ofstream file { filepath, std::ios_base::binary };
std::ranges::copy(data1, std::ostreambuf_iterator<char> { file });
std::copy(std::begin(data1), std::end(data1), std::ostreambuf_iterator<char> { file });
}

EXPECT_TRUE(std::filesystem::exists(filepath));
Expand DownExpand Up@@ -92,7 +92,7 @@ TEST_F_S(Load, FileRead) {

{
std::ofstream file { filepath, std::ios_base::binary };
std::ranges::copy(data, std::ostreambuf_iterator<char> { file });
std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> { file });
}

EXPECT_EQ(getImpl(filepath).load(), data);
Expand Down
24 changes: 24 additions & 0 deletions tests/unit/general/test_logging.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ TEST_S(LogLevelVerbose) {
EXPECT_EQ(logger.isLogLevelEnabled(level::info), true);
EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelDebug) {
Expand All@@ -31,6 +32,7 @@ TEST_S(LogLevelDebug) {
EXPECT_EQ(logger.isLogLevelEnabled(level::info), true);
EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelInfo) {
Expand All@@ -44,6 +46,7 @@ TEST_S(LogLevelInfo) {
EXPECT_EQ(logger.isLogLevelEnabled(level::info), true);
EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelWarning) {
Expand All@@ -57,6 +60,7 @@ TEST_S(LogLevelWarning) {
EXPECT_EQ(logger.isLogLevelEnabled(level::info), false);
EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelError) {
Expand All@@ -70,6 +74,21 @@ TEST_S(LogLevelError) {
EXPECT_EQ(logger.isLogLevelEnabled(level::info), false);
EXPECT_EQ(logger.isLogLevelEnabled(level::warning), false);
EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelFatal) {
using level = display_device::Logger::LogLevel;
auto &logger { display_device::Logger::get() };

logger.setLogLevel(level::fatal);

EXPECT_EQ(logger.isLogLevelEnabled(level::verbose), false);
EXPECT_EQ(logger.isLogLevelEnabled(level::debug), false);
EXPECT_EQ(logger.isLogLevelEnabled(level::info), false);
EXPECT_EQ(logger.isLogLevelEnabled(level::warning), false);
EXPECT_EQ(logger.isLogLevelEnabled(level::error), false);
EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(DefaultLogger) {
Expand All@@ -89,6 +108,7 @@ TEST_S(DefaultLogger) {
EXPECT_TRUE(testRegex(write_and_get_cout(level::info, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] INFO: Hello World!\n)"));
EXPECT_TRUE(testRegex(write_and_get_cout(level::warning, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] WARNING: Hello World!\n)"));
EXPECT_TRUE(testRegex(write_and_get_cout(level::error, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] ERROR: Hello World!\n)"));
EXPECT_TRUE(testRegex(write_and_get_cout(level::fatal, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] FATAL: Hello World!\n)"));
// clang-format on
}

Expand DownExpand Up@@ -122,6 +142,10 @@ TEST_S(CustomCallback) {
logger.write(level::error, "Hello World!");
EXPECT_EQ(output, "4 Hello World!");
EXPECT_TRUE(m_cout_buffer.str().empty());

logger.write(level::fatal, "Hello World!");
EXPECT_EQ(output, "5 Hello World!");
EXPECT_TRUE(m_cout_buffer.str().empty());
}

TEST_S(WriteMethodRespectsLogLevel, DefaultLogger) {
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
feat: Improve Sunshine compatibility#67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 2 commits into

from

Jul 19, 2024
 Merged


feat: Improve Sunshine compatibility
#67
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b8048f3

feat: Improve Sunshine compatibility


FrogTheFrog Jul 19, 2024
f0f4867

OMG


FrogTheFrog Jul 19, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ namespace display_device {
 return false;
 }

 std::ranges::copy(data, std::ostreambuf_iterator<char> { stream });
 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> { stream });
 return true;
 }
 catch (const std::exception &error) {
Expand Down

3 changes: 2 additions & 1 deletion
src/common/include/display_device/logging.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,8 @@ namespace display_device {
 debug,
 info,
 warning,
 error
 error,
 fatal
 };

 /**
Expand Down

72 changes: 34 additions & 38 deletions
src/common/logging.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
#if !defined(_MSC_VER) && !defined(_POSIX_THREAD_SAFE_FUNCTIONS)
 #define _POSIX_THREAD_SAFE_FUNCTIONS // For localtime_r
#endif

// class header include
#include "display_device/logging.h"

Expand All@@ -8,14 +12,30 @@
#include <mutex>

namespace display_device {
 namespace {
 std::tm
 threadSafeLocaltime(const std::time_t &time) {
#if defined(_MSC_VER) // MSVCRT (2005+): std::localtime is threadsafe
 const auto tm_ptr { std::localtime(&time) };
#else // POSIX
 std::tm buffer;
 const auto tm_ptr { localtime_r(&time, &buffer) };
#endif // _MSC_VER
 if (tm_ptr) {
 return *tm_ptr;
 }
 return {};
 }
 } // namespace

 Logger &
 Logger::get() {
 static Logger instance; // GCOVR_EXCL_BR_LINE for some reason...
 return instance;
 }

 void
 Logger::setLogLevel(LogLevel log_level) {
 Logger::setLogLevel(const LogLevel log_level) {
 m_enabled_log_level = log_level;
 }

Expand DownExpand Up@@ -44,45 +64,18 @@ namespace display_device {

 std::stringstream stream;
 {
 // Time (limited by GCC 11, so it's not pretty and no timezones are supported...)
 // Time (limited by GCC 10, so it's not pretty...)
 {
 static const auto get_time { []() {
 static const auto to_year_month_day { [](const auto &now) {
 return std::chrono::year_month_day { std::chrono::time_point_cast<std::chrono::days>(now) };
 } };
 static const auto to_hour_minute_second { [](const auto &now) {
 const auto start_of_day { std::chrono::floor<std::chrono::days>(now) };
 const auto time_since_start_of_day { std::chrono::round<std::chrono::seconds>(now - start_of_day) };
 return std::chrono::hh_mm_ss { time_since_start_of_day };
 } };
 static const auto to_milliseconds { [](const auto &now) {
 const auto now_ms { std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()) };
 const auto time_s { std::chrono::duration_cast<std::chrono::seconds>(now.time_since_epoch()) };
 return now_ms - time_s;
 } };

 const auto now { std::chrono::system_clock::now() };
 return std::make_tuple(to_year_month_day(now), to_hour_minute_second(now), to_milliseconds(now));
 } };

 const auto [year_month_day, hh_mm_ss, ms] { get_time() };
 const auto old_flags { stream.flags() }; // Save formatting flags so that they can be restored...
 const auto now { std::chrono::system_clock::now() };
 const auto now_ms { std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()) };
 const auto now_s { std::chrono::duration_cast<std::chrono::seconds>(now_ms) };

 const std::time_t time { std::chrono::system_clock::to_time_t(now) };
 const auto localtime { threadSafeLocaltime(time) };
 const auto now_decimal_part { now_ms - now_s };

 stream << "[";
 stream << std::setfill('0') << std::setw(2) << static_cast<int>(year_month_day.year());
 stream << "-";
 stream << std::setfill('0') << std::setw(2) << static_cast<unsigned>(year_month_day.month());
 stream << "-";
 stream << std::setfill('0') << std::setw(2) << static_cast<unsigned>(year_month_day.day());
 stream << " ";
 stream << std::setfill('0') << std::setw(2) << hh_mm_ss.hours().count();
 stream << ":";
 stream << std::setfill('0') << std::setw(2) << hh_mm_ss.minutes().count();
 stream << ":";
 stream << std::setfill('0') << std::setw(2) << hh_mm_ss.seconds().count();
 stream << ".";
 stream << std::setfill('0') << std::setw(3) << ms.count();
 stream << "] ";
 const auto old_flags { stream.flags() }; // Save formatting flags so that they can be restored...
 stream << std::put_time(&localtime, "[%Y-%m-%d %H:%M:%S.") << std::setfill('0') << std::setw(3) << now_decimal_part.count() << "] ";
 stream.flags(old_flags);
 }

Expand All@@ -103,6 +96,9 @@ namespace display_device {
 case LogLevel::error:
 stream << "ERROR: ";
 break;
 case LogLevel::fatal:
 stream << "FATAL: ";
 break;
 }

 // Value
Expand Down

4 changes: 2 additions & 2 deletions
tests/unit/general/test_file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@ TEST_F_S(Store, FileOverwritten) {

 {
 std::ofstream file { filepath, std::ios_base::binary };
 std::ranges::copy(data1, std::ostreambuf_iterator<char> { file });
 std::copy(std::begin(data1), std::end(data1), std::ostreambuf_iterator<char> { file });
 }

 EXPECT_TRUE(std::filesystem::exists(filepath));
Expand DownExpand Up@@ -92,7 +92,7 @@ TEST_F_S(Load, FileRead) {

 {
 std::ofstream file { filepath, std::ios_base::binary };
 std::ranges::copy(data, std::ostreambuf_iterator<char> { file });
 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> { file });
 }

 EXPECT_EQ(getImpl(filepath).load(), data);
Expand Down

24 changes: 24 additions & 0 deletions
tests/unit/general/test_logging.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ TEST_S(LogLevelVerbose) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelDebug) {
Expand All@@ -31,6 +32,7 @@ TEST_S(LogLevelDebug) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelInfo) {
Expand All@@ -44,6 +46,7 @@ TEST_S(LogLevelInfo) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelWarning) {
Expand All@@ -57,6 +60,7 @@ TEST_S(LogLevelWarning) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelError) {
Expand All@@ -70,6 +74,21 @@ TEST_S(LogLevelError) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelFatal) {
 using level = display_device::Logger::LogLevel;
 auto &logger { display_device::Logger::get() };

 logger.setLogLevel(level::fatal);

 EXPECT_EQ(logger.isLogLevelEnabled(level::verbose), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::debug), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(DefaultLogger) {
Expand All@@ -89,6 +108,7 @@ TEST_S(DefaultLogger) {
 EXPECT_TRUE(testRegex(write_and_get_cout(level::info, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] INFO: Hello World!\n)"));
 EXPECT_TRUE(testRegex(write_and_get_cout(level::warning, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] WARNING: Hello World!\n)"));
 EXPECT_TRUE(testRegex(write_and_get_cout(level::error, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] ERROR: Hello World!\n)"));
 EXPECT_TRUE(testRegex(write_and_get_cout(level::fatal, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] FATAL: Hello World!\n)"));
 // clang-format on
}

Expand DownExpand Up@@ -122,6 +142,10 @@ TEST_S(CustomCallback) {
 logger.write(level::error, "Hello World!");
 EXPECT_EQ(output, "4 Hello World!");
 EXPECT_TRUE(m_cout_buffer.str().empty());

 logger.write(level::fatal, "Hello World!");
 EXPECT_EQ(output, "5 Hello World!");
 EXPECT_TRUE(m_cout_buffer.str().empty());
}

TEST_S(WriteMethodRespectsLogLevel, DefaultLogger) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: Improve Sunshine compatibility#67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 2 commits into

from

Jul 19, 2024
 Merged


feat: Improve Sunshine compatibility
#67
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b8048f3

feat: Improve Sunshine compatibility


FrogTheFrog Jul 19, 2024
f0f4867

OMG


FrogTheFrog Jul 19, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ namespace display_device {
 return false;
 }

 std::ranges::copy(data, std::ostreambuf_iterator<char> { stream });
 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> { stream });
 return true;
 }
 catch (const std::exception &error) {
Expand Down

3 changes: 2 additions & 1 deletion
src/common/include/display_device/logging.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,8 @@ namespace display_device {
 debug,
 info,
 warning,
 error
 error,
 fatal
 };

 /**
Expand Down

72 changes: 34 additions & 38 deletions
src/common/logging.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
#if !defined(_MSC_VER) && !defined(_POSIX_THREAD_SAFE_FUNCTIONS)
 #define _POSIX_THREAD_SAFE_FUNCTIONS // For localtime_r
#endif

// class header include
#include "display_device/logging.h"

Expand All@@ -8,14 +12,30 @@
#include <mutex>

namespace display_device {
 namespace {
 std::tm
 threadSafeLocaltime(const std::time_t &time) {
#if defined(_MSC_VER) // MSVCRT (2005+): std::localtime is threadsafe
 const auto tm_ptr { std::localtime(&time) };
#else // POSIX
 std::tm buffer;
 const auto tm_ptr { localtime_r(&time, &buffer) };
#endif // _MSC_VER
 if (tm_ptr) {
 return *tm_ptr;
 }
 return {};
 }
 } // namespace

 Logger &
 Logger::get() {
 static Logger instance; // GCOVR_EXCL_BR_LINE for some reason...
 return instance;
 }

 void
 Logger::setLogLevel(LogLevel log_level) {
 Logger::setLogLevel(const LogLevel log_level) {
 m_enabled_log_level = log_level;
 }

Expand DownExpand Up@@ -44,45 +64,18 @@ namespace display_device {

 std::stringstream stream;
 {
 // Time (limited by GCC 11, so it's not pretty and no timezones are supported...)
 // Time (limited by GCC 10, so it's not pretty...)
 {
 static const auto get_time { []() {
 static const auto to_year_month_day { [](const auto &now) {
 return std::chrono::year_month_day { std::chrono::time_point_cast<std::chrono::days>(now) };
 } };
 static const auto to_hour_minute_second { [](const auto &now) {
 const auto start_of_day { std::chrono::floor<std::chrono::days>(now) };
 const auto time_since_start_of_day { std::chrono::round<std::chrono::seconds>(now - start_of_day) };
 return std::chrono::hh_mm_ss { time_since_start_of_day };
 } };
 static const auto to_milliseconds { [](const auto &now) {
 const auto now_ms { std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()) };
 const auto time_s { std::chrono::duration_cast<std::chrono::seconds>(now.time_since_epoch()) };
 return now_ms - time_s;
 } };

 const auto now { std::chrono::system_clock::now() };
 return std::make_tuple(to_year_month_day(now), to_hour_minute_second(now), to_milliseconds(now));
 } };

 const auto [year_month_day, hh_mm_ss, ms] { get_time() };
 const auto old_flags { stream.flags() }; // Save formatting flags so that they can be restored...
 const auto now { std::chrono::system_clock::now() };
 const auto now_ms { std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()) };
 const auto now_s { std::chrono::duration_cast<std::chrono::seconds>(now_ms) };

 const std::time_t time { std::chrono::system_clock::to_time_t(now) };
 const auto localtime { threadSafeLocaltime(time) };
 const auto now_decimal_part { now_ms - now_s };

 stream << "[";
 stream << std::setfill('0') << std::setw(2) << static_cast<int>(year_month_day.year());
 stream << "-";
 stream << std::setfill('0') << std::setw(2) << static_cast<unsigned>(year_month_day.month());
 stream << "-";
 stream << std::setfill('0') << std::setw(2) << static_cast<unsigned>(year_month_day.day());
 stream << " ";
 stream << std::setfill('0') << std::setw(2) << hh_mm_ss.hours().count();
 stream << ":";
 stream << std::setfill('0') << std::setw(2) << hh_mm_ss.minutes().count();
 stream << ":";
 stream << std::setfill('0') << std::setw(2) << hh_mm_ss.seconds().count();
 stream << ".";
 stream << std::setfill('0') << std::setw(3) << ms.count();
 stream << "] ";
 const auto old_flags { stream.flags() }; // Save formatting flags so that they can be restored...
 stream << std::put_time(&localtime, "[%Y-%m-%d %H:%M:%S.") << std::setfill('0') << std::setw(3) << now_decimal_part.count() << "] ";
 stream.flags(old_flags);
 }

Expand All@@ -103,6 +96,9 @@ namespace display_device {
 case LogLevel::error:
 stream << "ERROR: ";
 break;
 case LogLevel::fatal:
 stream << "FATAL: ";
 break;
 }

 // Value
Expand Down

4 changes: 2 additions & 2 deletions
tests/unit/general/test_file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@ TEST_F_S(Store, FileOverwritten) {

 {
 std::ofstream file { filepath, std::ios_base::binary };
 std::ranges::copy(data1, std::ostreambuf_iterator<char> { file });
 std::copy(std::begin(data1), std::end(data1), std::ostreambuf_iterator<char> { file });
 }

 EXPECT_TRUE(std::filesystem::exists(filepath));
Expand DownExpand Up@@ -92,7 +92,7 @@ TEST_F_S(Load, FileRead) {

 {
 std::ofstream file { filepath, std::ios_base::binary };
 std::ranges::copy(data, std::ostreambuf_iterator<char> { file });
 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> { file });
 }

 EXPECT_EQ(getImpl(filepath).load(), data);
Expand Down

24 changes: 24 additions & 0 deletions
tests/unit/general/test_logging.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ TEST_S(LogLevelVerbose) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelDebug) {
Expand All@@ -31,6 +32,7 @@ TEST_S(LogLevelDebug) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelInfo) {
Expand All@@ -44,6 +46,7 @@ TEST_S(LogLevelInfo) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelWarning) {
Expand All@@ -57,6 +60,7 @@ TEST_S(LogLevelWarning) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelError) {
Expand All@@ -70,6 +74,21 @@ TEST_S(LogLevelError) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelFatal) {
 using level = display_device::Logger::LogLevel;
 auto &logger { display_device::Logger::get() };

 logger.setLogLevel(level::fatal);

 EXPECT_EQ(logger.isLogLevelEnabled(level::verbose), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::debug), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(DefaultLogger) {
Expand All@@ -89,6 +108,7 @@ TEST_S(DefaultLogger) {
 EXPECT_TRUE(testRegex(write_and_get_cout(level::info, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] INFO: Hello World!\n)"));
 EXPECT_TRUE(testRegex(write_and_get_cout(level::warning, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] WARNING: Hello World!\n)"));
 EXPECT_TRUE(testRegex(write_and_get_cout(level::error, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] ERROR: Hello World!\n)"));
 EXPECT_TRUE(testRegex(write_and_get_cout(level::fatal, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] FATAL: Hello World!\n)"));
 // clang-format on
}

Expand DownExpand Up@@ -122,6 +142,10 @@ TEST_S(CustomCallback) {
 logger.write(level::error, "Hello World!");
 EXPECT_EQ(output, "4 Hello World!");
 EXPECT_TRUE(m_cout_buffer.str().empty());

 logger.write(level::fatal, "Hello World!");
 EXPECT_EQ(output, "5 Hello World!");
 EXPECT_TRUE(m_cout_buffer.str().empty());
}

TEST_S(WriteMethodRespectsLogLevel, DefaultLogger) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: Improve Sunshine compatibility#67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 2 commits into

from

Jul 19, 2024
 Merged


feat: Improve Sunshine compatibility
#67
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b8048f3

feat: Improve Sunshine compatibility


FrogTheFrog Jul 19, 2024
f0f4867

OMG


FrogTheFrog Jul 19, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ namespace display_device {
 return false;
 }

 std::ranges::copy(data, std::ostreambuf_iterator<char> { stream });
 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> { stream });
 return true;
 }
 catch (const std::exception &error) {
Expand Down

3 changes: 2 additions & 1 deletion
src/common/include/display_device/logging.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,8 @@ namespace display_device {
 debug,
 info,
 warning,
 error
 error,
 fatal
 };

 /**
Expand Down

72 changes: 34 additions & 38 deletions
src/common/logging.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
#if !defined(_MSC_VER) && !defined(_POSIX_THREAD_SAFE_FUNCTIONS)
 #define _POSIX_THREAD_SAFE_FUNCTIONS // For localtime_r
#endif

// class header include
#include "display_device/logging.h"

Expand All@@ -8,14 +12,30 @@
#include <mutex>

namespace display_device {
 namespace {
 std::tm
 threadSafeLocaltime(const std::time_t &time) {
#if defined(_MSC_VER) // MSVCRT (2005+): std::localtime is threadsafe
 const auto tm_ptr { std::localtime(&time) };
#else // POSIX
 std::tm buffer;
 const auto tm_ptr { localtime_r(&time, &buffer) };
#endif // _MSC_VER
 if (tm_ptr) {
 return *tm_ptr;
 }
 return {};
 }
 } // namespace

 Logger &
 Logger::get() {
 static Logger instance; // GCOVR_EXCL_BR_LINE for some reason...
 return instance;
 }

 void
 Logger::setLogLevel(LogLevel log_level) {
 Logger::setLogLevel(const LogLevel log_level) {
 m_enabled_log_level = log_level;
 }

Expand DownExpand Up@@ -44,45 +64,18 @@ namespace display_device {

 std::stringstream stream;
 {
 // Time (limited by GCC 11, so it's not pretty and no timezones are supported...)
 // Time (limited by GCC 10, so it's not pretty...)
 {
 static const auto get_time { []() {
 static const auto to_year_month_day { [](const auto &now) {
 return std::chrono::year_month_day { std::chrono::time_point_cast<std::chrono::days>(now) };
 } };
 static const auto to_hour_minute_second { [](const auto &now) {
 const auto start_of_day { std::chrono::floor<std::chrono::days>(now) };
 const auto time_since_start_of_day { std::chrono::round<std::chrono::seconds>(now - start_of_day) };
 return std::chrono::hh_mm_ss { time_since_start_of_day };
 } };
 static const auto to_milliseconds { [](const auto &now) {
 const auto now_ms { std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()) };
 const auto time_s { std::chrono::duration_cast<std::chrono::seconds>(now.time_since_epoch()) };
 return now_ms - time_s;
 } };

 const auto now { std::chrono::system_clock::now() };
 return std::make_tuple(to_year_month_day(now), to_hour_minute_second(now), to_milliseconds(now));
 } };

 const auto [year_month_day, hh_mm_ss, ms] { get_time() };
 const auto old_flags { stream.flags() }; // Save formatting flags so that they can be restored...
 const auto now { std::chrono::system_clock::now() };
 const auto now_ms { std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()) };
 const auto now_s { std::chrono::duration_cast<std::chrono::seconds>(now_ms) };

 const std::time_t time { std::chrono::system_clock::to_time_t(now) };
 const auto localtime { threadSafeLocaltime(time) };
 const auto now_decimal_part { now_ms - now_s };

 stream << "[";
 stream << std::setfill('0') << std::setw(2) << static_cast<int>(year_month_day.year());
 stream << "-";
 stream << std::setfill('0') << std::setw(2) << static_cast<unsigned>(year_month_day.month());
 stream << "-";
 stream << std::setfill('0') << std::setw(2) << static_cast<unsigned>(year_month_day.day());
 stream << " ";
 stream << std::setfill('0') << std::setw(2) << hh_mm_ss.hours().count();
 stream << ":";
 stream << std::setfill('0') << std::setw(2) << hh_mm_ss.minutes().count();
 stream << ":";
 stream << std::setfill('0') << std::setw(2) << hh_mm_ss.seconds().count();
 stream << ".";
 stream << std::setfill('0') << std::setw(3) << ms.count();
 stream << "] ";
 const auto old_flags { stream.flags() }; // Save formatting flags so that they can be restored...
 stream << std::put_time(&localtime, "[%Y-%m-%d %H:%M:%S.") << std::setfill('0') << std::setw(3) << now_decimal_part.count() << "] ";
 stream.flags(old_flags);
 }

Expand All@@ -103,6 +96,9 @@ namespace display_device {
 case LogLevel::error:
 stream << "ERROR: ";
 break;
 case LogLevel::fatal:
 stream << "FATAL: ";
 break;
 }

 // Value
Expand Down

4 changes: 2 additions & 2 deletions
tests/unit/general/test_file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@ TEST_F_S(Store, FileOverwritten) {

 {
 std::ofstream file { filepath, std::ios_base::binary };
 std::ranges::copy(data1, std::ostreambuf_iterator<char> { file });
 std::copy(std::begin(data1), std::end(data1), std::ostreambuf_iterator<char> { file });
 }

 EXPECT_TRUE(std::filesystem::exists(filepath));
Expand DownExpand Up@@ -92,7 +92,7 @@ TEST_F_S(Load, FileRead) {

 {
 std::ofstream file { filepath, std::ios_base::binary };
 std::ranges::copy(data, std::ostreambuf_iterator<char> { file });
 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> { file });
 }

 EXPECT_EQ(getImpl(filepath).load(), data);
Expand Down

24 changes: 24 additions & 0 deletions
tests/unit/general/test_logging.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ TEST_S(LogLevelVerbose) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelDebug) {
Expand All@@ -31,6 +32,7 @@ TEST_S(LogLevelDebug) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelInfo) {
Expand All@@ -44,6 +46,7 @@ TEST_S(LogLevelInfo) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelWarning) {
Expand All@@ -57,6 +60,7 @@ TEST_S(LogLevelWarning) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelError) {
Expand All@@ -70,6 +74,21 @@ TEST_S(LogLevelError) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelFatal) {
 using level = display_device::Logger::LogLevel;
 auto &logger { display_device::Logger::get() };

 logger.setLogLevel(level::fatal);

 EXPECT_EQ(logger.isLogLevelEnabled(level::verbose), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::debug), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(DefaultLogger) {
Expand All@@ -89,6 +108,7 @@ TEST_S(DefaultLogger) {
 EXPECT_TRUE(testRegex(write_and_get_cout(level::info, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] INFO: Hello World!\n)"));
 EXPECT_TRUE(testRegex(write_and_get_cout(level::warning, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] WARNING: Hello World!\n)"));
 EXPECT_TRUE(testRegex(write_and_get_cout(level::error, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] ERROR: Hello World!\n)"));
 EXPECT_TRUE(testRegex(write_and_get_cout(level::fatal, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] FATAL: Hello World!\n)"));
 // clang-format on
}

Expand DownExpand Up@@ -122,6 +142,10 @@ TEST_S(CustomCallback) {
 logger.write(level::error, "Hello World!");
 EXPECT_EQ(output, "4 Hello World!");
 EXPECT_TRUE(m_cout_buffer.str().empty());

 logger.write(level::fatal, "Hello World!");
 EXPECT_EQ(output, "5 Hello World!");
 EXPECT_TRUE(m_cout_buffer.str().empty());
}

TEST_S(WriteMethodRespectsLogLevel, DefaultLogger) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
feat: Improve Sunshine compatibility#67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 2 commits into

from

Jul 19, 2024
 Merged


feat: Improve Sunshine compatibility
#67
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b8048f3

feat: Improve Sunshine compatibility


FrogTheFrog Jul 19, 2024
f0f4867

OMG


FrogTheFrog Jul 19, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ namespace display_device {
 return false;
 }

 std::ranges::copy(data, std::ostreambuf_iterator<char> { stream });
 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> { stream });
 return true;
 }
 catch (const std::exception &error) {
Expand Down

3 changes: 2 additions & 1 deletion
src/common/include/display_device/logging.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,8 @@ namespace display_device {
 debug,
 info,
 warning,
 error
 error,
 fatal
 };

 /**
Expand Down

72 changes: 34 additions & 38 deletions
src/common/logging.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
#if !defined(_MSC_VER) && !defined(_POSIX_THREAD_SAFE_FUNCTIONS)
 #define _POSIX_THREAD_SAFE_FUNCTIONS // For localtime_r
#endif

// class header include
#include "display_device/logging.h"

Expand All@@ -8,14 +12,30 @@
#include <mutex>

namespace display_device {
 namespace {
 std::tm
 threadSafeLocaltime(const std::time_t &time) {
#if defined(_MSC_VER) // MSVCRT (2005+): std::localtime is threadsafe
 const auto tm_ptr { std::localtime(&time) };
#else // POSIX
 std::tm buffer;
 const auto tm_ptr { localtime_r(&time, &buffer) };
#endif // _MSC_VER
 if (tm_ptr) {
 return *tm_ptr;
 }
 return {};
 }
 } // namespace

 Logger &
 Logger::get() {
 static Logger instance; // GCOVR_EXCL_BR_LINE for some reason...
 return instance;
 }

 void
 Logger::setLogLevel(LogLevel log_level) {
 Logger::setLogLevel(const LogLevel log_level) {
 m_enabled_log_level = log_level;
 }

Expand DownExpand Up@@ -44,45 +64,18 @@ namespace display_device {

 std::stringstream stream;
 {
 // Time (limited by GCC 11, so it's not pretty and no timezones are supported...)
 // Time (limited by GCC 10, so it's not pretty...)
 {
 static const auto get_time { []() {
 static const auto to_year_month_day { [](const auto &now) {
 return std::chrono::year_month_day { std::chrono::time_point_cast<std::chrono::days>(now) };
 } };
 static const auto to_hour_minute_second { [](const auto &now) {
 const auto start_of_day { std::chrono::floor<std::chrono::days>(now) };
 const auto time_since_start_of_day { std::chrono::round<std::chrono::seconds>(now - start_of_day) };
 return std::chrono::hh_mm_ss { time_since_start_of_day };
 } };
 static const auto to_milliseconds { [](const auto &now) {
 const auto now_ms { std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()) };
 const auto time_s { std::chrono::duration_cast<std::chrono::seconds>(now.time_since_epoch()) };
 return now_ms - time_s;
 } };

 const auto now { std::chrono::system_clock::now() };
 return std::make_tuple(to_year_month_day(now), to_hour_minute_second(now), to_milliseconds(now));
 } };

 const auto [year_month_day, hh_mm_ss, ms] { get_time() };
 const auto old_flags { stream.flags() }; // Save formatting flags so that they can be restored...
 const auto now { std::chrono::system_clock::now() };
 const auto now_ms { std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()) };
 const auto now_s { std::chrono::duration_cast<std::chrono::seconds>(now_ms) };

 const std::time_t time { std::chrono::system_clock::to_time_t(now) };
 const auto localtime { threadSafeLocaltime(time) };
 const auto now_decimal_part { now_ms - now_s };

 stream << "[";
 stream << std::setfill('0') << std::setw(2) << static_cast<int>(year_month_day.year());
 stream << "-";
 stream << std::setfill('0') << std::setw(2) << static_cast<unsigned>(year_month_day.month());
 stream << "-";
 stream << std::setfill('0') << std::setw(2) << static_cast<unsigned>(year_month_day.day());
 stream << " ";
 stream << std::setfill('0') << std::setw(2) << hh_mm_ss.hours().count();
 stream << ":";
 stream << std::setfill('0') << std::setw(2) << hh_mm_ss.minutes().count();
 stream << ":";
 stream << std::setfill('0') << std::setw(2) << hh_mm_ss.seconds().count();
 stream << ".";
 stream << std::setfill('0') << std::setw(3) << ms.count();
 stream << "] ";
 const auto old_flags { stream.flags() }; // Save formatting flags so that they can be restored...
 stream << std::put_time(&localtime, "[%Y-%m-%d %H:%M:%S.") << std::setfill('0') << std::setw(3) << now_decimal_part.count() << "] ";
 stream.flags(old_flags);
 }

Expand All@@ -103,6 +96,9 @@ namespace display_device {
 case LogLevel::error:
 stream << "ERROR: ";
 break;
 case LogLevel::fatal:
 stream << "FATAL: ";
 break;
 }

 // Value
Expand Down

4 changes: 2 additions & 2 deletions
tests/unit/general/test_file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@ TEST_F_S(Store, FileOverwritten) {

 {
 std::ofstream file { filepath, std::ios_base::binary };
 std::ranges::copy(data1, std::ostreambuf_iterator<char> { file });
 std::copy(std::begin(data1), std::end(data1), std::ostreambuf_iterator<char> { file });
 }

 EXPECT_TRUE(std::filesystem::exists(filepath));
Expand DownExpand Up@@ -92,7 +92,7 @@ TEST_F_S(Load, FileRead) {

 {
 std::ofstream file { filepath, std::ios_base::binary };
 std::ranges::copy(data, std::ostreambuf_iterator<char> { file });
 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> { file });
 }

 EXPECT_EQ(getImpl(filepath).load(), data);
Expand Down

24 changes: 24 additions & 0 deletions
tests/unit/general/test_logging.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ TEST_S(LogLevelVerbose) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelDebug) {
Expand All@@ -31,6 +32,7 @@ TEST_S(LogLevelDebug) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelInfo) {
Expand All@@ -44,6 +46,7 @@ TEST_S(LogLevelInfo) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelWarning) {
Expand All@@ -57,6 +60,7 @@ TEST_S(LogLevelWarning) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelError) {
Expand All@@ -70,6 +74,21 @@ TEST_S(LogLevelError) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelFatal) {
 using level = display_device::Logger::LogLevel;
 auto &logger { display_device::Logger::get() };

 logger.setLogLevel(level::fatal);

 EXPECT_EQ(logger.isLogLevelEnabled(level::verbose), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::debug), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(DefaultLogger) {
Expand All@@ -89,6 +108,7 @@ TEST_S(DefaultLogger) {
 EXPECT_TRUE(testRegex(write_and_get_cout(level::info, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] INFO: Hello World!\n)"));
 EXPECT_TRUE(testRegex(write_and_get_cout(level::warning, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] WARNING: Hello World!\n)"));
 EXPECT_TRUE(testRegex(write_and_get_cout(level::error, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] ERROR: Hello World!\n)"));
 EXPECT_TRUE(testRegex(write_and_get_cout(level::fatal, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] FATAL: Hello World!\n)"));
 // clang-format on
}

Expand DownExpand Up@@ -122,6 +142,10 @@ TEST_S(CustomCallback) {
 logger.write(level::error, "Hello World!");
 EXPECT_EQ(output, "4 Hello World!");
 EXPECT_TRUE(m_cout_buffer.str().empty());

 logger.write(level::fatal, "Hello World!");
 EXPECT_EQ(output, "5 Hello World!");
 EXPECT_TRUE(m_cout_buffer.str().empty());
}

TEST_S(WriteMethodRespectsLogLevel, DefaultLogger) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: Improve Sunshine compatibility#67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 2 commits into

from

Jul 19, 2024
 Merged


feat: Improve Sunshine compatibility
#67
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b8048f3

feat: Improve Sunshine compatibility


FrogTheFrog Jul 19, 2024
f0f4867

OMG


FrogTheFrog Jul 19, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ namespace display_device {
 return false;
 }

 std::ranges::copy(data, std::ostreambuf_iterator<char> { stream });
 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> { stream });
 return true;
 }
 catch (const std::exception &error) {
Expand Down

3 changes: 2 additions & 1 deletion
src/common/include/display_device/logging.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,8 @@ namespace display_device {
 debug,
 info,
 warning,
 error
 error,
 fatal
 };

 /**
Expand Down

72 changes: 34 additions & 38 deletions
src/common/logging.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
#if !defined(_MSC_VER) && !defined(_POSIX_THREAD_SAFE_FUNCTIONS)
 #define _POSIX_THREAD_SAFE_FUNCTIONS // For localtime_r
#endif

// class header include
#include "display_device/logging.h"

Expand All@@ -8,14 +12,30 @@
#include <mutex>

namespace display_device {
 namespace {
 std::tm
 threadSafeLocaltime(const std::time_t &time) {
#if defined(_MSC_VER) // MSVCRT (2005+): std::localtime is threadsafe
 const auto tm_ptr { std::localtime(&time) };
#else // POSIX
 std::tm buffer;
 const auto tm_ptr { localtime_r(&time, &buffer) };
#endif // _MSC_VER
 if (tm_ptr) {
 return *tm_ptr;
 }
 return {};
 }
 } // namespace

 Logger &
 Logger::get() {
 static Logger instance; // GCOVR_EXCL_BR_LINE for some reason...
 return instance;
 }

 void
 Logger::setLogLevel(LogLevel log_level) {
 Logger::setLogLevel(const LogLevel log_level) {
 m_enabled_log_level = log_level;
 }

Expand DownExpand Up@@ -44,45 +64,18 @@ namespace display_device {

 std::stringstream stream;
 {
 // Time (limited by GCC 11, so it's not pretty and no timezones are supported...)
 // Time (limited by GCC 10, so it's not pretty...)
 {
 static const auto get_time { []() {
 static const auto to_year_month_day { [](const auto &now) {
 return std::chrono::year_month_day { std::chrono::time_point_cast<std::chrono::days>(now) };
 } };
 static const auto to_hour_minute_second { [](const auto &now) {
 const auto start_of_day { std::chrono::floor<std::chrono::days>(now) };
 const auto time_since_start_of_day { std::chrono::round<std::chrono::seconds>(now - start_of_day) };
 return std::chrono::hh_mm_ss { time_since_start_of_day };
 } };
 static const auto to_milliseconds { [](const auto &now) {
 const auto now_ms { std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()) };
 const auto time_s { std::chrono::duration_cast<std::chrono::seconds>(now.time_since_epoch()) };
 return now_ms - time_s;
 } };

 const auto now { std::chrono::system_clock::now() };
 return std::make_tuple(to_year_month_day(now), to_hour_minute_second(now), to_milliseconds(now));
 } };

 const auto [year_month_day, hh_mm_ss, ms] { get_time() };
 const auto old_flags { stream.flags() }; // Save formatting flags so that they can be restored...
 const auto now { std::chrono::system_clock::now() };
 const auto now_ms { std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()) };
 const auto now_s { std::chrono::duration_cast<std::chrono::seconds>(now_ms) };

 const std::time_t time { std::chrono::system_clock::to_time_t(now) };
 const auto localtime { threadSafeLocaltime(time) };
 const auto now_decimal_part { now_ms - now_s };

 stream << "[";
 stream << std::setfill('0') << std::setw(2) << static_cast<int>(year_month_day.year());
 stream << "-";
 stream << std::setfill('0') << std::setw(2) << static_cast<unsigned>(year_month_day.month());
 stream << "-";
 stream << std::setfill('0') << std::setw(2) << static_cast<unsigned>(year_month_day.day());
 stream << " ";
 stream << std::setfill('0') << std::setw(2) << hh_mm_ss.hours().count();
 stream << ":";
 stream << std::setfill('0') << std::setw(2) << hh_mm_ss.minutes().count();
 stream << ":";
 stream << std::setfill('0') << std::setw(2) << hh_mm_ss.seconds().count();
 stream << ".";
 stream << std::setfill('0') << std::setw(3) << ms.count();
 stream << "] ";
 const auto old_flags { stream.flags() }; // Save formatting flags so that they can be restored...
 stream << std::put_time(&localtime, "[%Y-%m-%d %H:%M:%S.") << std::setfill('0') << std::setw(3) << now_decimal_part.count() << "] ";
 stream.flags(old_flags);
 }

Expand All@@ -103,6 +96,9 @@ namespace display_device {
 case LogLevel::error:
 stream << "ERROR: ";
 break;
 case LogLevel::fatal:
 stream << "FATAL: ";
 break;
 }

 // Value
Expand Down

4 changes: 2 additions & 2 deletions
tests/unit/general/test_file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@ TEST_F_S(Store, FileOverwritten) {

 {
 std::ofstream file { filepath, std::ios_base::binary };
 std::ranges::copy(data1, std::ostreambuf_iterator<char> { file });
 std::copy(std::begin(data1), std::end(data1), std::ostreambuf_iterator<char> { file });
 }

 EXPECT_TRUE(std::filesystem::exists(filepath));
Expand DownExpand Up@@ -92,7 +92,7 @@ TEST_F_S(Load, FileRead) {

 {
 std::ofstream file { filepath, std::ios_base::binary };
 std::ranges::copy(data, std::ostreambuf_iterator<char> { file });
 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> { file });
 }

 EXPECT_EQ(getImpl(filepath).load(), data);
Expand Down

24 changes: 24 additions & 0 deletions
tests/unit/general/test_logging.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ TEST_S(LogLevelVerbose) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelDebug) {
Expand All@@ -31,6 +32,7 @@ TEST_S(LogLevelDebug) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelInfo) {
Expand All@@ -44,6 +46,7 @@ TEST_S(LogLevelInfo) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelWarning) {
Expand All@@ -57,6 +60,7 @@ TEST_S(LogLevelWarning) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelError) {
Expand All@@ -70,6 +74,21 @@ TEST_S(LogLevelError) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelFatal) {
 using level = display_device::Logger::LogLevel;
 auto &logger { display_device::Logger::get() };

 logger.setLogLevel(level::fatal);

 EXPECT_EQ(logger.isLogLevelEnabled(level::verbose), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::debug), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(DefaultLogger) {
Expand All@@ -89,6 +108,7 @@ TEST_S(DefaultLogger) {
 EXPECT_TRUE(testRegex(write_and_get_cout(level::info, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] INFO: Hello World!\n)"));
 EXPECT_TRUE(testRegex(write_and_get_cout(level::warning, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] WARNING: Hello World!\n)"));
 EXPECT_TRUE(testRegex(write_and_get_cout(level::error, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] ERROR: Hello World!\n)"));
 EXPECT_TRUE(testRegex(write_and_get_cout(level::fatal, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] FATAL: Hello World!\n)"));
 // clang-format on
}

Expand DownExpand Up@@ -122,6 +142,10 @@ TEST_S(CustomCallback) {
 logger.write(level::error, "Hello World!");
 EXPECT_EQ(output, "4 Hello World!");
 EXPECT_TRUE(m_cout_buffer.str().empty());

 logger.write(level::fatal, "Hello World!");
 EXPECT_EQ(output, "5 Hello World!");
 EXPECT_TRUE(m_cout_buffer.str().empty());
}

TEST_S(WriteMethodRespectsLogLevel, DefaultLogger) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: Improve Sunshine compatibility#67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 2 commits into

from

Jul 19, 2024
 Merged


feat: Improve Sunshine compatibility
#67
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b8048f3

feat: Improve Sunshine compatibility


FrogTheFrog Jul 19, 2024
f0f4867

OMG


FrogTheFrog Jul 19, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ namespace display_device {
 return false;
 }

 std::ranges::copy(data, std::ostreambuf_iterator<char> { stream });
 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> { stream });
 return true;
 }
 catch (const std::exception &error) {
Expand Down

3 changes: 2 additions & 1 deletion
src/common/include/display_device/logging.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,8 @@ namespace display_device {
 debug,
 info,
 warning,
 error
 error,
 fatal
 };

 /**
Expand Down

72 changes: 34 additions & 38 deletions
src/common/logging.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
#if !defined(_MSC_VER) && !defined(_POSIX_THREAD_SAFE_FUNCTIONS)
 #define _POSIX_THREAD_SAFE_FUNCTIONS // For localtime_r
#endif

// class header include
#include "display_device/logging.h"

Expand All@@ -8,14 +12,30 @@
#include <mutex>

namespace display_device {
 namespace {
 std::tm
 threadSafeLocaltime(const std::time_t &time) {
#if defined(_MSC_VER) // MSVCRT (2005+): std::localtime is threadsafe
 const auto tm_ptr { std::localtime(&time) };
#else // POSIX
 std::tm buffer;
 const auto tm_ptr { localtime_r(&time, &buffer) };
#endif // _MSC_VER
 if (tm_ptr) {
 return *tm_ptr;
 }
 return {};
 }
 } // namespace

 Logger &
 Logger::get() {
 static Logger instance; // GCOVR_EXCL_BR_LINE for some reason...
 return instance;
 }

 void
 Logger::setLogLevel(LogLevel log_level) {
 Logger::setLogLevel(const LogLevel log_level) {
 m_enabled_log_level = log_level;
 }

Expand DownExpand Up@@ -44,45 +64,18 @@ namespace display_device {

 std::stringstream stream;
 {
 // Time (limited by GCC 11, so it's not pretty and no timezones are supported...)
 // Time (limited by GCC 10, so it's not pretty...)
 {
 static const auto get_time { []() {
 static const auto to_year_month_day { [](const auto &now) {
 return std::chrono::year_month_day { std::chrono::time_point_cast<std::chrono::days>(now) };
 } };
 static const auto to_hour_minute_second { [](const auto &now) {
 const auto start_of_day { std::chrono::floor<std::chrono::days>(now) };
 const auto time_since_start_of_day { std::chrono::round<std::chrono::seconds>(now - start_of_day) };
 return std::chrono::hh_mm_ss { time_since_start_of_day };
 } };
 static const auto to_milliseconds { [](const auto &now) {
 const auto now_ms { std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()) };
 const auto time_s { std::chrono::duration_cast<std::chrono::seconds>(now.time_since_epoch()) };
 return now_ms - time_s;
 } };

 const auto now { std::chrono::system_clock::now() };
 return std::make_tuple(to_year_month_day(now), to_hour_minute_second(now), to_milliseconds(now));
 } };

 const auto [year_month_day, hh_mm_ss, ms] { get_time() };
 const auto old_flags { stream.flags() }; // Save formatting flags so that they can be restored...
 const auto now { std::chrono::system_clock::now() };
 const auto now_ms { std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()) };
 const auto now_s { std::chrono::duration_cast<std::chrono::seconds>(now_ms) };

 const std::time_t time { std::chrono::system_clock::to_time_t(now) };
 const auto localtime { threadSafeLocaltime(time) };
 const auto now_decimal_part { now_ms - now_s };

 stream << "[";
 stream << std::setfill('0') << std::setw(2) << static_cast<int>(year_month_day.year());
 stream << "-";
 stream << std::setfill('0') << std::setw(2) << static_cast<unsigned>(year_month_day.month());
 stream << "-";
 stream << std::setfill('0') << std::setw(2) << static_cast<unsigned>(year_month_day.day());
 stream << " ";
 stream << std::setfill('0') << std::setw(2) << hh_mm_ss.hours().count();
 stream << ":";
 stream << std::setfill('0') << std::setw(2) << hh_mm_ss.minutes().count();
 stream << ":";
 stream << std::setfill('0') << std::setw(2) << hh_mm_ss.seconds().count();
 stream << ".";
 stream << std::setfill('0') << std::setw(3) << ms.count();
 stream << "] ";
 const auto old_flags { stream.flags() }; // Save formatting flags so that they can be restored...
 stream << std::put_time(&localtime, "[%Y-%m-%d %H:%M:%S.") << std::setfill('0') << std::setw(3) << now_decimal_part.count() << "] ";
 stream.flags(old_flags);
 }

Expand All@@ -103,6 +96,9 @@ namespace display_device {
 case LogLevel::error:
 stream << "ERROR: ";
 break;
 case LogLevel::fatal:
 stream << "FATAL: ";
 break;
 }

 // Value
Expand Down

4 changes: 2 additions & 2 deletions
tests/unit/general/test_file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@ TEST_F_S(Store, FileOverwritten) {

 {
 std::ofstream file { filepath, std::ios_base::binary };
 std::ranges::copy(data1, std::ostreambuf_iterator<char> { file });
 std::copy(std::begin(data1), std::end(data1), std::ostreambuf_iterator<char> { file });
 }

 EXPECT_TRUE(std::filesystem::exists(filepath));
Expand DownExpand Up@@ -92,7 +92,7 @@ TEST_F_S(Load, FileRead) {

 {
 std::ofstream file { filepath, std::ios_base::binary };
 std::ranges::copy(data, std::ostreambuf_iterator<char> { file });
 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> { file });
 }

 EXPECT_EQ(getImpl(filepath).load(), data);
Expand Down

24 changes: 24 additions & 0 deletions
tests/unit/general/test_logging.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ TEST_S(LogLevelVerbose) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelDebug) {
Expand All@@ -31,6 +32,7 @@ TEST_S(LogLevelDebug) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelInfo) {
Expand All@@ -44,6 +46,7 @@ TEST_S(LogLevelInfo) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelWarning) {
Expand All@@ -57,6 +60,7 @@ TEST_S(LogLevelWarning) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelError) {
Expand All@@ -70,6 +74,21 @@ TEST_S(LogLevelError) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelFatal) {
 using level = display_device::Logger::LogLevel;
 auto &logger { display_device::Logger::get() };

 logger.setLogLevel(level::fatal);

 EXPECT_EQ(logger.isLogLevelEnabled(level::verbose), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::debug), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(DefaultLogger) {
Expand All@@ -89,6 +108,7 @@ TEST_S(DefaultLogger) {
 EXPECT_TRUE(testRegex(write_and_get_cout(level::info, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] INFO: Hello World!\n)"));
 EXPECT_TRUE(testRegex(write_and_get_cout(level::warning, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] WARNING: Hello World!\n)"));
 EXPECT_TRUE(testRegex(write_and_get_cout(level::error, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] ERROR: Hello World!\n)"));
 EXPECT_TRUE(testRegex(write_and_get_cout(level::fatal, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] FATAL: Hello World!\n)"));
 // clang-format on
}

Expand DownExpand Up@@ -122,6 +142,10 @@ TEST_S(CustomCallback) {
 logger.write(level::error, "Hello World!");
 EXPECT_EQ(output, "4 Hello World!");
 EXPECT_TRUE(m_cout_buffer.str().empty());

 logger.write(level::fatal, "Hello World!");
 EXPECT_EQ(output, "5 Hello World!");
 EXPECT_TRUE(m_cout_buffer.str().empty());
}

TEST_S(WriteMethodRespectsLogLevel, DefaultLogger) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
feat: Improve Sunshine compatibility#67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 2 commits into

from

Jul 19, 2024
 Merged


feat: Improve Sunshine compatibility
#67
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b8048f3

feat: Improve Sunshine compatibility


FrogTheFrog Jul 19, 2024
f0f4867

OMG


FrogTheFrog Jul 19, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ namespace display_device {
 return false;
 }

 std::ranges::copy(data, std::ostreambuf_iterator<char> { stream });
 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> { stream });
 return true;
 }
 catch (const std::exception &error) {
Expand Down

3 changes: 2 additions & 1 deletion
src/common/include/display_device/logging.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,8 @@ namespace display_device {
 debug,
 info,
 warning,
 error
 error,
 fatal
 };

 /**
Expand Down

72 changes: 34 additions & 38 deletions
src/common/logging.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
#if !defined(_MSC_VER) && !defined(_POSIX_THREAD_SAFE_FUNCTIONS)
 #define _POSIX_THREAD_SAFE_FUNCTIONS // For localtime_r
#endif

// class header include
#include "display_device/logging.h"

Expand All@@ -8,14 +12,30 @@
#include <mutex>

namespace display_device {
 namespace {
 std::tm
 threadSafeLocaltime(const std::time_t &time) {
#if defined(_MSC_VER) // MSVCRT (2005+): std::localtime is threadsafe
 const auto tm_ptr { std::localtime(&time) };
#else // POSIX
 std::tm buffer;
 const auto tm_ptr { localtime_r(&time, &buffer) };
#endif // _MSC_VER
 if (tm_ptr) {
 return *tm_ptr;
 }
 return {};
 }
 } // namespace

 Logger &
 Logger::get() {
 static Logger instance; // GCOVR_EXCL_BR_LINE for some reason...
 return instance;
 }

 void
 Logger::setLogLevel(LogLevel log_level) {
 Logger::setLogLevel(const LogLevel log_level) {
 m_enabled_log_level = log_level;
 }

Expand DownExpand Up@@ -44,45 +64,18 @@ namespace display_device {

 std::stringstream stream;
 {
 // Time (limited by GCC 11, so it's not pretty and no timezones are supported...)
 // Time (limited by GCC 10, so it's not pretty...)
 {
 static const auto get_time { []() {
 static const auto to_year_month_day { [](const auto &now) {
 return std::chrono::year_month_day { std::chrono::time_point_cast<std::chrono::days>(now) };
 } };
 static const auto to_hour_minute_second { [](const auto &now) {
 const auto start_of_day { std::chrono::floor<std::chrono::days>(now) };
 const auto time_since_start_of_day { std::chrono::round<std::chrono::seconds>(now - start_of_day) };
 return std::chrono::hh_mm_ss { time_since_start_of_day };
 } };
 static const auto to_milliseconds { [](const auto &now) {
 const auto now_ms { std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()) };
 const auto time_s { std::chrono::duration_cast<std::chrono::seconds>(now.time_since_epoch()) };
 return now_ms - time_s;
 } };

 const auto now { std::chrono::system_clock::now() };
 return std::make_tuple(to_year_month_day(now), to_hour_minute_second(now), to_milliseconds(now));
 } };

 const auto [year_month_day, hh_mm_ss, ms] { get_time() };
 const auto old_flags { stream.flags() }; // Save formatting flags so that they can be restored...
 const auto now { std::chrono::system_clock::now() };
 const auto now_ms { std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()) };
 const auto now_s { std::chrono::duration_cast<std::chrono::seconds>(now_ms) };

 const std::time_t time { std::chrono::system_clock::to_time_t(now) };
 const auto localtime { threadSafeLocaltime(time) };
 const auto now_decimal_part { now_ms - now_s };

 stream << "[";
 stream << std::setfill('0') << std::setw(2) << static_cast<int>(year_month_day.year());
 stream << "-";
 stream << std::setfill('0') << std::setw(2) << static_cast<unsigned>(year_month_day.month());
 stream << "-";
 stream << std::setfill('0') << std::setw(2) << static_cast<unsigned>(year_month_day.day());
 stream << " ";
 stream << std::setfill('0') << std::setw(2) << hh_mm_ss.hours().count();
 stream << ":";
 stream << std::setfill('0') << std::setw(2) << hh_mm_ss.minutes().count();
 stream << ":";
 stream << std::setfill('0') << std::setw(2) << hh_mm_ss.seconds().count();
 stream << ".";
 stream << std::setfill('0') << std::setw(3) << ms.count();
 stream << "] ";
 const auto old_flags { stream.flags() }; // Save formatting flags so that they can be restored...
 stream << std::put_time(&localtime, "[%Y-%m-%d %H:%M:%S.") << std::setfill('0') << std::setw(3) << now_decimal_part.count() << "] ";
 stream.flags(old_flags);
 }

Expand All@@ -103,6 +96,9 @@ namespace display_device {
 case LogLevel::error:
 stream << "ERROR: ";
 break;
 case LogLevel::fatal:
 stream << "FATAL: ";
 break;
 }

 // Value
Expand Down

4 changes: 2 additions & 2 deletions
tests/unit/general/test_file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@ TEST_F_S(Store, FileOverwritten) {

 {
 std::ofstream file { filepath, std::ios_base::binary };
 std::ranges::copy(data1, std::ostreambuf_iterator<char> { file });
 std::copy(std::begin(data1), std::end(data1), std::ostreambuf_iterator<char> { file });
 }

 EXPECT_TRUE(std::filesystem::exists(filepath));
Expand DownExpand Up@@ -92,7 +92,7 @@ TEST_F_S(Load, FileRead) {

 {
 std::ofstream file { filepath, std::ios_base::binary };
 std::ranges::copy(data, std::ostreambuf_iterator<char> { file });
 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> { file });
 }

 EXPECT_EQ(getImpl(filepath).load(), data);
Expand Down

24 changes: 24 additions & 0 deletions
tests/unit/general/test_logging.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ TEST_S(LogLevelVerbose) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelDebug) {
Expand All@@ -31,6 +32,7 @@ TEST_S(LogLevelDebug) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelInfo) {
Expand All@@ -44,6 +46,7 @@ TEST_S(LogLevelInfo) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelWarning) {
Expand All@@ -57,6 +60,7 @@ TEST_S(LogLevelWarning) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelError) {
Expand All@@ -70,6 +74,21 @@ TEST_S(LogLevelError) {
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), true);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(LogLevelFatal) {
 using level = display_device::Logger::LogLevel;
 auto &logger { display_device::Logger::get() };

 logger.setLogLevel(level::fatal);

 EXPECT_EQ(logger.isLogLevelEnabled(level::verbose), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::debug), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::info), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::warning), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::error), false);
 EXPECT_EQ(logger.isLogLevelEnabled(level::fatal), true);
}

TEST_S(DefaultLogger) {
Expand All@@ -89,6 +108,7 @@ TEST_S(DefaultLogger) {
 EXPECT_TRUE(testRegex(write_and_get_cout(level::info, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] INFO: Hello World!\n)"));
 EXPECT_TRUE(testRegex(write_and_get_cout(level::warning, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] WARNING: Hello World!\n)"));
 EXPECT_TRUE(testRegex(write_and_get_cout(level::error, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] ERROR: Hello World!\n)"));
 EXPECT_TRUE(testRegex(write_and_get_cout(level::fatal, "Hello World!"), R"(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\] FATAL: Hello World!\n)"));
 // clang-format on
}

Expand DownExpand Up@@ -122,6 +142,10 @@ TEST_S(CustomCallback) {
 logger.write(level::error, "Hello World!");
 EXPECT_EQ(output, "4 Hello World!");
 EXPECT_TRUE(m_cout_buffer.str().empty());

 logger.write(level::fatal, "Hello World!");
 EXPECT_EQ(output, "5 Hello World!");
 EXPECT_TRUE(m_cout_buffer.str().empty());
}

TEST_S(WriteMethodRespectsLogLevel, DefaultLogger) {
Expand Down