Skip to content

Commit

Permalink
chore: update global workflows (#134)
Browse files Browse the repository at this point in the history
Co-authored-by: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com>
  • Loading branch information
LizardByte-bot and ReenigneArcher authored Jan 20, 2025
1 parent 63599b0 commit d6fa6cf
Show file tree
Hide file tree
Showing 79 changed files with 2,216 additions and 2,552 deletions.
63 changes: 53 additions & 10 deletions .clang-format
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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

0 comments on commit d6fa6cf

Please sign in to comment.