refactor(sonar): fix cpp:S6197, cpp:S1066, and cpp:S1181#264

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 1 commit into from
Jun 9, 2026
Merged

refactor(sonar): fix cpp:S6197, cpp:S1066, and cpp:S1181 #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/common/file_settings_persistence.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,9 +30,9 @@ namespace display_device {
return false;
}

std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> {stream});
std::ranges::copy(data, std::ostreambuf_iterator<char> {stream});
return true;
} catch (const std::exception &error) {
} catch (const std::ios_base::failure &error) {
DD_LOG(error) << "Failed to write to " << m_filepath << "! Error:\n"
<< error.what();
return false;
Expand All@@ -58,7 +58,7 @@ namespace display_device {
}

return std::vector<std::uint8_t> {std::istreambuf_iterator<char> {stream}, std::istreambuf_iterator<char> {}};
} catch (const std::exception &error) {
} catch (const std::ios_base::failure &error) {
DD_LOG(error) << "Failed to read " << m_filepath << "! Error:\n"
<< error.what();
return std::nullopt;
Expand Down
29 changes: 27 additions & 2 deletions src/common/include/display_device/detail/json_converter.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
#ifdef DD_JSON_DETAIL
// system includes
#include <nlohmann/json.hpp>
#include <stdexcept>

namespace display_device {
// A shared "toJson" implementation. Extracted here for UTs + coverage.
Expand All@@ -19,7 +20,19 @@ namespace display_device {

nlohmann::json json_obj = obj;
return json_obj.dump(static_cast<int>(indent.value_or(-1)));
} catch (const std::exception &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
} catch (const nlohmann::json::exception &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
if (success) {
*success = false;
}

return err.what();
} catch (const std::out_of_range &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
if (success) {
*success = false;
}

return err.what();
} catch (const std::invalid_argument &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
if (success) {
*success = false;
}
Expand All@@ -39,7 +52,19 @@ namespace display_device {
Type parsed_obj = nlohmann::json::parse(string);
obj = std::move(parsed_obj);
return true;
} catch (const std::exception &err) {
} catch (const nlohmann::json::exception &err) {
if (error_message) {
*error_message = err.what();
}

return false;
} catch (const std::out_of_range &err) {
if (error_message) {
*error_message = err.what();
}

return false;
} catch (const std::invalid_argument &err) {
if (error_message) {
*error_message = err.what();
}
Expand Down
3 changes: 2 additions & 1 deletion src/common/include/display_device/detail/json_serializer_details.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@

#ifdef DD_JSON_DETAIL
// system includes
#include <algorithm>
#include <nlohmann/json.hpp>
#include <stdexcept>

Expand DownExpand Up@@ -84,7 +85,7 @@ namespace display_device {
template<class T, class Predicate>
typename std::map<T, nlohmann::json>::const_iterator findInEnumMap(const char *error_msg, Predicate predicate) {
const auto &map {getEnumMap(T {})};
auto it {std::find_if(std::begin(map), std::end(map), predicate)};
auto it {std::ranges::find_if(map, predicate)};
if (it == std::end(map)) { // GCOVR_EXCL_BR_LINE for fallthrough branch
throw std::out_of_range(error_msg); // GCOVR_EXCL_BR_LINE for fallthrough branch
}
Expand Down
16 changes: 10 additions & 6 deletions src/common/include/display_device/retry_scheduler.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
// system includes
#include <algorithm>
#include <condition_variable>
#include <exception>
#include <functional>
#include <memory>
#include <stdexcept>
Expand DownExpand Up@@ -63,6 +64,11 @@ namespace display_device {
};

namespace detail {
inline void logSchedulerException(const std::exception &exception, const char *message) {
DD_LOG(error) << message << " Error:\n"
<< exception.what();
}

/**
* @brief Given that we know that we are dealing with a function,
* check if it is an optional function (like std::function<...>) or other callable.
Expand DownExpand Up@@ -176,9 +182,8 @@ namespace display_device {
}};
m_retry_function(*m_iface, scheduler_stop_token);
continue;
} catch (const std::exception &error) {
DD_LOG(error) << "Exception thrown in the RetryScheduler thread. Stopping scheduler. Error:\n"
<< error.what();
} catch (const std::exception &error) { // NOSONAR(cpp:S1181): Scheduler callback boundary must catch standard callback failures.
detail::logSchedulerException(error, "Exception thrown in the RetryScheduler thread. Stopping scheduler.");
}

clearThreadLoopUnlocked();
Expand DownExpand Up@@ -254,10 +259,9 @@ namespace display_device {
m_sleep_durations = std::move(sleep_durations);
syncThreadUnlocked();
}
} catch (const std::exception &error) {
} catch (const std::exception &error) { // NOSONAR(cpp:S1181): Scheduler callback boundary must catch standard callback failures.
stop_token.requestStop();
DD_LOG(error) << "Exception thrown in the RetryScheduler::schedule. Stopping scheduler. Error:\n"
<< error.what();
detail::logSchedulerException(error, "Exception thrown in the RetryScheduler::schedule. Stopping scheduler.");
}
}

Expand Down
36 changes: 14 additions & 22 deletions src/windows/settings_manager_apply.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,13 +181,11 @@ namespace display_device {
// Non-stripped initial state MUST be checked here as the missing device could have its context captured!
const bool switching_from_initial {m_dd_api->isTopologyTheSame(new_state.m_initial.m_topology, topology_before_changes)};
const bool new_topology_contains_all_current_topology_devices {std::ranges::includes(win_utils::flattenTopology(new_topology), win_utils::flattenTopology(topology_before_changes))};
if (switching_from_initial && !new_topology_contains_all_current_topology_devices) {
// Only capture the context when switching from initial topology. All the other intermediate states, like non-existent
// capture state after system restart are to be avoided.
if (!m_audio_context_api->capture()) {
DD_LOG(error) << "Failed to capture audio context!";
return std::nullopt;
}
// Only capture the context when switching from initial topology. All the other intermediate states, like non-existent
// capture state after system restart are to be avoided.
if (switching_from_initial && !new_topology_contains_all_current_topology_devices && !m_audio_context_api->capture()) {
DD_LOG(error) << "Failed to capture audio context!";
return std::nullopt;
}
}

Expand DownExpand Up@@ -251,11 +249,9 @@ namespace display_device {
return true;
}

if (might_need_to_restore) {
if (!try_change(cached_primary_device, "Changing primary display back to:\n", "Failed to restore original primary device!")) {
// Error already logged
return false;
}
if (might_need_to_restore && !try_change(cached_primary_device, "Changing primary display back to:\n", "Failed to restore original primary device!")) {
// Error already logged
return false;
}

return true;
Expand DownExpand Up@@ -313,11 +309,9 @@ namespace display_device {
return true;
}

if (might_need_to_restore) {
if (!try_change(cached_display_modes, "Changing display modes back to:\n", "Failed to restore original display modes!")) {
// Error already logged
return false;
}
if (might_need_to_restore && !try_change(cached_display_modes, "Changing display modes back to:\n", "Failed to restore original display modes!")) {
// Error already logged
return false;
}

return true;
Expand DownExpand Up@@ -370,11 +364,9 @@ namespace display_device {
return true;
}

if (might_need_to_restore) {
if (!try_change(cached_hdr_states, "Changing HDR states back to:\n", "Failed to restore original HDR states!")) {
// Error already logged
return false;
}
if (might_need_to_restore && !try_change(cached_hdr_states, "Changing HDR states back to:\n", "Failed to restore original HDR states!")) {
// Error already logged
return false;
}

return true;
Expand Down
8 changes: 3 additions & 5 deletions src/windows/win_api_layer.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -656,11 +656,9 @@ namespace display_device {
return FALSE;
}

if (MONITORINFOEXA monitor_info {sizeof(MONITORINFOEXA)}; GetMonitorInfoA(monitor, &monitor_info)) {
if (data->m_display_name == monitor_info.szDevice) {
data->m_width = monitor_info.rcMonitor.right - monitor_info.rcMonitor.left;
return FALSE;
}
if (MONITORINFOEXA monitor_info {sizeof(MONITORINFOEXA)}; GetMonitorInfoA(monitor, &monitor_info) && data->m_display_name == monitor_info.szDevice) {
data->m_width = monitor_info.rcMonitor.right - monitor_info.rcMonitor.left;
return FALSE;
}

return TRUE;
Expand Down
6 changes: 2 additions & 4 deletions src/windows/win_api_utils.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -183,10 +183,8 @@ namespace display_device::win_utils {
return std::nullopt;
}

if (type == ValidatedPathType::Active) {
if (!isActive(path)) {
return std::nullopt;
}
if (type == ValidatedPathType::Active && !isActive(path)) {
return std::nullopt;
}

const auto device_path {w_api.getMonitorDevicePath(path)};
Expand Down
4 changes: 2 additions & 2 deletions src/windows/win_display_device_topology.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -119,10 +119,10 @@ namespace display_device {
bool WinDisplayDevice::isTopologyTheSame(const ActiveTopology &lhs, const ActiveTopology &rhs) const {
const auto sort_topology = [](ActiveTopology &topology) {
for (auto &group : topology) {
std::sort(std::begin(group), std::end(group));
std::ranges::sort(group);
}

std::sort(std::begin(topology), std::end(topology));
std::ranges::sort(topology);
};

auto lhs_copy {lhs};
Expand Down
5 changes: 3 additions & 2 deletions tests/unit/general/test_file_settings_persistence.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
// system includes
#include <algorithm>
#include <fstream>
#include <gmock/gmock.h>
#include <stdexcept>
Expand DownExpand Up@@ -63,7 +64,7 @@ TEST_F_S(Store, FileOverwritten) {

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

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

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

EXPECT_EQ(getImpl(filepath).load(), data);
Expand Down
6 changes: 3 additions & 3 deletions tests/unit/general/test_retry_scheduler.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,10 +24,10 @@ namespace {
void constMethod() const { /* noop */ }
};

class SchedulerStopTokenTestException final: public std::exception {
class SchedulerStopTokenTestException final: public std::runtime_error {
public:
[[nodiscard]] const char *what() const noexcept override {
return "Get rekt!";
SchedulerStopTokenTestException():
std::runtime_error {"Get rekt!"} {
}
};

Expand Down
3 changes: 2 additions & 1 deletion tests/unit/windows/test_win_display_device_general.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
// system includes
#include <algorithm>
#include <format>
#include <stdexcept>

Expand DownExpand Up@@ -87,7 +88,7 @@ TEST_F_S(EnumAvailableDevices) {

const auto topology {display_device::win_utils::flattenTopology(m_win_dd.getCurrentTopology())};
for (const auto &device_id : *available_devices) {
auto enum_it {std::find_if(std::begin(enum_devices), std::end(enum_devices), [&device_id](const auto &entry) {
auto enum_it {std::ranges::find_if(enum_devices, [&device_id](const auto &entry) {
return entry.m_device_id == device_id;
})};

Expand Down
Loading
, '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
refactor(sonar): fix cpp:S6197, cpp:S1066, and cpp:S1181#264

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 1 commit into

from

Jun 9, 2026
 Merged


refactor(sonar): fix cpp:S6197, cpp:S1066, and cpp:S1181
#264
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


6 changes: 3 additions & 3 deletions
src/common/file_settings_persistence.cpp

View file


Open in desktop

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

 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> {stream});
 std::ranges::copy(data, std::ostreambuf_iterator<char> {stream});
 return true;
 } catch (const std::exception &error) {
 } catch (const std::ios_base::failure &error) {
 DD_LOG(error) << "Failed to write to " << m_filepath << "! Error:\n"
 << error.what();
 return false;
Expand All@@ -58,7 +58,7 @@ namespace display_device {
 }

 return std::vector<std::uint8_t> {std::istreambuf_iterator<char> {stream}, std::istreambuf_iterator<char> {}};
 } catch (const std::exception &error) {
 } catch (const std::ios_base::failure &error) {
 DD_LOG(error) << "Failed to read " << m_filepath << "! Error:\n"
 << error.what();
 return std::nullopt;
Expand Down

29 changes: 27 additions & 2 deletions
src/common/include/display_device/detail/json_converter.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
#ifdef DD_JSON_DETAIL
 // system includes
 #include <nlohmann/json.hpp>
 #include <stdexcept>

namespace display_device {
 // A shared "toJson" implementation. Extracted here for UTs + coverage.
Expand All@@ -19,7 +20,19 @@ namespace display_device {

 nlohmann::json json_obj = obj;
 return json_obj.dump(static_cast<int>(indent.value_or(-1)));
 } catch (const std::exception &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 } catch (const nlohmann::json::exception &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 if (success) {
 *success = false;
 }

 return err.what();
 } catch (const std::out_of_range &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 if (success) {
 *success = false;
 }

 return err.what();
 } catch (const std::invalid_argument &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 if (success) {
 *success = false;
 }
Expand All@@ -39,7 +52,19 @@ namespace display_device {
 Type parsed_obj = nlohmann::json::parse(string);
 obj = std::move(parsed_obj);
 return true;
 } catch (const std::exception &err) {
 } catch (const nlohmann::json::exception &err) {
 if (error_message) {
 *error_message = err.what();
 }

 return false;
 } catch (const std::out_of_range &err) {
 if (error_message) {
 *error_message = err.what();
 }

 return false;
 } catch (const std::invalid_argument &err) {
 if (error_message) {
 *error_message = err.what();
 }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@

#ifdef DD_JSON_DETAIL
 // system includes
 #include <algorithm>
 #include <nlohmann/json.hpp>
 #include <stdexcept>

Expand DownExpand Up@@ -84,7 +85,7 @@ namespace display_device {
 template<class T, class Predicate>
 typename std::map<T, nlohmann::json>::const_iterator findInEnumMap(const char *error_msg, Predicate predicate) {
 const auto &map {getEnumMap(T {})};
 auto it {std::find_if(std::begin(map), std::end(map), predicate)};
 auto it {std::ranges::find_if(map, predicate)};
 if (it == std::end(map)) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 throw std::out_of_range(error_msg); // GCOVR_EXCL_BR_LINE for fallthrough branch
 }
Expand Down

16 changes: 10 additions & 6 deletions
src/common/include/display_device/retry_scheduler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
// system includes
#include <algorithm>
#include <condition_variable>
#include <exception>
#include <functional>
#include <memory>
#include <stdexcept>
Expand DownExpand Up@@ -63,6 +64,11 @@ namespace display_device {
 };

 namespace detail {
 inline void logSchedulerException(const std::exception &exception, const char *message) {
 DD_LOG(error) << message << " Error:\n"
 << exception.what();
 }

 /**
 * @brief Given that we know that we are dealing with a function,
 * check if it is an optional function (like std::function<...>) or other callable.
Expand DownExpand Up@@ -176,9 +182,8 @@ namespace display_device {
 }};
 m_retry_function(*m_iface, scheduler_stop_token);
 continue;
 } catch (const std::exception &error) {
 DD_LOG(error) << "Exception thrown in the RetryScheduler thread. Stopping scheduler. Error:\n"
 << error.what();
 } catch (const std::exception &error) { // NOSONAR(cpp:S1181): Scheduler callback boundary must catch standard callback failures.
 detail::logSchedulerException(error, "Exception thrown in the RetryScheduler thread. Stopping scheduler.");
 }

 clearThreadLoopUnlocked();
Expand DownExpand Up@@ -254,10 +259,9 @@ namespace display_device {
 m_sleep_durations = std::move(sleep_durations);
 syncThreadUnlocked();
 }
 } catch (const std::exception &error) {
 } catch (const std::exception &error) { // NOSONAR(cpp:S1181): Scheduler callback boundary must catch standard callback failures.
 stop_token.requestStop();
 DD_LOG(error) << "Exception thrown in the RetryScheduler::schedule. Stopping scheduler. Error:\n"
 << error.what();
 detail::logSchedulerException(error, "Exception thrown in the RetryScheduler::schedule. Stopping scheduler.");
 }
 }

Expand Down

36 changes: 14 additions & 22 deletions
src/windows/settings_manager_apply.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,13 +181,11 @@ namespace display_device {
 // Non-stripped initial state MUST be checked here as the missing device could have its context captured!
 const bool switching_from_initial {m_dd_api->isTopologyTheSame(new_state.m_initial.m_topology, topology_before_changes)};
 const bool new_topology_contains_all_current_topology_devices {std::ranges::includes(win_utils::flattenTopology(new_topology), win_utils::flattenTopology(topology_before_changes))};
 if (switching_from_initial && !new_topology_contains_all_current_topology_devices) {
 // Only capture the context when switching from initial topology. All the other intermediate states, like non-existent
 // capture state after system restart are to be avoided.
 if (!m_audio_context_api->capture()) {
 DD_LOG(error) << "Failed to capture audio context!";
 return std::nullopt;
 }
 // Only capture the context when switching from initial topology. All the other intermediate states, like non-existent
 // capture state after system restart are to be avoided.
 if (switching_from_initial && !new_topology_contains_all_current_topology_devices && !m_audio_context_api->capture()) {
 DD_LOG(error) << "Failed to capture audio context!";
 return std::nullopt;
 }
 }

Expand DownExpand Up@@ -251,11 +249,9 @@ namespace display_device {
 return true;
 }

 if (might_need_to_restore) {
 if (!try_change(cached_primary_device, "Changing primary display back to:\n", "Failed to restore original primary device!")) {
 // Error already logged
 return false;
 }
 if (might_need_to_restore && !try_change(cached_primary_device, "Changing primary display back to:\n", "Failed to restore original primary device!")) {
 // Error already logged
 return false;
 }

 return true;
Expand DownExpand Up@@ -313,11 +309,9 @@ namespace display_device {
 return true;
 }

 if (might_need_to_restore) {
 if (!try_change(cached_display_modes, "Changing display modes back to:\n", "Failed to restore original display modes!")) {
 // Error already logged
 return false;
 }
 if (might_need_to_restore && !try_change(cached_display_modes, "Changing display modes back to:\n", "Failed to restore original display modes!")) {
 // Error already logged
 return false;
 }

 return true;
Expand DownExpand Up@@ -370,11 +364,9 @@ namespace display_device {
 return true;
 }

 if (might_need_to_restore) {
 if (!try_change(cached_hdr_states, "Changing HDR states back to:\n", "Failed to restore original HDR states!")) {
 // Error already logged
 return false;
 }
 if (might_need_to_restore && !try_change(cached_hdr_states, "Changing HDR states back to:\n", "Failed to restore original HDR states!")) {
 // Error already logged
 return false;
 }

 return true;
Expand Down

8 changes: 3 additions & 5 deletions
src/windows/win_api_layer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -656,11 +656,9 @@ namespace display_device {
 return FALSE;
 }

 if (MONITORINFOEXA monitor_info {sizeof(MONITORINFOEXA)}; GetMonitorInfoA(monitor, &monitor_info)) {
 if (data->m_display_name == monitor_info.szDevice) {
 data->m_width = monitor_info.rcMonitor.right - monitor_info.rcMonitor.left;
 return FALSE;
 }
 if (MONITORINFOEXA monitor_info {sizeof(MONITORINFOEXA)}; GetMonitorInfoA(monitor, &monitor_info) && data->m_display_name == monitor_info.szDevice) {
 data->m_width = monitor_info.rcMonitor.right - monitor_info.rcMonitor.left;
 return FALSE;
 }

 return TRUE;
Expand Down

6 changes: 2 additions & 4 deletions
src/windows/win_api_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,10 +183,8 @@ namespace display_device::win_utils {
 return std::nullopt;
 }

 if (type == ValidatedPathType::Active) {
 if (!isActive(path)) {
 return std::nullopt;
 }
 if (type == ValidatedPathType::Active && !isActive(path)) {
 return std::nullopt;
 }

 const auto device_path {w_api.getMonitorDevicePath(path)};
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/win_display_device_topology.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,10 +119,10 @@ namespace display_device {
 bool WinDisplayDevice::isTopologyTheSame(const ActiveTopology &lhs, const ActiveTopology &rhs) const {
 const auto sort_topology = [](ActiveTopology &topology) {
 for (auto &group : topology) {
 std::sort(std::begin(group), std::end(group));
 std::ranges::sort(group);
 }

 std::sort(std::begin(topology), std::end(topology));
 std::ranges::sort(topology);
 };

 auto lhs_copy {lhs};
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
// system includes
#include <algorithm>
#include <fstream>
#include <gmock/gmock.h>
#include <stdexcept>
Expand DownExpand Up@@ -63,7 +64,7 @@ TEST_F_S(Store, FileOverwritten) {

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

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

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

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

6 changes: 3 additions & 3 deletions
tests/unit/general/test_retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,10 +24,10 @@ namespace {
 void constMethod() const { /* noop */ }
 };

 class SchedulerStopTokenTestException final: public std::exception {
 class SchedulerStopTokenTestException final: public std::runtime_error {
 public:
[[nodiscard]] const char *what() const noexcept override {
return "Get rekt!";
SchedulerStopTokenTestException():
 std::runtime_error {"Get rekt!"} {
 }
 };

Expand Down

3 changes: 2 additions & 1 deletion
tests/unit/windows/test_win_display_device_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
// system includes
#include <algorithm>
#include <format>
#include <stdexcept>

Expand DownExpand Up@@ -87,7 +88,7 @@ TEST_F_S(EnumAvailableDevices) {

 const auto topology {display_device::win_utils::flattenTopology(m_win_dd.getCurrentTopology())};
 for (const auto &device_id : *available_devices) {
 auto enum_it {std::find_if(std::begin(enum_devices), std::end(enum_devices), [&device_id](const auto &entry) {
 auto enum_it {std::ranges::find_if(enum_devices, [&device_id](const auto &entry) {
 return entry.m_device_id == device_id;
 })};

Expand Down
Loading

, '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
refactor(sonar): fix cpp:S6197, cpp:S1066, and cpp:S1181#264

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 1 commit into

from

Jun 9, 2026
 Merged


refactor(sonar): fix cpp:S6197, cpp:S1066, and cpp:S1181
#264
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


6 changes: 3 additions & 3 deletions
src/common/file_settings_persistence.cpp

View file


Open in desktop

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

 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> {stream});
 std::ranges::copy(data, std::ostreambuf_iterator<char> {stream});
 return true;
 } catch (const std::exception &error) {
 } catch (const std::ios_base::failure &error) {
 DD_LOG(error) << "Failed to write to " << m_filepath << "! Error:\n"
 << error.what();
 return false;
Expand All@@ -58,7 +58,7 @@ namespace display_device {
 }

 return std::vector<std::uint8_t> {std::istreambuf_iterator<char> {stream}, std::istreambuf_iterator<char> {}};
 } catch (const std::exception &error) {
 } catch (const std::ios_base::failure &error) {
 DD_LOG(error) << "Failed to read " << m_filepath << "! Error:\n"
 << error.what();
 return std::nullopt;
Expand Down

29 changes: 27 additions & 2 deletions
src/common/include/display_device/detail/json_converter.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
#ifdef DD_JSON_DETAIL
 // system includes
 #include <nlohmann/json.hpp>
 #include <stdexcept>

namespace display_device {
 // A shared "toJson" implementation. Extracted here for UTs + coverage.
Expand All@@ -19,7 +20,19 @@ namespace display_device {

 nlohmann::json json_obj = obj;
 return json_obj.dump(static_cast<int>(indent.value_or(-1)));
 } catch (const std::exception &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 } catch (const nlohmann::json::exception &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 if (success) {
 *success = false;
 }

 return err.what();
 } catch (const std::out_of_range &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 if (success) {
 *success = false;
 }

 return err.what();
 } catch (const std::invalid_argument &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 if (success) {
 *success = false;
 }
Expand All@@ -39,7 +52,19 @@ namespace display_device {
 Type parsed_obj = nlohmann::json::parse(string);
 obj = std::move(parsed_obj);
 return true;
 } catch (const std::exception &err) {
 } catch (const nlohmann::json::exception &err) {
 if (error_message) {
 *error_message = err.what();
 }

 return false;
 } catch (const std::out_of_range &err) {
 if (error_message) {
 *error_message = err.what();
 }

 return false;
 } catch (const std::invalid_argument &err) {
 if (error_message) {
 *error_message = err.what();
 }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@

#ifdef DD_JSON_DETAIL
 // system includes
 #include <algorithm>
 #include <nlohmann/json.hpp>
 #include <stdexcept>

Expand DownExpand Up@@ -84,7 +85,7 @@ namespace display_device {
 template<class T, class Predicate>
 typename std::map<T, nlohmann::json>::const_iterator findInEnumMap(const char *error_msg, Predicate predicate) {
 const auto &map {getEnumMap(T {})};
 auto it {std::find_if(std::begin(map), std::end(map), predicate)};
 auto it {std::ranges::find_if(map, predicate)};
 if (it == std::end(map)) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 throw std::out_of_range(error_msg); // GCOVR_EXCL_BR_LINE for fallthrough branch
 }
Expand Down

16 changes: 10 additions & 6 deletions
src/common/include/display_device/retry_scheduler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
// system includes
#include <algorithm>
#include <condition_variable>
#include <exception>
#include <functional>
#include <memory>
#include <stdexcept>
Expand DownExpand Up@@ -63,6 +64,11 @@ namespace display_device {
 };

 namespace detail {
 inline void logSchedulerException(const std::exception &exception, const char *message) {
 DD_LOG(error) << message << " Error:\n"
 << exception.what();
 }

 /**
 * @brief Given that we know that we are dealing with a function,
 * check if it is an optional function (like std::function<...>) or other callable.
Expand DownExpand Up@@ -176,9 +182,8 @@ namespace display_device {
 }};
 m_retry_function(*m_iface, scheduler_stop_token);
 continue;
 } catch (const std::exception &error) {
 DD_LOG(error) << "Exception thrown in the RetryScheduler thread. Stopping scheduler. Error:\n"
 << error.what();
 } catch (const std::exception &error) { // NOSONAR(cpp:S1181): Scheduler callback boundary must catch standard callback failures.
 detail::logSchedulerException(error, "Exception thrown in the RetryScheduler thread. Stopping scheduler.");
 }

 clearThreadLoopUnlocked();
Expand DownExpand Up@@ -254,10 +259,9 @@ namespace display_device {
 m_sleep_durations = std::move(sleep_durations);
 syncThreadUnlocked();
 }
 } catch (const std::exception &error) {
 } catch (const std::exception &error) { // NOSONAR(cpp:S1181): Scheduler callback boundary must catch standard callback failures.
 stop_token.requestStop();
 DD_LOG(error) << "Exception thrown in the RetryScheduler::schedule. Stopping scheduler. Error:\n"
 << error.what();
 detail::logSchedulerException(error, "Exception thrown in the RetryScheduler::schedule. Stopping scheduler.");
 }
 }

Expand Down

36 changes: 14 additions & 22 deletions
src/windows/settings_manager_apply.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,13 +181,11 @@ namespace display_device {
 // Non-stripped initial state MUST be checked here as the missing device could have its context captured!
 const bool switching_from_initial {m_dd_api->isTopologyTheSame(new_state.m_initial.m_topology, topology_before_changes)};
 const bool new_topology_contains_all_current_topology_devices {std::ranges::includes(win_utils::flattenTopology(new_topology), win_utils::flattenTopology(topology_before_changes))};
 if (switching_from_initial && !new_topology_contains_all_current_topology_devices) {
 // Only capture the context when switching from initial topology. All the other intermediate states, like non-existent
 // capture state after system restart are to be avoided.
 if (!m_audio_context_api->capture()) {
 DD_LOG(error) << "Failed to capture audio context!";
 return std::nullopt;
 }
 // Only capture the context when switching from initial topology. All the other intermediate states, like non-existent
 // capture state after system restart are to be avoided.
 if (switching_from_initial && !new_topology_contains_all_current_topology_devices && !m_audio_context_api->capture()) {
 DD_LOG(error) << "Failed to capture audio context!";
 return std::nullopt;
 }
 }

Expand DownExpand Up@@ -251,11 +249,9 @@ namespace display_device {
 return true;
 }

 if (might_need_to_restore) {
 if (!try_change(cached_primary_device, "Changing primary display back to:\n", "Failed to restore original primary device!")) {
 // Error already logged
 return false;
 }
 if (might_need_to_restore && !try_change(cached_primary_device, "Changing primary display back to:\n", "Failed to restore original primary device!")) {
 // Error already logged
 return false;
 }

 return true;
Expand DownExpand Up@@ -313,11 +309,9 @@ namespace display_device {
 return true;
 }

 if (might_need_to_restore) {
 if (!try_change(cached_display_modes, "Changing display modes back to:\n", "Failed to restore original display modes!")) {
 // Error already logged
 return false;
 }
 if (might_need_to_restore && !try_change(cached_display_modes, "Changing display modes back to:\n", "Failed to restore original display modes!")) {
 // Error already logged
 return false;
 }

 return true;
Expand DownExpand Up@@ -370,11 +364,9 @@ namespace display_device {
 return true;
 }

 if (might_need_to_restore) {
 if (!try_change(cached_hdr_states, "Changing HDR states back to:\n", "Failed to restore original HDR states!")) {
 // Error already logged
 return false;
 }
 if (might_need_to_restore && !try_change(cached_hdr_states, "Changing HDR states back to:\n", "Failed to restore original HDR states!")) {
 // Error already logged
 return false;
 }

 return true;
Expand Down

8 changes: 3 additions & 5 deletions
src/windows/win_api_layer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -656,11 +656,9 @@ namespace display_device {
 return FALSE;
 }

 if (MONITORINFOEXA monitor_info {sizeof(MONITORINFOEXA)}; GetMonitorInfoA(monitor, &monitor_info)) {
 if (data->m_display_name == monitor_info.szDevice) {
 data->m_width = monitor_info.rcMonitor.right - monitor_info.rcMonitor.left;
 return FALSE;
 }
 if (MONITORINFOEXA monitor_info {sizeof(MONITORINFOEXA)}; GetMonitorInfoA(monitor, &monitor_info) && data->m_display_name == monitor_info.szDevice) {
 data->m_width = monitor_info.rcMonitor.right - monitor_info.rcMonitor.left;
 return FALSE;
 }

 return TRUE;
Expand Down

6 changes: 2 additions & 4 deletions
src/windows/win_api_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,10 +183,8 @@ namespace display_device::win_utils {
 return std::nullopt;
 }

 if (type == ValidatedPathType::Active) {
 if (!isActive(path)) {
 return std::nullopt;
 }
 if (type == ValidatedPathType::Active && !isActive(path)) {
 return std::nullopt;
 }

 const auto device_path {w_api.getMonitorDevicePath(path)};
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/win_display_device_topology.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,10 +119,10 @@ namespace display_device {
 bool WinDisplayDevice::isTopologyTheSame(const ActiveTopology &lhs, const ActiveTopology &rhs) const {
 const auto sort_topology = [](ActiveTopology &topology) {
 for (auto &group : topology) {
 std::sort(std::begin(group), std::end(group));
 std::ranges::sort(group);
 }

 std::sort(std::begin(topology), std::end(topology));
 std::ranges::sort(topology);
 };

 auto lhs_copy {lhs};
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
// system includes
#include <algorithm>
#include <fstream>
#include <gmock/gmock.h>
#include <stdexcept>
Expand DownExpand Up@@ -63,7 +64,7 @@ TEST_F_S(Store, FileOverwritten) {

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

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

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

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

6 changes: 3 additions & 3 deletions
tests/unit/general/test_retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,10 +24,10 @@ namespace {
 void constMethod() const { /* noop */ }
 };

 class SchedulerStopTokenTestException final: public std::exception {
 class SchedulerStopTokenTestException final: public std::runtime_error {
 public:
[[nodiscard]] const char *what() const noexcept override {
return "Get rekt!";
SchedulerStopTokenTestException():
 std::runtime_error {"Get rekt!"} {
 }
 };

Expand Down

3 changes: 2 additions & 1 deletion
tests/unit/windows/test_win_display_device_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
// system includes
#include <algorithm>
#include <format>
#include <stdexcept>

Expand DownExpand Up@@ -87,7 +88,7 @@ TEST_F_S(EnumAvailableDevices) {

 const auto topology {display_device::win_utils::flattenTopology(m_win_dd.getCurrentTopology())};
 for (const auto &device_id : *available_devices) {
 auto enum_it {std::find_if(std::begin(enum_devices), std::end(enum_devices), [&device_id](const auto &entry) {
 auto enum_it {std::ranges::find_if(enum_devices, [&device_id](const auto &entry) {
 return entry.m_device_id == device_id;
 })};

Expand Down
Loading

, '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
refactor(sonar): fix cpp:S6197, cpp:S1066, and cpp:S1181#264

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 1 commit into

from

Jun 9, 2026
 Merged


refactor(sonar): fix cpp:S6197, cpp:S1066, and cpp:S1181
#264
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


6 changes: 3 additions & 3 deletions
src/common/file_settings_persistence.cpp

View file


Open in desktop

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

 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> {stream});
 std::ranges::copy(data, std::ostreambuf_iterator<char> {stream});
 return true;
 } catch (const std::exception &error) {
 } catch (const std::ios_base::failure &error) {
 DD_LOG(error) << "Failed to write to " << m_filepath << "! Error:\n"
 << error.what();
 return false;
Expand All@@ -58,7 +58,7 @@ namespace display_device {
 }

 return std::vector<std::uint8_t> {std::istreambuf_iterator<char> {stream}, std::istreambuf_iterator<char> {}};
 } catch (const std::exception &error) {
 } catch (const std::ios_base::failure &error) {
 DD_LOG(error) << "Failed to read " << m_filepath << "! Error:\n"
 << error.what();
 return std::nullopt;
Expand Down

29 changes: 27 additions & 2 deletions
src/common/include/display_device/detail/json_converter.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
#ifdef DD_JSON_DETAIL
 // system includes
 #include <nlohmann/json.hpp>
 #include <stdexcept>

namespace display_device {
 // A shared "toJson" implementation. Extracted here for UTs + coverage.
Expand All@@ -19,7 +20,19 @@ namespace display_device {

 nlohmann::json json_obj = obj;
 return json_obj.dump(static_cast<int>(indent.value_or(-1)));
 } catch (const std::exception &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 } catch (const nlohmann::json::exception &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 if (success) {
 *success = false;
 }

 return err.what();
 } catch (const std::out_of_range &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 if (success) {
 *success = false;
 }

 return err.what();
 } catch (const std::invalid_argument &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 if (success) {
 *success = false;
 }
Expand All@@ -39,7 +52,19 @@ namespace display_device {
 Type parsed_obj = nlohmann::json::parse(string);
 obj = std::move(parsed_obj);
 return true;
 } catch (const std::exception &err) {
 } catch (const nlohmann::json::exception &err) {
 if (error_message) {
 *error_message = err.what();
 }

 return false;
 } catch (const std::out_of_range &err) {
 if (error_message) {
 *error_message = err.what();
 }

 return false;
 } catch (const std::invalid_argument &err) {
 if (error_message) {
 *error_message = err.what();
 }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@

#ifdef DD_JSON_DETAIL
 // system includes
 #include <algorithm>
 #include <nlohmann/json.hpp>
 #include <stdexcept>

Expand DownExpand Up@@ -84,7 +85,7 @@ namespace display_device {
 template<class T, class Predicate>
 typename std::map<T, nlohmann::json>::const_iterator findInEnumMap(const char *error_msg, Predicate predicate) {
 const auto &map {getEnumMap(T {})};
 auto it {std::find_if(std::begin(map), std::end(map), predicate)};
 auto it {std::ranges::find_if(map, predicate)};
 if (it == std::end(map)) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 throw std::out_of_range(error_msg); // GCOVR_EXCL_BR_LINE for fallthrough branch
 }
Expand Down

16 changes: 10 additions & 6 deletions
src/common/include/display_device/retry_scheduler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
// system includes
#include <algorithm>
#include <condition_variable>
#include <exception>
#include <functional>
#include <memory>
#include <stdexcept>
Expand DownExpand Up@@ -63,6 +64,11 @@ namespace display_device {
 };

 namespace detail {
 inline void logSchedulerException(const std::exception &exception, const char *message) {
 DD_LOG(error) << message << " Error:\n"
 << exception.what();
 }

 /**
 * @brief Given that we know that we are dealing with a function,
 * check if it is an optional function (like std::function<...>) or other callable.
Expand DownExpand Up@@ -176,9 +182,8 @@ namespace display_device {
 }};
 m_retry_function(*m_iface, scheduler_stop_token);
 continue;
 } catch (const std::exception &error) {
 DD_LOG(error) << "Exception thrown in the RetryScheduler thread. Stopping scheduler. Error:\n"
 << error.what();
 } catch (const std::exception &error) { // NOSONAR(cpp:S1181): Scheduler callback boundary must catch standard callback failures.
 detail::logSchedulerException(error, "Exception thrown in the RetryScheduler thread. Stopping scheduler.");
 }

 clearThreadLoopUnlocked();
Expand DownExpand Up@@ -254,10 +259,9 @@ namespace display_device {
 m_sleep_durations = std::move(sleep_durations);
 syncThreadUnlocked();
 }
 } catch (const std::exception &error) {
 } catch (const std::exception &error) { // NOSONAR(cpp:S1181): Scheduler callback boundary must catch standard callback failures.
 stop_token.requestStop();
 DD_LOG(error) << "Exception thrown in the RetryScheduler::schedule. Stopping scheduler. Error:\n"
 << error.what();
 detail::logSchedulerException(error, "Exception thrown in the RetryScheduler::schedule. Stopping scheduler.");
 }
 }

Expand Down

36 changes: 14 additions & 22 deletions
src/windows/settings_manager_apply.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,13 +181,11 @@ namespace display_device {
 // Non-stripped initial state MUST be checked here as the missing device could have its context captured!
 const bool switching_from_initial {m_dd_api->isTopologyTheSame(new_state.m_initial.m_topology, topology_before_changes)};
 const bool new_topology_contains_all_current_topology_devices {std::ranges::includes(win_utils::flattenTopology(new_topology), win_utils::flattenTopology(topology_before_changes))};
 if (switching_from_initial && !new_topology_contains_all_current_topology_devices) {
 // Only capture the context when switching from initial topology. All the other intermediate states, like non-existent
 // capture state after system restart are to be avoided.
 if (!m_audio_context_api->capture()) {
 DD_LOG(error) << "Failed to capture audio context!";
 return std::nullopt;
 }
 // Only capture the context when switching from initial topology. All the other intermediate states, like non-existent
 // capture state after system restart are to be avoided.
 if (switching_from_initial && !new_topology_contains_all_current_topology_devices && !m_audio_context_api->capture()) {
 DD_LOG(error) << "Failed to capture audio context!";
 return std::nullopt;
 }
 }

Expand DownExpand Up@@ -251,11 +249,9 @@ namespace display_device {
 return true;
 }

 if (might_need_to_restore) {
 if (!try_change(cached_primary_device, "Changing primary display back to:\n", "Failed to restore original primary device!")) {
 // Error already logged
 return false;
 }
 if (might_need_to_restore && !try_change(cached_primary_device, "Changing primary display back to:\n", "Failed to restore original primary device!")) {
 // Error already logged
 return false;
 }

 return true;
Expand DownExpand Up@@ -313,11 +309,9 @@ namespace display_device {
 return true;
 }

 if (might_need_to_restore) {
 if (!try_change(cached_display_modes, "Changing display modes back to:\n", "Failed to restore original display modes!")) {
 // Error already logged
 return false;
 }
 if (might_need_to_restore && !try_change(cached_display_modes, "Changing display modes back to:\n", "Failed to restore original display modes!")) {
 // Error already logged
 return false;
 }

 return true;
Expand DownExpand Up@@ -370,11 +364,9 @@ namespace display_device {
 return true;
 }

 if (might_need_to_restore) {
 if (!try_change(cached_hdr_states, "Changing HDR states back to:\n", "Failed to restore original HDR states!")) {
 // Error already logged
 return false;
 }
 if (might_need_to_restore && !try_change(cached_hdr_states, "Changing HDR states back to:\n", "Failed to restore original HDR states!")) {
 // Error already logged
 return false;
 }

 return true;
Expand Down

8 changes: 3 additions & 5 deletions
src/windows/win_api_layer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -656,11 +656,9 @@ namespace display_device {
 return FALSE;
 }

 if (MONITORINFOEXA monitor_info {sizeof(MONITORINFOEXA)}; GetMonitorInfoA(monitor, &monitor_info)) {
 if (data->m_display_name == monitor_info.szDevice) {
 data->m_width = monitor_info.rcMonitor.right - monitor_info.rcMonitor.left;
 return FALSE;
 }
 if (MONITORINFOEXA monitor_info {sizeof(MONITORINFOEXA)}; GetMonitorInfoA(monitor, &monitor_info) && data->m_display_name == monitor_info.szDevice) {
 data->m_width = monitor_info.rcMonitor.right - monitor_info.rcMonitor.left;
 return FALSE;
 }

 return TRUE;
Expand Down

6 changes: 2 additions & 4 deletions
src/windows/win_api_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,10 +183,8 @@ namespace display_device::win_utils {
 return std::nullopt;
 }

 if (type == ValidatedPathType::Active) {
 if (!isActive(path)) {
 return std::nullopt;
 }
 if (type == ValidatedPathType::Active && !isActive(path)) {
 return std::nullopt;
 }

 const auto device_path {w_api.getMonitorDevicePath(path)};
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/win_display_device_topology.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,10 +119,10 @@ namespace display_device {
 bool WinDisplayDevice::isTopologyTheSame(const ActiveTopology &lhs, const ActiveTopology &rhs) const {
 const auto sort_topology = [](ActiveTopology &topology) {
 for (auto &group : topology) {
 std::sort(std::begin(group), std::end(group));
 std::ranges::sort(group);
 }

 std::sort(std::begin(topology), std::end(topology));
 std::ranges::sort(topology);
 };

 auto lhs_copy {lhs};
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
// system includes
#include <algorithm>
#include <fstream>
#include <gmock/gmock.h>
#include <stdexcept>
Expand DownExpand Up@@ -63,7 +64,7 @@ TEST_F_S(Store, FileOverwritten) {

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

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

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

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

6 changes: 3 additions & 3 deletions
tests/unit/general/test_retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,10 +24,10 @@ namespace {
 void constMethod() const { /* noop */ }
 };

 class SchedulerStopTokenTestException final: public std::exception {
 class SchedulerStopTokenTestException final: public std::runtime_error {
 public:
[[nodiscard]] const char *what() const noexcept override {
return "Get rekt!";
SchedulerStopTokenTestException():
 std::runtime_error {"Get rekt!"} {
 }
 };

Expand Down

3 changes: 2 additions & 1 deletion
tests/unit/windows/test_win_display_device_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
// system includes
#include <algorithm>
#include <format>
#include <stdexcept>

Expand DownExpand Up@@ -87,7 +88,7 @@ TEST_F_S(EnumAvailableDevices) {

 const auto topology {display_device::win_utils::flattenTopology(m_win_dd.getCurrentTopology())};
 for (const auto &device_id : *available_devices) {
 auto enum_it {std::find_if(std::begin(enum_devices), std::end(enum_devices), [&device_id](const auto &entry) {
 auto enum_it {std::ranges::find_if(enum_devices, [&device_id](const auto &entry) {
 return entry.m_device_id == device_id;
 })};

Expand Down
Loading

, '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
refactor(sonar): fix cpp:S6197, cpp:S1066, and cpp:S1181#264

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 1 commit into

from

Jun 9, 2026
 Merged


refactor(sonar): fix cpp:S6197, cpp:S1066, and cpp:S1181
#264
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


6 changes: 3 additions & 3 deletions
src/common/file_settings_persistence.cpp

View file


Open in desktop

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

 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> {stream});
 std::ranges::copy(data, std::ostreambuf_iterator<char> {stream});
 return true;
 } catch (const std::exception &error) {
 } catch (const std::ios_base::failure &error) {
 DD_LOG(error) << "Failed to write to " << m_filepath << "! Error:\n"
 << error.what();
 return false;
Expand All@@ -58,7 +58,7 @@ namespace display_device {
 }

 return std::vector<std::uint8_t> {std::istreambuf_iterator<char> {stream}, std::istreambuf_iterator<char> {}};
 } catch (const std::exception &error) {
 } catch (const std::ios_base::failure &error) {
 DD_LOG(error) << "Failed to read " << m_filepath << "! Error:\n"
 << error.what();
 return std::nullopt;
Expand Down

29 changes: 27 additions & 2 deletions
src/common/include/display_device/detail/json_converter.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
#ifdef DD_JSON_DETAIL
 // system includes
 #include <nlohmann/json.hpp>
 #include <stdexcept>

namespace display_device {
 // A shared "toJson" implementation. Extracted here for UTs + coverage.
Expand All@@ -19,7 +20,19 @@ namespace display_device {

 nlohmann::json json_obj = obj;
 return json_obj.dump(static_cast<int>(indent.value_or(-1)));
 } catch (const std::exception &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 } catch (const nlohmann::json::exception &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 if (success) {
 *success = false;
 }

 return err.what();
 } catch (const std::out_of_range &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 if (success) {
 *success = false;
 }

 return err.what();
 } catch (const std::invalid_argument &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 if (success) {
 *success = false;
 }
Expand All@@ -39,7 +52,19 @@ namespace display_device {
 Type parsed_obj = nlohmann::json::parse(string);
 obj = std::move(parsed_obj);
 return true;
 } catch (const std::exception &err) {
 } catch (const nlohmann::json::exception &err) {
 if (error_message) {
 *error_message = err.what();
 }

 return false;
 } catch (const std::out_of_range &err) {
 if (error_message) {
 *error_message = err.what();
 }

 return false;
 } catch (const std::invalid_argument &err) {
 if (error_message) {
 *error_message = err.what();
 }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@

#ifdef DD_JSON_DETAIL
 // system includes
 #include <algorithm>
 #include <nlohmann/json.hpp>
 #include <stdexcept>

Expand DownExpand Up@@ -84,7 +85,7 @@ namespace display_device {
 template<class T, class Predicate>
 typename std::map<T, nlohmann::json>::const_iterator findInEnumMap(const char *error_msg, Predicate predicate) {
 const auto &map {getEnumMap(T {})};
 auto it {std::find_if(std::begin(map), std::end(map), predicate)};
 auto it {std::ranges::find_if(map, predicate)};
 if (it == std::end(map)) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 throw std::out_of_range(error_msg); // GCOVR_EXCL_BR_LINE for fallthrough branch
 }
Expand Down

16 changes: 10 additions & 6 deletions
src/common/include/display_device/retry_scheduler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
// system includes
#include <algorithm>
#include <condition_variable>
#include <exception>
#include <functional>
#include <memory>
#include <stdexcept>
Expand DownExpand Up@@ -63,6 +64,11 @@ namespace display_device {
 };

 namespace detail {
 inline void logSchedulerException(const std::exception &exception, const char *message) {
 DD_LOG(error) << message << " Error:\n"
 << exception.what();
 }

 /**
 * @brief Given that we know that we are dealing with a function,
 * check if it is an optional function (like std::function<...>) or other callable.
Expand DownExpand Up@@ -176,9 +182,8 @@ namespace display_device {
 }};
 m_retry_function(*m_iface, scheduler_stop_token);
 continue;
 } catch (const std::exception &error) {
 DD_LOG(error) << "Exception thrown in the RetryScheduler thread. Stopping scheduler. Error:\n"
 << error.what();
 } catch (const std::exception &error) { // NOSONAR(cpp:S1181): Scheduler callback boundary must catch standard callback failures.
 detail::logSchedulerException(error, "Exception thrown in the RetryScheduler thread. Stopping scheduler.");
 }

 clearThreadLoopUnlocked();
Expand DownExpand Up@@ -254,10 +259,9 @@ namespace display_device {
 m_sleep_durations = std::move(sleep_durations);
 syncThreadUnlocked();
 }
 } catch (const std::exception &error) {
 } catch (const std::exception &error) { // NOSONAR(cpp:S1181): Scheduler callback boundary must catch standard callback failures.
 stop_token.requestStop();
 DD_LOG(error) << "Exception thrown in the RetryScheduler::schedule. Stopping scheduler. Error:\n"
 << error.what();
 detail::logSchedulerException(error, "Exception thrown in the RetryScheduler::schedule. Stopping scheduler.");
 }
 }

Expand Down

36 changes: 14 additions & 22 deletions
src/windows/settings_manager_apply.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,13 +181,11 @@ namespace display_device {
 // Non-stripped initial state MUST be checked here as the missing device could have its context captured!
 const bool switching_from_initial {m_dd_api->isTopologyTheSame(new_state.m_initial.m_topology, topology_before_changes)};
 const bool new_topology_contains_all_current_topology_devices {std::ranges::includes(win_utils::flattenTopology(new_topology), win_utils::flattenTopology(topology_before_changes))};
 if (switching_from_initial && !new_topology_contains_all_current_topology_devices) {
 // Only capture the context when switching from initial topology. All the other intermediate states, like non-existent
 // capture state after system restart are to be avoided.
 if (!m_audio_context_api->capture()) {
 DD_LOG(error) << "Failed to capture audio context!";
 return std::nullopt;
 }
 // Only capture the context when switching from initial topology. All the other intermediate states, like non-existent
 // capture state after system restart are to be avoided.
 if (switching_from_initial && !new_topology_contains_all_current_topology_devices && !m_audio_context_api->capture()) {
 DD_LOG(error) << "Failed to capture audio context!";
 return std::nullopt;
 }
 }

Expand DownExpand Up@@ -251,11 +249,9 @@ namespace display_device {
 return true;
 }

 if (might_need_to_restore) {
 if (!try_change(cached_primary_device, "Changing primary display back to:\n", "Failed to restore original primary device!")) {
 // Error already logged
 return false;
 }
 if (might_need_to_restore && !try_change(cached_primary_device, "Changing primary display back to:\n", "Failed to restore original primary device!")) {
 // Error already logged
 return false;
 }

 return true;
Expand DownExpand Up@@ -313,11 +309,9 @@ namespace display_device {
 return true;
 }

 if (might_need_to_restore) {
 if (!try_change(cached_display_modes, "Changing display modes back to:\n", "Failed to restore original display modes!")) {
 // Error already logged
 return false;
 }
 if (might_need_to_restore && !try_change(cached_display_modes, "Changing display modes back to:\n", "Failed to restore original display modes!")) {
 // Error already logged
 return false;
 }

 return true;
Expand DownExpand Up@@ -370,11 +364,9 @@ namespace display_device {
 return true;
 }

 if (might_need_to_restore) {
 if (!try_change(cached_hdr_states, "Changing HDR states back to:\n", "Failed to restore original HDR states!")) {
 // Error already logged
 return false;
 }
 if (might_need_to_restore && !try_change(cached_hdr_states, "Changing HDR states back to:\n", "Failed to restore original HDR states!")) {
 // Error already logged
 return false;
 }

 return true;
Expand Down

8 changes: 3 additions & 5 deletions
src/windows/win_api_layer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -656,11 +656,9 @@ namespace display_device {
 return FALSE;
 }

 if (MONITORINFOEXA monitor_info {sizeof(MONITORINFOEXA)}; GetMonitorInfoA(monitor, &monitor_info)) {
 if (data->m_display_name == monitor_info.szDevice) {
 data->m_width = monitor_info.rcMonitor.right - monitor_info.rcMonitor.left;
 return FALSE;
 }
 if (MONITORINFOEXA monitor_info {sizeof(MONITORINFOEXA)}; GetMonitorInfoA(monitor, &monitor_info) && data->m_display_name == monitor_info.szDevice) {
 data->m_width = monitor_info.rcMonitor.right - monitor_info.rcMonitor.left;
 return FALSE;
 }

 return TRUE;
Expand Down

6 changes: 2 additions & 4 deletions
src/windows/win_api_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,10 +183,8 @@ namespace display_device::win_utils {
 return std::nullopt;
 }

 if (type == ValidatedPathType::Active) {
 if (!isActive(path)) {
 return std::nullopt;
 }
 if (type == ValidatedPathType::Active && !isActive(path)) {
 return std::nullopt;
 }

 const auto device_path {w_api.getMonitorDevicePath(path)};
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/win_display_device_topology.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,10 +119,10 @@ namespace display_device {
 bool WinDisplayDevice::isTopologyTheSame(const ActiveTopology &lhs, const ActiveTopology &rhs) const {
 const auto sort_topology = [](ActiveTopology &topology) {
 for (auto &group : topology) {
 std::sort(std::begin(group), std::end(group));
 std::ranges::sort(group);
 }

 std::sort(std::begin(topology), std::end(topology));
 std::ranges::sort(topology);
 };

 auto lhs_copy {lhs};
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
// system includes
#include <algorithm>
#include <fstream>
#include <gmock/gmock.h>
#include <stdexcept>
Expand DownExpand Up@@ -63,7 +64,7 @@ TEST_F_S(Store, FileOverwritten) {

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

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

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

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

6 changes: 3 additions & 3 deletions
tests/unit/general/test_retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,10 +24,10 @@ namespace {
 void constMethod() const { /* noop */ }
 };

 class SchedulerStopTokenTestException final: public std::exception {
 class SchedulerStopTokenTestException final: public std::runtime_error {
 public:
[[nodiscard]] const char *what() const noexcept override {
return "Get rekt!";
SchedulerStopTokenTestException():
 std::runtime_error {"Get rekt!"} {
 }
 };

Expand Down

3 changes: 2 additions & 1 deletion
tests/unit/windows/test_win_display_device_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
// system includes
#include <algorithm>
#include <format>
#include <stdexcept>

Expand DownExpand Up@@ -87,7 +88,7 @@ TEST_F_S(EnumAvailableDevices) {

 const auto topology {display_device::win_utils::flattenTopology(m_win_dd.getCurrentTopology())};
 for (const auto &device_id : *available_devices) {
 auto enum_it {std::find_if(std::begin(enum_devices), std::end(enum_devices), [&device_id](const auto &entry) {
 auto enum_it {std::ranges::find_if(enum_devices, [&device_id](const auto &entry) {
 return entry.m_device_id == device_id;
 })};

Expand Down
Loading

, '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
refactor(sonar): fix cpp:S6197, cpp:S1066, and cpp:S1181#264

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 1 commit into

from

Jun 9, 2026
 Merged


refactor(sonar): fix cpp:S6197, cpp:S1066, and cpp:S1181
#264
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


6 changes: 3 additions & 3 deletions
src/common/file_settings_persistence.cpp

View file


Open in desktop

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

 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> {stream});
 std::ranges::copy(data, std::ostreambuf_iterator<char> {stream});
 return true;
 } catch (const std::exception &error) {
 } catch (const std::ios_base::failure &error) {
 DD_LOG(error) << "Failed to write to " << m_filepath << "! Error:\n"
 << error.what();
 return false;
Expand All@@ -58,7 +58,7 @@ namespace display_device {
 }

 return std::vector<std::uint8_t> {std::istreambuf_iterator<char> {stream}, std::istreambuf_iterator<char> {}};
 } catch (const std::exception &error) {
 } catch (const std::ios_base::failure &error) {
 DD_LOG(error) << "Failed to read " << m_filepath << "! Error:\n"
 << error.what();
 return std::nullopt;
Expand Down

29 changes: 27 additions & 2 deletions
src/common/include/display_device/detail/json_converter.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
#ifdef DD_JSON_DETAIL
 // system includes
 #include <nlohmann/json.hpp>
 #include <stdexcept>

namespace display_device {
 // A shared "toJson" implementation. Extracted here for UTs + coverage.
Expand All@@ -19,7 +20,19 @@ namespace display_device {

 nlohmann::json json_obj = obj;
 return json_obj.dump(static_cast<int>(indent.value_or(-1)));
 } catch (const std::exception &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 } catch (const nlohmann::json::exception &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 if (success) {
 *success = false;
 }

 return err.what();
 } catch (const std::out_of_range &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 if (success) {
 *success = false;
 }

 return err.what();
 } catch (const std::invalid_argument &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 if (success) {
 *success = false;
 }
Expand All@@ -39,7 +52,19 @@ namespace display_device {
 Type parsed_obj = nlohmann::json::parse(string);
 obj = std::move(parsed_obj);
 return true;
 } catch (const std::exception &err) {
 } catch (const nlohmann::json::exception &err) {
 if (error_message) {
 *error_message = err.what();
 }

 return false;
 } catch (const std::out_of_range &err) {
 if (error_message) {
 *error_message = err.what();
 }

 return false;
 } catch (const std::invalid_argument &err) {
 if (error_message) {
 *error_message = err.what();
 }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@

#ifdef DD_JSON_DETAIL
 // system includes
 #include <algorithm>
 #include <nlohmann/json.hpp>
 #include <stdexcept>

Expand DownExpand Up@@ -84,7 +85,7 @@ namespace display_device {
 template<class T, class Predicate>
 typename std::map<T, nlohmann::json>::const_iterator findInEnumMap(const char *error_msg, Predicate predicate) {
 const auto &map {getEnumMap(T {})};
 auto it {std::find_if(std::begin(map), std::end(map), predicate)};
 auto it {std::ranges::find_if(map, predicate)};
 if (it == std::end(map)) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 throw std::out_of_range(error_msg); // GCOVR_EXCL_BR_LINE for fallthrough branch
 }
Expand Down

16 changes: 10 additions & 6 deletions
src/common/include/display_device/retry_scheduler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
// system includes
#include <algorithm>
#include <condition_variable>
#include <exception>
#include <functional>
#include <memory>
#include <stdexcept>
Expand DownExpand Up@@ -63,6 +64,11 @@ namespace display_device {
 };

 namespace detail {
 inline void logSchedulerException(const std::exception &exception, const char *message) {
 DD_LOG(error) << message << " Error:\n"
 << exception.what();
 }

 /**
 * @brief Given that we know that we are dealing with a function,
 * check if it is an optional function (like std::function<...>) or other callable.
Expand DownExpand Up@@ -176,9 +182,8 @@ namespace display_device {
 }};
 m_retry_function(*m_iface, scheduler_stop_token);
 continue;
 } catch (const std::exception &error) {
 DD_LOG(error) << "Exception thrown in the RetryScheduler thread. Stopping scheduler. Error:\n"
 << error.what();
 } catch (const std::exception &error) { // NOSONAR(cpp:S1181): Scheduler callback boundary must catch standard callback failures.
 detail::logSchedulerException(error, "Exception thrown in the RetryScheduler thread. Stopping scheduler.");
 }

 clearThreadLoopUnlocked();
Expand DownExpand Up@@ -254,10 +259,9 @@ namespace display_device {
 m_sleep_durations = std::move(sleep_durations);
 syncThreadUnlocked();
 }
 } catch (const std::exception &error) {
 } catch (const std::exception &error) { // NOSONAR(cpp:S1181): Scheduler callback boundary must catch standard callback failures.
 stop_token.requestStop();
 DD_LOG(error) << "Exception thrown in the RetryScheduler::schedule. Stopping scheduler. Error:\n"
 << error.what();
 detail::logSchedulerException(error, "Exception thrown in the RetryScheduler::schedule. Stopping scheduler.");
 }
 }

Expand Down

36 changes: 14 additions & 22 deletions
src/windows/settings_manager_apply.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,13 +181,11 @@ namespace display_device {
 // Non-stripped initial state MUST be checked here as the missing device could have its context captured!
 const bool switching_from_initial {m_dd_api->isTopologyTheSame(new_state.m_initial.m_topology, topology_before_changes)};
 const bool new_topology_contains_all_current_topology_devices {std::ranges::includes(win_utils::flattenTopology(new_topology), win_utils::flattenTopology(topology_before_changes))};
 if (switching_from_initial && !new_topology_contains_all_current_topology_devices) {
 // Only capture the context when switching from initial topology. All the other intermediate states, like non-existent
 // capture state after system restart are to be avoided.
 if (!m_audio_context_api->capture()) {
 DD_LOG(error) << "Failed to capture audio context!";
 return std::nullopt;
 }
 // Only capture the context when switching from initial topology. All the other intermediate states, like non-existent
 // capture state after system restart are to be avoided.
 if (switching_from_initial && !new_topology_contains_all_current_topology_devices && !m_audio_context_api->capture()) {
 DD_LOG(error) << "Failed to capture audio context!";
 return std::nullopt;
 }
 }

Expand DownExpand Up@@ -251,11 +249,9 @@ namespace display_device {
 return true;
 }

 if (might_need_to_restore) {
 if (!try_change(cached_primary_device, "Changing primary display back to:\n", "Failed to restore original primary device!")) {
 // Error already logged
 return false;
 }
 if (might_need_to_restore && !try_change(cached_primary_device, "Changing primary display back to:\n", "Failed to restore original primary device!")) {
 // Error already logged
 return false;
 }

 return true;
Expand DownExpand Up@@ -313,11 +309,9 @@ namespace display_device {
 return true;
 }

 if (might_need_to_restore) {
 if (!try_change(cached_display_modes, "Changing display modes back to:\n", "Failed to restore original display modes!")) {
 // Error already logged
 return false;
 }
 if (might_need_to_restore && !try_change(cached_display_modes, "Changing display modes back to:\n", "Failed to restore original display modes!")) {
 // Error already logged
 return false;
 }

 return true;
Expand DownExpand Up@@ -370,11 +364,9 @@ namespace display_device {
 return true;
 }

 if (might_need_to_restore) {
 if (!try_change(cached_hdr_states, "Changing HDR states back to:\n", "Failed to restore original HDR states!")) {
 // Error already logged
 return false;
 }
 if (might_need_to_restore && !try_change(cached_hdr_states, "Changing HDR states back to:\n", "Failed to restore original HDR states!")) {
 // Error already logged
 return false;
 }

 return true;
Expand Down

8 changes: 3 additions & 5 deletions
src/windows/win_api_layer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -656,11 +656,9 @@ namespace display_device {
 return FALSE;
 }

 if (MONITORINFOEXA monitor_info {sizeof(MONITORINFOEXA)}; GetMonitorInfoA(monitor, &monitor_info)) {
 if (data->m_display_name == monitor_info.szDevice) {
 data->m_width = monitor_info.rcMonitor.right - monitor_info.rcMonitor.left;
 return FALSE;
 }
 if (MONITORINFOEXA monitor_info {sizeof(MONITORINFOEXA)}; GetMonitorInfoA(monitor, &monitor_info) && data->m_display_name == monitor_info.szDevice) {
 data->m_width = monitor_info.rcMonitor.right - monitor_info.rcMonitor.left;
 return FALSE;
 }

 return TRUE;
Expand Down

6 changes: 2 additions & 4 deletions
src/windows/win_api_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,10 +183,8 @@ namespace display_device::win_utils {
 return std::nullopt;
 }

 if (type == ValidatedPathType::Active) {
 if (!isActive(path)) {
 return std::nullopt;
 }
 if (type == ValidatedPathType::Active && !isActive(path)) {
 return std::nullopt;
 }

 const auto device_path {w_api.getMonitorDevicePath(path)};
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/win_display_device_topology.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,10 +119,10 @@ namespace display_device {
 bool WinDisplayDevice::isTopologyTheSame(const ActiveTopology &lhs, const ActiveTopology &rhs) const {
 const auto sort_topology = [](ActiveTopology &topology) {
 for (auto &group : topology) {
 std::sort(std::begin(group), std::end(group));
 std::ranges::sort(group);
 }

 std::sort(std::begin(topology), std::end(topology));
 std::ranges::sort(topology);
 };

 auto lhs_copy {lhs};
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
// system includes
#include <algorithm>
#include <fstream>
#include <gmock/gmock.h>
#include <stdexcept>
Expand DownExpand Up@@ -63,7 +64,7 @@ TEST_F_S(Store, FileOverwritten) {

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

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

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

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

6 changes: 3 additions & 3 deletions
tests/unit/general/test_retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,10 +24,10 @@ namespace {
 void constMethod() const { /* noop */ }
 };

 class SchedulerStopTokenTestException final: public std::exception {
 class SchedulerStopTokenTestException final: public std::runtime_error {
 public:
[[nodiscard]] const char *what() const noexcept override {
return "Get rekt!";
SchedulerStopTokenTestException():
 std::runtime_error {"Get rekt!"} {
 }
 };

Expand Down

3 changes: 2 additions & 1 deletion
tests/unit/windows/test_win_display_device_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
// system includes
#include <algorithm>
#include <format>
#include <stdexcept>

Expand DownExpand Up@@ -87,7 +88,7 @@ TEST_F_S(EnumAvailableDevices) {

 const auto topology {display_device::win_utils::flattenTopology(m_win_dd.getCurrentTopology())};
 for (const auto &device_id : *available_devices) {
 auto enum_it {std::find_if(std::begin(enum_devices), std::end(enum_devices), [&device_id](const auto &entry) {
 auto enum_it {std::ranges::find_if(enum_devices, [&device_id](const auto &entry) {
 return entry.m_device_id == device_id;
 })};

Expand Down
Loading

, '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
refactor(sonar): fix cpp:S6197, cpp:S1066, and cpp:S1181#264

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 1 commit into

from

Jun 9, 2026
 Merged


refactor(sonar): fix cpp:S6197, cpp:S1066, and cpp:S1181
#264
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


6 changes: 3 additions & 3 deletions
src/common/file_settings_persistence.cpp

View file


Open in desktop

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

 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> {stream});
 std::ranges::copy(data, std::ostreambuf_iterator<char> {stream});
 return true;
 } catch (const std::exception &error) {
 } catch (const std::ios_base::failure &error) {
 DD_LOG(error) << "Failed to write to " << m_filepath << "! Error:\n"
 << error.what();
 return false;
Expand All@@ -58,7 +58,7 @@ namespace display_device {
 }

 return std::vector<std::uint8_t> {std::istreambuf_iterator<char> {stream}, std::istreambuf_iterator<char> {}};
 } catch (const std::exception &error) {
 } catch (const std::ios_base::failure &error) {
 DD_LOG(error) << "Failed to read " << m_filepath << "! Error:\n"
 << error.what();
 return std::nullopt;
Expand Down

29 changes: 27 additions & 2 deletions
src/common/include/display_device/detail/json_converter.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
#ifdef DD_JSON_DETAIL
 // system includes
 #include <nlohmann/json.hpp>
 #include <stdexcept>

namespace display_device {
 // A shared "toJson" implementation. Extracted here for UTs + coverage.
Expand All@@ -19,7 +20,19 @@ namespace display_device {

 nlohmann::json json_obj = obj;
 return json_obj.dump(static_cast<int>(indent.value_or(-1)));
 } catch (const std::exception &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 } catch (const nlohmann::json::exception &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 if (success) {
 *success = false;
 }

 return err.what();
 } catch (const std::out_of_range &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 if (success) {
 *success = false;
 }

 return err.what();
 } catch (const std::invalid_argument &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 if (success) {
 *success = false;
 }
Expand All@@ -39,7 +52,19 @@ namespace display_device {
 Type parsed_obj = nlohmann::json::parse(string);
 obj = std::move(parsed_obj);
 return true;
 } catch (const std::exception &err) {
 } catch (const nlohmann::json::exception &err) {
 if (error_message) {
 *error_message = err.what();
 }

 return false;
 } catch (const std::out_of_range &err) {
 if (error_message) {
 *error_message = err.what();
 }

 return false;
 } catch (const std::invalid_argument &err) {
 if (error_message) {
 *error_message = err.what();
 }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@

#ifdef DD_JSON_DETAIL
 // system includes
 #include <algorithm>
 #include <nlohmann/json.hpp>
 #include <stdexcept>

Expand DownExpand Up@@ -84,7 +85,7 @@ namespace display_device {
 template<class T, class Predicate>
 typename std::map<T, nlohmann::json>::const_iterator findInEnumMap(const char *error_msg, Predicate predicate) {
 const auto &map {getEnumMap(T {})};
 auto it {std::find_if(std::begin(map), std::end(map), predicate)};
 auto it {std::ranges::find_if(map, predicate)};
 if (it == std::end(map)) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 throw std::out_of_range(error_msg); // GCOVR_EXCL_BR_LINE for fallthrough branch
 }
Expand Down

16 changes: 10 additions & 6 deletions
src/common/include/display_device/retry_scheduler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
// system includes
#include <algorithm>
#include <condition_variable>
#include <exception>
#include <functional>
#include <memory>
#include <stdexcept>
Expand DownExpand Up@@ -63,6 +64,11 @@ namespace display_device {
 };

 namespace detail {
 inline void logSchedulerException(const std::exception &exception, const char *message) {
 DD_LOG(error) << message << " Error:\n"
 << exception.what();
 }

 /**
 * @brief Given that we know that we are dealing with a function,
 * check if it is an optional function (like std::function<...>) or other callable.
Expand DownExpand Up@@ -176,9 +182,8 @@ namespace display_device {
 }};
 m_retry_function(*m_iface, scheduler_stop_token);
 continue;
 } catch (const std::exception &error) {
 DD_LOG(error) << "Exception thrown in the RetryScheduler thread. Stopping scheduler. Error:\n"
 << error.what();
 } catch (const std::exception &error) { // NOSONAR(cpp:S1181): Scheduler callback boundary must catch standard callback failures.
 detail::logSchedulerException(error, "Exception thrown in the RetryScheduler thread. Stopping scheduler.");
 }

 clearThreadLoopUnlocked();
Expand DownExpand Up@@ -254,10 +259,9 @@ namespace display_device {
 m_sleep_durations = std::move(sleep_durations);
 syncThreadUnlocked();
 }
 } catch (const std::exception &error) {
 } catch (const std::exception &error) { // NOSONAR(cpp:S1181): Scheduler callback boundary must catch standard callback failures.
 stop_token.requestStop();
 DD_LOG(error) << "Exception thrown in the RetryScheduler::schedule. Stopping scheduler. Error:\n"
 << error.what();
 detail::logSchedulerException(error, "Exception thrown in the RetryScheduler::schedule. Stopping scheduler.");
 }
 }

Expand Down

36 changes: 14 additions & 22 deletions
src/windows/settings_manager_apply.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,13 +181,11 @@ namespace display_device {
 // Non-stripped initial state MUST be checked here as the missing device could have its context captured!
 const bool switching_from_initial {m_dd_api->isTopologyTheSame(new_state.m_initial.m_topology, topology_before_changes)};
 const bool new_topology_contains_all_current_topology_devices {std::ranges::includes(win_utils::flattenTopology(new_topology), win_utils::flattenTopology(topology_before_changes))};
 if (switching_from_initial && !new_topology_contains_all_current_topology_devices) {
 // Only capture the context when switching from initial topology. All the other intermediate states, like non-existent
 // capture state after system restart are to be avoided.
 if (!m_audio_context_api->capture()) {
 DD_LOG(error) << "Failed to capture audio context!";
 return std::nullopt;
 }
 // Only capture the context when switching from initial topology. All the other intermediate states, like non-existent
 // capture state after system restart are to be avoided.
 if (switching_from_initial && !new_topology_contains_all_current_topology_devices && !m_audio_context_api->capture()) {
 DD_LOG(error) << "Failed to capture audio context!";
 return std::nullopt;
 }
 }

Expand DownExpand Up@@ -251,11 +249,9 @@ namespace display_device {
 return true;
 }

 if (might_need_to_restore) {
 if (!try_change(cached_primary_device, "Changing primary display back to:\n", "Failed to restore original primary device!")) {
 // Error already logged
 return false;
 }
 if (might_need_to_restore && !try_change(cached_primary_device, "Changing primary display back to:\n", "Failed to restore original primary device!")) {
 // Error already logged
 return false;
 }

 return true;
Expand DownExpand Up@@ -313,11 +309,9 @@ namespace display_device {
 return true;
 }

 if (might_need_to_restore) {
 if (!try_change(cached_display_modes, "Changing display modes back to:\n", "Failed to restore original display modes!")) {
 // Error already logged
 return false;
 }
 if (might_need_to_restore && !try_change(cached_display_modes, "Changing display modes back to:\n", "Failed to restore original display modes!")) {
 // Error already logged
 return false;
 }

 return true;
Expand DownExpand Up@@ -370,11 +364,9 @@ namespace display_device {
 return true;
 }

 if (might_need_to_restore) {
 if (!try_change(cached_hdr_states, "Changing HDR states back to:\n", "Failed to restore original HDR states!")) {
 // Error already logged
 return false;
 }
 if (might_need_to_restore && !try_change(cached_hdr_states, "Changing HDR states back to:\n", "Failed to restore original HDR states!")) {
 // Error already logged
 return false;
 }

 return true;
Expand Down

8 changes: 3 additions & 5 deletions
src/windows/win_api_layer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -656,11 +656,9 @@ namespace display_device {
 return FALSE;
 }

 if (MONITORINFOEXA monitor_info {sizeof(MONITORINFOEXA)}; GetMonitorInfoA(monitor, &monitor_info)) {
 if (data->m_display_name == monitor_info.szDevice) {
 data->m_width = monitor_info.rcMonitor.right - monitor_info.rcMonitor.left;
 return FALSE;
 }
 if (MONITORINFOEXA monitor_info {sizeof(MONITORINFOEXA)}; GetMonitorInfoA(monitor, &monitor_info) && data->m_display_name == monitor_info.szDevice) {
 data->m_width = monitor_info.rcMonitor.right - monitor_info.rcMonitor.left;
 return FALSE;
 }

 return TRUE;
Expand Down

6 changes: 2 additions & 4 deletions
src/windows/win_api_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,10 +183,8 @@ namespace display_device::win_utils {
 return std::nullopt;
 }

 if (type == ValidatedPathType::Active) {
 if (!isActive(path)) {
 return std::nullopt;
 }
 if (type == ValidatedPathType::Active && !isActive(path)) {
 return std::nullopt;
 }

 const auto device_path {w_api.getMonitorDevicePath(path)};
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/win_display_device_topology.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,10 +119,10 @@ namespace display_device {
 bool WinDisplayDevice::isTopologyTheSame(const ActiveTopology &lhs, const ActiveTopology &rhs) const {
 const auto sort_topology = [](ActiveTopology &topology) {
 for (auto &group : topology) {
 std::sort(std::begin(group), std::end(group));
 std::ranges::sort(group);
 }

 std::sort(std::begin(topology), std::end(topology));
 std::ranges::sort(topology);
 };

 auto lhs_copy {lhs};
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
// system includes
#include <algorithm>
#include <fstream>
#include <gmock/gmock.h>
#include <stdexcept>
Expand DownExpand Up@@ -63,7 +64,7 @@ TEST_F_S(Store, FileOverwritten) {

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

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

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

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

6 changes: 3 additions & 3 deletions
tests/unit/general/test_retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,10 +24,10 @@ namespace {
 void constMethod() const { /* noop */ }
 };

 class SchedulerStopTokenTestException final: public std::exception {
 class SchedulerStopTokenTestException final: public std::runtime_error {
 public:
[[nodiscard]] const char *what() const noexcept override {
return "Get rekt!";
SchedulerStopTokenTestException():
 std::runtime_error {"Get rekt!"} {
 }
 };

Expand Down

3 changes: 2 additions & 1 deletion
tests/unit/windows/test_win_display_device_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
// system includes
#include <algorithm>
#include <format>
#include <stdexcept>

Expand DownExpand Up@@ -87,7 +88,7 @@ TEST_F_S(EnumAvailableDevices) {

 const auto topology {display_device::win_utils::flattenTopology(m_win_dd.getCurrentTopology())};
 for (const auto &device_id : *available_devices) {
 auto enum_it {std::find_if(std::begin(enum_devices), std::end(enum_devices), [&device_id](const auto &entry) {
 auto enum_it {std::ranges::find_if(enum_devices, [&device_id](const auto &entry) {
 return entry.m_device_id == device_id;
 })};

Expand Down
Loading

, '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
refactor(sonar): fix cpp:S6197, cpp:S1066, and cpp:S1181#264

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 1 commit into

from

Jun 9, 2026
 Merged


refactor(sonar): fix cpp:S6197, cpp:S1066, and cpp:S1181
#264
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


6 changes: 3 additions & 3 deletions
src/common/file_settings_persistence.cpp

View file


Open in desktop

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

 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> {stream});
 std::ranges::copy(data, std::ostreambuf_iterator<char> {stream});
 return true;
 } catch (const std::exception &error) {
 } catch (const std::ios_base::failure &error) {
 DD_LOG(error) << "Failed to write to " << m_filepath << "! Error:\n"
 << error.what();
 return false;
Expand All@@ -58,7 +58,7 @@ namespace display_device {
 }

 return std::vector<std::uint8_t> {std::istreambuf_iterator<char> {stream}, std::istreambuf_iterator<char> {}};
 } catch (const std::exception &error) {
 } catch (const std::ios_base::failure &error) {
 DD_LOG(error) << "Failed to read " << m_filepath << "! Error:\n"
 << error.what();
 return std::nullopt;
Expand Down

29 changes: 27 additions & 2 deletions
src/common/include/display_device/detail/json_converter.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
#ifdef DD_JSON_DETAIL
 // system includes
 #include <nlohmann/json.hpp>
 #include <stdexcept>

namespace display_device {
 // A shared "toJson" implementation. Extracted here for UTs + coverage.
Expand All@@ -19,7 +20,19 @@ namespace display_device {

 nlohmann::json json_obj = obj;
 return json_obj.dump(static_cast<int>(indent.value_or(-1)));
 } catch (const std::exception &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 } catch (const nlohmann::json::exception &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 if (success) {
 *success = false;
 }

 return err.what();
 } catch (const std::out_of_range &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 if (success) {
 *success = false;
 }

 return err.what();
 } catch (const std::invalid_argument &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 if (success) {
 *success = false;
 }
Expand All@@ -39,7 +52,19 @@ namespace display_device {
 Type parsed_obj = nlohmann::json::parse(string);
 obj = std::move(parsed_obj);
 return true;
 } catch (const std::exception &err) {
 } catch (const nlohmann::json::exception &err) {
 if (error_message) {
 *error_message = err.what();
 }

 return false;
 } catch (const std::out_of_range &err) {
 if (error_message) {
 *error_message = err.what();
 }

 return false;
 } catch (const std::invalid_argument &err) {
 if (error_message) {
 *error_message = err.what();
 }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@

#ifdef DD_JSON_DETAIL
 // system includes
 #include <algorithm>
 #include <nlohmann/json.hpp>
 #include <stdexcept>

Expand DownExpand Up@@ -84,7 +85,7 @@ namespace display_device {
 template<class T, class Predicate>
 typename std::map<T, nlohmann::json>::const_iterator findInEnumMap(const char *error_msg, Predicate predicate) {
 const auto &map {getEnumMap(T {})};
 auto it {std::find_if(std::begin(map), std::end(map), predicate)};
 auto it {std::ranges::find_if(map, predicate)};
 if (it == std::end(map)) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 throw std::out_of_range(error_msg); // GCOVR_EXCL_BR_LINE for fallthrough branch
 }
Expand Down

16 changes: 10 additions & 6 deletions
src/common/include/display_device/retry_scheduler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
// system includes
#include <algorithm>
#include <condition_variable>
#include <exception>
#include <functional>
#include <memory>
#include <stdexcept>
Expand DownExpand Up@@ -63,6 +64,11 @@ namespace display_device {
 };

 namespace detail {
 inline void logSchedulerException(const std::exception &exception, const char *message) {
 DD_LOG(error) << message << " Error:\n"
 << exception.what();
 }

 /**
 * @brief Given that we know that we are dealing with a function,
 * check if it is an optional function (like std::function<...>) or other callable.
Expand DownExpand Up@@ -176,9 +182,8 @@ namespace display_device {
 }};
 m_retry_function(*m_iface, scheduler_stop_token);
 continue;
 } catch (const std::exception &error) {
 DD_LOG(error) << "Exception thrown in the RetryScheduler thread. Stopping scheduler. Error:\n"
 << error.what();
 } catch (const std::exception &error) { // NOSONAR(cpp:S1181): Scheduler callback boundary must catch standard callback failures.
 detail::logSchedulerException(error, "Exception thrown in the RetryScheduler thread. Stopping scheduler.");
 }

 clearThreadLoopUnlocked();
Expand DownExpand Up@@ -254,10 +259,9 @@ namespace display_device {
 m_sleep_durations = std::move(sleep_durations);
 syncThreadUnlocked();
 }
 } catch (const std::exception &error) {
 } catch (const std::exception &error) { // NOSONAR(cpp:S1181): Scheduler callback boundary must catch standard callback failures.
 stop_token.requestStop();
 DD_LOG(error) << "Exception thrown in the RetryScheduler::schedule. Stopping scheduler. Error:\n"
 << error.what();
 detail::logSchedulerException(error, "Exception thrown in the RetryScheduler::schedule. Stopping scheduler.");
 }
 }

Expand Down

36 changes: 14 additions & 22 deletions
src/windows/settings_manager_apply.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,13 +181,11 @@ namespace display_device {
 // Non-stripped initial state MUST be checked here as the missing device could have its context captured!
 const bool switching_from_initial {m_dd_api->isTopologyTheSame(new_state.m_initial.m_topology, topology_before_changes)};
 const bool new_topology_contains_all_current_topology_devices {std::ranges::includes(win_utils::flattenTopology(new_topology), win_utils::flattenTopology(topology_before_changes))};
 if (switching_from_initial && !new_topology_contains_all_current_topology_devices) {
 // Only capture the context when switching from initial topology. All the other intermediate states, like non-existent
 // capture state after system restart are to be avoided.
 if (!m_audio_context_api->capture()) {
 DD_LOG(error) << "Failed to capture audio context!";
 return std::nullopt;
 }
 // Only capture the context when switching from initial topology. All the other intermediate states, like non-existent
 // capture state after system restart are to be avoided.
 if (switching_from_initial && !new_topology_contains_all_current_topology_devices && !m_audio_context_api->capture()) {
 DD_LOG(error) << "Failed to capture audio context!";
 return std::nullopt;
 }
 }

Expand DownExpand Up@@ -251,11 +249,9 @@ namespace display_device {
 return true;
 }

 if (might_need_to_restore) {
 if (!try_change(cached_primary_device, "Changing primary display back to:\n", "Failed to restore original primary device!")) {
 // Error already logged
 return false;
 }
 if (might_need_to_restore && !try_change(cached_primary_device, "Changing primary display back to:\n", "Failed to restore original primary device!")) {
 // Error already logged
 return false;
 }

 return true;
Expand DownExpand Up@@ -313,11 +309,9 @@ namespace display_device {
 return true;
 }

 if (might_need_to_restore) {
 if (!try_change(cached_display_modes, "Changing display modes back to:\n", "Failed to restore original display modes!")) {
 // Error already logged
 return false;
 }
 if (might_need_to_restore && !try_change(cached_display_modes, "Changing display modes back to:\n", "Failed to restore original display modes!")) {
 // Error already logged
 return false;
 }

 return true;
Expand DownExpand Up@@ -370,11 +364,9 @@ namespace display_device {
 return true;
 }

 if (might_need_to_restore) {
 if (!try_change(cached_hdr_states, "Changing HDR states back to:\n", "Failed to restore original HDR states!")) {
 // Error already logged
 return false;
 }
 if (might_need_to_restore && !try_change(cached_hdr_states, "Changing HDR states back to:\n", "Failed to restore original HDR states!")) {
 // Error already logged
 return false;
 }

 return true;
Expand Down

8 changes: 3 additions & 5 deletions
src/windows/win_api_layer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -656,11 +656,9 @@ namespace display_device {
 return FALSE;
 }

 if (MONITORINFOEXA monitor_info {sizeof(MONITORINFOEXA)}; GetMonitorInfoA(monitor, &monitor_info)) {
 if (data->m_display_name == monitor_info.szDevice) {
 data->m_width = monitor_info.rcMonitor.right - monitor_info.rcMonitor.left;
 return FALSE;
 }
 if (MONITORINFOEXA monitor_info {sizeof(MONITORINFOEXA)}; GetMonitorInfoA(monitor, &monitor_info) && data->m_display_name == monitor_info.szDevice) {
 data->m_width = monitor_info.rcMonitor.right - monitor_info.rcMonitor.left;
 return FALSE;
 }

 return TRUE;
Expand Down

6 changes: 2 additions & 4 deletions
src/windows/win_api_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,10 +183,8 @@ namespace display_device::win_utils {
 return std::nullopt;
 }

 if (type == ValidatedPathType::Active) {
 if (!isActive(path)) {
 return std::nullopt;
 }
 if (type == ValidatedPathType::Active && !isActive(path)) {
 return std::nullopt;
 }

 const auto device_path {w_api.getMonitorDevicePath(path)};
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/win_display_device_topology.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,10 +119,10 @@ namespace display_device {
 bool WinDisplayDevice::isTopologyTheSame(const ActiveTopology &lhs, const ActiveTopology &rhs) const {
 const auto sort_topology = [](ActiveTopology &topology) {
 for (auto &group : topology) {
 std::sort(std::begin(group), std::end(group));
 std::ranges::sort(group);
 }

 std::sort(std::begin(topology), std::end(topology));
 std::ranges::sort(topology);
 };

 auto lhs_copy {lhs};
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
// system includes
#include <algorithm>
#include <fstream>
#include <gmock/gmock.h>
#include <stdexcept>
Expand DownExpand Up@@ -63,7 +64,7 @@ TEST_F_S(Store, FileOverwritten) {

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

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

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

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

6 changes: 3 additions & 3 deletions
tests/unit/general/test_retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,10 +24,10 @@ namespace {
 void constMethod() const { /* noop */ }
 };

 class SchedulerStopTokenTestException final: public std::exception {
 class SchedulerStopTokenTestException final: public std::runtime_error {
 public:
[[nodiscard]] const char *what() const noexcept override {
return "Get rekt!";
SchedulerStopTokenTestException():
 std::runtime_error {"Get rekt!"} {
 }
 };

Expand Down

3 changes: 2 additions & 1 deletion
tests/unit/windows/test_win_display_device_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
// system includes
#include <algorithm>
#include <format>
#include <stdexcept>

Expand DownExpand Up@@ -87,7 +88,7 @@ TEST_F_S(EnumAvailableDevices) {

 const auto topology {display_device::win_utils::flattenTopology(m_win_dd.getCurrentTopology())};
 for (const auto &device_id : *available_devices) {
 auto enum_it {std::find_if(std::begin(enum_devices), std::end(enum_devices), [&device_id](const auto &entry) {
 auto enum_it {std::ranges::find_if(enum_devices, [&device_id](const auto &entry) {
 return entry.m_device_id == device_id;
 })};

Expand Down
Loading