chore: update global workflows#134

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
ReenigneArcher merged 2 commits into from
Jan 20, 2025
Merged

chore: update global workflows #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a84dca3
chore: update global workflows
LizardByte-bot Jan 20, 2025
f5199bc
chore: update clang-format
ReenigneArcher Jan 20, 2025
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
63 changes: 53 additions & 10 deletions .clang-format
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,27 +6,34 @@
# Generated from CLion C/C++ Code Style settings
BasedOnStyle: LLVM
AccessModifierOffset: -2
AlignAfterOpenBracket: DontAlign
AlignConsecutiveAssignments: false
AlignAfterOpenBracket: BlockIndent
AlignConsecutiveAssignments: None
AlignEscapedNewlines: DontAlign
AlignOperands: Align
AllowAllArgumentsOnNextLine: false
AllowAllConstructorInitializersOnNextLine: false
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: Always
AllowShortBlocksOnASingleLine: Empty
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
AllowShortIfStatementsOnASingleLine: WithoutElse
AllowShortLambdasOnASingleLine: All
AllowShortEnumsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Empty
AllowShortIfStatementsOnASingleLine: Never
AllowShortLambdasOnASingleLine: None
AllowShortLoopsOnASingleLine: true
AlignTrailingComments: false
AlwaysBreakAfterReturnType: All
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: true
AlwaysBreakTemplateDeclarations: MultiLine
BreakBeforeBraces: Custom
BinPackArguments: false
BinPackParameters: false
BracedInitializerIndentWidth: 2
BraceWrapping:
AfterCaseLabel: false
AfterClass: false
AfterControlStatement: Never
AfterEnum: false
AfterExternBlock: true
AfterFunction: false
AfterNamespace: false
AfterObjCDeclaration: false
Expand All@@ -36,39 +43,75 @@ BraceWrapping:
IndentBraces: false
SplitEmptyFunction: false
SplitEmptyRecord: true
BreakArrays: true
BreakBeforeBinaryOperators: None
BreakBeforeBraces: Attach
BreakBeforeTernaryOperators: false
BreakConstructorInitializers: AfterColon
BreakInheritanceList: AfterColon
ColumnLimit: 0
CompactNamespaces: false
ContinuationIndentWidth: 2
Cpp11BracedListStyle: true
EmptyLineAfterAccessModifier: Never
EmptyLineBeforeAccessModifier: Always
ExperimentalAutoDetectBinPacking: true
FixNamespaceComments: true
IncludeBlocks: Regroup
IndentAccessModifiers: false
IndentCaseBlocks: true
IndentCaseLabels: true
IndentExternBlock: Indent
IndentGotoLabels: true
IndentPPDirectives: BeforeHash
IndentWidth: 2
IndentWrappedFunctionNames: true
InsertBraces: true
InsertNewlineAtEOF: true
KeepEmptyLinesAtTheStartOfBlocks: false
LineEnding: LF
MaxEmptyLinesToKeep: 1
NamespaceIndentation: All
ObjCBinPackProtocolList: Never
ObjCSpaceAfterProperty: true
ObjCSpaceBeforeProtocolList: true
PackConstructorInitializers: Never
PenaltyBreakBeforeFirstCallParameter: 1
PenaltyBreakComment: 1
PenaltyBreakString: 1
PenaltyBreakFirstLessLess: 0
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 100000000
PointerAlignment: Right
ReferenceAlignment: Pointer
ReflowComments: true
RemoveBracesLLVM: false
RemoveSemicolon: false
SeparateDefinitionBlocks: Always
SortIncludes: CaseInsensitive
SortUsingDeclarations: Lexicographic
SpaceAfterCStyleCast: true
SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: true
SpaceAfterTemplateKeyword: false
SpaceBeforeAssignmentOperators: true
SpaceBeforeCaseColon: false
SpaceBeforeCpp11BracedList: true
SpaceBeforeCtorInitializerColon: false
SpaceBeforeInheritanceColon: false
SpaceBeforeJsonColon: false
SpaceBeforeParens: ControlStatements
SpaceBeforeRangeBasedForLoopColon: true
SpaceBeforeSquareBrackets: false
SpaceInEmptyBlock: false
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 2
SpacesInAngles: Never
SpacesInCStyleCastParentheses: false
SpacesInContainerLiterals: false
SpacesInLineCommentPrefix:
Maximum: 3
Minimum: 1
SpacesInParentheses: false
SpacesInSquareBrackets: false
TabWidth: 2
Cpp11BracedListStyle: false
UseTab: Never
2 changes: 2 additions & 0 deletions scripts/update_clang_format.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,10 @@
'tests',
]
file_types = [
'c',
'cpp',
'h',
'h',
'm',
'mm'
]
Expand Down
28 changes: 11 additions & 17 deletions src/common/file_settings_persistence.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,33 +15,30 @@

namespace display_device {
FileSettingsPersistence::FileSettingsPersistence(std::filesystem::path filepath):
m_filepath {std::move(filepath)} {
m_filepath {std::move(filepath)} {
if (m_filepath.empty()) {
throw std::runtime_error {"Empty filename provided for FileSettingsPersistence!"};
throw std::runtime_error {"Empty filename provided for FileSettingsPersistence!"};
}
}

bool
FileSettingsPersistence::store(const std::vector<std::uint8_t> &data) {
bool FileSettingsPersistence::store(const std::vector<std::uint8_t> &data) {
try {
std::ofstream stream {m_filepath, std::ios::binary | std::ios::trunc};
std::ofstream stream {m_filepath, std::ios::binary | std::ios::trunc};
if (!stream) {
DD_LOG(error) << "Failed to open " << m_filepath << " for writing!";
return false;
}

std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> {stream});
std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> {stream});
return true;
}
catch (const std::exception &error) {
} catch (const std::exception &error) {
DD_LOG(error) << "Failed to write to " << m_filepath << "! Error:\n"
<< error.what();
return false;
}
}

std::optional<std::vector<std::uint8_t>>
FileSettingsPersistence::load() const {
std::optional<std::vector<std::uint8_t>> FileSettingsPersistence::load() const {
if (std::error_code error_code; !std::filesystem::exists(m_filepath, error_code)) {
if (error_code) {
DD_LOG(error) << "Failed to load " << m_filepath << "! Error:\n"
Expand All@@ -53,24 +50,21 @@ namespace display_device {
}

try {
std::ifstream stream {m_filepath, std::ios::binary};
std::ifstream stream {m_filepath, std::ios::binary};
if (!stream) {
DD_LOG(error) << "Failed to open " << m_filepath << " for reading!";
return std::nullopt;
}

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

bool
FileSettingsPersistence::clear() {
bool FileSettingsPersistence::clear() {
// Return valud does not matter since we check the error code in case the file could NOT be removed.
std::error_code error_code;
std::filesystem::remove(m_filepath, error_code);
Expand Down
9 changes: 3 additions & 6 deletions src/common/include/display_device/audio_context_interface.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,7 @@ namespace display_device {
* const auto result { iface->capture() };
* @examples_end
*/
[[nodiscard]] virtual bool
capture() = 0;
[[nodiscard]] virtual bool capture() = 0;

/**
* @brief Check if the context is already captured.
Expand All@@ -38,8 +37,7 @@ namespace display_device {
* const auto result { iface->isCaptured() };
* @examples_end
*/
[[nodiscard]] virtual bool
isCaptured() const = 0;
[[nodiscard]] virtual bool isCaptured() const = 0;

/**
* @brief Release captured audio context for the devices (if any).
Expand All@@ -48,7 +46,6 @@ namespace display_device {
* const auto result { iface->release() };
* @examples_end
*/
virtual void
release() = 0;
virtual void release() = 0;
};
} // namespace display_device
26 changes: 11 additions & 15 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@@ -10,18 +10,16 @@

namespace display_device {
// A shared "toJson" implementation. Extracted here for UTs + coverage.
template <typename Type>
std::string
toJsonHelper(const Type &obj, const std::optional<unsigned int> &indent, bool *success) {
template<typename Type>
std::string toJsonHelper(const Type &obj, const std::optional<unsigned int> &indent, bool *success) {
try {
if (success) {
*success = true;
}

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 std::exception &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
if (success) {
*success = false;
}
Expand All@@ -31,9 +29,8 @@ namespace display_device {
}

// A shared "fromJson" implementation. Extracted here for UTs + coverage.
template <typename Type>
bool
fromJsonHelper(const std::string &string, Type &obj, std::string *error_message = nullptr) {
template<typename Type>
bool fromJsonHelper(const std::string &string, Type &obj, std::string *error_message = nullptr) {
try {
if (error_message) {
error_message->clear();
Expand All@@ -42,8 +39,7 @@ namespace display_device {
Type parsed_obj = nlohmann::json::parse(string);
obj = std::move(parsed_obj);
return true;
}
catch (const std::exception &err) {
} catch (const std::exception &err) {
if (error_message) {
*error_message = err.what();
}
Expand All@@ -52,12 +48,12 @@ namespace display_device {
}
}

#define DD_JSON_DEFINE_CONVERTER(Type) \
#define DD_JSON_DEFINE_CONVERTER(Type) \
std::string toJson(const Type &obj, const std::optional<unsigned int> &indent, bool *success) { \
return toJsonHelper(obj, indent, success); \
} \
bool fromJson(const std::string &string, Type &obj, std::string *error_message) { \
return fromJsonHelper<Type>(string, obj, error_message); \
return toJsonHelper(obj, indent, success); \
} \
bool fromJson(const std::string &string, Type &obj, std::string *error_message) { \
return fromJsonHelper<Type>(string, obj, error_message); \
}
} // namespace display_device
#endif
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
chore: update global workflows#134

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 2 commits into

from

Jan 20, 2025
 Merged


chore: update global workflows
#134
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a84dca3

chore: update global workflows


LizardByte-bot Jan 20, 2025
f5199bc

chore: update clang-format


ReenigneArcher Jan 20, 2025

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


63 changes: 53 additions & 10 deletions
.clang-format

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,27 +6,34 @@
# Generated from CLion C/C++ Code Style settings
BasedOnStyle: LLVM
AccessModifierOffset: -2
AlignAfterOpenBracket: DontAlign
AlignConsecutiveAssignments: false
AlignAfterOpenBracket: BlockIndent
AlignConsecutiveAssignments: None
AlignEscapedNewlines: DontAlign
AlignOperands: Align
AllowAllArgumentsOnNextLine: false
AllowAllConstructorInitializersOnNextLine: false
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: Always
AllowShortBlocksOnASingleLine: Empty
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
AllowShortIfStatementsOnASingleLine: WithoutElse
AllowShortLambdasOnASingleLine: All
AllowShortEnumsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Empty
AllowShortIfStatementsOnASingleLine: Never
AllowShortLambdasOnASingleLine: None
AllowShortLoopsOnASingleLine: true
AlignTrailingComments: false
AlwaysBreakAfterReturnType: All
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: true
AlwaysBreakTemplateDeclarations: MultiLine
BreakBeforeBraces: Custom
BinPackArguments: false
BinPackParameters: false
BracedInitializerIndentWidth: 2
BraceWrapping:
 AfterCaseLabel: false
 AfterClass: false
 AfterControlStatement: Never
 AfterEnum: false
 AfterExternBlock: true
 AfterFunction: false
 AfterNamespace: false
 AfterObjCDeclaration: false
Expand All@@ -36,39 +43,75 @@ BraceWrapping:
 IndentBraces: false
 SplitEmptyFunction: false
 SplitEmptyRecord: true
BreakArrays: true
BreakBeforeBinaryOperators: None
BreakBeforeBraces: Attach
BreakBeforeTernaryOperators: false
BreakConstructorInitializers: AfterColon
BreakInheritanceList: AfterColon
ColumnLimit: 0
CompactNamespaces: false
ContinuationIndentWidth: 2
Cpp11BracedListStyle: true
EmptyLineAfterAccessModifier: Never
EmptyLineBeforeAccessModifier: Always
ExperimentalAutoDetectBinPacking: true
FixNamespaceComments: true
IncludeBlocks: Regroup
IndentAccessModifiers: false
IndentCaseBlocks: true
IndentCaseLabels: true
IndentExternBlock: Indent
IndentGotoLabels: true
IndentPPDirectives: BeforeHash
IndentWidth: 2
IndentWrappedFunctionNames: true
InsertBraces: true
InsertNewlineAtEOF: true
KeepEmptyLinesAtTheStartOfBlocks: false
LineEnding: LF
MaxEmptyLinesToKeep: 1
NamespaceIndentation: All
ObjCBinPackProtocolList: Never
ObjCSpaceAfterProperty: true
ObjCSpaceBeforeProtocolList: true
PackConstructorInitializers: Never
PenaltyBreakBeforeFirstCallParameter: 1
PenaltyBreakComment: 1
PenaltyBreakString: 1
PenaltyBreakFirstLessLess: 0
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 100000000
PointerAlignment: Right
ReferenceAlignment: Pointer
ReflowComments: true
RemoveBracesLLVM: false
RemoveSemicolon: false
SeparateDefinitionBlocks: Always
SortIncludes: CaseInsensitive
SortUsingDeclarations: Lexicographic
SpaceAfterCStyleCast: true
SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: true
SpaceAfterTemplateKeyword: false
SpaceBeforeAssignmentOperators: true
SpaceBeforeCaseColon: false
SpaceBeforeCpp11BracedList: true
SpaceBeforeCtorInitializerColon: false
SpaceBeforeInheritanceColon: false
SpaceBeforeJsonColon: false
SpaceBeforeParens: ControlStatements
SpaceBeforeRangeBasedForLoopColon: true
SpaceBeforeSquareBrackets: false
SpaceInEmptyBlock: false
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 2
SpacesInAngles: Never
SpacesInCStyleCastParentheses: false
SpacesInContainerLiterals: false
SpacesInLineCommentPrefix:
 Maximum: 3
 Minimum: 1
SpacesInParentheses: false
SpacesInSquareBrackets: false
TabWidth: 2
Cpp11BracedListStyle: false
UseTab: Never

2 changes: 2 additions & 0 deletions
scripts/update_clang_format.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,10 @@
 'tests',
]
file_types = [
 'c',
 'cpp',
 'h',
 'h',
 'm',
 'mm'
]
Expand Down

28 changes: 11 additions & 17 deletions
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,33 +15,30 @@

namespace display_device {
 FileSettingsPersistence::FileSettingsPersistence(std::filesystem::path filepath):
 m_filepath {std::move(filepath)} {
 m_filepath {std::move(filepath)} {
 if (m_filepath.empty()) {
 throw std::runtime_error {"Empty filename provided for FileSettingsPersistence!"};
 throw std::runtime_error {"Empty filename provided for FileSettingsPersistence!"};
 }
 }

 bool
 FileSettingsPersistence::store(const std::vector<std::uint8_t> &data) {
 bool FileSettingsPersistence::store(const std::vector<std::uint8_t> &data) {
 try {
 std::ofstream stream {m_filepath, std::ios::binary | std::ios::trunc};
 std::ofstream stream {m_filepath, std::ios::binary | std::ios::trunc};
 if (!stream) {
 DD_LOG(error) << "Failed to open " << m_filepath << " for writing!";
 return false;
 }

 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> {stream});
 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> {stream});
 return true;
 }
 catch (const std::exception &error) {
 } catch (const std::exception &error) {
 DD_LOG(error) << "Failed to write to " << m_filepath << "! Error:\n"
 << error.what();
 return false;
 }
 }

 std::optional<std::vector<std::uint8_t>>
 FileSettingsPersistence::load() const {
 std::optional<std::vector<std::uint8_t>> FileSettingsPersistence::load() const {
 if (std::error_code error_code; !std::filesystem::exists(m_filepath, error_code)) {
 if (error_code) {
 DD_LOG(error) << "Failed to load " << m_filepath << "! Error:\n"
Expand All@@ -53,24 +50,21 @@ namespace display_device {
 }

 try {
 std::ifstream stream {m_filepath, std::ios::binary};
 std::ifstream stream {m_filepath, std::ios::binary};
 if (!stream) {
 DD_LOG(error) << "Failed to open " << m_filepath << " for reading!";
 return std::nullopt;
 }

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

 bool
 FileSettingsPersistence::clear() {
 bool FileSettingsPersistence::clear() {
 // Return valud does not matter since we check the error code in case the file could NOT be removed.
 std::error_code error_code;
 std::filesystem::remove(m_filepath, error_code);
Expand Down

9 changes: 3 additions & 6 deletions
src/common/include/display_device/audio_context_interface.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,7 @@ namespace display_device {
 * const auto result { iface->capture() };
 * @examples_end
 */
 [[nodiscard]] virtual bool
 capture() = 0;
 [[nodiscard]] virtual bool capture() = 0;

 /**
 * @brief Check if the context is already captured.
Expand All@@ -38,8 +37,7 @@ namespace display_device {
 * const auto result { iface->isCaptured() };
 * @examples_end
 */
 [[nodiscard]] virtual bool
 isCaptured() const = 0;
 [[nodiscard]] virtual bool isCaptured() const = 0;

 /**
 * @brief Release captured audio context for the devices (if any).
Expand All@@ -48,7 +46,6 @@ namespace display_device {
 * const auto result { iface->release() };
 * @examples_end
 */
 virtual void
 release() = 0;
 virtual void release() = 0;
 };
} // namespace display_device

26 changes: 11 additions & 15 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@@ -10,18 +10,16 @@

namespace display_device {
 // A shared "toJson" implementation. Extracted here for UTs + coverage.
 template <typename Type>
 std::string
 toJsonHelper(const Type &obj, const std::optional<unsigned int> &indent, bool *success) {
 template<typename Type>
 std::string toJsonHelper(const Type &obj, const std::optional<unsigned int> &indent, bool *success) {
 try {
 if (success) {
 *success = true;
 }

 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 std::exception &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 if (success) {
 *success = false;
 }
Expand All@@ -31,9 +29,8 @@ namespace display_device {
 }

 // A shared "fromJson" implementation. Extracted here for UTs + coverage.
 template <typename Type>
 bool
 fromJsonHelper(const std::string &string, Type &obj, std::string *error_message = nullptr) {
 template<typename Type>
 bool fromJsonHelper(const std::string &string, Type &obj, std::string *error_message = nullptr) {
 try {
 if (error_message) {
 error_message->clear();
Expand All@@ -42,8 +39,7 @@ namespace display_device {
 Type parsed_obj = nlohmann::json::parse(string);
 obj = std::move(parsed_obj);
 return true;
 }
 catch (const std::exception &err) {
 } catch (const std::exception &err) {
 if (error_message) {
 *error_message = err.what();
 }
Expand All@@ -52,12 +48,12 @@ namespace display_device {
 }
 }

 #define DD_JSON_DEFINE_CONVERTER(Type) \
 #define DD_JSON_DEFINE_CONVERTER(Type) \
 std::string toJson(const Type &obj, const std::optional<unsigned int> &indent, bool *success) { \
 return toJsonHelper(obj, indent, success); \
 } \
 bool fromJson(const std::string &string, Type &obj, std::string *error_message) { \
 return fromJsonHelper<Type>(string, obj, error_message); \
 return toJsonHelper(obj, indent, success); \
 } \
 bool fromJson(const std::string &string, Type &obj, std::string *error_message) { \
 return fromJsonHelper<Type>(string, obj, error_message); \
 }
} // namespace display_device
#endif
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
chore: update global workflows#134

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 2 commits into

from

Jan 20, 2025
 Merged


chore: update global workflows
#134
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a84dca3

chore: update global workflows


LizardByte-bot Jan 20, 2025
f5199bc

chore: update clang-format


ReenigneArcher Jan 20, 2025

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


63 changes: 53 additions & 10 deletions
.clang-format

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,27 +6,34 @@
# Generated from CLion C/C++ Code Style settings
BasedOnStyle: LLVM
AccessModifierOffset: -2
AlignAfterOpenBracket: DontAlign
AlignConsecutiveAssignments: false
AlignAfterOpenBracket: BlockIndent
AlignConsecutiveAssignments: None
AlignEscapedNewlines: DontAlign
AlignOperands: Align
AllowAllArgumentsOnNextLine: false
AllowAllConstructorInitializersOnNextLine: false
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: Always
AllowShortBlocksOnASingleLine: Empty
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
AllowShortIfStatementsOnASingleLine: WithoutElse
AllowShortLambdasOnASingleLine: All
AllowShortEnumsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Empty
AllowShortIfStatementsOnASingleLine: Never
AllowShortLambdasOnASingleLine: None
AllowShortLoopsOnASingleLine: true
AlignTrailingComments: false
AlwaysBreakAfterReturnType: All
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: true
AlwaysBreakTemplateDeclarations: MultiLine
BreakBeforeBraces: Custom
BinPackArguments: false
BinPackParameters: false
BracedInitializerIndentWidth: 2
BraceWrapping:
 AfterCaseLabel: false
 AfterClass: false
 AfterControlStatement: Never
 AfterEnum: false
 AfterExternBlock: true
 AfterFunction: false
 AfterNamespace: false
 AfterObjCDeclaration: false
Expand All@@ -36,39 +43,75 @@ BraceWrapping:
 IndentBraces: false
 SplitEmptyFunction: false
 SplitEmptyRecord: true
BreakArrays: true
BreakBeforeBinaryOperators: None
BreakBeforeBraces: Attach
BreakBeforeTernaryOperators: false
BreakConstructorInitializers: AfterColon
BreakInheritanceList: AfterColon
ColumnLimit: 0
CompactNamespaces: false
ContinuationIndentWidth: 2
Cpp11BracedListStyle: true
EmptyLineAfterAccessModifier: Never
EmptyLineBeforeAccessModifier: Always
ExperimentalAutoDetectBinPacking: true
FixNamespaceComments: true
IncludeBlocks: Regroup
IndentAccessModifiers: false
IndentCaseBlocks: true
IndentCaseLabels: true
IndentExternBlock: Indent
IndentGotoLabels: true
IndentPPDirectives: BeforeHash
IndentWidth: 2
IndentWrappedFunctionNames: true
InsertBraces: true
InsertNewlineAtEOF: true
KeepEmptyLinesAtTheStartOfBlocks: false
LineEnding: LF
MaxEmptyLinesToKeep: 1
NamespaceIndentation: All
ObjCBinPackProtocolList: Never
ObjCSpaceAfterProperty: true
ObjCSpaceBeforeProtocolList: true
PackConstructorInitializers: Never
PenaltyBreakBeforeFirstCallParameter: 1
PenaltyBreakComment: 1
PenaltyBreakString: 1
PenaltyBreakFirstLessLess: 0
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 100000000
PointerAlignment: Right
ReferenceAlignment: Pointer
ReflowComments: true
RemoveBracesLLVM: false
RemoveSemicolon: false
SeparateDefinitionBlocks: Always
SortIncludes: CaseInsensitive
SortUsingDeclarations: Lexicographic
SpaceAfterCStyleCast: true
SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: true
SpaceAfterTemplateKeyword: false
SpaceBeforeAssignmentOperators: true
SpaceBeforeCaseColon: false
SpaceBeforeCpp11BracedList: true
SpaceBeforeCtorInitializerColon: false
SpaceBeforeInheritanceColon: false
SpaceBeforeJsonColon: false
SpaceBeforeParens: ControlStatements
SpaceBeforeRangeBasedForLoopColon: true
SpaceBeforeSquareBrackets: false
SpaceInEmptyBlock: false
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 2
SpacesInAngles: Never
SpacesInCStyleCastParentheses: false
SpacesInContainerLiterals: false
SpacesInLineCommentPrefix:
 Maximum: 3
 Minimum: 1
SpacesInParentheses: false
SpacesInSquareBrackets: false
TabWidth: 2
Cpp11BracedListStyle: false
UseTab: Never

2 changes: 2 additions & 0 deletions
scripts/update_clang_format.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,10 @@
 'tests',
]
file_types = [
 'c',
 'cpp',
 'h',
 'h',
 'm',
 'mm'
]
Expand Down

28 changes: 11 additions & 17 deletions
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,33 +15,30 @@

namespace display_device {
 FileSettingsPersistence::FileSettingsPersistence(std::filesystem::path filepath):
 m_filepath {std::move(filepath)} {
 m_filepath {std::move(filepath)} {
 if (m_filepath.empty()) {
 throw std::runtime_error {"Empty filename provided for FileSettingsPersistence!"};
 throw std::runtime_error {"Empty filename provided for FileSettingsPersistence!"};
 }
 }

 bool
 FileSettingsPersistence::store(const std::vector<std::uint8_t> &data) {
 bool FileSettingsPersistence::store(const std::vector<std::uint8_t> &data) {
 try {
 std::ofstream stream {m_filepath, std::ios::binary | std::ios::trunc};
 std::ofstream stream {m_filepath, std::ios::binary | std::ios::trunc};
 if (!stream) {
 DD_LOG(error) << "Failed to open " << m_filepath << " for writing!";
 return false;
 }

 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> {stream});
 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> {stream});
 return true;
 }
 catch (const std::exception &error) {
 } catch (const std::exception &error) {
 DD_LOG(error) << "Failed to write to " << m_filepath << "! Error:\n"
 << error.what();
 return false;
 }
 }

 std::optional<std::vector<std::uint8_t>>
 FileSettingsPersistence::load() const {
 std::optional<std::vector<std::uint8_t>> FileSettingsPersistence::load() const {
 if (std::error_code error_code; !std::filesystem::exists(m_filepath, error_code)) {
 if (error_code) {
 DD_LOG(error) << "Failed to load " << m_filepath << "! Error:\n"
Expand All@@ -53,24 +50,21 @@ namespace display_device {
 }

 try {
 std::ifstream stream {m_filepath, std::ios::binary};
 std::ifstream stream {m_filepath, std::ios::binary};
 if (!stream) {
 DD_LOG(error) << "Failed to open " << m_filepath << " for reading!";
 return std::nullopt;
 }

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

 bool
 FileSettingsPersistence::clear() {
 bool FileSettingsPersistence::clear() {
 // Return valud does not matter since we check the error code in case the file could NOT be removed.
 std::error_code error_code;
 std::filesystem::remove(m_filepath, error_code);
Expand Down

9 changes: 3 additions & 6 deletions
src/common/include/display_device/audio_context_interface.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,7 @@ namespace display_device {
 * const auto result { iface->capture() };
 * @examples_end
 */
 [[nodiscard]] virtual bool
 capture() = 0;
 [[nodiscard]] virtual bool capture() = 0;

 /**
 * @brief Check if the context is already captured.
Expand All@@ -38,8 +37,7 @@ namespace display_device {
 * const auto result { iface->isCaptured() };
 * @examples_end
 */
 [[nodiscard]] virtual bool
 isCaptured() const = 0;
 [[nodiscard]] virtual bool isCaptured() const = 0;

 /**
 * @brief Release captured audio context for the devices (if any).
Expand All@@ -48,7 +46,6 @@ namespace display_device {
 * const auto result { iface->release() };
 * @examples_end
 */
 virtual void
 release() = 0;
 virtual void release() = 0;
 };
} // namespace display_device

26 changes: 11 additions & 15 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@@ -10,18 +10,16 @@

namespace display_device {
 // A shared "toJson" implementation. Extracted here for UTs + coverage.
 template <typename Type>
 std::string
 toJsonHelper(const Type &obj, const std::optional<unsigned int> &indent, bool *success) {
 template<typename Type>
 std::string toJsonHelper(const Type &obj, const std::optional<unsigned int> &indent, bool *success) {
 try {
 if (success) {
 *success = true;
 }

 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 std::exception &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 if (success) {
 *success = false;
 }
Expand All@@ -31,9 +29,8 @@ namespace display_device {
 }

 // A shared "fromJson" implementation. Extracted here for UTs + coverage.
 template <typename Type>
 bool
 fromJsonHelper(const std::string &string, Type &obj, std::string *error_message = nullptr) {
 template<typename Type>
 bool fromJsonHelper(const std::string &string, Type &obj, std::string *error_message = nullptr) {
 try {
 if (error_message) {
 error_message->clear();
Expand All@@ -42,8 +39,7 @@ namespace display_device {
 Type parsed_obj = nlohmann::json::parse(string);
 obj = std::move(parsed_obj);
 return true;
 }
 catch (const std::exception &err) {
 } catch (const std::exception &err) {
 if (error_message) {
 *error_message = err.what();
 }
Expand All@@ -52,12 +48,12 @@ namespace display_device {
 }
 }

 #define DD_JSON_DEFINE_CONVERTER(Type) \
 #define DD_JSON_DEFINE_CONVERTER(Type) \
 std::string toJson(const Type &obj, const std::optional<unsigned int> &indent, bool *success) { \
 return toJsonHelper(obj, indent, success); \
 } \
 bool fromJson(const std::string &string, Type &obj, std::string *error_message) { \
 return fromJsonHelper<Type>(string, obj, error_message); \
 return toJsonHelper(obj, indent, success); \
 } \
 bool fromJson(const std::string &string, Type &obj, std::string *error_message) { \
 return fromJsonHelper<Type>(string, obj, error_message); \
 }
} // namespace display_device
#endif
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
chore: update global workflows#134

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 2 commits into

from

Jan 20, 2025
 Merged


chore: update global workflows
#134
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a84dca3

chore: update global workflows


LizardByte-bot Jan 20, 2025
f5199bc

chore: update clang-format


ReenigneArcher Jan 20, 2025

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


63 changes: 53 additions & 10 deletions
.clang-format

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,27 +6,34 @@
# Generated from CLion C/C++ Code Style settings
BasedOnStyle: LLVM
AccessModifierOffset: -2
AlignAfterOpenBracket: DontAlign
AlignConsecutiveAssignments: false
AlignAfterOpenBracket: BlockIndent
AlignConsecutiveAssignments: None
AlignEscapedNewlines: DontAlign
AlignOperands: Align
AllowAllArgumentsOnNextLine: false
AllowAllConstructorInitializersOnNextLine: false
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: Always
AllowShortBlocksOnASingleLine: Empty
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
AllowShortIfStatementsOnASingleLine: WithoutElse
AllowShortLambdasOnASingleLine: All
AllowShortEnumsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Empty
AllowShortIfStatementsOnASingleLine: Never
AllowShortLambdasOnASingleLine: None
AllowShortLoopsOnASingleLine: true
AlignTrailingComments: false
AlwaysBreakAfterReturnType: All
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: true
AlwaysBreakTemplateDeclarations: MultiLine
BreakBeforeBraces: Custom
BinPackArguments: false
BinPackParameters: false
BracedInitializerIndentWidth: 2
BraceWrapping:
 AfterCaseLabel: false
 AfterClass: false
 AfterControlStatement: Never
 AfterEnum: false
 AfterExternBlock: true
 AfterFunction: false
 AfterNamespace: false
 AfterObjCDeclaration: false
Expand All@@ -36,39 +43,75 @@ BraceWrapping:
 IndentBraces: false
 SplitEmptyFunction: false
 SplitEmptyRecord: true
BreakArrays: true
BreakBeforeBinaryOperators: None
BreakBeforeBraces: Attach
BreakBeforeTernaryOperators: false
BreakConstructorInitializers: AfterColon
BreakInheritanceList: AfterColon
ColumnLimit: 0
CompactNamespaces: false
ContinuationIndentWidth: 2
Cpp11BracedListStyle: true
EmptyLineAfterAccessModifier: Never
EmptyLineBeforeAccessModifier: Always
ExperimentalAutoDetectBinPacking: true
FixNamespaceComments: true
IncludeBlocks: Regroup
IndentAccessModifiers: false
IndentCaseBlocks: true
IndentCaseLabels: true
IndentExternBlock: Indent
IndentGotoLabels: true
IndentPPDirectives: BeforeHash
IndentWidth: 2
IndentWrappedFunctionNames: true
InsertBraces: true
InsertNewlineAtEOF: true
KeepEmptyLinesAtTheStartOfBlocks: false
LineEnding: LF
MaxEmptyLinesToKeep: 1
NamespaceIndentation: All
ObjCBinPackProtocolList: Never
ObjCSpaceAfterProperty: true
ObjCSpaceBeforeProtocolList: true
PackConstructorInitializers: Never
PenaltyBreakBeforeFirstCallParameter: 1
PenaltyBreakComment: 1
PenaltyBreakString: 1
PenaltyBreakFirstLessLess: 0
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 100000000
PointerAlignment: Right
ReferenceAlignment: Pointer
ReflowComments: true
RemoveBracesLLVM: false
RemoveSemicolon: false
SeparateDefinitionBlocks: Always
SortIncludes: CaseInsensitive
SortUsingDeclarations: Lexicographic
SpaceAfterCStyleCast: true
SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: true
SpaceAfterTemplateKeyword: false
SpaceBeforeAssignmentOperators: true
SpaceBeforeCaseColon: false
SpaceBeforeCpp11BracedList: true
SpaceBeforeCtorInitializerColon: false
SpaceBeforeInheritanceColon: false
SpaceBeforeJsonColon: false
SpaceBeforeParens: ControlStatements
SpaceBeforeRangeBasedForLoopColon: true
SpaceBeforeSquareBrackets: false
SpaceInEmptyBlock: false
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 2
SpacesInAngles: Never
SpacesInCStyleCastParentheses: false
SpacesInContainerLiterals: false
SpacesInLineCommentPrefix:
 Maximum: 3
 Minimum: 1
SpacesInParentheses: false
SpacesInSquareBrackets: false
TabWidth: 2
Cpp11BracedListStyle: false
UseTab: Never

2 changes: 2 additions & 0 deletions
scripts/update_clang_format.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,10 @@
 'tests',
]
file_types = [
 'c',
 'cpp',
 'h',
 'h',
 'm',
 'mm'
]
Expand Down

28 changes: 11 additions & 17 deletions
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,33 +15,30 @@

namespace display_device {
 FileSettingsPersistence::FileSettingsPersistence(std::filesystem::path filepath):
 m_filepath {std::move(filepath)} {
 m_filepath {std::move(filepath)} {
 if (m_filepath.empty()) {
 throw std::runtime_error {"Empty filename provided for FileSettingsPersistence!"};
 throw std::runtime_error {"Empty filename provided for FileSettingsPersistence!"};
 }
 }

 bool
 FileSettingsPersistence::store(const std::vector<std::uint8_t> &data) {
 bool FileSettingsPersistence::store(const std::vector<std::uint8_t> &data) {
 try {
 std::ofstream stream {m_filepath, std::ios::binary | std::ios::trunc};
 std::ofstream stream {m_filepath, std::ios::binary | std::ios::trunc};
 if (!stream) {
 DD_LOG(error) << "Failed to open " << m_filepath << " for writing!";
 return false;
 }

 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> {stream});
 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> {stream});
 return true;
 }
 catch (const std::exception &error) {
 } catch (const std::exception &error) {
 DD_LOG(error) << "Failed to write to " << m_filepath << "! Error:\n"
 << error.what();
 return false;
 }
 }

 std::optional<std::vector<std::uint8_t>>
 FileSettingsPersistence::load() const {
 std::optional<std::vector<std::uint8_t>> FileSettingsPersistence::load() const {
 if (std::error_code error_code; !std::filesystem::exists(m_filepath, error_code)) {
 if (error_code) {
 DD_LOG(error) << "Failed to load " << m_filepath << "! Error:\n"
Expand All@@ -53,24 +50,21 @@ namespace display_device {
 }

 try {
 std::ifstream stream {m_filepath, std::ios::binary};
 std::ifstream stream {m_filepath, std::ios::binary};
 if (!stream) {
 DD_LOG(error) << "Failed to open " << m_filepath << " for reading!";
 return std::nullopt;
 }

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

 bool
 FileSettingsPersistence::clear() {
 bool FileSettingsPersistence::clear() {
 // Return valud does not matter since we check the error code in case the file could NOT be removed.
 std::error_code error_code;
 std::filesystem::remove(m_filepath, error_code);
Expand Down

9 changes: 3 additions & 6 deletions
src/common/include/display_device/audio_context_interface.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,7 @@ namespace display_device {
 * const auto result { iface->capture() };
 * @examples_end
 */
 [[nodiscard]] virtual bool
 capture() = 0;
 [[nodiscard]] virtual bool capture() = 0;

 /**
 * @brief Check if the context is already captured.
Expand All@@ -38,8 +37,7 @@ namespace display_device {
 * const auto result { iface->isCaptured() };
 * @examples_end
 */
 [[nodiscard]] virtual bool
 isCaptured() const = 0;
 [[nodiscard]] virtual bool isCaptured() const = 0;

 /**
 * @brief Release captured audio context for the devices (if any).
Expand All@@ -48,7 +46,6 @@ namespace display_device {
 * const auto result { iface->release() };
 * @examples_end
 */
 virtual void
 release() = 0;
 virtual void release() = 0;
 };
} // namespace display_device

26 changes: 11 additions & 15 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@@ -10,18 +10,16 @@

namespace display_device {
 // A shared "toJson" implementation. Extracted here for UTs + coverage.
 template <typename Type>
 std::string
 toJsonHelper(const Type &obj, const std::optional<unsigned int> &indent, bool *success) {
 template<typename Type>
 std::string toJsonHelper(const Type &obj, const std::optional<unsigned int> &indent, bool *success) {
 try {
 if (success) {
 *success = true;
 }

 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 std::exception &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 if (success) {
 *success = false;
 }
Expand All@@ -31,9 +29,8 @@ namespace display_device {
 }

 // A shared "fromJson" implementation. Extracted here for UTs + coverage.
 template <typename Type>
 bool
 fromJsonHelper(const std::string &string, Type &obj, std::string *error_message = nullptr) {
 template<typename Type>
 bool fromJsonHelper(const std::string &string, Type &obj, std::string *error_message = nullptr) {
 try {
 if (error_message) {
 error_message->clear();
Expand All@@ -42,8 +39,7 @@ namespace display_device {
 Type parsed_obj = nlohmann::json::parse(string);
 obj = std::move(parsed_obj);
 return true;
 }
 catch (const std::exception &err) {
 } catch (const std::exception &err) {
 if (error_message) {
 *error_message = err.what();
 }
Expand All@@ -52,12 +48,12 @@ namespace display_device {
 }
 }

 #define DD_JSON_DEFINE_CONVERTER(Type) \
 #define DD_JSON_DEFINE_CONVERTER(Type) \
 std::string toJson(const Type &obj, const std::optional<unsigned int> &indent, bool *success) { \
 return toJsonHelper(obj, indent, success); \
 } \
 bool fromJson(const std::string &string, Type &obj, std::string *error_message) { \
 return fromJsonHelper<Type>(string, obj, error_message); \
 return toJsonHelper(obj, indent, success); \
 } \
 bool fromJson(const std::string &string, Type &obj, std::string *error_message) { \
 return fromJsonHelper<Type>(string, obj, error_message); \
 }
} // namespace display_device
#endif
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
chore: update global workflows#134

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 2 commits into

from

Jan 20, 2025
 Merged


chore: update global workflows
#134
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a84dca3

chore: update global workflows


LizardByte-bot Jan 20, 2025
f5199bc

chore: update clang-format


ReenigneArcher Jan 20, 2025

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


63 changes: 53 additions & 10 deletions
.clang-format

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,27 +6,34 @@
# Generated from CLion C/C++ Code Style settings
BasedOnStyle: LLVM
AccessModifierOffset: -2
AlignAfterOpenBracket: DontAlign
AlignConsecutiveAssignments: false
AlignAfterOpenBracket: BlockIndent
AlignConsecutiveAssignments: None
AlignEscapedNewlines: DontAlign
AlignOperands: Align
AllowAllArgumentsOnNextLine: false
AllowAllConstructorInitializersOnNextLine: false
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: Always
AllowShortBlocksOnASingleLine: Empty
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
AllowShortIfStatementsOnASingleLine: WithoutElse
AllowShortLambdasOnASingleLine: All
AllowShortEnumsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Empty
AllowShortIfStatementsOnASingleLine: Never
AllowShortLambdasOnASingleLine: None
AllowShortLoopsOnASingleLine: true
AlignTrailingComments: false
AlwaysBreakAfterReturnType: All
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: true
AlwaysBreakTemplateDeclarations: MultiLine
BreakBeforeBraces: Custom
BinPackArguments: false
BinPackParameters: false
BracedInitializerIndentWidth: 2
BraceWrapping:
 AfterCaseLabel: false
 AfterClass: false
 AfterControlStatement: Never
 AfterEnum: false
 AfterExternBlock: true
 AfterFunction: false
 AfterNamespace: false
 AfterObjCDeclaration: false
Expand All@@ -36,39 +43,75 @@ BraceWrapping:
 IndentBraces: false
 SplitEmptyFunction: false
 SplitEmptyRecord: true
BreakArrays: true
BreakBeforeBinaryOperators: None
BreakBeforeBraces: Attach
BreakBeforeTernaryOperators: false
BreakConstructorInitializers: AfterColon
BreakInheritanceList: AfterColon
ColumnLimit: 0
CompactNamespaces: false
ContinuationIndentWidth: 2
Cpp11BracedListStyle: true
EmptyLineAfterAccessModifier: Never
EmptyLineBeforeAccessModifier: Always
ExperimentalAutoDetectBinPacking: true
FixNamespaceComments: true
IncludeBlocks: Regroup
IndentAccessModifiers: false
IndentCaseBlocks: true
IndentCaseLabels: true
IndentExternBlock: Indent
IndentGotoLabels: true
IndentPPDirectives: BeforeHash
IndentWidth: 2
IndentWrappedFunctionNames: true
InsertBraces: true
InsertNewlineAtEOF: true
KeepEmptyLinesAtTheStartOfBlocks: false
LineEnding: LF
MaxEmptyLinesToKeep: 1
NamespaceIndentation: All
ObjCBinPackProtocolList: Never
ObjCSpaceAfterProperty: true
ObjCSpaceBeforeProtocolList: true
PackConstructorInitializers: Never
PenaltyBreakBeforeFirstCallParameter: 1
PenaltyBreakComment: 1
PenaltyBreakString: 1
PenaltyBreakFirstLessLess: 0
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 100000000
PointerAlignment: Right
ReferenceAlignment: Pointer
ReflowComments: true
RemoveBracesLLVM: false
RemoveSemicolon: false
SeparateDefinitionBlocks: Always
SortIncludes: CaseInsensitive
SortUsingDeclarations: Lexicographic
SpaceAfterCStyleCast: true
SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: true
SpaceAfterTemplateKeyword: false
SpaceBeforeAssignmentOperators: true
SpaceBeforeCaseColon: false
SpaceBeforeCpp11BracedList: true
SpaceBeforeCtorInitializerColon: false
SpaceBeforeInheritanceColon: false
SpaceBeforeJsonColon: false
SpaceBeforeParens: ControlStatements
SpaceBeforeRangeBasedForLoopColon: true
SpaceBeforeSquareBrackets: false
SpaceInEmptyBlock: false
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 2
SpacesInAngles: Never
SpacesInCStyleCastParentheses: false
SpacesInContainerLiterals: false
SpacesInLineCommentPrefix:
 Maximum: 3
 Minimum: 1
SpacesInParentheses: false
SpacesInSquareBrackets: false
TabWidth: 2
Cpp11BracedListStyle: false
UseTab: Never

2 changes: 2 additions & 0 deletions
scripts/update_clang_format.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,10 @@
 'tests',
]
file_types = [
 'c',
 'cpp',
 'h',
 'h',
 'm',
 'mm'
]
Expand Down

28 changes: 11 additions & 17 deletions
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,33 +15,30 @@

namespace display_device {
 FileSettingsPersistence::FileSettingsPersistence(std::filesystem::path filepath):
 m_filepath {std::move(filepath)} {
 m_filepath {std::move(filepath)} {
 if (m_filepath.empty()) {
 throw std::runtime_error {"Empty filename provided for FileSettingsPersistence!"};
 throw std::runtime_error {"Empty filename provided for FileSettingsPersistence!"};
 }
 }

 bool
 FileSettingsPersistence::store(const std::vector<std::uint8_t> &data) {
 bool FileSettingsPersistence::store(const std::vector<std::uint8_t> &data) {
 try {
 std::ofstream stream {m_filepath, std::ios::binary | std::ios::trunc};
 std::ofstream stream {m_filepath, std::ios::binary | std::ios::trunc};
 if (!stream) {
 DD_LOG(error) << "Failed to open " << m_filepath << " for writing!";
 return false;
 }

 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> {stream});
 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> {stream});
 return true;
 }
 catch (const std::exception &error) {
 } catch (const std::exception &error) {
 DD_LOG(error) << "Failed to write to " << m_filepath << "! Error:\n"
 << error.what();
 return false;
 }
 }

 std::optional<std::vector<std::uint8_t>>
 FileSettingsPersistence::load() const {
 std::optional<std::vector<std::uint8_t>> FileSettingsPersistence::load() const {
 if (std::error_code error_code; !std::filesystem::exists(m_filepath, error_code)) {
 if (error_code) {
 DD_LOG(error) << "Failed to load " << m_filepath << "! Error:\n"
Expand All@@ -53,24 +50,21 @@ namespace display_device {
 }

 try {
 std::ifstream stream {m_filepath, std::ios::binary};
 std::ifstream stream {m_filepath, std::ios::binary};
 if (!stream) {
 DD_LOG(error) << "Failed to open " << m_filepath << " for reading!";
 return std::nullopt;
 }

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

 bool
 FileSettingsPersistence::clear() {
 bool FileSettingsPersistence::clear() {
 // Return valud does not matter since we check the error code in case the file could NOT be removed.
 std::error_code error_code;
 std::filesystem::remove(m_filepath, error_code);
Expand Down

9 changes: 3 additions & 6 deletions
src/common/include/display_device/audio_context_interface.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,7 @@ namespace display_device {
 * const auto result { iface->capture() };
 * @examples_end
 */
 [[nodiscard]] virtual bool
 capture() = 0;
 [[nodiscard]] virtual bool capture() = 0;

 /**
 * @brief Check if the context is already captured.
Expand All@@ -38,8 +37,7 @@ namespace display_device {
 * const auto result { iface->isCaptured() };
 * @examples_end
 */
 [[nodiscard]] virtual bool
 isCaptured() const = 0;
 [[nodiscard]] virtual bool isCaptured() const = 0;

 /**
 * @brief Release captured audio context for the devices (if any).
Expand All@@ -48,7 +46,6 @@ namespace display_device {
 * const auto result { iface->release() };
 * @examples_end
 */
 virtual void
 release() = 0;
 virtual void release() = 0;
 };
} // namespace display_device

26 changes: 11 additions & 15 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@@ -10,18 +10,16 @@

namespace display_device {
 // A shared "toJson" implementation. Extracted here for UTs + coverage.
 template <typename Type>
 std::string
 toJsonHelper(const Type &obj, const std::optional<unsigned int> &indent, bool *success) {
 template<typename Type>
 std::string toJsonHelper(const Type &obj, const std::optional<unsigned int> &indent, bool *success) {
 try {
 if (success) {
 *success = true;
 }

 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 std::exception &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 if (success) {
 *success = false;
 }
Expand All@@ -31,9 +29,8 @@ namespace display_device {
 }

 // A shared "fromJson" implementation. Extracted here for UTs + coverage.
 template <typename Type>
 bool
 fromJsonHelper(const std::string &string, Type &obj, std::string *error_message = nullptr) {
 template<typename Type>
 bool fromJsonHelper(const std::string &string, Type &obj, std::string *error_message = nullptr) {
 try {
 if (error_message) {
 error_message->clear();
Expand All@@ -42,8 +39,7 @@ namespace display_device {
 Type parsed_obj = nlohmann::json::parse(string);
 obj = std::move(parsed_obj);
 return true;
 }
 catch (const std::exception &err) {
 } catch (const std::exception &err) {
 if (error_message) {
 *error_message = err.what();
 }
Expand All@@ -52,12 +48,12 @@ namespace display_device {
 }
 }

 #define DD_JSON_DEFINE_CONVERTER(Type) \
 #define DD_JSON_DEFINE_CONVERTER(Type) \
 std::string toJson(const Type &obj, const std::optional<unsigned int> &indent, bool *success) { \
 return toJsonHelper(obj, indent, success); \
 } \
 bool fromJson(const std::string &string, Type &obj, std::string *error_message) { \
 return fromJsonHelper<Type>(string, obj, error_message); \
 return toJsonHelper(obj, indent, success); \
 } \
 bool fromJson(const std::string &string, Type &obj, std::string *error_message) { \
 return fromJsonHelper<Type>(string, obj, error_message); \
 }
} // namespace display_device
#endif
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
chore: update global workflows#134

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 2 commits into

from

Jan 20, 2025
 Merged


chore: update global workflows
#134
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a84dca3

chore: update global workflows


LizardByte-bot Jan 20, 2025
f5199bc

chore: update clang-format


ReenigneArcher Jan 20, 2025

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


63 changes: 53 additions & 10 deletions
.clang-format

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,27 +6,34 @@
# Generated from CLion C/C++ Code Style settings
BasedOnStyle: LLVM
AccessModifierOffset: -2
AlignAfterOpenBracket: DontAlign
AlignConsecutiveAssignments: false
AlignAfterOpenBracket: BlockIndent
AlignConsecutiveAssignments: None
AlignEscapedNewlines: DontAlign
AlignOperands: Align
AllowAllArgumentsOnNextLine: false
AllowAllConstructorInitializersOnNextLine: false
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: Always
AllowShortBlocksOnASingleLine: Empty
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
AllowShortIfStatementsOnASingleLine: WithoutElse
AllowShortLambdasOnASingleLine: All
AllowShortEnumsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Empty
AllowShortIfStatementsOnASingleLine: Never
AllowShortLambdasOnASingleLine: None
AllowShortLoopsOnASingleLine: true
AlignTrailingComments: false
AlwaysBreakAfterReturnType: All
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: true
AlwaysBreakTemplateDeclarations: MultiLine
BreakBeforeBraces: Custom
BinPackArguments: false
BinPackParameters: false
BracedInitializerIndentWidth: 2
BraceWrapping:
 AfterCaseLabel: false
 AfterClass: false
 AfterControlStatement: Never
 AfterEnum: false
 AfterExternBlock: true
 AfterFunction: false
 AfterNamespace: false
 AfterObjCDeclaration: false
Expand All@@ -36,39 +43,75 @@ BraceWrapping:
 IndentBraces: false
 SplitEmptyFunction: false
 SplitEmptyRecord: true
BreakArrays: true
BreakBeforeBinaryOperators: None
BreakBeforeBraces: Attach
BreakBeforeTernaryOperators: false
BreakConstructorInitializers: AfterColon
BreakInheritanceList: AfterColon
ColumnLimit: 0
CompactNamespaces: false
ContinuationIndentWidth: 2
Cpp11BracedListStyle: true
EmptyLineAfterAccessModifier: Never
EmptyLineBeforeAccessModifier: Always
ExperimentalAutoDetectBinPacking: true
FixNamespaceComments: true
IncludeBlocks: Regroup
IndentAccessModifiers: false
IndentCaseBlocks: true
IndentCaseLabels: true
IndentExternBlock: Indent
IndentGotoLabels: true
IndentPPDirectives: BeforeHash
IndentWidth: 2
IndentWrappedFunctionNames: true
InsertBraces: true
InsertNewlineAtEOF: true
KeepEmptyLinesAtTheStartOfBlocks: false
LineEnding: LF
MaxEmptyLinesToKeep: 1
NamespaceIndentation: All
ObjCBinPackProtocolList: Never
ObjCSpaceAfterProperty: true
ObjCSpaceBeforeProtocolList: true
PackConstructorInitializers: Never
PenaltyBreakBeforeFirstCallParameter: 1
PenaltyBreakComment: 1
PenaltyBreakString: 1
PenaltyBreakFirstLessLess: 0
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 100000000
PointerAlignment: Right
ReferenceAlignment: Pointer
ReflowComments: true
RemoveBracesLLVM: false
RemoveSemicolon: false
SeparateDefinitionBlocks: Always
SortIncludes: CaseInsensitive
SortUsingDeclarations: Lexicographic
SpaceAfterCStyleCast: true
SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: true
SpaceAfterTemplateKeyword: false
SpaceBeforeAssignmentOperators: true
SpaceBeforeCaseColon: false
SpaceBeforeCpp11BracedList: true
SpaceBeforeCtorInitializerColon: false
SpaceBeforeInheritanceColon: false
SpaceBeforeJsonColon: false
SpaceBeforeParens: ControlStatements
SpaceBeforeRangeBasedForLoopColon: true
SpaceBeforeSquareBrackets: false
SpaceInEmptyBlock: false
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 2
SpacesInAngles: Never
SpacesInCStyleCastParentheses: false
SpacesInContainerLiterals: false
SpacesInLineCommentPrefix:
 Maximum: 3
 Minimum: 1
SpacesInParentheses: false
SpacesInSquareBrackets: false
TabWidth: 2
Cpp11BracedListStyle: false
UseTab: Never

2 changes: 2 additions & 0 deletions
scripts/update_clang_format.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,10 @@
 'tests',
]
file_types = [
 'c',
 'cpp',
 'h',
 'h',
 'm',
 'mm'
]
Expand Down

28 changes: 11 additions & 17 deletions
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,33 +15,30 @@

namespace display_device {
 FileSettingsPersistence::FileSettingsPersistence(std::filesystem::path filepath):
 m_filepath {std::move(filepath)} {
 m_filepath {std::move(filepath)} {
 if (m_filepath.empty()) {
 throw std::runtime_error {"Empty filename provided for FileSettingsPersistence!"};
 throw std::runtime_error {"Empty filename provided for FileSettingsPersistence!"};
 }
 }

 bool
 FileSettingsPersistence::store(const std::vector<std::uint8_t> &data) {
 bool FileSettingsPersistence::store(const std::vector<std::uint8_t> &data) {
 try {
 std::ofstream stream {m_filepath, std::ios::binary | std::ios::trunc};
 std::ofstream stream {m_filepath, std::ios::binary | std::ios::trunc};
 if (!stream) {
 DD_LOG(error) << "Failed to open " << m_filepath << " for writing!";
 return false;
 }

 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> {stream});
 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> {stream});
 return true;
 }
 catch (const std::exception &error) {
 } catch (const std::exception &error) {
 DD_LOG(error) << "Failed to write to " << m_filepath << "! Error:\n"
 << error.what();
 return false;
 }
 }

 std::optional<std::vector<std::uint8_t>>
 FileSettingsPersistence::load() const {
 std::optional<std::vector<std::uint8_t>> FileSettingsPersistence::load() const {
 if (std::error_code error_code; !std::filesystem::exists(m_filepath, error_code)) {
 if (error_code) {
 DD_LOG(error) << "Failed to load " << m_filepath << "! Error:\n"
Expand All@@ -53,24 +50,21 @@ namespace display_device {
 }

 try {
 std::ifstream stream {m_filepath, std::ios::binary};
 std::ifstream stream {m_filepath, std::ios::binary};
 if (!stream) {
 DD_LOG(error) << "Failed to open " << m_filepath << " for reading!";
 return std::nullopt;
 }

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

 bool
 FileSettingsPersistence::clear() {
 bool FileSettingsPersistence::clear() {
 // Return valud does not matter since we check the error code in case the file could NOT be removed.
 std::error_code error_code;
 std::filesystem::remove(m_filepath, error_code);
Expand Down

9 changes: 3 additions & 6 deletions
src/common/include/display_device/audio_context_interface.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,7 @@ namespace display_device {
 * const auto result { iface->capture() };
 * @examples_end
 */
 [[nodiscard]] virtual bool
 capture() = 0;
 [[nodiscard]] virtual bool capture() = 0;

 /**
 * @brief Check if the context is already captured.
Expand All@@ -38,8 +37,7 @@ namespace display_device {
 * const auto result { iface->isCaptured() };
 * @examples_end
 */
 [[nodiscard]] virtual bool
 isCaptured() const = 0;
 [[nodiscard]] virtual bool isCaptured() const = 0;

 /**
 * @brief Release captured audio context for the devices (if any).
Expand All@@ -48,7 +46,6 @@ namespace display_device {
 * const auto result { iface->release() };
 * @examples_end
 */
 virtual void
 release() = 0;
 virtual void release() = 0;
 };
} // namespace display_device

26 changes: 11 additions & 15 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@@ -10,18 +10,16 @@

namespace display_device {
 // A shared "toJson" implementation. Extracted here for UTs + coverage.
 template <typename Type>
 std::string
 toJsonHelper(const Type &obj, const std::optional<unsigned int> &indent, bool *success) {
 template<typename Type>
 std::string toJsonHelper(const Type &obj, const std::optional<unsigned int> &indent, bool *success) {
 try {
 if (success) {
 *success = true;
 }

 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 std::exception &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 if (success) {
 *success = false;
 }
Expand All@@ -31,9 +29,8 @@ namespace display_device {
 }

 // A shared "fromJson" implementation. Extracted here for UTs + coverage.
 template <typename Type>
 bool
 fromJsonHelper(const std::string &string, Type &obj, std::string *error_message = nullptr) {
 template<typename Type>
 bool fromJsonHelper(const std::string &string, Type &obj, std::string *error_message = nullptr) {
 try {
 if (error_message) {
 error_message->clear();
Expand All@@ -42,8 +39,7 @@ namespace display_device {
 Type parsed_obj = nlohmann::json::parse(string);
 obj = std::move(parsed_obj);
 return true;
 }
 catch (const std::exception &err) {
 } catch (const std::exception &err) {
 if (error_message) {
 *error_message = err.what();
 }
Expand All@@ -52,12 +48,12 @@ namespace display_device {
 }
 }

 #define DD_JSON_DEFINE_CONVERTER(Type) \
 #define DD_JSON_DEFINE_CONVERTER(Type) \
 std::string toJson(const Type &obj, const std::optional<unsigned int> &indent, bool *success) { \
 return toJsonHelper(obj, indent, success); \
 } \
 bool fromJson(const std::string &string, Type &obj, std::string *error_message) { \
 return fromJsonHelper<Type>(string, obj, error_message); \
 return toJsonHelper(obj, indent, success); \
 } \
 bool fromJson(const std::string &string, Type &obj, std::string *error_message) { \
 return fromJsonHelper<Type>(string, obj, error_message); \
 }
} // namespace display_device
#endif
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
chore: update global workflows#134

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 2 commits into

from

Jan 20, 2025
 Merged


chore: update global workflows
#134
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a84dca3

chore: update global workflows


LizardByte-bot Jan 20, 2025
f5199bc

chore: update clang-format


ReenigneArcher Jan 20, 2025

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


63 changes: 53 additions & 10 deletions
.clang-format

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,27 +6,34 @@
# Generated from CLion C/C++ Code Style settings
BasedOnStyle: LLVM
AccessModifierOffset: -2
AlignAfterOpenBracket: DontAlign
AlignConsecutiveAssignments: false
AlignAfterOpenBracket: BlockIndent
AlignConsecutiveAssignments: None
AlignEscapedNewlines: DontAlign
AlignOperands: Align
AllowAllArgumentsOnNextLine: false
AllowAllConstructorInitializersOnNextLine: false
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: Always
AllowShortBlocksOnASingleLine: Empty
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
AllowShortIfStatementsOnASingleLine: WithoutElse
AllowShortLambdasOnASingleLine: All
AllowShortEnumsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Empty
AllowShortIfStatementsOnASingleLine: Never
AllowShortLambdasOnASingleLine: None
AllowShortLoopsOnASingleLine: true
AlignTrailingComments: false
AlwaysBreakAfterReturnType: All
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: true
AlwaysBreakTemplateDeclarations: MultiLine
BreakBeforeBraces: Custom
BinPackArguments: false
BinPackParameters: false
BracedInitializerIndentWidth: 2
BraceWrapping:
 AfterCaseLabel: false
 AfterClass: false
 AfterControlStatement: Never
 AfterEnum: false
 AfterExternBlock: true
 AfterFunction: false
 AfterNamespace: false
 AfterObjCDeclaration: false
Expand All@@ -36,39 +43,75 @@ BraceWrapping:
 IndentBraces: false
 SplitEmptyFunction: false
 SplitEmptyRecord: true
BreakArrays: true
BreakBeforeBinaryOperators: None
BreakBeforeBraces: Attach
BreakBeforeTernaryOperators: false
BreakConstructorInitializers: AfterColon
BreakInheritanceList: AfterColon
ColumnLimit: 0
CompactNamespaces: false
ContinuationIndentWidth: 2
Cpp11BracedListStyle: true
EmptyLineAfterAccessModifier: Never
EmptyLineBeforeAccessModifier: Always
ExperimentalAutoDetectBinPacking: true
FixNamespaceComments: true
IncludeBlocks: Regroup
IndentAccessModifiers: false
IndentCaseBlocks: true
IndentCaseLabels: true
IndentExternBlock: Indent
IndentGotoLabels: true
IndentPPDirectives: BeforeHash
IndentWidth: 2
IndentWrappedFunctionNames: true
InsertBraces: true
InsertNewlineAtEOF: true
KeepEmptyLinesAtTheStartOfBlocks: false
LineEnding: LF
MaxEmptyLinesToKeep: 1
NamespaceIndentation: All
ObjCBinPackProtocolList: Never
ObjCSpaceAfterProperty: true
ObjCSpaceBeforeProtocolList: true
PackConstructorInitializers: Never
PenaltyBreakBeforeFirstCallParameter: 1
PenaltyBreakComment: 1
PenaltyBreakString: 1
PenaltyBreakFirstLessLess: 0
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 100000000
PointerAlignment: Right
ReferenceAlignment: Pointer
ReflowComments: true
RemoveBracesLLVM: false
RemoveSemicolon: false
SeparateDefinitionBlocks: Always
SortIncludes: CaseInsensitive
SortUsingDeclarations: Lexicographic
SpaceAfterCStyleCast: true
SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: true
SpaceAfterTemplateKeyword: false
SpaceBeforeAssignmentOperators: true
SpaceBeforeCaseColon: false
SpaceBeforeCpp11BracedList: true
SpaceBeforeCtorInitializerColon: false
SpaceBeforeInheritanceColon: false
SpaceBeforeJsonColon: false
SpaceBeforeParens: ControlStatements
SpaceBeforeRangeBasedForLoopColon: true
SpaceBeforeSquareBrackets: false
SpaceInEmptyBlock: false
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 2
SpacesInAngles: Never
SpacesInCStyleCastParentheses: false
SpacesInContainerLiterals: false
SpacesInLineCommentPrefix:
 Maximum: 3
 Minimum: 1
SpacesInParentheses: false
SpacesInSquareBrackets: false
TabWidth: 2
Cpp11BracedListStyle: false
UseTab: Never

2 changes: 2 additions & 0 deletions
scripts/update_clang_format.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,10 @@
 'tests',
]
file_types = [
 'c',
 'cpp',
 'h',
 'h',
 'm',
 'mm'
]
Expand Down

28 changes: 11 additions & 17 deletions
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,33 +15,30 @@

namespace display_device {
 FileSettingsPersistence::FileSettingsPersistence(std::filesystem::path filepath):
 m_filepath {std::move(filepath)} {
 m_filepath {std::move(filepath)} {
 if (m_filepath.empty()) {
 throw std::runtime_error {"Empty filename provided for FileSettingsPersistence!"};
 throw std::runtime_error {"Empty filename provided for FileSettingsPersistence!"};
 }
 }

 bool
 FileSettingsPersistence::store(const std::vector<std::uint8_t> &data) {
 bool FileSettingsPersistence::store(const std::vector<std::uint8_t> &data) {
 try {
 std::ofstream stream {m_filepath, std::ios::binary | std::ios::trunc};
 std::ofstream stream {m_filepath, std::ios::binary | std::ios::trunc};
 if (!stream) {
 DD_LOG(error) << "Failed to open " << m_filepath << " for writing!";
 return false;
 }

 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> {stream});
 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> {stream});
 return true;
 }
 catch (const std::exception &error) {
 } catch (const std::exception &error) {
 DD_LOG(error) << "Failed to write to " << m_filepath << "! Error:\n"
 << error.what();
 return false;
 }
 }

 std::optional<std::vector<std::uint8_t>>
 FileSettingsPersistence::load() const {
 std::optional<std::vector<std::uint8_t>> FileSettingsPersistence::load() const {
 if (std::error_code error_code; !std::filesystem::exists(m_filepath, error_code)) {
 if (error_code) {
 DD_LOG(error) << "Failed to load " << m_filepath << "! Error:\n"
Expand All@@ -53,24 +50,21 @@ namespace display_device {
 }

 try {
 std::ifstream stream {m_filepath, std::ios::binary};
 std::ifstream stream {m_filepath, std::ios::binary};
 if (!stream) {
 DD_LOG(error) << "Failed to open " << m_filepath << " for reading!";
 return std::nullopt;
 }

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

 bool
 FileSettingsPersistence::clear() {
 bool FileSettingsPersistence::clear() {
 // Return valud does not matter since we check the error code in case the file could NOT be removed.
 std::error_code error_code;
 std::filesystem::remove(m_filepath, error_code);
Expand Down

9 changes: 3 additions & 6 deletions
src/common/include/display_device/audio_context_interface.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,7 @@ namespace display_device {
 * const auto result { iface->capture() };
 * @examples_end
 */
 [[nodiscard]] virtual bool
 capture() = 0;
 [[nodiscard]] virtual bool capture() = 0;

 /**
 * @brief Check if the context is already captured.
Expand All@@ -38,8 +37,7 @@ namespace display_device {
 * const auto result { iface->isCaptured() };
 * @examples_end
 */
 [[nodiscard]] virtual bool
 isCaptured() const = 0;
 [[nodiscard]] virtual bool isCaptured() const = 0;

 /**
 * @brief Release captured audio context for the devices (if any).
Expand All@@ -48,7 +46,6 @@ namespace display_device {
 * const auto result { iface->release() };
 * @examples_end
 */
 virtual void
 release() = 0;
 virtual void release() = 0;
 };
} // namespace display_device

26 changes: 11 additions & 15 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@@ -10,18 +10,16 @@

namespace display_device {
 // A shared "toJson" implementation. Extracted here for UTs + coverage.
 template <typename Type>
 std::string
 toJsonHelper(const Type &obj, const std::optional<unsigned int> &indent, bool *success) {
 template<typename Type>
 std::string toJsonHelper(const Type &obj, const std::optional<unsigned int> &indent, bool *success) {
 try {
 if (success) {
 *success = true;
 }

 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 std::exception &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 if (success) {
 *success = false;
 }
Expand All@@ -31,9 +29,8 @@ namespace display_device {
 }

 // A shared "fromJson" implementation. Extracted here for UTs + coverage.
 template <typename Type>
 bool
 fromJsonHelper(const std::string &string, Type &obj, std::string *error_message = nullptr) {
 template<typename Type>
 bool fromJsonHelper(const std::string &string, Type &obj, std::string *error_message = nullptr) {
 try {
 if (error_message) {
 error_message->clear();
Expand All@@ -42,8 +39,7 @@ namespace display_device {
 Type parsed_obj = nlohmann::json::parse(string);
 obj = std::move(parsed_obj);
 return true;
 }
 catch (const std::exception &err) {
 } catch (const std::exception &err) {
 if (error_message) {
 *error_message = err.what();
 }
Expand All@@ -52,12 +48,12 @@ namespace display_device {
 }
 }

 #define DD_JSON_DEFINE_CONVERTER(Type) \
 #define DD_JSON_DEFINE_CONVERTER(Type) \
 std::string toJson(const Type &obj, const std::optional<unsigned int> &indent, bool *success) { \
 return toJsonHelper(obj, indent, success); \
 } \
 bool fromJson(const std::string &string, Type &obj, std::string *error_message) { \
 return fromJsonHelper<Type>(string, obj, error_message); \
 return toJsonHelper(obj, indent, success); \
 } \
 bool fromJson(const std::string &string, Type &obj, std::string *error_message) { \
 return fromJsonHelper<Type>(string, obj, error_message); \
 }
} // namespace display_device
#endif
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
chore: update global workflows#134

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 2 commits into

from

Jan 20, 2025
 Merged


chore: update global workflows
#134
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a84dca3

chore: update global workflows


LizardByte-bot Jan 20, 2025
f5199bc

chore: update clang-format


ReenigneArcher Jan 20, 2025

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


63 changes: 53 additions & 10 deletions
.clang-format

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,27 +6,34 @@
# Generated from CLion C/C++ Code Style settings
BasedOnStyle: LLVM
AccessModifierOffset: -2
AlignAfterOpenBracket: DontAlign
AlignConsecutiveAssignments: false
AlignAfterOpenBracket: BlockIndent
AlignConsecutiveAssignments: None
AlignEscapedNewlines: DontAlign
AlignOperands: Align
AllowAllArgumentsOnNextLine: false
AllowAllConstructorInitializersOnNextLine: false
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: Always
AllowShortBlocksOnASingleLine: Empty
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
AllowShortIfStatementsOnASingleLine: WithoutElse
AllowShortLambdasOnASingleLine: All
AllowShortEnumsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Empty
AllowShortIfStatementsOnASingleLine: Never
AllowShortLambdasOnASingleLine: None
AllowShortLoopsOnASingleLine: true
AlignTrailingComments: false
AlwaysBreakAfterReturnType: All
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: true
AlwaysBreakTemplateDeclarations: MultiLine
BreakBeforeBraces: Custom
BinPackArguments: false
BinPackParameters: false
BracedInitializerIndentWidth: 2
BraceWrapping:
 AfterCaseLabel: false
 AfterClass: false
 AfterControlStatement: Never
 AfterEnum: false
 AfterExternBlock: true
 AfterFunction: false
 AfterNamespace: false
 AfterObjCDeclaration: false
Expand All@@ -36,39 +43,75 @@ BraceWrapping:
 IndentBraces: false
 SplitEmptyFunction: false
 SplitEmptyRecord: true
BreakArrays: true
BreakBeforeBinaryOperators: None
BreakBeforeBraces: Attach
BreakBeforeTernaryOperators: false
BreakConstructorInitializers: AfterColon
BreakInheritanceList: AfterColon
ColumnLimit: 0
CompactNamespaces: false
ContinuationIndentWidth: 2
Cpp11BracedListStyle: true
EmptyLineAfterAccessModifier: Never
EmptyLineBeforeAccessModifier: Always
ExperimentalAutoDetectBinPacking: true
FixNamespaceComments: true
IncludeBlocks: Regroup
IndentAccessModifiers: false
IndentCaseBlocks: true
IndentCaseLabels: true
IndentExternBlock: Indent
IndentGotoLabels: true
IndentPPDirectives: BeforeHash
IndentWidth: 2
IndentWrappedFunctionNames: true
InsertBraces: true
InsertNewlineAtEOF: true
KeepEmptyLinesAtTheStartOfBlocks: false
LineEnding: LF
MaxEmptyLinesToKeep: 1
NamespaceIndentation: All
ObjCBinPackProtocolList: Never
ObjCSpaceAfterProperty: true
ObjCSpaceBeforeProtocolList: true
PackConstructorInitializers: Never
PenaltyBreakBeforeFirstCallParameter: 1
PenaltyBreakComment: 1
PenaltyBreakString: 1
PenaltyBreakFirstLessLess: 0
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 100000000
PointerAlignment: Right
ReferenceAlignment: Pointer
ReflowComments: true
RemoveBracesLLVM: false
RemoveSemicolon: false
SeparateDefinitionBlocks: Always
SortIncludes: CaseInsensitive
SortUsingDeclarations: Lexicographic
SpaceAfterCStyleCast: true
SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: true
SpaceAfterTemplateKeyword: false
SpaceBeforeAssignmentOperators: true
SpaceBeforeCaseColon: false
SpaceBeforeCpp11BracedList: true
SpaceBeforeCtorInitializerColon: false
SpaceBeforeInheritanceColon: false
SpaceBeforeJsonColon: false
SpaceBeforeParens: ControlStatements
SpaceBeforeRangeBasedForLoopColon: true
SpaceBeforeSquareBrackets: false
SpaceInEmptyBlock: false
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 2
SpacesInAngles: Never
SpacesInCStyleCastParentheses: false
SpacesInContainerLiterals: false
SpacesInLineCommentPrefix:
 Maximum: 3
 Minimum: 1
SpacesInParentheses: false
SpacesInSquareBrackets: false
TabWidth: 2
Cpp11BracedListStyle: false
UseTab: Never

2 changes: 2 additions & 0 deletions
scripts/update_clang_format.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,10 @@
 'tests',
]
file_types = [
 'c',
 'cpp',
 'h',
 'h',
 'm',
 'mm'
]
Expand Down

28 changes: 11 additions & 17 deletions
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,33 +15,30 @@

namespace display_device {
 FileSettingsPersistence::FileSettingsPersistence(std::filesystem::path filepath):
 m_filepath {std::move(filepath)} {
 m_filepath {std::move(filepath)} {
 if (m_filepath.empty()) {
 throw std::runtime_error {"Empty filename provided for FileSettingsPersistence!"};
 throw std::runtime_error {"Empty filename provided for FileSettingsPersistence!"};
 }
 }

 bool
 FileSettingsPersistence::store(const std::vector<std::uint8_t> &data) {
 bool FileSettingsPersistence::store(const std::vector<std::uint8_t> &data) {
 try {
 std::ofstream stream {m_filepath, std::ios::binary | std::ios::trunc};
 std::ofstream stream {m_filepath, std::ios::binary | std::ios::trunc};
 if (!stream) {
 DD_LOG(error) << "Failed to open " << m_filepath << " for writing!";
 return false;
 }

 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> {stream});
 std::copy(std::begin(data), std::end(data), std::ostreambuf_iterator<char> {stream});
 return true;
 }
 catch (const std::exception &error) {
 } catch (const std::exception &error) {
 DD_LOG(error) << "Failed to write to " << m_filepath << "! Error:\n"
 << error.what();
 return false;
 }
 }

 std::optional<std::vector<std::uint8_t>>
 FileSettingsPersistence::load() const {
 std::optional<std::vector<std::uint8_t>> FileSettingsPersistence::load() const {
 if (std::error_code error_code; !std::filesystem::exists(m_filepath, error_code)) {
 if (error_code) {
 DD_LOG(error) << "Failed to load " << m_filepath << "! Error:\n"
Expand All@@ -53,24 +50,21 @@ namespace display_device {
 }

 try {
 std::ifstream stream {m_filepath, std::ios::binary};
 std::ifstream stream {m_filepath, std::ios::binary};
 if (!stream) {
 DD_LOG(error) << "Failed to open " << m_filepath << " for reading!";
 return std::nullopt;
 }

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

 bool
 FileSettingsPersistence::clear() {
 bool FileSettingsPersistence::clear() {
 // Return valud does not matter since we check the error code in case the file could NOT be removed.
 std::error_code error_code;
 std::filesystem::remove(m_filepath, error_code);
Expand Down

9 changes: 3 additions & 6 deletions
src/common/include/display_device/audio_context_interface.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,7 @@ namespace display_device {
 * const auto result { iface->capture() };
 * @examples_end
 */
 [[nodiscard]] virtual bool
 capture() = 0;
 [[nodiscard]] virtual bool capture() = 0;

 /**
 * @brief Check if the context is already captured.
Expand All@@ -38,8 +37,7 @@ namespace display_device {
 * const auto result { iface->isCaptured() };
 * @examples_end
 */
 [[nodiscard]] virtual bool
 isCaptured() const = 0;
 [[nodiscard]] virtual bool isCaptured() const = 0;

 /**
 * @brief Release captured audio context for the devices (if any).
Expand All@@ -48,7 +46,6 @@ namespace display_device {
 * const auto result { iface->release() };
 * @examples_end
 */
 virtual void
 release() = 0;
 virtual void release() = 0;
 };
} // namespace display_device

26 changes: 11 additions & 15 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@@ -10,18 +10,16 @@

namespace display_device {
 // A shared "toJson" implementation. Extracted here for UTs + coverage.
 template <typename Type>
 std::string
 toJsonHelper(const Type &obj, const std::optional<unsigned int> &indent, bool *success) {
 template<typename Type>
 std::string toJsonHelper(const Type &obj, const std::optional<unsigned int> &indent, bool *success) {
 try {
 if (success) {
 *success = true;
 }

 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 std::exception &err) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 if (success) {
 *success = false;
 }
Expand All@@ -31,9 +29,8 @@ namespace display_device {
 }

 // A shared "fromJson" implementation. Extracted here for UTs + coverage.
 template <typename Type>
 bool
 fromJsonHelper(const std::string &string, Type &obj, std::string *error_message = nullptr) {
 template<typename Type>
 bool fromJsonHelper(const std::string &string, Type &obj, std::string *error_message = nullptr) {
 try {
 if (error_message) {
 error_message->clear();
Expand All@@ -42,8 +39,7 @@ namespace display_device {
 Type parsed_obj = nlohmann::json::parse(string);
 obj = std::move(parsed_obj);
 return true;
 }
 catch (const std::exception &err) {
 } catch (const std::exception &err) {
 if (error_message) {
 *error_message = err.what();
 }
Expand All@@ -52,12 +48,12 @@ namespace display_device {
 }
 }

 #define DD_JSON_DEFINE_CONVERTER(Type) \
 #define DD_JSON_DEFINE_CONVERTER(Type) \
 std::string toJson(const Type &obj, const std::optional<unsigned int> &indent, bool *success) { \
 return toJsonHelper(obj, indent, success); \
 } \
 bool fromJson(const std::string &string, Type &obj, std::string *error_message) { \
 return fromJsonHelper<Type>(string, obj, error_message); \
 return toJsonHelper(obj, indent, success); \
 } \
 bool fromJson(const std::string &string, Type &obj, std::string *error_message) { \
 return fromJsonHelper<Type>(string, obj, error_message); \
 }
} // namespace display_device
#endif
Loading