pmt: reformat code, etc.

This reverts commit 9a1af981d9.

.clang-format

@@ -1,6 +1,6 @@
 ---
 Language:        Cpp
-AccessModifierOffset: -2
+AccessModifierOffset: -1
 AlignAfterOpenBracket: Align
 AlignArrayOfStructures: None
 AlignConsecutiveAssignments:
@@ -65,7 +65,7 @@ AlignConsecutiveTableGenDefinitionColons:
   AlignFunctionDeclarations: false
   AlignFunctionPointers: false
   PadOperators:    false
-AlignEscapedNewlines: Right
+AlignEscapedNewlines: Left
 AlignOperands:   Align
 AlignTrailingComments:
   Kind:            Always
@@ -79,17 +79,22 @@ AllowShortCaseLabelsOnASingleLine: false
 AllowShortCompoundRequirementOnASingleLine: true
 AllowShortEnumsOnASingleLine: true
 AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: AllIfsAndElse
+AllowShortIfStatementsOnASingleLine: WithoutElse
 AllowShortLambdasOnASingleLine: All
-AllowShortLoopsOnASingleLine: false
+AllowShortLoopsOnASingleLine: true
 AllowShortNamespacesOnASingleLine: false
 AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakBeforeMultilineStrings: true
 AttributeMacros:
   - __capability
+  - absl_nonnull
+  - absl_nullable
+  - absl_nullability_unknown
 BinPackArguments: true
+BinPackLongBracedList: true
 BinPackParameters: BinPack
 BitFieldColonSpacing: Both
+BracedInitializerIndentWidth: -1
 BraceWrapping:
   AfterCaseLabel:  false
   AfterClass:      false
@@ -118,13 +123,14 @@ BreakBeforeBinaryOperators: None
 BreakBeforeConceptDeclarations: Always
 BreakBeforeBraces: Attach
 BreakBeforeInlineASMColon: OnlyMultiline
+BreakBeforeTemplateCloser: false
 BreakBeforeTernaryOperators: true
 BreakBinaryOperations: Never
 BreakConstructorInitializers: BeforeColon
 BreakFunctionDefinitionParameters: false
 BreakInheritanceList: BeforeColon
 BreakStringLiterals: true
-BreakTemplateDeclarations: MultiLine
+BreakTemplateDeclarations: Yes
 ColumnLimit:     80
 CommentPragmas:  '^ IWYU pragma:'
 CompactNamespaces: false
@@ -135,6 +141,7 @@ DerivePointerAlignment: false
 DisableFormat:   false
 EmptyLineAfterAccessModifier: Never
 EmptyLineBeforeAccessModifier: LogicalBlock
+EnumTrailingComma: Leave
 ExperimentalAutoDetectBinPacking: false
 FixNamespaceComments: true
 ForEachMacros:
@@ -143,25 +150,29 @@ ForEachMacros:
   - BOOST_FOREACH
 IfMacros:
   - KJ_IF_MAYBE
-IncludeBlocks:   Preserve
+IncludeBlocks:   Regroup
 IncludeCategories:
-  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+  - Regex:           '^<ext/.*\.h>'
     Priority:        2
     SortPriority:    0
     CaseSensitive:   false
-  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
-    Priority:        3
-    SortPriority:    0
-    CaseSensitive:   false
-  - Regex:           '.*'
+  - Regex:           '^<.*\.h>'
     Priority:        1
     SortPriority:    0
     CaseSensitive:   false
-IncludeIsMainRegex: '(Test)?$'
+  - Regex:           '^<.*'
+    Priority:        2
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '.*'
+    Priority:        3
+    SortPriority:    0
+    CaseSensitive:   false
+IncludeIsMainRegex: '([-_](test|unittest))?$'
 IncludeIsMainSourceRegex: ''
 IndentAccessModifiers: false
 IndentCaseBlocks: false
-IndentCaseLabels: false
+IndentCaseLabels: true
 IndentExportBlock: true
 IndentExternBlock: AfterExternBlock
 IndentGotoLabels: true
@@ -183,7 +194,7 @@ JavaScriptQuotes: Leave
 JavaScriptWrapImports: true
 KeepEmptyLines:
   AtEndOfFile:     false
-  AtStartOfBlock:  true
+  AtStartOfBlock:  false
   AtStartOfFile:   true
 KeepFormFeed:    false
 LambdaBodyIndentation: Signature
@@ -193,14 +204,15 @@ MacroBlockEnd:   ''
 MainIncludeChar: Quote
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None
-ObjCBinPackProtocolList: Auto
+ObjCBinPackProtocolList: Never
 ObjCBlockIndentWidth: 2
 ObjCBreakBeforeNestedBlockParam: true
 ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
-PackConstructorInitializers: BinPack
+OneLineFormatOffRegex: ''
+PackConstructorInitializers: NextLine
 PenaltyBreakAssignment: 2
-PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakBeforeFirstCallParameter: 1
 PenaltyBreakBeforeMemberAccess: 150
 PenaltyBreakComment: 300
 PenaltyBreakFirstLessLess: 120
@@ -210,10 +222,40 @@ PenaltyBreakString: 1000
 PenaltyBreakTemplateDeclaration: 10
 PenaltyExcessCharacter: 1000000
 PenaltyIndentedWhitespace: 0
-PenaltyReturnTypeOnItsOwnLine: 60
-PointerAlignment: Right
+PenaltyReturnTypeOnItsOwnLine: 200
+PointerAlignment: Left
 PPIndentWidth:   -1
 QualifierAlignment: Leave
+RawStringFormats:
+  - Language:        Cpp
+    Delimiters:
+      - cc
+      - CC
+      - cpp
+      - Cpp
+      - CPP
+      - 'c++'
+      - 'C++'
+    CanonicalDelimiter: ''
+    BasedOnStyle:    google
+  - Language:        TextProto
+    Delimiters:
+      - pb
+      - PB
+      - proto
+      - PROTO
+    EnclosingFunctions:
+      - EqualsProto
+      - EquivToProto
+      - PARSE_PARTIAL_TEXT_PROTO
+      - PARSE_TEST_PROTO
+      - PARSE_TEXT_PROTO
+      - ParseTextOrDie
+      - ParseTextProtoOrDie
+      - ParseTestProto
+      - ParsePartialTestProto
+    CanonicalDelimiter: pb
+    BasedOnStyle:    google
 ReferenceAlignment: Pointer
 ReflowComments:  Always
 RemoveBracesLLVM: false
@@ -225,11 +267,14 @@ RequiresExpressionIndentation: OuterScope
 SeparateDefinitionBlocks: Leave
 ShortNamespaceLines: 1
 SkipMacroDefinitionBody: false
-SortIncludes:    CaseSensitive
+SortIncludes:
+  Enabled:         true
+  IgnoreCase:      false
 SortJavaStaticImport: Before
 SortUsingDeclarations: LexicographicNumeric
 SpaceAfterCStyleCast: false
 SpaceAfterLogicalNot: false
+SpaceAfterOperatorKeyword: false
 SpaceAfterTemplateKeyword: true
 SpaceAroundPointerQualifiers: Default
 SpaceBeforeAssignmentOperators: true
@@ -245,6 +290,7 @@ SpaceBeforeParensOptions:
   AfterFunctionDefinitionName: false
   AfterFunctionDeclarationName: false
   AfterIfMacros:   true
+  AfterNot:        false
   AfterOverloadedOperator: false
   AfterPlacementOperator: true
   AfterRequiresInClause: false
@@ -253,7 +299,7 @@ SpaceBeforeParensOptions:
 SpaceBeforeRangeBasedForLoopColon: true
 SpaceBeforeSquareBrackets: false
 SpaceInEmptyBlock: false
-SpacesBeforeTrailingComments: 1
+SpacesBeforeTrailingComments: 2
 SpacesInAngles:  Never
 SpacesInContainerLiterals: true
 SpacesInLineCommentPrefix:
@@ -267,7 +313,7 @@ SpacesInParensOptions:
   InEmptyParentheses: false
   Other:           false
 SpacesInSquareBrackets: false
-Standard:        Latest
+Standard:        Auto
 StatementAttributeLikeMacros:
   - Q_EMIT
 StatementMacros:

.github/workflows/build.yml

@@ -5,7 +5,7 @@ on: [workflow_dispatch]
 jobs:
   build:
     runs-on: ubuntu-latest
-
+    
     permissions:
       contents: write
 
@@ -23,7 +23,7 @@ jobs:
         run: |
           sudo apt update
           sudo apt upgrade -y
-          sudo apt install make cmake extra-cmake-modules zip -y
+          sudo apt install make ninja-build cmake extra-cmake-modules zip -y
 
       - name: Setup Android NDK
         id: setup-ndk
@@ -35,7 +35,7 @@ jobs:
       - name: Build And Prepare For Release
         id: build
         run: |
-          git clone https://github.com/ShawkTeam/pmt-renovated -b main ./pmt && cd pmt
+          git clone https://git.yzbruh.space/${{ github.repository }} -b main ./pmt && cd pmt
           export ANDROID_NDK="${{ github.workspace }}/android-ndk-r28c"
           bash build.sh clean
           bash build.sh build -DCMAKE_BUILD_TYPE=Release
@@ -49,6 +49,9 @@ jobs:
           zip pmt-static-armeabi-v7a.zip pmt_static
           echo "BUILD_DATE=$(date +%Y%m%d)" >> $GITHUB_ENV 
           echo "BUILD=${{ github.workspace }}/pmt" >> $GITHUB_ENV
+          cd ..
+          echo -e "Read [Wiki - About Release Types](https://git.yzbruh.space/${{ github.repository }}/wiki/About-Release-Types) for getting more information.\n\n### Changes\n" > release.txt
+          git log --since="2025-08-21" --pretty=format:" * %ad | [%s](https://git.yzbruh.space/${{ github.repository }}/commit/%H)" --date=short | sed 's/ -.*//' | grep -v cleanup >> release.txt
         working-directory: ${{ github.workspace }}
 
       - name: Upload To GitHub Releases
@@ -60,4 +63,4 @@ jobs:
             ${{ env.BUILD }}/build_armeabi-v7a/*.zip
           name: Partition Manager Tool Release ${{ env.BUILD_DATE }}
           tag_name: ${{ env.BUILD_DATE }}
-          body: "Read [RELEASE-TYPES.md](https://github.com/ShawkTeam/pmt-renovated/blob/main/RELEASE-TYPES.md) for getting more information."
+          body_path: ${{ env.BUILD }}/release.txt

.gitignore

@@ -7,8 +7,7 @@ cmake-build-*
 include/generated
 
 # Dont't add build directories
-build_arm64-v8a
-build_armeabi-v7a
+build_*
 
 # Don't add generated objects and libs
 *.o

.idea/.name

@@ -1 +0,0 @@
-pmt

.idea/1.0.0.iml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module classpath="CMake" type="CPP_MODULE" version="4" />

.idea/editor.xml

@@ -1,344 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="BackendCodeEditorSettings">
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CDeclarationWithImplicitIntType/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CommentTypo/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConstevalIfIsAlwaysConstant/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppAbstractClassWithoutSpecifier/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppAbstractFinalClass/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppAbstractVirtualFunctionCallInCtor/@EntryIndexedValue" value="ERROR" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppAccessSpecifierWithNoDeclarations/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppAwaiterTypeIsNotClass/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppBooleanIncrementExpression/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppBoostFormatBadCode/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppBoostFormatLegacyCode/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppBoostFormatMixedArgs/@EntryIndexedValue" value="ERROR" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppBoostFormatTooFewArgs/@EntryIndexedValue" value="ERROR" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppBoostFormatTooManyArgs/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppCStyleCast/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppCVQualifierCanNotBeAppliedToReference/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppClassCanBeFinal/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppClassIsIncomplete/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppClassNeedsConstructorBecauseOfUninitializedMember/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppClassNeverUsed/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppCompileTimeConstantCanBeReplacedWithBooleanConstant/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppConceptNeverUsed/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppConditionalExpressionCanBeSimplified/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppConstParameterInDeclaration/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppConstValueFunctionReturnType/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppCoroutineCallResolveError/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAArrayIndexOutOfBounds/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAConstantConditions/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAConstantFunctionResult/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAConstantParameter/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFADeletedPointer/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAEndlessLoop/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAInfiniteRecursion/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAInvalidatedMemory/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFALocalValueEscapesFunction/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFALocalValueEscapesScope/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFALoopConditionNotUpdated/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAMemoryLeak/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFANotInitializedField/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFANullDereference/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFATimeOver/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAUnreachableCode/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAUnreachableFunctionCall/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAUnreadVariable/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAUnusedValue/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeclarationHidesLocal/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeclarationHidesUncapturedLocal/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeclarationSpecifierWithoutDeclarators/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeclaratorDisambiguatedAsFunction/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeclaratorNeverUsed/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeclaratorUsedBeforeInitialization/@EntryIndexedValue" value="ERROR" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDefaultCaseNotHandledInSwitchStatement/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDefaultInitializationWithNoUserConstructor/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDefaultIsUsedAsIdentifier/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDefaultedSpecialMemberFunctionIsImplicitlyDeleted/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeletingVoidPointer/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDependentTemplateWithoutTemplateKeyword/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDependentTypeWithoutTypenameKeyword/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeprecatedEntity/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeprecatedOverridenMethod/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeprecatedRegisterStorageClassSpecifier/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDereferenceOperatorLimitExceeded/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDiscardedPostfixOperatorResult/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDoxygenSyntaxError/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDoxygenUndocumentedParameter/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDoxygenUnresolvedReference/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEmptyDeclaration/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceCVQualifiersOrder/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceCVQualifiersPlacement/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceDoStatementBraces/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceForStatementBraces/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceFunctionDeclarationStyle/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceIfStatementBraces/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceNestedNamespacesStyle/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceOverridingDestructorStyle/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceOverridingFunctionStyle/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceTypeAliasCodeStyle/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceWhileStatementBraces/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEntityAssignedButNoRead/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEntityUsedOnlyInUnevaluatedContext/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnumeratorNeverUsed/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEqualOperandsInBinaryExpression/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEvaluationFailure/@EntryIndexedValue" value="ERROR" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppExplicitSpecializationInNonNamespaceScope/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppExpressionWithoutSideEffects/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppFinalFunctionInFinalClass/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppFinalNonOverridingVirtualFunction/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppForLoopCanBeReplacedWithWhile/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppForwardEnumDeclarationWithoutUnderlyingType/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppFunctionDoesntReturnValue/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppFunctionIsNotImplemented/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppFunctionResultShouldBeUsed/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppFunctionalStyleCast/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppHeaderHasBeenAlreadyIncluded/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppHiddenFunction/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppHidingFunction/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppIdenticalOperandsInBinaryExpression/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppIfCanBeReplacedByConstexprIf/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppImplicitDefaultConstructorNotAvailable/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppIncompatiblePointerConversion/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppIncompleteSwitchStatement/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppInconsistentNaming/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppIntegralToPointerConversion/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppInvalidLineContinuation/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppJoinDeclarationAndAssignment/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppLambdaCaptureNeverUsed/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppLocalVariableMayBeConst/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppLocalVariableMightNotBeInitialized/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppLocalVariableWithNonTrivialDtorIsNeverUsed/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppLongFloat/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMemberFunctionMayBeConst/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMemberFunctionMayBeStatic/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMemberInitializersOrder/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMismatchedClassTags/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMissingIncludeGuard/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMissingKeywordThrow/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMsExtAddressOfClassRValue/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMsExtBindingRValueToLvalueReference/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMsExtCopyElisionInCopyInitDeclarator/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMsExtDoubleUserConversionInCopyInit/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMsExtNotInitializedStaticConstLocalVar/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMsExtReinterpretCastFromNullptr/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMultiCharacterLiteral/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMultiCharacterWideLiteral/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMustBePublicVirtualToImplementInterface/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMutableSpecifierOnReferenceMember/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNoDiscardExpression/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNodiscardFunctionWithoutReturnValue/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNonExceptionSafeResourceAcquisition/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNonExplicitConversionOperator/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNonExplicitConvertingConstructor/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNonInlineFunctionDefinitionInHeaderFile/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNonInlineVariableDefinitionInHeaderFile/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNotAllPathsReturnValue/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppObjectMemberMightNotBeInitialized/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppOutParameterMustBeWritten/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppParameterMayBeConst/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppParameterMayBeConstPtrOrRef/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppParameterNamesMismatch/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppParameterNeverUsed/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPassValueParameterByConstReference/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPointerConversionDropsQualifiers/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPointerToIntegralConversion/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPolymorphicClassWithNonVirtualPublicDestructor/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPossiblyErroneousEmptyStatements/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPossiblyUninitializedMember/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPossiblyUnintendedObjectSlicing/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPrecompiledHeaderIsNotIncluded/@EntryIndexedValue" value="ERROR" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPrecompiledHeaderNotFound/@EntryIndexedValue" value="ERROR" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPrintfBadFormat/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPrintfExtraArg/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPrintfMissedArg/@EntryIndexedValue" value="ERROR" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPrintfRiskyFormat/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPrivateSpecialMemberFunctionIsNotImplemented/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRangeBasedForIncompatibleReference/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedefinitionOfDefaultArgumentInOverrideFunction/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantAccessSpecifier/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantBaseClassAccessSpecifier/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantBaseClassInitializer/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantBooleanExpressionArgument/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantCastExpression/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantComplexityInComparison/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantConditionalExpression/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantConstSpecifier/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantControlFlowJump/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantDereferencingAndTakingAddress/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantElaboratedTypeSpecifier/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantElseKeyword/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantElseKeywordInsideCompoundStatement/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantEmptyDeclaration/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantEmptyStatement/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantExportKeyword/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantFwdClassOrEnumSpecifier/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantInlineSpecifier/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantLambdaParameterList/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantMemberInitializer/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantNamespaceDefinition/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantParentheses/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantQualifier/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantQualifierADL/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantStaticSpecifierOnMemberAllocationFunction/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantStaticSpecifierOnThreadLocalLocalVariable/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantTemplateArguments/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantTemplateKeyword/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantTypenameKeyword/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantVoidArgumentList/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantZeroInitializerInAggregateInitialization/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppReinterpretCastFromVoidPtr/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRemoveRedundantBraces/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppReplaceMemsetWithZeroInitialization/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppReplaceTieWithStructuredBinding/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppReturnNoValueInNonVoidFunction/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppSmartPointerVsMakeFunction/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppSomeObjectMembersMightNotBeInitialized/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppSpecialFunctionWithoutNoexceptSpecification/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppStaticAssertFailure/@EntryIndexedValue" value="ERROR" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppStaticDataMemberInUnnamedStruct/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppStaticSpecifierOnAnonymousNamespaceMember/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppStringLiteralToCharPointerConversion/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTabsAreDisallowed/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTemplateArgumentsCanBeDeduced/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTemplateParameterNeverUsed/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTemplateParameterShadowing/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppThrowExpressionCanBeReplacedWithRethrow/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTooWideScope/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTooWideScopeInitStatement/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTypeAliasNeverUsed/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUninitializedDependentBaseClass/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUninitializedNonStaticDataMember/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnionMemberOfReferenceType/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnmatchedPragmaEndRegionDirective/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnmatchedPragmaRegionDirective/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnnamedNamespaceInHeaderFile/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnnecessaryWhitespace/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnsignedZeroComparison/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnusedIncludeDirective/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseAlgorithmWithCount/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseAssociativeContains/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseAuto/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseAutoForNumeric/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseElementsView/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseEraseAlgorithm/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseFamiliarTemplateSyntaxForGenericLambdas/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseRangeAlgorithm/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseStdSize/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseStructuredBinding/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseTypeTraitAlias/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUserDefinedLiteralSuffixDoesNotStartWithUnderscore/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUsingResultOfAssignmentAsCondition/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppVariableCanBeMadeConstexpr/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppVirtualFunctionCallInsideCtor/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppVirtualFunctionInFinalClass/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppVolatileParameterInDeclaration/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppWarningDirective/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppWrongIncludesOrder/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppWrongSlashesInIncludeDirective/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppZeroConstantCanBeReplacedWithNullptr/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppZeroValuedExpressionUsedAsNullPointer/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=IdentifierTypo/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=IfStdIsConstantEvaluatedCanBeReplaced/@EntryIndexedValue" value="SUGGESTION" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=StdIsConstantEvaluatedWillAlwaysEvaluateToConstant/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringLiteralTypo/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppClangFormat/EnableClangFormatSupport/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_ARGUMENT/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_BINARY_EXPRESSIONS_CHAIN/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_CALLS_CHAIN/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_EXPRESSION/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_EXTENDS_LIST/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_FOR_STMT/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_PARAMETER/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_TYPE_ARGUMENT/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_TYPE_PARAMETER/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTIPLE_DECLARATION/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_TERNARY/@EntryValue" value="ALIGN_ALL" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/BLANK_LINES_AROUND_CLASS_DEFINITION/@EntryValue" value="1" type="int" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/BLANK_LINES_AROUND_DECLARATIONS/@EntryValue" value="0" type="int" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/BLANK_LINES_AROUND_FUNCTION_DECLARATION/@EntryValue" value="1" type="int" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/BLANK_LINES_AROUND_FUNCTION_DEFINITION/@EntryValue" value="1" type="int" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/BREAK_TEMPLATE_DECLARATION/@EntryValue" value="LINE_BREAK" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/CASE_BLOCK_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/CONTINUOUS_LINE_INDENT/@EntryValue" value="Double" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/FREE_BLOCK_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INDENT_ACCESS_SPECIFIERS_FROM_CLASS/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INDENT_CASE_FROM_SWITCH/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INDENT_CLASS_MEMBERS_FROM_ACCESS_SPECIFIERS/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INDENT_COMMENT/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INDENT_SIZE/@EntryValue" value="4" type="int" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INDENT_STYLE/@EntryValue" value="Tab" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INITIALIZER_BRACES/@EntryValue" value="END_OF_LINE_NO_SPACE" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INT_ALIGN_EQ/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INVOCABLE_DECLARATION_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/KEEP_BLANK_LINES_IN_CODE/@EntryValue" value="2" type="int" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue" value="2" type="int" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/KEEP_USER_LINEBREAKS/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/LINE_BREAK_AFTER_COLON_IN_MEMBER_INITIALIZER_LISTS/@EntryValue" value="ON_SINGLE_LINE" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/MEMBER_INITIALIZER_LIST_STYLE/@EntryValue" value="DO_NOT_CHANGE" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/NAMESPACE_DECLARATION_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/NAMESPACE_INDENTATION/@EntryValue" value="All" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/OTHER_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/PLACE_CATCH_ON_NEW_LINE/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/PLACE_ELSE_ON_NEW_LINE/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/PLACE_NAMESPACE_DEFINITIONS_ON_SAME_LINE/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/PLACE_WHILE_ON_NEW_LINE/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SIMPLE_BLOCK_STYLE/@EntryValue" value="DO_NOT_CHANGE" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_CAST_EXPRESSION_PARENTHESES/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_COLON_IN_BITFIELD_DECLARATOR/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_COMMA_IN_TEMPLATE_ARGS/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_COMMA_IN_TEMPLATE_PARAMS/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_EXTENDS_COLON/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_FOR_COLON/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_FOR_SEMICOLON/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_PTR_IN_DATA_MEMBER/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_PTR_IN_DATA_MEMBERS/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_PTR_IN_METHOD/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_PTR_IN_NESTED_DECLARATOR/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_REF_IN_DATA_MEMBER/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_REF_IN_DATA_MEMBERS/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_REF_IN_METHOD/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_UNARY_OPERATOR/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_COLON_IN_BITFIELD_DECLARATOR/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_EXTENDS_COLON/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_FOR_COLON/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_FOR_SEMICOLON/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_PTR_IN_ABSTRACT_DECL/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_PTR_IN_DATA_MEMBER/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_PTR_IN_DATA_MEMBERS/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_PTR_IN_METHOD/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_REF_IN_ABSTRACT_DECL/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_REF_IN_DATA_MEMBER/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_REF_IN_DATA_MEMBERS/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_REF_IN_METHOD/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_TEMPLATE_ARGS/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_TEMPLATE_PARAMS/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BETWEEN_CLOSING_ANGLE_BRACKETS_IN_TEMPLATE_ARGS/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_ARRAY_ACCESS_BRACKETS/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_CAST_EXPRESSION_PARENTHESES/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_DECLARATION_PARENTHESES/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_EMPTY_BLOCKS/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_EMPTY_INITIALIZER_BRACES/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_EMPTY_METHOD_PARENTHESES/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_EMPTY_TEMPLATE_PARAMS/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_INITIALIZER_BRACES/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_TEMPLATE_ARGS/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_TEMPLATE_PARAMS/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPECIAL_ELSE_IF_TREATMENT/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/TAB_WIDTH/@EntryValue" value="4" type="int" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/TYPE_DECLARATION_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_AFTER_BINARY_OPSIGN/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_AFTER_DECLARATION_LPAR/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_AFTER_INVOCATION_LPAR/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_ARGUMENTS_STYLE/@EntryValue" value="WRAP_IF_LONG" type="string" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_BEFORE_DECLARATION_LPAR/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_BEFORE_DECLARATION_RPAR/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_BEFORE_INVOCATION_LPAR/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_BEFORE_INVOCATION_RPAR/@EntryValue" value="false" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_BEFORE_TERNARY_OPSIGNS/@EntryValue" value="true" type="bool" />
-    <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_PARAMETERS_STYLE/@EntryValue" value="WRAP_IF_LONG" type="string" />
-    <option name="/Default/CodeStyle/EditorConfig/EnableClangFormatSupport/@EntryValue" value="false" type="bool" />
-  </component>
-</project>

.idea/misc.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CMakePythonSetting">
-    <option name="pythonIntegrationState" value="YES" />
-  </component>
-  <component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
-  <component name="WestSettings"><![CDATA[{}]]></component>
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/1.0.0.iml" filepath="$PROJECT_DIR$/.idea/1.0.0.iml" />
-    </modules>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

Android.bp

@@ -0,0 +1,110 @@
+//
+//   Copyright 2025 Yağız Zengin
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+//
+
+// Partition manager tool source list
+filegroup {
+    name: "pmt_srcs",
+    srcs: [
+        "src/FunctionManager.cpp",
+        "src/Main.cpp",
+        "src/PartitionManager.cpp",
+        "src/functions/BackupFunction.cpp",
+        "src/functions/EraseFunction.cpp",
+        "src/functions/FlashFunction.cpp",
+        "src/functions/InfoFunction.cpp",
+        "src/functions/MemoryTestFunction.cpp",
+        "src/functions/PartitionSizeFunction.cpp",
+        "src/functions/RealPathFunction.cpp",
+        "src/functions/RebootFunction.cpp",
+        "src/functions/TypeFunction.cpp",
+    ],
+}
+
+// libhelper source list
+filegroup {
+    name: "libhelper_srcs",
+    srcs: [
+        "srclib/libhelper/src/Checkers.cpp",
+        "srclib/libhelper/src/Classes.cpp",
+        "srclib/libhelper/src/FileUtil.cpp",
+        "srclib/libhelper/src/Sha256.cpp",
+        "srclib/libhelper/src/Utilities.cpp",
+    ],
+}
+
+// libpartition_map source list
+filegroup {
+    name: "libpartition_map_srcs",
+    srcs: [
+        "srclib/libpartition_map/src/Getters.cpp",
+        "srclib/libpartition_map/src/Magic.cpp",
+        "srclib/libpartition_map/src/PartitionMap.cpp",
+        "srclib/libpartition_map/src/Type.cpp",
+    ],
+}
+
+// Default configurations of pmt
+cc_defaults {
+    name: "pmt_defaults",
+    recovery_available: true,
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wno-deprecated-declarations",
+        "-Os",
+        "-fexceptions",
+        "-DANDROID_BUILD",
+    ],
+    ldflags: ["-Wl,-s"],
+    local_include_dirs: [
+        "include",
+        "srclib/libhelper/include",
+        "srclib/libpartition_map/include",
+    ],
+    export_include_dirs: [
+        "include",
+        "srclib/libhelper/include",
+        "srclib/libpartition_map/include",
+    ],
+    shared_libs: ["libbase"],
+}
+
+// libhelper library target
+cc_library_shared {
+    name: "libhelper",
+    defaults: ["pmt_defaults"],
+    srcs: [":libhelper_srcs"],
+}
+
+// libpartition_map library target
+cc_library_shared {
+    name: "libpartition_map",
+    defaults: ["pmt_defaults"],
+    srcs: [":libpartition_map_srcs"],
+    shared_libs: ["libhelper"],
+    static_libs: ["libc++fs"],
+}
+
+// pmt executable target
+cc_binary {
+    name: "pmt",
+    defaults: ["pmt_defaults"],
+    srcs: [":pmt_srcs"],
+    shared_libs: [
+        "libhelper",
+        "libpartition_map",
+    ],
+}

CMakeLists.txt

@@ -16,7 +16,7 @@
 
 # Project info
 cmake_minimum_required(VERSION 3.10)
-project(pmt VERSION 1.0.0)
+project(pmt VERSION 1.3.0)
 
 # Set compiler flags
 add_compile_options(-Wall -Werror -Wno-deprecated-declarations)
@@ -29,7 +29,7 @@ else()
 endif()
 
 # Add pmt's CMake module(s)
-include(cmake/generate_headers.cmake)
+include(build/cmake/generate_headers.cmake)
 
 # Generate header(s)
 get_property(FLAGS DIRECTORY PROPERTY COMPILE_OPTIONS)

README.md

@@ -19,15 +19,23 @@ PMT is designed for developers, technicians, and Android enthusiasts who need fi
 - **Reboot** the device into multiple modes (normal, recovery, etc.).
 - **Asynchronous processing** for speed — each partition runs in its own thread.
 - **Error isolation** so one failing operation doesn’t cancel the rest. For back upping, flashing and erasing.
+- **Test** sequential read/write speed of your memory.
 
 ---
 
 ## Documentation
 
-Detailed usage instructions and option references can be found in the [USAGE.md](./USAGE.md) file.
+For all information about PMT, see the [wiki](https://git.yzbruh.space/YZBruh/pmt-renovated/wiki).\
+Read [Wiki - Using PMT via Termux or ADB](https://git.yzbruh.space/YZBruh/pmt-renovated/wiki/Using-PMT-via-Termux-or-ADB) for learn how to use PMT via Termux or ADB.\
+Detailed usage instructions and option references can be found in the [Wiki - Usage](https://git.yzbruh.space/YZBruh/pmt-renovated/wiki/Usage).\
+See [Wiki - How To Build](https://git.yzbruh.space/YZBruh/pmt-renovated/wiki/How-To-Build) to learn how to build.
+
+## Bug Reporting
+Please submit bugs at [Issues](https://git.yzbruh.space/YZBruh/pmt-renovated/issues) page.
 
 ---
 
 ## Credits
  - [CLI11: Command line parser for C++11](https://github.com/CLIUtils/CLI11)
  - [PicoSHA2: A header-file-only, SHA256 hash generator in C++](https://github.com/okdshin/PicoSHA2)
+ - [nlohmann/json: JSON for Modern C++](https://github.com/nlohmann/json)

RELEASE-TYPES.md

@@ -1,65 +0,0 @@
-# Release Types
-
-This project provides four different release packages, each tailored for specific Android device architectures and usage preferences.
-
----
-
-## The Four Release Files
-
-| File Name                 | Architecture    | Bitness | Library Type   | Description                                              |
-|---------------------------|-----------------|---------|----------------|----------------------------------------------------------|
-| `pmt-arm64-v8a.zip`       | ARM64 (ARMv8-A) | 64-bit  | Dynamic (.so)  | For 64-bit devices, uses dynamic libraries. Requires accompanying `.so` files (`libhelper` and `libpartition_map`). |
-| `pmt-static-arm64-v8a.zip`| ARM64 (ARMv8-A) | 64-bit  | Static (.a)    | Fully static build for 64-bit devices. No external dependencies. Great for general use and ADB environments. |
-| `pmt-armeabi-v7a.zip`     | ARM (ARMv7)     | 32-bit  | Dynamic (.so)  | For 32-bit devices, uses dynamic libraries. Requires `.so` files (`libhelper` and `libpartition_map`). |
-| `pmt-static-armeabi-v7a.zip`| ARM (ARMv7)   | 32-bit  | Static (.a)    | Fully static build for 32-bit devices. No external dependencies. Great for general use and ADB environments. |
-
----
-
-## Architecture & Bitness Explained
-
-- **ARM64 (arm64-v8a)**:  
-  This is a 64-bit architecture used by newer Android devices. It can handle larger amounts of memory and generally runs faster for heavy tasks.
-
-- **ARM (armeabi-v7a)**:  
-  This is a 32-bit architecture common on older or less powerful Android devices. It has some limitations compared to 64-bit but is still widely supported.
-
----
-
-## Dynamic vs Static Libraries
-
-The project relies on two helper libraries:
-- **libhelper**
-- **libpartition_map**
-
-### Dynamic Versions (`.so` files)
-
-- In the non-static (`pmt-arm64-v8a.zip` and `pmt-armeabi-v7a.zip`) packages, these libraries are **compiled as shared objects (`.so` files)**.
-- This means that the main program (`pmt`) **depends on these libraries being present** on the device or alongside the executable to run correctly.
-- If these libraries are missing, the program will fail to start.
-- These builds are mostly for developers or users who want to customize or work closely with the libraries.
-
-### Static Versions (`.a` files)
-
-- The static packages (`pmt-static-arm64-v8a.zip` and `pmt-static-armeabi-v7a.zip`) **include these libraries inside the main executable** by linking them statically.
-- This means the `pmt` binary is **completely self-contained** and **does not require any external `.so` files**.
-- These versions are ideal for general users and especially convenient for ADB usage, where installing separate `.so` files might be cumbersome.
-
----
-
-## Which Should You Use?
-
-- If you want a hassle-free experience and don’t want to worry about missing libraries, **choose the static version** matching your device’s architecture.
-- If you are a developer or want to experiment with the libraries separately, or save space by sharing `.so` files between multiple programs, the **dynamic version** is the way to go.
-
----
-
-## Summary
-
-| Release Type | Architecture | Dependencies          | Best For                  |
-|--------------|--------------|-----------------------|---------------------------|
-| Static       | 32-bit / 64-bit | None (fully standalone) | General users, ADB usage  |
-| Dynamic      | 32-bit / 64-bit | Requires `.so` libs   | Developers, advanced users |
-
----
-
-If you’re unsure which one to pick, try the **static version** first — it works out of the box on all supported devices.

USAGE.md

@@ -1,319 +0,0 @@
-# Partition Manager Tool (PMT)
-
-**Partition Manager Tool** is a powerful command-line utility for **Android** devices, designed to perform various operations on partitions quickly, reliably, and efficiently.  
-This is the **renovated version** of PMT, rewritten in C++ for improved performance, stability, and usability compared to its older variant.
-
-It supports **asynchronous operations**, allowing multiple partitions to be processed in parallel, and includes safety measures to prevent a single error from breaking the entire operation batch.
-
----
-
-## Features
-
-- **Backup** partitions to files (with optional permissions fix for non-root access).
-- **Flash** image files directly to partitions.
-- **Erase** partitions by filling them with zero bytes.
-- **Get** partition sizes in various units.
-- **Display** partition information in plain text or JSON format.
-- **Retrieve** real paths and symbolic link paths of partitions.
-- **Identify** file system or image types by checking magic numbers.
-- **Reboot** the device into different modes.
-
----
-
-## Usage
-Don't forget to check out how to use it with **ADB**!
-
-```bash
-pmt [OPTIONS] [SUBCOMMAND]
-```
-
-### Global Options
-
-| Option | Long Option            | Description |
-|--------|------------------------|-------------|
-| `-h`   | `--help`               | Print basic help message and exit. |
-|        | `--help-all`           | Print full help message and exit. |
-| `-S`   | `--search-path TEXT`   | Set the partition search path. |
-| `-L`   | `--log-file TEXT`      | Set log file path. |
-| `-f`   | `--force`              | Force the process to be executed even if checks fail. |
-| `-l`   | `--logical`            | Specify that the target partition is **dynamic**. |
-| `-q`   | `--quiet`              | Suppress output. |
-| `-V`   | `--verbose`            | Enable detailed logs during execution. |
-| `-v`   | `--version`            | Print version and exit. |
-
-**Example usages for global options:**\
-`pmt [SUBCOMMAND ...] --quiet`\
-`pmt [SUBCOMMAND ...] -S /dev/block/platform/bootdevice/by-name`\
-`pmt [SUBCOMMAND ...] [GLOBAL OPTIONS ...]`
-
----
-
-## Subcommands
-
-### 1. `backup`
-Backup partitions to files. General syntax:
-```bash
-pmt backup partition(s) [output(s)] [OPTIONS]
-```
-
-**Options:**
-- `-b`, `--buffer-size SIZE` → Set buffer size (in bytes) for read/write operations.
-- `-O`, `--output-directory DIR` → Specify an output directory for backups.
-
-**Notes:**
-- Partition names are separated by commas.
-- If custom output names are provided, they must match the number of partitions.
-- Automatically adjusts permissions so backup files can be read/written without root.
-
-**Example usages:**\
-`pmt backup boot`\
-`pmt backup boot boot_backup.img`\
-`pmt backup boot,recovery,vendor`\
-`pmt backup boot`\
-`pmt backup boot,recovery -O /sdcard`\
-`pmt backup system,vendor --buffer-size=8192 # '=' is not mandatory`
-
----
-
-### 2. `flash`
-Flash an image or multiple images to partitions. general syntax:
-```bash
-pmt flash partition(s) image(s) [OPTIONS]
-```
-
-**Options:**
-- `-b`, `--buffer-size SIZE` → Set buffer size (in bytes).
-- `-I`, `--image-directory DIR` → Directory containing image files.
-
-**Notes:**
-- Multiple partitions and images are separated by commas.
-
-- **Example usages:**\
-  `pmt flash boot boot_backup.img`\
-  `pmt flash boot,recovery /sdcard/backups/boot_backup.img,/sdcard/backups/recovery_backup.img`\
-  `pmt flash boot boot_backup.img,recovery_backup.img -I /sdcard/backups`\
-  `pmt flash system,vendor system_backup.img,vendor_backup.img -I /sdcard/backups --buffer-size=8192`
-
----
-
-### 3. `erase`
-Fill partition(s) with zero bytes (like `dd if=/dev/zero of=/dev/block/by-name/<partition>`). General syntax:
-```bash
-pmt erase partition(s) [OPTIONS]
-```
-**Options:**
-- `-b`, `--buffer-size SIZE` → Set buffer size.
-
-**Example usages (DO NOT USE FOR TRYING!!!):**\
-`pmt erase boot`\
-`pmt erase nvdata,nvram`\
-`pmt erase system,vendor --buffer-size=8192`
-
----
-
-### 4. `sizeof`
-Show the size of partition(s). General syntax:
-```bash
-pmt sizeof partition(s) [OPTIONS]
-```
-
-**Options:**
-- `--as-byte` → Show size in bytes.
-- `--as-kilobyte` → Show size in KB.
-- `--as-megabyte` → Show size in MB (default).
-- `--as-gigabyte` → Show size in GB.
-- `--only-size` → Output only the numeric value (no partition name).
-
-**Example usages:**\
-`pmt sizeof boot` - Example output: `boot: 64MB`\
-`pmt sizeof boot --as-byte` - Example output: `64`\
-`pmt sizeof boot --as-<write type here> --only-size` - Example output (for `--as-kilobyte`): `98304`
-
----
-
-### 5. `info`
-Show partition name, size, and dynamic status. General syntax:
-```bash
-pmt info partition(s) [OPTIONS]
-```
-
-**Options:**
-- `-J`, `--json` → Output in JSON format.
-- `--json-partition-name NAME` → Custom JSON key for partition name.
-- `--json-size-name NAME` → Custom JSON key for size.
-- `--json-logical-name NAME` → Custom JSON key for dynamic status.
-
-**Example usages:**\
-`pmt info boot` - Example output: `partition=boot size=100663296 isLogical=false`\
-`pmt info boot -J` - Example output: `{"name": "boot", "size": 100663296, "isLogical": false}`\
-`pmt info boot -J --json-partition-name=partitionName` - Example output: `{"partitionName": "boot", "size": 100663296, "isLogical": false}`
-
----
-
-### 6. `real-path`
-Show the **absolute block device path** for each partition. General syntax:
-```bash
-pmt real-path partition(s) [OPTIONS]
-```
-
-**Example usages:**\
-`pmt real-path boot` - Example output: `/dev/block/sda25`
-
----
-
-### 7. `real-linkpath`
-Show the **symbolic link path** for each partition (e.g., `/dev/block/by-name/boot`). General syntax:
-```bash
-pmt real-link-path partition(s) [OPTIONS]
-```
-
----
-
-### 8. `type`
-Check magic numbers to determine file system or other types of partition(s) or image(s). General syntax:
-```bash
-pmt type partition(s) [OPTIONS]
-```
-
-**Options:**
-- `-b`, `--buffer-size SIZE` → Set buffer size.
-- `--only-check-android-magics` → Check only Android-related magic numbers.
-- `--only-check-filesystem-magic` → Check only file system magic numbers.
-
-**Example usages:**\
-`pmt type boot` - Example output: `boot contains Android Boot Image magic (0x2144494F52444241)`\
-`pmt type vendor_boot.img` - Example output: `vendor_boot.img contains Android Vendor Boot Image magic (0x544F4F4252444E56)`
-
----
-
-### 9. `reboot`
-Reboot the device. Default reboot target is normal. If you are using it via ADB terminal, you **DO NOT** need root to use this feature. General syntax:
-```bash
-pmt reboot [rebootTarget] [OPTIONS]
-```
-
-**Example usages:**\
-`pmt reboot`
-`pmt reboot recovery`
-`pmt reboot download`
-
-## Additional Notes
-
-- **Comma-separated inputs**: All commands (except `reboot`) require multiple inputs to be separated by commas.
-- **Asynchronous execution**: For `backup`, `flash`, and `erase`, each partition is processed in a separate thread for maximum speed.
-- **Error isolation**: A failure in processing one partition will not cancel the others. Only for `backup`, `flash` and `erase` functions.
-- **Automatic diagnostics**: By default, whether a partition is dynamic or regular is determined automatically. With global options, you only specify precision.
-- **Root access**: Root access is required if operations are to be performed on partitions.
-
-## Extra Note: Comma Usage
-
-In **Partition Manager Tool**, whenever you provide **multiple partitions**, **multiple image files**, or **multiple output file names**, they **must** be separated by commas (`,`), without spaces.
-
-✅ **Correct:**\
-`pmt backup boot,recovery`\
-`pmt flash boot,recovery boot.img,recovery.img`
-
-
-❌ **Incorrect:**\
-`pmt backup boot recovery`\
-`pmt flash boot recovery boot.img recovery.img`
-
-The **number of items must match** when providing both input and output lists.  
-For example, if you specify 3 partitions, you must also provide 3 output file names.
-
-This rule applies to **all commands except `reboot`**, since `reboot` only takes one optional argument.
-
----
-
-## Using `pmt-static` via ADB
-
-This guide will show you how to use the **static** version of Partition Manager Tool (`pmt-static`) on your Android device through **ADB**.  
-It’s written for beginners — no advanced knowledge needed.
-
----
-
-## 📦 Why Static Version?
-The **static** build of PMT contains everything it needs inside one single file.  
-This means you can run it directly on your Android device **without** installing extra libraries.  
-Perfect for quick tasks via ADB.
-
----
-
-## 📋 Requirements
-- **ADB installed** on your computer  
-  (Part of the Android SDK Platform Tools — [Download here](https://developer.android.com/studio/releases/platform-tools))
-- **USB Debugging enabled** on your phone  
-  (Settings → Developer options → Enable USB debugging)
-- Your **phone connected via USB** and recognized by ADB
-
----
-
-## 🚀 Step-by-Step Usage
-
-### 1️⃣ Get the Correct Binary
-Download the **`pmt-static`** file that matches your device’s architecture:
-- **`pmt-static-arm64-v8a`** → For 64-bit devices
-- **`pmt-static-armeabi-v7a`** → For 32-bit devices
-
-Unzip the downloaded `.zip` file — you should now have a `pmt` binary.
-
----
-
-### 2️⃣ Push the Binary to Your Device
-Use ADB to copy the `pmt` file to your phone’s temporary folder:
-```bash
-# Rename for more easily usage
-mv pmt_static pmt
-
-adb push pmt /data/local/tmp/pmt
-```
-
-### 3️⃣ Open an ADB Shell
-Access your device shell:
-```bash
-adb shell
-```
-
-### 4️⃣ Change to the Directory
-Move into the temporary directory where pmt is stored:
-```bash
-cd /data/local/tmp
-```
-
-### 5️⃣ Give Execute Permission
-Allow the binary to be executed:
-```bash
-chmod 755 pmt
-```
-
-### 6️⃣ Run PMT
-You can now run PMT directly from this directory:
-
-```bash
-# Open root terminal
-su
-
-./pmt --help
-```
-Example — Back up the boot partition:
-
-```bash
-./pmt backup boot
-```
-
-### 💡 Tips
-Commands must be run from /data/local/tmp unless you move pmt elsewhere.\
-The /data/local/tmp folder is cleared when you reboot your device.\
-Static builds are completely standalone — no missing library issues.
-
----
-
-## License
-Partition Manager Tool is licensed under the **Apache 2.0 License**.  
-Copyright © YZBruh.
-
----
-
-## Bug Reports
-Please submit issues at:  
-[https://github.com/ShawkTeam/pmt-renovated/issues](https://github.com/ShawkTeam/pmt-renovated/issues)

build.sh

@@ -15,74 +15,68 @@
 #  limitations under the License.
 #
 
-set -e
-
-BUILD_64="build_arm64-v8a"
-BUILD_32="build_armeabi-v7a"
 THIS="$(basename $0)"
+TARGET_ABI_LIST=("arm64-v8a" "armeabi-v7a")
 
 echo() { command echo "[$THIS]: $@"; }
 
-checks()
-{
+checks() {
     if [ -z "$ANDROID_NDK" ]; then
         echo "Please set ANDROID_NDK variable as your NDK path."
         exit 1
     fi
-    if [ ! -f /usr/bin/cmake ] && [ ! -f /bin/cmake ]; then
+    if ! which cmake &>/dev/null; then
         echo "Please verify your CMake installation."
         exit 1
     fi
+    if ! which ninja &>/dev/null; then
+        echo "Please verify your Ninja installation."
+        exit 1
+    fi
 }
 
-clean()
-{
+clean() {
     echo "Cleaning workspace."
-    rm -rf $BUILD_32 $BUILD_64 \
-        include/generated \
+    for a in ${TARGET_ABI_LIST[@]}; do rm -rf build_$a; done
+    rm -rf include/generated \
         srclib/libhelper/tests/dir \
         srclib/libhelper/tests/linkdir \
         srclib/libhelper/tests/file.txt
 }
 
-build()
-{
-    mkdir -p $BUILD_64 $BUILD_32
+build() {
+    set -e
     command echo -e "BUILD INFO:
-    ARCHS: arm64-v8a armeabi-v7a
+    ARCHS: ${TARGET_ABI_LIST[@]}
     ANDROID_PLATFORM: $ANDROID_PLATFORM
     ANDROID_TOOLCHAIN_FILE: $ANDROID_NDK/build/cmake/android.toolchain.cmake\n"
 
-    echo "Configuring for arm64-v8a..."
-    cmake -B $BUILD_64 -S . $1 \
-        -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake \
-        -DANDROID_ABI=arm64-v8a \
-        -DANDROID_PLATFORM=$ANDROID_PLATFORM \
-        -DANDROID_STL=c++_static
+    for a in ${TARGET_ABI_LIST[@]}; do
+        echo "Configuring for $a..."
+        mkdir -p build_$a
+        cmake -B build_$a -G Ninja -S . $1 \
+            -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake \
+            -DANDROID_ABI=$a \
+            -DANDROID_PLATFORM=$ANDROID_PLATFORM \
+            -DANDROID_STL=c++_static
+    done
 
-    echo "Configuring for armeabi-v7a..."
-    cmake -B $BUILD_32 -S . $1 \
-        -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake \
-        -DANDROID_ABI=armeabi-v7a \
-        -DANDROID_PLATFORM=$ANDROID_PLATFORM \
-        -DANDROID_STL=c++_static
+    CORES=$(($(nproc --all) - 2))
+    [ $CORES -eq 0 ] && CORES=2
 
-    echo "Building arm64-v8a artifacts..."
-    cmake --build $BUILD_64
-    echo "arm64-v8a build complete, artifacts: $PWD/$BUILD_64"
-
-    echo "Building armeabi-v7a artifacts..."
-    cmake --build $BUILD_32
-    echo "armeabi-v7a build complete, artifacts: $PWD/$BUILD_32"
+    for a in ${TARGET_ABI_LIST[@]}; do
+        echo "Building $a artifacts... Using $CORES thread."
+        cmake --build build_$a -j$CORES
+        echo "$a build complete, artifacts: $PWD/build_$a"
+    done
 }
 
 if [ $# -eq 0 ]; then
-    command echo "Usage: $0 build|rebuild|clean [EXTRA_CMAKE_FLAGS] [ANDROID_PLATFORM=SELECTED_ANDROID_PLATFORM]"
+    command echo -e "Usage: $0 build|rebuild|clean [EXTRA_CMAKE_FLAGS]\n  HINT: Export ANDROID_PLATFORM if you set min Android target.\n  HINT: Change TARGET_ABI_LIST array in build.sh if you build other archs."
     exit 1
 fi
 
-if [ -z $ANDROID_PLATFORM ]; then ANDROID_PLATFORM="android-21"; fi
-
+[ -z $ANDROID_PLATFORM ] && ANDROID_PLATFORM="android-21"
 checks
 
 case $1 in

include/CLI/CLI11.hpp

@@ -3902,9 +3902,9 @@ get_default_flag_values(const std::string &str);
 
 /// Get a vector of short names, one of long names, and a single name
 CLI11_INLINE
-    std::tuple<std::vector<std::string>, std::vector<std::string>, std::string>
-    get_names(const std::vector<std::string> &input,
-              bool allow_non_standard = false);
+std::tuple<std::vector<std::string>, std::vector<std::string>, std::string>
+get_names(const std::vector<std::string> &input,
+          bool allow_non_standard = false);
 
 } // namespace detail
 
@@ -3995,8 +3995,8 @@ get_default_flag_values(const std::string &str) {
 }
 
 CLI11_INLINE
-    std::tuple<std::vector<std::string>, std::vector<std::string>, std::string>
-    get_names(const std::vector<std::string> &input, bool allow_non_standard) {
+std::tuple<std::vector<std::string>, std::vector<std::string>, std::string>
+get_names(const std::vector<std::string> &input, bool allow_non_standard) {
 
   std::vector<std::string> short_names;
   std::vector<std::string> long_names;

include/PartitionManager/PartitionManager.hpp

@@ -17,9 +17,9 @@
 #ifndef LIBPMT_LIB_HPP
 #define LIBPMT_LIB_HPP
 
+#include <CLI/CLI11.hpp>
 #include <libhelper/lib.hpp>
 #include <libpartition_map/lib.hpp>
-#include <CLI/CLI11.hpp>
 #include <memory>
 #include <string>
 #include <vector>
@@ -28,39 +28,127 @@
 #define PMTE "pmt"
 #define PMTF "libpmt-function-manager"
 
+// Quick access to variables.
+#define VARS (*Variables)
+// Quick access to partition map.
+#define PART_MAP (*VARS.PartMap)
+
 namespace PartitionManager {
+int Main(int argc, char** argv);
+
+// Print messages if not using quiet mode
+__attribute__((format(printf, 1, 2))) void print(const char* format, ...);
+__attribute__((format(printf, 1, 2))) void println(const char* format, ...);
+
+// If there is a delimiter in the string, CLI::detail::split returns; if not, an
+// empty vector is returned. And checks duplicate arguments.
+std::vector<std::string> splitIfHasDelim(const std::string& s, char delim,
+                                         bool checkForBadUsage = false);
+
+// Process vectors with input strings. Use for [flag(s)]-[other flag(s)]
+// situations
+void processCommandLine(std::vector<std::string>& vec1,
+                        std::vector<std::string>& vec2, const std::string& s1,
+                        const std::string& s2, char delim,
+                        bool checkForBadUsage = false);
+
+// Setting ups buffer size
+void setupBufferSize(uint64_t& size, const std::string& entry);
+
+std::string getLibVersion();
+
+std::string getAppVersion();  // Not Android app version (an Android app is
+                              // planned!), tells pmt version.
+
+enum basic_function_flags {
+  NO_SU = 1,
+  NO_MAP_CHECK = 2,
+  ADB_SUFFICIENT = 3,
+};
+
 // All function classes must inherit from this class.
 class basic_function {
-public:
-  CLI::App *cmd = nullptr;
+ public:
+  CLI::App* cmd = nullptr;
+  std::vector<int> flags = {};
 
-  virtual bool init(CLI::App &_app) = 0;
+  virtual bool init(CLI::App& _app) = 0;
   virtual bool run() = 0;
 
   [[nodiscard]] virtual bool isUsed() const = 0;
-  [[nodiscard]] virtual const char *name() const = 0;
+  [[nodiscard]] virtual const char* name() const = 0;
 
   virtual ~basic_function() = default;
 };
 
 // A class for function management.
-class basic_function_manager final {
-private:
-  std::vector<std::unique_ptr<basic_function>> _functions;
+template <class _Type>
+class basic_manager {
+ private:
+  std::vector<std::unique_ptr<_Type>> _functions;
 
-public:
-  void registerFunction(std::unique_ptr<basic_function> _func, CLI::App &_app);
+ public:
+  void registerFunction(std::unique_ptr<_Type> _func, CLI::App& _app) {
+    LOGN(PMTF, INFO) << "registering: " << _func->name() << std::endl;
+    for (const auto& f : _functions) {
+      if (std::string(_func->name()) == std::string(f->name())) {
+        LOGN(PMTF, INFO) << "Is already registered: " << _func->name()
+                         << ". Skipping." << std::endl;
+        return;
+      }
+    }
+    if (!_func->init(_app))
+      throw Helper::Error("Cannot init: %s", _func->name());
+    _functions.push_back(std::move(_func));
+    LOGN(PMTF, INFO) << _functions.back()->name() << " successfully registered."
+                     << std::endl;
+  }
 
-  [[nodiscard]] bool isUsed(std::string name) const;
-  [[nodiscard]] bool handleAll() const;
+  [[nodiscard]] bool hasFlagOnUsedFunction(int flag) const {
+    for (const auto& func : _functions) {
+      if (func->isUsed()) {
+        std::for_each(func->flags.begin(), func->flags.end(), [&](const int x) {
+          LOGN(PMTF, INFO) << "Used flag " << x << " on " << func->name()
+                           << std::endl;
+        });
+        return std::find(func->flags.begin(), func->flags.end(), flag) !=
+               func->flags.end();
+      }
+    }
+    return false;
+  }
+
+  [[nodiscard]] bool isUsed(const std::string& name) const {
+    if (_functions.empty()) return false;
+    for (const auto& func : _functions) {
+      if (func->name() == name) return func->isUsed();
+    }
+    return false;
+  }
+
+  [[nodiscard]] bool handleAll() const {
+    LOGN(PMTF, INFO) << "running caught commands in command-line." << std::endl;
+    for (const auto& func : _functions) {
+      if (func->isUsed()) {
+        LOGN(PMTF, INFO) << func->name()
+                         << " is calling because used in command-line."
+                         << std::endl;
+        return func->run();
+      }
+    }
+
+    LOGN(PMTF, INFO) << "not found any used function from command-line."
+                     << std::endl;
+    println("Target progress is not specified. Specify a progress.");
+    return false;
+  }
 };
 
 class basic_variables final {
-public:
+ public:
   basic_variables();
-  ~basic_variables();
 
-  PartitionMap::BuildMap *PartMap;
+  std::unique_ptr<PartitionMap::BuildMap> PartMap;
 
   std::string searchPath, logFile;
   bool onLogical;
@@ -70,53 +158,14 @@ public:
   bool forceProcess;
 };
 
-class variableProtect final {
-private:
-  basic_variables *_ptr = nullptr;
-
-public:
-  variableProtect();
-  ~variableProtect();
-
-  void setVariablePointer(basic_variables *&_ptr);
-};
-
 using FunctionBase = basic_function;
-using FunctionManager = basic_function_manager;
+using FunctionManager = basic_manager<FunctionBase>;
+using FunctionFlags = basic_function_flags;
 using VariableTable = basic_variables;
 using Error = Helper::Error;
 
-extern VariableTable *Variables;
+extern std::unique_ptr<VariableTable> Variables;
+extern FILE *pstdout, *pstderr;
+}  // namespace PartitionManager
 
-int Main(int argc, char **argv);
-
-// Print messages if not using quiet mode
-__attribute__((format(printf, 1, 2))) void print(const char *format, ...);
-__attribute__((format(printf, 1, 2))) void println(const char *format, ...);
-
-// Format it input and return as std::string
-__attribute__((format(printf, 1, 2))) std::string format(const char *format,
-                                                         ...);
-
-// If there is a delimiter in the string, CLI::detail::split returns; if not, an
-// empty vector is returned. And checks duplicate arguments.
-std::vector<std::string> splitIfHasDelim(const std::string &s, char delim,
-                                         bool checkForBadUsage = false);
-
-// Process vectors with input strings. Use for [flag(s)]-[other flag(s)]
-// situations
-void processCommandLine(std::vector<std::string> &vec1,
-                        std::vector<std::string> &vec2, const std::string &s1,
-                        const std::string &s2, char delim,
-                        bool checkForBadUsage = false);
-
-// Setting ups buffer size
-void setupBufferSize(int &size, const std::string &partition);
-
-std::string getLibVersion();
-
-std::string getAppVersion(); // Not Android app version (an Android app is
-                             // planned!), tells pmt version.
-} // namespace PartitionManager
-
-#endif // #ifndef LIBPMT_LIB_HPP
+#endif  // #ifndef LIBPMT_LIB_HPP

include/nlohmann/LICENSE

@@ -0,0 +1,21 @@
+MIT License 
+
+Copyright (c) 2013-2025 Niels Lohmann
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

include/nlohmann/json_fwd.hpp

@@ -0,0 +1,187 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
+#define INCLUDE_NLOHMANN_JSON_FWD_HPP_
+
+#include <cstdint> // int64_t, uint64_t
+#include <map> // map
+#include <memory> // allocator
+#include <string> // string
+#include <vector> // vector
+
+// #include <nlohmann/detail/abi_macros.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// This file contains all macro definitions affecting or depending on the ABI
+
+#ifndef JSON_SKIP_LIBRARY_VERSION_CHECK
+    #if defined(NLOHMANN_JSON_VERSION_MAJOR) && defined(NLOHMANN_JSON_VERSION_MINOR) && defined(NLOHMANN_JSON_VERSION_PATCH)
+        #if NLOHMANN_JSON_VERSION_MAJOR != 3 || NLOHMANN_JSON_VERSION_MINOR != 12 || NLOHMANN_JSON_VERSION_PATCH != 0
+            #warning "Already included a different version of the library!"
+        #endif
+    #endif
+#endif
+
+#define NLOHMANN_JSON_VERSION_MAJOR 3   // NOLINT(modernize-macro-to-enum)
+#define NLOHMANN_JSON_VERSION_MINOR 12  // NOLINT(modernize-macro-to-enum)
+#define NLOHMANN_JSON_VERSION_PATCH 0   // NOLINT(modernize-macro-to-enum)
+
+#ifndef JSON_DIAGNOSTICS
+    #define JSON_DIAGNOSTICS 0
+#endif
+
+#ifndef JSON_DIAGNOSTIC_POSITIONS
+    #define JSON_DIAGNOSTIC_POSITIONS 0
+#endif
+
+#ifndef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+    #define JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON 0
+#endif
+
+#if JSON_DIAGNOSTICS
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS _diag
+#else
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS
+#endif
+
+#if JSON_DIAGNOSTIC_POSITIONS
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTIC_POSITIONS _dp
+#else
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTIC_POSITIONS
+#endif
+
+#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+    #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON _ldvcmp
+#else
+    #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_NO_VERSION
+    #define NLOHMANN_JSON_NAMESPACE_NO_VERSION 0
+#endif
+
+// Construct the namespace ABI tags component
+#define NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b, c) json_abi ## a ## b ## c
+#define NLOHMANN_JSON_ABI_TAGS_CONCAT(a, b, c) \
+    NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b, c)
+
+#define NLOHMANN_JSON_ABI_TAGS                                       \
+    NLOHMANN_JSON_ABI_TAGS_CONCAT(                                   \
+            NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS,                       \
+            NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON, \
+            NLOHMANN_JSON_ABI_TAG_DIAGNOSTIC_POSITIONS)
+
+// Construct the namespace version component
+#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch) \
+    _v ## major ## _ ## minor ## _ ## patch
+#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(major, minor, patch) \
+    NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch)
+
+#if NLOHMANN_JSON_NAMESPACE_NO_VERSION
+#define NLOHMANN_JSON_NAMESPACE_VERSION
+#else
+#define NLOHMANN_JSON_NAMESPACE_VERSION                                 \
+    NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(NLOHMANN_JSON_VERSION_MAJOR, \
+                                           NLOHMANN_JSON_VERSION_MINOR, \
+                                           NLOHMANN_JSON_VERSION_PATCH)
+#endif
+
+// Combine namespace components
+#define NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b) a ## b
+#define NLOHMANN_JSON_NAMESPACE_CONCAT(a, b) \
+    NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b)
+
+#ifndef NLOHMANN_JSON_NAMESPACE
+#define NLOHMANN_JSON_NAMESPACE               \
+    nlohmann::NLOHMANN_JSON_NAMESPACE_CONCAT( \
+            NLOHMANN_JSON_ABI_TAGS,           \
+            NLOHMANN_JSON_NAMESPACE_VERSION)
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_BEGIN
+#define NLOHMANN_JSON_NAMESPACE_BEGIN                \
+    namespace nlohmann                               \
+    {                                                \
+    inline namespace NLOHMANN_JSON_NAMESPACE_CONCAT( \
+                NLOHMANN_JSON_ABI_TAGS,              \
+                NLOHMANN_JSON_NAMESPACE_VERSION)     \
+    {
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_END
+#define NLOHMANN_JSON_NAMESPACE_END                                     \
+    }  /* namespace (inline namespace) NOLINT(readability/namespace) */ \
+    }  // namespace nlohmann
+#endif
+
+
+/*!
+@brief namespace for Niels Lohmann
+@see https://github.com/nlohmann
+@since version 1.0.0
+*/
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/*!
+@brief default JSONSerializer template argument
+
+This serializer ignores the template arguments and uses ADL
+([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
+for serialization.
+*/
+template<typename T = void, typename SFINAE = void>
+struct adl_serializer;
+
+/// a class to store JSON values
+/// @sa https://json.nlohmann.me/api/basic_json/
+template<template<typename U, typename V, typename... Args> class ObjectType =
+         std::map,
+         template<typename U, typename... Args> class ArrayType = std::vector,
+         class StringType = std::string, class BooleanType = bool,
+         class NumberIntegerType = std::int64_t,
+         class NumberUnsignedType = std::uint64_t,
+         class NumberFloatType = double,
+         template<typename U> class AllocatorType = std::allocator,
+         template<typename T, typename SFINAE = void> class JSONSerializer =
+         adl_serializer,
+         class BinaryType = std::vector<std::uint8_t>, // cppcheck-suppress syntaxError
+         class CustomBaseClass = void>
+class basic_json;
+
+/// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document
+/// @sa https://json.nlohmann.me/api/json_pointer/
+template<typename RefStringType>
+class json_pointer;
+
+/*!
+@brief default specialization
+@sa https://json.nlohmann.me/api/json/
+*/
+using json = basic_json<>;
+
+/// @brief a minimal map-like container that preserves insertion order
+/// @sa https://json.nlohmann.me/api/ordered_map/
+template<class Key, class T, class IgnoredLess, class Allocator>
+struct ordered_map;
+
+/// @brief specialization that maintains the insertion order of object keys
+/// @sa https://json.nlohmann.me/api/ordered_json/
+using ordered_json = basic_json<nlohmann::ordered_map>;
+
+NLOHMANN_JSON_NAMESPACE_END
+
+#endif  // INCLUDE_NLOHMANN_JSON_FWD_HPP_

manager.sh

@@ -1,4 +1,3 @@
-#!/data/data/com.termux/files/usr/bin/env bash
 #
 #  Copyright 2025 Yağız Zengin
 #
@@ -16,12 +15,11 @@
 #
 
 THIS="$(basename $0)"
-RELEASE="20250811"
+RELEASE="20250821"
 
 echo() { command echo "[$THIS]: $@"; }
 
-checks()
-{
+checks() {
 	if ! curl "https://github.com" &>/dev/null; then
 		echo "No internet connection!"
 		exit 1
@@ -33,38 +31,34 @@ checks()
   [ ! -f $PREFIX/bin/wget ] && pkg install -y wget
 }
 
-select_variant()
-{
+select_variant() {
 	LINK=""; ARCH=""; VARIANT=""
 
-	if getprop ro.product.cpu.abi | grep "arm64-v8a" &>/dev/null; then ARCH="arm64-v8a";
+	if getprop ro.product.cpu.abi | grep "arm64-v8a" &>/dev/null; then ARCH="arm64-v8a"
 	else ARCH="armeabi-v7a"
 	fi
-  [ $1 == "static" ] && VARIANT="static-"
+  if grep "static" <<< $1 &>/dev/null; then VARIANT="static-"; fi
 
-  LINK="https://github.com/ShawkTeam/pmt-renovated/releases/download/${RELEASE}/pmt-${VARIANT}${ARCH}.zip"
+	LINK="https://github.com/ShawkTeam/pmt-renovated/releases/download/${RELEASE}/pmt-${VARIANT}${ARCH}.zip"
 }
 
-download()
-{
-	mkdir -p $PREFIX/tmp
+download() {
 	echo "Downloading pmt-${VARIANT}${ARCH}.zip (${RELEASE})"
-	if ! wget -o $PREFIX/tmp/pmt.zip "${LINK}" &>/dev/null; then
+	if ! wget -O $PREFIX/tmp/pmt.zip "${LINK}" &>/dev/null; then
 		echo "Download failed! LINK=${LINK}"
 		rm $PREFIX/tmp/*.zip
 		exit 1
 	fi
 
 	echo "Extracting..."
-	if ! unzip -d $PREFIX/tmp $PREFIX/tmp/pmt.zip &>/dev/null; then
+	if ! unzip -o -d $PREFIX/tmp $PREFIX/tmp/pmt.zip &>/dev/null; then
 		echo "Extraction failed!"
 		exit 1
 	fi
 }
 
-setup()
-{
-	[ -f $PREFIX/tmp/pmt_static ]; mv $PREFIX/tmp/pmt_static $PREFIX/tmp/pmt
+setup() {
+	[ -f $PREFIX/tmp/pmt_static ] && mv $PREFIX/tmp/pmt_static $PREFIX/tmp/pmt
 	set -e
 	install -t $PREFIX/bin $PREFIX/tmp/pmt
 	if [ -f $PREFIX/tmp/libhelper.so ]; then
@@ -74,21 +68,18 @@ setup()
 	echo "Installed successfully. Try running 'pmt' command."
 }
 
-uninstall()
-{
-	rm -f $PREFIX/bin7pmt $PREFIX/lib/libhelper* $PREFIX/lib/libpartition_map* &>/dev/null
+uninstall() {
+	rm -f $PREFIX/bin/pmt $PREFIX/lib/libhelper* $PREFIX/lib/libpartition_map* &>/dev/null
 }
 
-is_installed()
-{
+is_installed() {
 	if /system/bin/which pmt &>/dev/null; then
 		echo "PMT is already installed."
 		exit 1
 	fi
 }
 
-cleanup()
-{
+cleanup() {
 	rm -f $PREFIX/tmp/pmt* $PREFIX/tmp/lib* $PREFIX/tmp/*.zip &>/dev/null
 }
 
@@ -97,11 +88,16 @@ if [ $# -eq 0 ]; then
     exit 1
 fi
 
+if ! echo ${HOME} | grep "com.termux" &>/dev/null; then
+	echo "This script only for termux!"
+	exit 1
+fi
+
 case $1 in
     "install")
     	is_installed
     	checks
-    	select_variant $([ "$2" == "--static" ] && echo static)
+    	select_variant $(grep "static" <<< $2 &>/dev/null && command echo static)
 			download
 			setup
     ;;
@@ -109,13 +105,13 @@ case $1 in
     	uninstall && echo "Uninstalled successfully."
     ;;
     "reinstall")
-  		uninstall
-  		checks
-      select_variant $([ "$2" == "--static" ] && echo static)
+    	uninstall
+    	checks
+      select_variant $(grep "static" <<< $2 &>/dev/null && command echo static)
       download
       setup
     ;;
     *)
-        command echo "$0: Unknown argument: $1"
-        exit 1 ;;
+      command echo "$0: Unknown argument: $1"
+      exit 1 ;;
 esac

src/CMakeLists.txt

@@ -19,18 +19,20 @@ set(PMT_SOURCES
 	${CMAKE_CURRENT_SOURCE_DIR}/PartitionManager.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/Main.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/functions/BackupFunction.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/functions/CleanLogFunction.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/functions/EraseFunction.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/functions/FlashFunction.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/functions/InfoFunction.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/functions/MemoryTestFunction.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/functions/PartitionSizeFunction.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/functions/RealPathFunction.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/functions/RealLinkPathFunction.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/functions/RebootFunction.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/functions/TypeFunction.cpp
 )
 
 # Add pmt
-add_executable(pmt ${PMT_SOURCES})
+add_executable(pmt ${PMT_SOURCES}
+        functions/CleanLogFunction.cpp)
 add_executable(pmt_static ${PMT_SOURCES})
 
 # Set linker options

src/FunctionManager.cpp

@@ -14,22 +14,24 @@
    limitations under the License.
 */
 
-#include <PartitionManager/PartitionManager.hpp>
 #include <fcntl.h>
+
+#include <PartitionManager/PartitionManager.hpp>
+#include <algorithm>
 #include <memory>
 #include <string>
 #include <unordered_set>
 #include <vector>
 
 namespace PartitionManager {
-std::vector<std::string> splitIfHasDelim(const std::string &s, const char delim,
+std::vector<std::string> splitIfHasDelim(const std::string& s, const char delim,
                                          const bool checkForBadUsage) {
   if (s.find(delim) == std::string::npos) return {};
   auto vec = CLI::detail::split(s, delim);
 
   if (checkForBadUsage) {
     std::unordered_set<std::string> set;
-    for (const auto &str : vec) {
+    for (const auto& str : vec) {
       if (set.find(str) != set.end())
         throw CLI::ValidationError("Duplicate element in your inputs!");
       set.insert(str);
@@ -39,18 +41,27 @@ std::vector<std::string> splitIfHasDelim(const std::string &s, const char delim,
   return vec;
 }
 
-void setupBufferSize(int &size, const std::string &partition) {
-  if (Variables->PartMap->sizeOf(partition) % size != 0) {
-    print("%sWARNING%s: Specified buffer size is invalid! Using 1 byte as "
-          "buffer size.",
-          YELLOW, STYLE_RESET);
-    size = 1;
+void setupBufferSize(uint64_t& size, const std::string& entry) {
+  if (PART_MAP.hasPartition(entry) && PART_MAP.sizeOf(entry) % size != 0) {
+    println(
+        "%sWARNING%s: Specified buffer size is invalid for %s! Using "
+        "different buffer size for %s.",
+        YELLOW, STYLE_RESET, entry.data(), entry.data());
+    size = PART_MAP.sizeOf(entry) % 4096 == 0 ? 4096 : 1;
+  } else if (Helper::fileIsExists(entry)) {
+    if (Helper::fileSize(entry) % size != 0) {
+      println(
+          "%sWARNING%s: Specified buffer size is invalid for %s! using "
+          "different buffer size for %s.",
+          YELLOW, STYLE_RESET, entry.data(), entry.data());
+      size = Helper::fileSize(entry) % 4096 == 0 ? 4096 : 1;
+    }
   }
 }
 
-void processCommandLine(std::vector<std::string> &vec1,
-                        std::vector<std::string> &vec2, const std::string &s1,
-                        const std::string &s2, const char delim,
+void processCommandLine(std::vector<std::string>& vec1,
+                        std::vector<std::string>& vec2, const std::string& s1,
+                        const std::string& s2, const char delim,
                         const bool checkForBadUsage) {
   vec1 = splitIfHasDelim(s1, delim, checkForBadUsage);
   vec2 = splitIfHasDelim(s2, delim, checkForBadUsage);
@@ -58,40 +69,4 @@ void processCommandLine(std::vector<std::string> &vec1,
   if (vec1.empty() && !s1.empty()) vec1.push_back(s1);
   if (vec2.empty() && !s2.empty()) vec2.push_back(s2);
 }
-
-void basic_function_manager::registerFunction(
-    std::unique_ptr<basic_function> _func, CLI::App &_app) {
-  LOGN(PMTF, INFO) << "registering function: " << _func->name() << std::endl;
-  if (!_func->init(_app))
-    throw Error("Cannot init function: %s\n", _func->name());
-  _functions.push_back(std::move(_func));
-  LOGN(PMTF, INFO) << _functions.back()->name() << " successfully registered."
-                   << std::endl;
-}
-
-bool basic_function_manager::isUsed(const std::string name) const {
-  if (_functions.empty()) return false;
-  for (const auto &func : _functions) {
-    if (func->name() == name) return func->isUsed();
-  }
-  return false;
-}
-
-bool basic_function_manager::handleAll() const {
-  LOGN(PMTF, INFO) << "running caught function commands in command-line."
-                   << std::endl;
-  for (const auto &func : _functions) {
-    if (func->isUsed()) {
-      LOGN(PMTF, INFO) << func->name()
-                       << " is calling because used in command-line."
-                       << std::endl;
-      return func->run();
-    }
-  }
-
-  LOGN(PMTF, INFO) << "not found any used function from command-line."
-                   << std::endl;
-  println("Target progress is not specified. Specify a progress.");
-  return false;
-}
-} // namespace PartitionManager
+}  // namespace PartitionManager

src/Main.cpp

@@ -16,8 +16,7 @@
 
 #include <PartitionManager/PartitionManager.hpp>
 
-int main(int argc, char **argv) {
+int main(int argc, char** argv) {
   // Call integrated main function in library
-  Helper::LoggingProperties::setProgramName(PMTE);
   return PartitionManager::Main(argc, argv);
 }

src/PartitionManager.cpp

@@ -14,71 +14,96 @@
    limitations under the License.
 */
 
-#include "functions/functions.hpp"
 #include <PartitionManager/PartitionManager.hpp>
+#include <csignal>
 #include <cstdarg>
 #include <cstdio>
 #include <cstdlib>
+
+#include "functions/functions.hpp"
+#ifndef ANDROID_BUILD
 #include <generated/buildInfo.hpp>
-#include <string>
+#endif
 #include <unistd.h>
 
-namespace PartitionManager {
-variableProtect protector;
-auto Variables = new VariableTable();
+#include <string>
 
-variableProtect::variableProtect() {
+namespace PartitionManager {
+
+/**
+ * Register functions. Uses ready 'FuncManager' variable.
+ *
+ * Usage: REGISTER_FUNCTION(FUNCTION_CLASS);
+ */
+#define REGISTER_FUNCTION(cls) \
+  FuncManager.registerFunction(std::make_unique<cls>(), AppMain)
+
+basic_variables::basic_variables()
+    : logFile(Helper::LoggingProperties::FILE),
+      onLogical(false),
+      quietProcess(false),
+      verboseMode(false),
+      viewVersion(false),
+      forceProcess(false) {
+  try {
+    PartMap = std::make_unique<PartitionMap::BuildMap>();
+  } catch (std::exception&) {
+  }
+}
+
+__attribute__((constructor)) void init() {
+  Helper::LoggingProperties::setProgramName(PMTE);
   Helper::LoggingProperties::setLogFile("/sdcard/Documents/last_pmt_logs.log");
 }
-variableProtect::~variableProtect() { delete _ptr; }
-void variableProtect::setVariablePointer(basic_variables *&_ptr) {
-  this->_ptr = _ptr;
+
+static void sigHandler(const int sig) {
+  if (sig == SIGINT) println("\n%sInterrupted.%s", YELLOW, STYLE_RESET);
+  if (sig == SIGABRT) println("\n%sAborted.%s", RED, STYLE_RESET);
+  exit(sig);
 }
 
-basic_variables::~basic_variables() { delete PartMap; }
-basic_variables::basic_variables()
-    : logFile("/sdcard/Documents/last_pmt_logs.log"), onLogical(false),
-      quietProcess(false), verboseMode(false), viewVersion(false),
-      forceProcess(false) {
-  try { PartMap = new PartitionMap::BuildMap(); }
-  catch (std::exception&) {}
+static int write(void* cookie, const char* buf, const int size) {
+  auto* real = static_cast<FILE*>(cookie);
+  if (!VARS.quietProcess) {
+    const int ret = fwrite(buf, 1, static_cast<size_t>(size), real);
+    fflush(real);
+    return ret;
+  } else
+    return size;
 }
 
-int Main(int argc, char **argv) {
+static FILE* make_fp(FILE* real) {
+  return funopen(real, nullptr, write, nullptr, nullptr);
+}
+
+auto Variables = std::make_unique<VariableTable>();
+FILE* pstdout = make_fp(stdout);
+FILE* pstderr = make_fp(stderr);
+
+static Helper::garbageCollector collector;
+
+int Main(int argc, char** argv) {
   try {
     // try-catch start
-    CLI::App AppMain{"Partition Manager Tool"};
-    protector.setVariablePointer(Variables);
-    FunctionManager FuncManager;
+    Helper::LoggingProperties::setProgramName(argv[0]);
+    collector.closeAfterProgress(pstdout);
+    collector.closeAfterProgress(pstderr);
 
-    AppMain.fallthrough(true);
-    AppMain.set_help_all_flag("--help-all", "Print full help message and exit");
-    AppMain.footer("Partition Manager Tool is written by YZBruh\nThis project "
-                   "licensed under "
-                   "Apache 2.0 license\nReport "
-                   "bugs to https://github.com/ShawkTeam/pmt-renovated/issues");
-    AppMain
-        .add_option("-S,--search-path", Variables->searchPath,
-                    "Set partition search path")
-        ->check([&](const std::string &val) {
-          if (val.find("/block") == std::string::npos)
-            throw CLI::ValidationError(
-                "Partition search path is unexpected! Couldn't find "
-                "'block' in input path!");
-          return std::string();
-        });
-    AppMain.add_option("-L,--log-file", Variables->logFile, "Set log file");
-    AppMain.add_flag("-f,--force", Variables->forceProcess,
-                     "Force process to be processed");
-    AppMain.add_flag("-l,--logical", Variables->onLogical,
-                     "Specify that the target partition is dynamic");
-    AppMain.add_flag("-q,--quiet", Variables->quietProcess, "Quiet process");
-    AppMain.add_flag("-V,--verbose", Variables->verboseMode,
-                     "Detailed information is written on the screen while the "
-                     "transaction is "
-                     "being carried out");
-    AppMain.add_flag("-v,--version", Variables->viewVersion,
-                     "Print version and exit");
+    signal(SIGINT, sigHandler);
+    signal(SIGABRT, sigHandler);
+
+    if (!isatty(fileno(stdin))) {
+      char buf[128];
+      while (fgets(buf, sizeof(buf), stdin) != nullptr) {
+        buf[strcspn(buf, "\n")] = 0;
+        const char* token = strtok(buf, " \t");
+        while (token != nullptr) {
+          argv[argc] = strdup(token);
+          argc++;
+          token = strtok(nullptr, " \t");
+        }
+      }
+    }
 
     if (argc < 2) {
       println(
@@ -87,83 +112,122 @@ int Main(int argc, char **argv) {
       return EXIT_FAILURE;
     }
 
-    FuncManager.registerFunction(std::make_unique<backupFunction>(), AppMain);
-    FuncManager.registerFunction(std::make_unique<flashFunction>(), AppMain);
-    FuncManager.registerFunction(std::make_unique<eraseFunction>(), AppMain);
-    FuncManager.registerFunction(std::make_unique<partitionSizeFunction>(),
-                                 AppMain);
-    FuncManager.registerFunction(std::make_unique<infoFunction>(), AppMain);
-    FuncManager.registerFunction(std::make_unique<realPathFunction>(), AppMain);
-    FuncManager.registerFunction(std::make_unique<realLinkPathFunction>(),
-                                 AppMain);
-    FuncManager.registerFunction(std::make_unique<typeFunction>(), AppMain);
-    FuncManager.registerFunction(std::make_unique<rebootFunction>(), AppMain);
+    CLI::App AppMain{"Partition Manager Tool"};
+    FunctionManager FuncManager;
+
+    AppMain.fallthrough(true);
+    AppMain.set_help_all_flag("--help-all", "Print full help message and exit");
+    AppMain.footer(
+        "Partition Manager Tool is written by YZBruh\n"
+        "This project licensed under "
+        "Apache 2.0 license\nReport "
+        "bugs to https://github.com/ShawkTeam/pmt-renovated/issues");
+    AppMain
+        .add_option("-S,--search-path", VARS.searchPath,
+                    "Set partition search path")
+        ->check([&](const std::string& val) {
+          if (val.find("/block") == std::string::npos)
+            return std::string(
+                "Partition search path is unexpected! Couldn't find "
+                "'block' in input path!");
+          return std::string();
+        });
+    AppMain.add_option("-L,--log-file", VARS.logFile, "Set log file");
+    AppMain.add_flag("-f,--force", VARS.forceProcess,
+                     "Force process to be processed");
+    AppMain.add_flag("-l,--logical", VARS.onLogical,
+                     "Specify that the target partition is dynamic");
+    AppMain.add_flag("-q,--quiet", VARS.quietProcess, "Quiet process");
+    AppMain.add_flag("-V,--verbose", VARS.verboseMode,
+                     "Detailed information is written on the screen while the "
+                     "transaction is "
+                     "being carried out");
+    AppMain.add_flag("-v,--version", VARS.viewVersion,
+                     "Print version and exit");
+
+    REGISTER_FUNCTION(backupFunction);
+    REGISTER_FUNCTION(cleanLogFunction);
+    REGISTER_FUNCTION(flashFunction);
+    REGISTER_FUNCTION(eraseFunction);
+    REGISTER_FUNCTION(partitionSizeFunction);
+    REGISTER_FUNCTION(infoFunction);
+    REGISTER_FUNCTION(realPathFunction);
+    REGISTER_FUNCTION(typeFunction);
+    REGISTER_FUNCTION(rebootFunction);
+    REGISTER_FUNCTION(memoryTestFunction);
 
     CLI11_PARSE(AppMain, argc, argv);
 
-    if (Variables->verboseMode) Helper::LoggingProperties::setPrinting(YES);
-    if (Variables->viewVersion) {
+    if (VARS.verboseMode) Helper::LoggingProperties::setPrinting<YES>();
+    if (VARS.viewVersion) {
       println("%s", getAppVersion().data());
       return EXIT_SUCCESS;
     }
-    if (!Variables->searchPath.empty())
-      (*Variables->PartMap)(Variables->searchPath);
 
-    if (!Variables->PartMap && Variables->searchPath.empty())
-      throw Error("No default search entries were found. Specify a search "
-                  "directory with -S "
-                  "(--search-path)");
-
-    if (!Helper::hasSuperUser()) {
-      if (!(FuncManager.isUsed("rebootFunction") && Helper::hasAdbPermissions()))
+    if (FuncManager.hasFlagOnUsedFunction(NO_MAP_CHECK)) {
+      if (!VARS.searchPath.empty())
+        WARNING(
+            "-S (--search-path) flag is ignored. Because, don't needed "
+            "partition map by your used function.\n");
+      if (VARS.onLogical)
+        WARNING(
+            "-l (--logical) flag ignored. Because, partition type don't "
+            "needed by your used function.\n");
+    } else {
+      if (!VARS.searchPath.empty()) (PART_MAP)(VARS.searchPath);
+      if (!VARS.PartMap && VARS.searchPath.empty())
         throw Error(
-            "Partition Manager Tool is requires super-user privileges!\n");
+            "No default search entries were found. Specify a search "
+            "directory with -S "
+            "(--search-path)");
+
+      if (VARS.onLogical) {
+        if (!PART_MAP.hasLogicalPartitions())
+          throw Error(
+              "This device doesn't contains logical partitions. But you "
+              "used -l (--logical) flag.");
+      }
+    }
+
+    if (!Helper::hasSuperUser() && !FuncManager.hasFlagOnUsedFunction(NO_SU)) {
+      if (!(FuncManager.hasFlagOnUsedFunction(ADB_SUFFICIENT) &&
+            Helper::hasAdbPermissions())) {
+        throw Error("This function is requires super-user privileges!");
+      }
     }
 
     return FuncManager.handleAll() == true ? EXIT_SUCCESS : EXIT_FAILURE;
-  } catch (Helper::Error &error) {
+  } catch (Helper::Error& error) {
     // catch Helper::Error
 
-    if (!Variables->quietProcess)
-      fprintf(stderr, "%s%sERROR(S) OCCURRED:%s\n%s", RED, BOLD, STYLE_RESET,
-              error.what());
+    fprintf(pstderr, "%s%sERROR(S) OCCURRED:%s\n%s\n", RED, BOLD, STYLE_RESET,
+            error.what());
     return EXIT_FAILURE;
-  } catch (CLI::Error &error) {
+  } catch (CLI::Error& error) {
     // catch CLI::Error
 
     fprintf(stderr, "%s: %s%sFLAG PARSE ERROR:%s %s\n", argv[0], RED, BOLD,
             STYLE_RESET, error.what());
     return EXIT_FAILURE;
-  } // try-catch block end
+  }  // try-catch block end
 }
 
-void print(const char *format, ...) {
+void print(const char* format, ...) {
   va_list args;
   va_start(args, format);
-  if (!Variables->quietProcess) vfprintf(stdout, format, args);
+  vfprintf(pstdout, format, args);
   va_end(args);
 }
 
-void println(const char *format, ...) {
+void println(const char* format, ...) {
   va_list args;
   va_start(args, format);
-  if (!Variables->quietProcess) {
-    vfprintf(stdout, format, args);
-    print("\n");
-  }
+  vfprintf(pstdout, format, args);
+  print("\n");
   va_end(args);
 }
 
-std::string format(const char *format, ...) {
-  va_list args;
-  va_start(args, format);
-  char str[1024];
-  vsnprintf(str, sizeof(str), format, args);
-  va_end(args);
-  return str;
-}
-
 std::string getLibVersion() { MKVERSION(PMT); }
 
 std::string getAppVersion() { MKVERSION(PMTE); }
-} // namespace PartitionManager
+}  // namespace PartitionManager

src/functions/BackupFunction.cpp

@@ -14,46 +14,49 @@
    limitations under the License.
 */
 
-#include "functions.hpp"
+#include <fcntl.h>
+#include <private/android_filesystem_config.h>
+#include <unistd.h>
+
 #include <PartitionManager/PartitionManager.hpp>
 #include <cerrno>
 #include <chrono>
 #include <cstdlib>
-#include <fcntl.h>
 #include <future>
-#include <private/android_filesystem_config.h>
-#include <unistd.h>
+
+#include "functions.hpp"
 
 #define BFUN "backupFunction"
+#define FUNCTION_CLASS backupFunction
 
 namespace PartitionManager {
-pair backupFunction::runAsync(const std::string &partitionName,
-                              const std::string &outputName, int bufferSize) {
-  if (!Variables->PartMap->hasPartition(partitionName))
-    return {format("Couldn't find partition: %s", partitionName.data()), false};
+RUN_ASYNC(const std::string& partitionName, const std::string& outputName,
+          const uint64_t bufferSize) {
+  if (!PART_MAP.hasPartition(partitionName))
+    return {Helper::format("Couldn't find partition: %s", partitionName.data()),
+            false};
 
-  LOGN(BFUN, INFO) << "back upping " << partitionName << " as " << outputName
+  LOGN(BFUN, INFO) << "Back upping " << partitionName << " as " << outputName
                    << std::endl;
 
-  if (Variables->onLogical && !Variables->PartMap->isLogical(partitionName)) {
-    if (Variables->forceProcess)
+  if (VARS.onLogical && !PART_MAP.isLogical(partitionName)) {
+    if (VARS.forceProcess)
       LOGN(BFUN, WARNING)
           << "Partition " << partitionName
           << " is exists but not logical. Ignoring (from --force, -f)."
           << std::endl;
     else
-      return {
-          format("Used --logical (-l) flag but is not logical partition: %s",
-                 partitionName.data()),
-          false};
+      return {Helper::format(
+                  "Used --logical (-l) flag but is not logical partition: %s",
+                  partitionName.data()),
+              false};
   }
 
-  if (Helper::fileIsExists(outputName) && !Variables->forceProcess)
-    return {format("%s is exists. Remove it, or use --force (-f) flag.",
-                   outputName.data()),
+  if (Helper::fileIsExists(outputName) && !VARS.forceProcess)
+    return {Helper::format("%s is exists. Remove it, or use --force (-f) flag.",
+                           outputName.data()),
             false};
 
-  setupBufferSize(bufferSize, partitionName);
   LOGN(BFUN, INFO) << "Using buffer size (for back upping " << partitionName
                    << "): " << bufferSize << std::endl;
 
@@ -61,22 +64,22 @@ pair backupFunction::runAsync(const std::string &partitionName,
   Helper::garbageCollector collector;
 
   const int pfd = Helper::openAndAddToCloseList(
-      Variables->PartMap->getRealPathOf(partitionName), collector, O_RDONLY);
+      PART_MAP.getRealPathOf(partitionName), collector, O_RDONLY);
   if (pfd < 0)
-    return {format("Can't open partition: %s: %s", partitionName.data(),
-                   strerror(errno)),
+    return {Helper::format("Can't open partition: %s: %s", partitionName.data(),
+                           strerror(errno)),
             false};
 
   const int ffd = Helper::openAndAddToCloseList(
       outputName, collector, O_WRONLY | O_CREAT | O_TRUNC, 0644);
   if (ffd < 0)
-    return {format("Can't create/open output file %s: %s", outputName.data(),
-                   strerror(errno)),
+    return {Helper::format("Can't create/open output file %s: %s",
+                           outputName.data(), strerror(errno)),
             false};
 
   LOGN(BFUN, INFO) << "Writing partition " << partitionName
                    << " to file: " << outputName << std::endl;
-  auto *buffer = new char[bufferSize];
+  auto* buffer = new (std::nothrow) char[bufferSize];
   collector.delAfterProgress(buffer);
   memset(buffer, 0x00, bufferSize);
 
@@ -84,8 +87,8 @@ pair backupFunction::runAsync(const std::string &partitionName,
   while ((bytesRead = read(pfd, buffer, bufferSize)) > 0) {
     if (const ssize_t bytesWritten = write(ffd, buffer, bytesRead);
         bytesWritten != bytesRead)
-      return {format("Can't write partition to output file %s: %s",
-                     outputName.data(), strerror(errno)),
+      return {Helper::format("Can't write partition to output file %s: %s",
+                             outputName.data(), strerror(errno)),
               false};
   }
 
@@ -94,18 +97,18 @@ pair backupFunction::runAsync(const std::string &partitionName,
                         << outputName
                         << ". Access problems maybe occur in non-root mode"
                         << std::endl;
-  if (!Helper::changeMode(outputName, 0660))
+  if (!Helper::changeMode(outputName, 0664))
     LOGN(BFUN, WARNING) << "Failed to change mode of output file as 660: "
                         << outputName
                         << ". Access problems maybe occur in non-root mode"
                         << std::endl;
 
-  return {format("%s partition successfully back upped to %s",
-                 partitionName.data(), outputName.data()),
+  return {Helper::format("%s partition successfully back upped to %s",
+                         partitionName.data(), outputName.data()),
           true};
 }
 
-bool backupFunction::init(CLI::App &_app) {
+INIT {
   LOGN(BFUN, INFO) << "Initializing variables of backup function." << std::endl;
   cmd = _app.add_subcommand("backup", "Backup partition(s) to file(s)");
   cmd->add_option("partition(s)", rawPartitions, "Partition name(s)")
@@ -115,14 +118,15 @@ bool backupFunction::init(CLI::App &_app) {
   cmd->add_option("-O,--output-directory", outputDirectory,
                   "Directory to save the partition image(s)")
       ->check(CLI::ExistingDirectory);
-  cmd->add_option(
-      "-b,--buffer-size", bufferSize,
-      "Buffer size for reading partition(s) and writing to file(s)");
+  cmd->add_option("-b,--buffer-size", bufferSize,
+                  "Buffer size for reading partition(s) and writing to file(s)")
+      ->transform(CLI::AsSizeValue(false))
+      ->default_val("4KB");
 
   return true;
 }
 
-bool backupFunction::run() {
+RUN {
   processCommandLine(partitions, outputNames, rawPartitions, rawOutputNames,
                      ',', true);
   if (!outputNames.empty() && partitions.size() != outputNames.size())
@@ -131,25 +135,28 @@ bool backupFunction::run() {
 
   std::vector<std::future<pair>> futures;
   for (size_t i = 0; i < partitions.size(); i++) {
+    uint64_t buf = bufferSize;
     std::string partitionName = partitions[i];
     std::string outputName =
         outputNames.empty() ? partitionName + ".img" : outputNames[i];
     if (!outputDirectory.empty()) outputName.insert(0, outputDirectory + '/');
 
+    setupBufferSize(buf, partitionName);
     futures.push_back(std::async(std::launch::async, runAsync, partitionName,
-                                 outputName, bufferSize));
+                                 outputName, buf));
     LOGN(BFUN, INFO) << "Created thread backup upping " << partitionName
                      << std::endl;
   }
 
   std::string end;
   bool endResult = true;
-  for (auto &future : futures) {
+  for (auto& future : futures) {
     auto [fst, snd] = future.get();
     if (!snd) {
       end += fst + '\n';
       endResult = false;
-    } else println("%s", fst.c_str());
+    } else
+      println("%s", fst.c_str());
   }
 
   if (!endResult) throw Error("%s", end.c_str());
@@ -158,7 +165,7 @@ bool backupFunction::run() {
   return endResult;
 }
 
-bool backupFunction::isUsed() const { return cmd->parsed(); }
+IS_USED_COMMON_BODY
 
-const char *backupFunction::name() const { return BFUN; }
-} // namespace PartitionManager
+NAME { return BFUN; }
+}  // namespace PartitionManager

src/functions/CleanLogFunction.cpp

@@ -0,0 +1,43 @@
+/*
+Copyright 2025 Yağız Zengin
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+#include <PartitionManager/PartitionManager.hpp>
+
+#include "functions.hpp"
+
+#define CFUN "cleanLogFunction"
+#define FUNCTION_CLASS cleanLogFunction
+
+namespace PartitionManager {
+INIT {
+  LOGN(CFUN, INFO) << "Initializing variables of clean log function."
+                   << std::endl;
+  flags = {FunctionFlags::NO_MAP_CHECK, FunctionFlags::NO_SU};
+  cmd = _app.add_subcommand("clean-logs", "Clean PMT logs.");
+  return true;
+}
+
+RUN {
+  LOGN(CFUN, INFO) << "Removing log file: " << VARS.logFile << std::endl;
+  Helper::LoggingProperties::setLoggingState<YES>();  // eraseEntry writes log!
+  return Helper::eraseEntry(VARS.logFile);
+}
+
+IS_USED_COMMON_BODY
+
+NAME { return CFUN; }
+
+}  // namespace PartitionManager

src/functions/EraseFunction.cpp

@@ -14,61 +14,65 @@ Copyright 2025 Yağız Zengin
    limitations under the License.
 */
 
-#include "functions.hpp"
-#include <PartitionManager/PartitionManager.hpp>
-#include <cerrno>
-#include <cstdlib>
 #include <fcntl.h>
-#include <future>
 #include <unistd.h>
 
+#include <PartitionManager/PartitionManager.hpp>
+#include <cerrno>
+#include <future>
+
+#include "functions.hpp"
+
 #define EFUN "eraseFunction"
+#define FUNCTION_CLASS eraseFunction
 
 namespace PartitionManager {
-pair eraseFunction::runAsync(const std::string &partitionName, int bufferSize) {
-  if (!Variables->PartMap->hasPartition(partitionName))
-    return {format("Couldn't find partition: %s", partitionName.data()), false};
+RUN_ASYNC(const std::string& partitionName, const uint64_t bufferSize) {
+  if (!PART_MAP.hasPartition(partitionName))
+    return {Helper::format("Couldn't find partition: %s", partitionName.data()),
+            false};
 
-  if (Variables->onLogical && !Variables->PartMap->isLogical(partitionName)) {
-    if (Variables->forceProcess)
+  if (VARS.onLogical && !PART_MAP.isLogical(partitionName)) {
+    if (VARS.forceProcess)
       LOGN(EFUN, WARNING)
           << "Partition " << partitionName
           << " is exists but not logical. Ignoring (from --force, -f)."
           << std::endl;
     else
-      return {
-          format("Used --logical (-l) flag but is not logical partition: %s",
-                 partitionName.data()),
-          false};
+      return {Helper::format(
+                  "Used --logical (-l) flag but is not logical partition: %s",
+                  partitionName.data()),
+              false};
   }
 
-  setupBufferSize(bufferSize, partitionName);
   LOGN(EFUN, INFO) << "Using buffer size: " << bufferSize;
 
   // Automatically close file descriptors and delete allocated memories (arrays)
   Helper::garbageCollector collector;
 
   const int pfd = Helper::openAndAddToCloseList(
-      Variables->PartMap->getRealPathOf(partitionName), collector, O_WRONLY);
+      PART_MAP.getRealPathOf(partitionName), collector, O_WRONLY);
   if (pfd < 0)
-    return {format("Can't open partition: %s: %s", partitionName.data(),
-                   strerror(errno)),
+    return {Helper::format("Can't open partition: %s: %s", partitionName.data(),
+                           strerror(errno)),
             false};
 
-  if (!Variables->forceProcess)
-    Helper::confirmPropt(
-        "Are you sure you want to continue? This could render your device "
-        "unusable! Do not continue if you "
-        "do not know what you are doing!");
+  if (!VARS.forceProcess) {
+    if (!Helper::confirmPropt(
+            "Are you sure you want to continue? This could render your device "
+            "unusable! Do not continue if you "
+            "do not know what you are doing!"))
+      throw Error("Operation canceled.");
+  }
 
   LOGN(EFUN, INFO) << "Writing zero bytes to partition: " << partitionName
                    << std::endl;
-  auto *buffer = new char[bufferSize];
+  auto* buffer = new (std::nothrow) char[bufferSize];
   collector.delAfterProgress(buffer);
   memset(buffer, 0x00, bufferSize);
 
   ssize_t bytesWritten = 0;
-  const uint64_t partitionSize = Variables->PartMap->sizeOf(partitionName);
+  const uint64_t partitionSize = PART_MAP.sizeOf(partitionName);
 
   while (bytesWritten < partitionSize) {
     size_t toWrite = sizeof(buffer);
@@ -76,45 +80,51 @@ pair eraseFunction::runAsync(const std::string &partitionName, int bufferSize) {
       toWrite = partitionSize - bytesWritten;
 
     if (const ssize_t result = write(pfd, buffer, toWrite); result == -1)
-      return {format("Can't write zero bytes to partition: %s: %s",
-                     partitionName.data(), strerror(errno)),
+      return {Helper::format("Can't write zero bytes to partition: %s: %s",
+                             partitionName.data(), strerror(errno)),
               false};
-    else bytesWritten += result;
+    else
+      bytesWritten += result;
   }
 
-  return {format("Successfully wrote zero bytes to the %s partition\n",
-                 partitionName.data()),
+  return {Helper::format("Successfully wrote zero bytes to the %s partition",
+                         partitionName.data()),
           true};
 }
 
-bool eraseFunction::init(CLI::App &_app) {
+INIT {
   LOGN(EFUN, INFO) << "Initializing variables of erase function." << std::endl;
   cmd = _app.add_subcommand("erase", "Writes zero bytes to partition(s)");
   cmd->add_option("partition(s)", partitions, "Partition name(s)")
       ->required()
       ->delimiter(',');
   cmd->add_option("-b,--buffer-size", bufferSize,
-                  "Buffer size for writing zero bytes to partition(s)");
+                  "Buffer size for writing zero bytes to partition(s)")
+      ->transform(CLI::AsSizeValue(false))
+      ->default_val("4KB");
   return true;
 }
 
-bool eraseFunction::run() {
+RUN {
   std::vector<std::future<pair>> futures;
-  for (const auto &partitionName : partitions) {
+  for (const auto& partitionName : partitions) {
+    uint64_t buf = bufferSize;
+    setupBufferSize(buf, partitionName);
     futures.push_back(
-        std::async(std::launch::async, runAsync, partitionName, bufferSize));
+        std::async(std::launch::async, runAsync, partitionName, buf));
     LOGN(EFUN, INFO) << "Created thread for writing zero bytes to "
                      << partitionName << std::endl;
   }
 
   std::string end;
   bool endResult = true;
-  for (auto &future : futures) {
+  for (auto& future : futures) {
     auto [fst, snd] = future.get();
     if (!snd) {
       end += fst + '\n';
       endResult = false;
-    } else println("%s", fst.c_str());
+    } else
+      println("%s", fst.c_str());
   }
 
   if (!endResult) throw Error("%s", end.c_str());
@@ -123,7 +133,7 @@ bool eraseFunction::run() {
   return endResult;
 }
 
-bool eraseFunction::isUsed() const { return cmd->parsed(); }
+IS_USED_COMMON_BODY
 
-const char *eraseFunction::name() const { return EFUN; }
-} // namespace PartitionManager
+NAME { return EFUN; }
+}  // namespace PartitionManager

src/functions/FlashFunction.cpp

@@ -14,67 +14,70 @@ Copyright 2025 Yağız Zengin
    limitations under the License.
 */
 
-#include "functions.hpp"
+#include <fcntl.h>
+#include <unistd.h>
+
 #include <PartitionManager/PartitionManager.hpp>
 #include <cerrno>
 #include <cstdlib>
-#include <fcntl.h>
 #include <future>
-#include <unistd.h>
+
+#include "functions.hpp"
 
 #define FFUN "flashFunction"
+#define FUNCTION_CLASS flashFunction
 
 namespace PartitionManager {
-pair flashFunction::runAsync(const std::string &partitionName,
-                             const std::string &imageName, int bufferSize) {
+RUN_ASYNC(const std::string& partitionName, const std::string& imageName,
+          const uint64_t bufferSize, const bool deleteAfterProgress) {
   if (!Helper::fileIsExists(imageName))
-    return {format("Couldn't find image file: %s", imageName.data()), false};
-  if (!Variables->PartMap->hasPartition(partitionName))
-    return {format("Couldn't find partition: %s", partitionName.data()), false};
-  if (Helper::fileSize(imageName) > Variables->PartMap->sizeOf(partitionName))
-    return {format("%s is larger than %s partition size!", imageName.data(),
-                   partitionName.data()),
+    return {Helper::format("Couldn't find image file: %s", imageName.data()),
+            false};
+  if (!PART_MAP.hasPartition(partitionName))
+    return {Helper::format("Couldn't find partition: %s", partitionName.data()),
+            false};
+  if (Helper::fileSize(imageName) > PART_MAP.sizeOf(partitionName))
+    return {Helper::format("%s is larger than %s partition size!",
+                           imageName.data(), partitionName.data()),
             false};
 
   LOGN(FFUN, INFO) << "flashing " << imageName << " to " << partitionName
                    << std::endl;
 
-  if (Variables->onLogical && !Variables->PartMap->isLogical(partitionName)) {
-    if (Variables->forceProcess)
+  if (VARS.onLogical && !PART_MAP.isLogical(partitionName)) {
+    if (VARS.forceProcess)
       LOGN(FFUN, WARNING)
           << "Partition " << partitionName
           << " is exists but not logical. Ignoring (from --force, -f)."
           << std::endl;
     else
-      return {
-          format("Used --logical (-l) flag but is not logical partition: %s",
-                 partitionName.data()),
-          false};
+      return {Helper::format(
+                  "Used --logical (-l) flag but is not logical partition: %s",
+                  partitionName.data()),
+              false};
   }
 
-  setupBufferSize(bufferSize, imageName);
-  LOGN(FFUN, INFO) << "Using buffer size: " << bufferSize;
+  LOGN(FFUN, INFO) << "Using buffer size: " << bufferSize << std::endl;
 
   // Automatically close file descriptors and delete allocated memories (arrays)
   Helper::garbageCollector collector;
 
   const int ffd = Helper::openAndAddToCloseList(imageName, collector, O_RDONLY);
   if (ffd < 0)
-    return {format("Can't open image file %s: %s", imageName.data(),
-                   strerror(errno)),
+    return {Helper::format("Can't open image file %s: %s", imageName.data(),
+                           strerror(errno)),
             false};
 
   const int pfd = Helper::openAndAddToCloseList(
-      Variables->PartMap->getRealPathOf(partitionName), collector,
-      O_RDWR | O_TRUNC);
+      PART_MAP.getRealPathOf(partitionName), collector, O_RDWR | O_TRUNC);
   if (pfd < 0)
-    return {format("Can't open partition: %s: %s", partitionName.data(),
-                   strerror(errno)),
+    return {Helper::format("Can't open partition: %s: %s", partitionName.data(),
+                           strerror(errno)),
             false};
 
   LOGN(FFUN, INFO) << "Writing image " << imageName
                    << " to partition: " << partitionName << std::endl;
-  auto *buffer = new char[bufferSize];
+  auto* buffer = new (std::nothrow) char[bufferSize];
   collector.delAfterProgress(buffer);
   memset(buffer, 0x00, bufferSize);
 
@@ -82,17 +85,24 @@ pair flashFunction::runAsync(const std::string &partitionName,
   while ((bytesRead = read(ffd, buffer, bufferSize)) > 0) {
     if (const ssize_t bytesWritten = write(pfd, buffer, bytesRead);
         bytesWritten != bytesRead)
-      return {format("Can't write partition to output file %s: %s",
-                     imageName.data(), strerror(errno)),
+      return {Helper::format("Can't write partition to output file %s: %s",
+                             imageName.data(), strerror(errno)),
               false};
   }
 
-  return {format("%s is successfully wrote to %s partition", imageName.data(),
-                 partitionName.data()),
+  if (deleteAfterProgress) {
+    LOGN(FFUN, INFO) << "Deleting flash file: " << imageName << std::endl;
+    if (!Helper::eraseEntry(imageName) && !VARS.quietProcess)
+      WARNING(
+          std::string("Cannot erase flash file: " + imageName + "\n").data());
+  }
+
+  return {Helper::format("%s is successfully wrote to %s partition",
+                         imageName.data(), partitionName.data()),
           true};
 }
 
-bool flashFunction::init(CLI::App &_app) {
+INIT {
   LOGN(FFUN, INFO) << "Initializing variables of flash function." << std::endl;
   cmd = _app.add_subcommand("flash", "Flash image(s) to partition(s)");
   cmd->add_option("partition(s)", rawPartitions, "Partition name(s)")
@@ -100,40 +110,51 @@ bool flashFunction::init(CLI::App &_app) {
   cmd->add_option("imageFile(s)", rawImageNames, "Name(s) of image file(s)")
       ->required();
   cmd->add_option(
-      "-b,--buffer-size", bufferSize,
-      "Buffer size for reading image(s) and writing to partition(s)");
+         "-b,--buffer-size", bufferSize,
+         "Buffer size for reading image(s) and writing to partition(s)")
+      ->transform(CLI::AsSizeValue(false))
+      ->default_val("4KB");
   cmd->add_option("-I,--image-directory", imageDirectory,
                   "Directory to find image(s) and flash to partition(s)");
+  cmd->add_flag("-d,--delete", deleteAfterProgress,
+                "Delete flash file(s) after progress.")
+      ->default_val(false);
 
   return true;
 }
 
-bool flashFunction::run() {
+RUN {
   processCommandLine(partitions, imageNames, rawPartitions, rawImageNames, ',',
                      true);
   if (partitions.size() != imageNames.size())
     throw CLI::ValidationError(
         "You must provide an image file(s) as long as the partition name(s)");
 
+  for (size_t i = 0; i < partitions.size(); i++) {
+    if (!imageDirectory.empty()) imageNames[i].insert(0, imageDirectory + '/');
+  }
+
   std::vector<std::future<pair>> futures;
   for (size_t i = 0; i < partitions.size(); i++) {
-    std::string imageName = imageNames[i];
-    if (!imageDirectory.empty()) imageName.insert(0, imageDirectory + '/');
+    uint64_t buf = bufferSize;
 
+    setupBufferSize(buf, imageNames[i]);
     futures.push_back(std::async(std::launch::async, runAsync, partitions[i],
-                                 imageName, bufferSize));
+                                 imageNames[i], bufferSize,
+                                 deleteAfterProgress));
     LOGN(FFUN, INFO) << "Created thread for flashing image to " << partitions[i]
                      << std::endl;
   }
 
   std::string end;
   bool endResult = true;
-  for (auto &future : futures) {
+  for (auto& future : futures) {
     auto [fst, snd] = future.get();
     if (!snd) {
       end += fst + '\n';
       endResult = false;
-    } else println("%s", fst.c_str());
+    } else
+      println("%s", fst.c_str());
   }
 
   if (!endResult) throw Error("%s", end.c_str());
@@ -142,7 +163,7 @@ bool flashFunction::run() {
   return endResult;
 }
 
-bool flashFunction::isUsed() const { return cmd->parsed(); }
+IS_USED_COMMON_BODY
 
-const char *flashFunction::name() const { return FFUN; }
-} // namespace PartitionManager
+NAME { return FFUN; }
+}  // namespace PartitionManager

src/functions/InfoFunction.cpp

@@ -14,57 +14,70 @@ Copyright 2025 Yağız Zengin
    limitations under the License.
 */
 
-#include "functions.hpp"
+#include <fcntl.h>
+
 #include <PartitionManager/PartitionManager.hpp>
 #include <cerrno>
 #include <cstdlib>
-#include <fcntl.h>
-#include <unistd.h>
+#include <nlohmann/json.hpp>
+
+#include "functions.hpp"
 
 #define IFUN "infoFunction"
+#define FUNCTION_CLASS infoFunction
 
 namespace PartitionManager {
-bool infoFunction::init(CLI::App &_app) {
+
+INIT {
   LOGN(IFUN, INFO) << "Initializing variables of info printer function."
                    << std::endl;
   cmd = _app.add_subcommand("info", "Tell info(s) of input partition list")
-            ->footer("Use get-all or getvar-all as partition name for getting "
-                     "info's of all "
-                     "partitions.");
+            ->footer(
+                "Use get-all or getvar-all as partition name for getting "
+                "info's of all partitions.\nUse get-logicals as partition "
+                "name for getting info's of logical partitions.\n"
+                "Use get-physical as partition name for getting info's of "
+                "physical partitions.");
   cmd->add_option("partition(s)", partitions, "Partition name(s).")
       ->required()
       ->delimiter(',');
   cmd->add_flag("-J,--json", jsonFormat,
                 "Print info(s) as JSON body. The body of each partition will "
-                "be written separately");
+                "be written separately")
+      ->default_val(false);
+  cmd->add_flag("--as-byte", asByte, "View sizes as byte.")->default_val(true);
+  cmd->add_flag("--as-kilobyte", asKiloBytes, "View sizes as kilobyte.")
+      ->default_val(false);
+  cmd->add_flag("--as-megabyte", asMega, "View sizes as megabyte.")
+      ->default_val(false);
+  cmd->add_flag("--as-gigabyte", asGiga, "View sizes as gigabyte.")
+      ->default_val(false);
   cmd->add_option("--json-partition-name", jNamePartition,
-                  "Speficy partition name element for JSON body");
+                  "Specify partition name element for JSON body")
+      ->default_val("name");
   cmd->add_option("--json-size-name", jNameSize,
-                  "Speficy size element name for JSON body");
+                  "Specify size element name for JSON body")
+      ->default_val("size");
   cmd->add_option("--json-logical-name", jNameLogical,
-                  "Speficy logical element name for JSON body");
+                  "Specify logical element name for JSON body")
+      ->default_val("isLogical");
+  cmd->add_option("--json-indent-size", jIndentSize,
+                  "Set JSON indent size for printing to screen")
+      ->default_val(2);
   return true;
 }
 
-bool infoFunction::run() {
-  if (partitions.back() == "get-all" || partitions.back() == "getvar-all") {
-    partitions.clear();
-    const auto parts = Variables->PartMap->getPartitionList();
-    if (!parts)
-      throw Error("Cannot get list of all partitions! See logs for more "
-                  "information (%s)",
-                  Helper::LoggingProperties::FILE.data());
+RUN {
+  std::vector<PartitionMap::Partition_t> jParts;
+  sizeCastTypes multiple;
+  if (asByte) multiple = B;
+  if (asKiloBytes) multiple = KB;
+  if (asMega) multiple = MB;
+  if (asGiga) multiple = GB;
 
-    for (const auto &name : *parts)
-      partitions.push_back(name);
-  }
-
-  for (const auto &partition : partitions) {
-    if (!Variables->PartMap->hasPartition(partition))
-      throw Error("Couldn't find partition: %s", partition.data());
-
-    if (Variables->onLogical && !Variables->PartMap->isLogical(partition)) {
-      if (Variables->forceProcess)
+  auto func = [this, &jParts, &multiple] COMMON_LAMBDA_PARAMS -> bool {
+    if (VARS.onLogical && !props.isLogical) {
+      if (VARS.forceProcess)
         LOGN(IFUN, WARNING)
             << "Partition " << partition
             << " is exists but not logical. Ignoring (from --force, -f)."
@@ -75,28 +88,44 @@ bool infoFunction::run() {
     }
 
     if (jsonFormat)
-#ifdef __LP64__
-      println("{\"%s\": \"%s\", \"%s\": %lu, \"%s\": %s}",
-#else
-      println("{\"%s\": \"%s\", \"%s\": %llu, \"%s\": %s}",
-#endif
-              jNamePartition.data(), partition.data(), jNameSize.data(),
-              Variables->PartMap->sizeOf(partition), jNameLogical.data(),
-              Variables->PartMap->isLogical(partition) ? "true" : "false");
+      jParts.push_back(
+          {partition,
+           {static_cast<uint64_t>(Helper::convertTo(props.size, multiple)),
+            props.isLogical}});
     else
-#ifdef __LP64__
-      println("partition=%s size=%lu isLogical=%s",
-#else
-      println("partition=%s size=%llu isLogical=%s",
-#endif
-              partition.data(), Variables->PartMap->sizeOf(partition),
-              Variables->PartMap->isLogical(partition) ? "true" : "false");
+      println("partition=%s size=%d isLogical=%s", partition.data(),
+              Helper::convertTo(props.size, multiple),
+              props.isLogical ? "true" : "false");
+
+    return true;
+  };
+
+  if (partitions.back() == "get-all" || partitions.back() == "getvar-all")
+    PART_MAP.doForAllPartitions(func);
+  else if (partitions.back() == "get-logicals")
+    PART_MAP.doForLogicalPartitions(func);
+  else if (partitions.back() == "get-physicals")
+    PART_MAP.doForPhysicalPartitions(func);
+  else
+    PART_MAP.doForPartitionList(partitions, func);
+
+  if (jsonFormat) {
+    nlohmann::json j;
+    j["multipleType"] = Helper::multipleToString(multiple);
+    j["partitions"] = nlohmann::json::array();
+    for (const auto& [name, props] : jParts) {
+      j["partitions"].push_back({{jNamePartition, name},
+                                 {jNameSize, props.size},
+                                 {jNameLogical, props.isLogical}});
+    }
+
+    println("%s", j.dump(jIndentSize).data());
   }
 
   return true;
 }
 
-bool infoFunction::isUsed() const { return cmd->parsed(); }
+IS_USED_COMMON_BODY
 
-const char *infoFunction::name() const { return IFUN; };
-} // namespace PartitionManager
+NAME { return IFUN; };
+}  // namespace PartitionManager

src/functions/MemoryTestFunction.cpp

@@ -0,0 +1,134 @@
+/*
+Copyright 2025 Yağız Zengin
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+                   http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+#include <fcntl.h>
+#include <unistd.h>
+
+#include <PartitionManager/PartitionManager.hpp>
+#include <chrono>
+#include <cstdlib>
+#include <cstring>
+#include <random>
+
+#include "functions.hpp"
+
+#define MTFUN "memoryTestFunction"
+#define FUNCTION_CLASS memoryTestFunction
+
+namespace PartitionManager {
+
+INIT {
+  LOGN(MTFUN, INFO) << "Initializing variables of memory test function."
+                    << std::endl;
+  flags = {FunctionFlags::NO_MAP_CHECK, FunctionFlags::ADB_SUFFICIENT};
+  cmd = _app.add_subcommand("memtest", "Test your write/read speed of device.");
+  cmd->add_option("testDirectory", testPath, "Path to test directory")
+      ->default_val("/data/local/tmp")
+      ->check([&](const std::string& val) {
+        if (val.find("/sdcard") != std::string::npos ||
+            val.find("/storage") != std::string::npos)
+          return std::string(
+              "Sequential read tests on FUSE-mounted paths do not give correct "
+              "results, so its use is prohibited (by pmt)!");
+
+        if (val != "/data/local/tmp" && !Helper::directoryIsExists(val))
+          return std::string("Couldn't find directory: " + val +
+                             ", no root? Try executing in ADB shell.");
+
+        return std::string();
+      });
+  cmd->add_option("-s,--file-size", testFileSize, "File size of test file")
+      ->transform(CLI::AsSizeValue(false))
+      ->default_val("1GB");
+  cmd->add_flag("--no-read-test", doNotReadTest,
+                "Don't read test data from disk")
+      ->default_val(false);
+
+  return true;
+}
+
+RUN {
+  if (testFileSize > GB(2) && !VARS.forceProcess)
+    throw Error(
+        "File size is more than 2GB! Sizes over 2GB may not give accurate "
+        "results in the write test. Use -f (--force) for skip this error.");
+
+  LOGN(MTFUN, INFO) << "Starting memory test on " << testPath << std::endl;
+  Helper::garbageCollector collector;
+  const std::string test = Helper::pathJoin(testPath, "test.bin");
+
+  LOGN(MTFUN, INFO) << "Generating random data for testing" << std::endl;
+  auto* buffer = new (std::nothrow) char[bufferSize];
+  collector.delAfterProgress(buffer);
+
+  for (size_t i = 0; i < bufferSize; i++)
+    buffer[i] = static_cast<char>(Helper::Random<1024>::getNumber());
+
+  collector.delFileAfterProgress(test);
+
+  const int wfd = Helper::openAndAddToCloseList(
+      test, collector, O_WRONLY | O_CREAT | O_TRUNC | O_SYNC, 0644);
+  if (wfd < 0) throw Error("Can't open/create test file: %s", strerror(errno));
+
+  LOGN(MTFUN, INFO) << "Sequential write test started!" << std::endl;
+  const auto startWrite = std::chrono::high_resolution_clock::now();
+  ssize_t bytesWritten = 0;
+  while (bytesWritten < testFileSize) {
+    const ssize_t ret = write(wfd, buffer, bufferSize);
+    if (ret < 0) throw Error("Can't write to test file: %s", strerror(errno));
+    bytesWritten += ret;
+  }
+
+  const auto endWrite = std::chrono::high_resolution_clock::now();
+
+  const double writeTime =
+      std::chrono::duration<double>(endWrite - startWrite).count();
+  println("Sequential write speed: %3.f MB/s",
+          (static_cast<double>(testFileSize) / (1024.0 * 1024.0)) / writeTime);
+  LOGN(MTFUN, INFO) << "Sequential write test done!" << std::endl;
+
+  if (!doNotReadTest) {
+    auto* rawBuffer = new char[bufferSize + 4096];
+    collector.delAfterProgress(rawBuffer);
+    auto* bufferRead = reinterpret_cast<char*>(
+        (reinterpret_cast<uintptr_t>(rawBuffer) + 4096 - 1) & ~(4096 - 1));
+    const int rfd =
+        Helper::openAndAddToCloseList(test, collector, O_RDONLY | O_DIRECT);
+    if (rfd < 0) throw Error("Can't open test file: %s", strerror(errno));
+
+    LOGN(MTFUN, INFO) << "Sequential read test started!" << std::endl;
+    const auto startRead = std::chrono::high_resolution_clock::now();
+    size_t total = 0;
+    ssize_t bytesRead;
+    while ((bytesRead = read(rfd, bufferRead, bufferSize)) > 0) {
+      total += bytesRead;
+    }
+    const auto endRead = std::chrono::high_resolution_clock::now();
+
+    const double read_time =
+        std::chrono::duration<double>(endRead - startRead).count();
+    println("Sequential read speed: %3.f MB/s",
+            (static_cast<double>(total) / (1024.0 * 1024.0)) / read_time);
+    LOGN(MTFUN, INFO) << "Sequential read test done!" << std::endl;
+  }
+
+  return true;
+}
+
+IS_USED_COMMON_BODY
+
+NAME { return MTFUN; }
+}  // namespace PartitionManager

src/functions/PartitionSizeFunction.cpp

@@ -14,48 +14,57 @@ Copyright 2025 Yağız Zengin
    limitations under the License.
 */
 
-#include "functions.hpp"
 #include <PartitionManager/PartitionManager.hpp>
 
-#define SFUN "partitionSizeFunction"
+#include "functions.hpp"
 
-std::string convertTo(const uint64_t size, const std::string &multiple) {
-  if (multiple == "KB") return std::to_string(TO_KB(size));
-  if (multiple == "MB") return std::to_string(TO_MB(size));
-  if (multiple == "GB") return std::to_string(TO_GB(size));
-  return std::to_string(size);
-}
+#define SFUN "partitionSizeFunction"
+#define FUNCTION_CLASS partitionSizeFunction
 
 namespace PartitionManager {
-bool partitionSizeFunction::init(CLI::App &_app) {
+INIT {
   LOGN(SFUN, INFO)
       << "Initializing variables of partition size getter function."
       << std::endl;
-  cmd = _app.add_subcommand("sizeof", "Tell size(s) of input partition list");
+  cmd = _app.add_subcommand("sizeof", "Tell size(s) of input partition list")
+            ->footer(
+                "Use get-all or getvar-all as partition name for getting "
+                "sizes of all partitions.\nUse get-logicals as partition "
+                "name for getting sizes of logical partitions.\n"
+                "Use get-physical as partition name for getting sizes of "
+                "physical partitions.");
   cmd->add_option("partition(s)", partitions, "Partition name(s).")
       ->required()
       ->delimiter(',');
   cmd->add_flag("--as-byte", asByte,
-                "Tell input size of partition list as byte.");
+                "Tell input size of partition list as byte.")
+      ->default_val(false);
   cmd->add_flag("--as-kilobyte", asKiloBytes,
-                "Tell input size of partition list as kilobyte.");
+                "Tell input size of partition list as kilobyte.")
+      ->default_val(false);
   cmd->add_flag("--as-megabyte", asMega,
-                "Tell input size of partition list as megabyte.");
+                "Tell input size of partition list as megabyte.")
+      ->default_val(true);
   cmd->add_flag("--as-gigabyte", asGiga,
-                "Tell input size of partition list as gigabyte.");
+                "Tell input size of partition list as gigabyte.")
+      ->default_val(false);
   cmd->add_flag("--only-size", onlySize,
                 "Tell input size of partition list as not printing multiple "
-                "and partition name.");
+                "and partition name.")
+      ->default_val(false);
   return true;
 }
 
-bool partitionSizeFunction::run() {
-  for (const auto &partition : partitions) {
-    if (!Variables->PartMap->hasPartition(partition))
-      throw Error("Couldn't find partition: %s", partition.data());
+RUN {
+  sizeCastTypes multiple = {};
+  if (asByte) multiple = B;
+  if (asKiloBytes) multiple = KB;
+  if (asMega) multiple = MB;
+  if (asGiga) multiple = GB;
 
-    if (Variables->onLogical && !Variables->PartMap->isLogical(partition)) {
-      if (Variables->forceProcess)
+  auto func = [this, &multiple] COMMON_LAMBDA_PARAMS -> bool {
+    if (VARS.onLogical && !props.isLogical) {
+      if (VARS.forceProcess)
         LOGN(SFUN, WARNING)
             << "Partition " << partition
             << " is exists but not logical. Ignoring (from --force, -f)."
@@ -65,26 +74,29 @@ bool partitionSizeFunction::run() {
                     partition.data());
     }
 
-    std::string multiple = "MB";
-    if (asByte) multiple = "B";
-    if (asKiloBytes) multiple = "KB";
-    if (asMega) multiple = "MB";
-    if (asGiga) multiple = "GB";
-
     if (onlySize)
-      println(
-          "%s",
-          convertTo(Variables->PartMap->sizeOf(partition), multiple).data());
+      println("%d", Helper::convertTo(props.size, multiple));
     else
-      println("%s: %s%s", partition.data(),
-              convertTo(Variables->PartMap->sizeOf(partition), multiple).data(),
-              multiple.data());
-  }
+      println("%s: %d%s", partition.data(),
+              Helper::convertTo(props.size, multiple),
+              Helper::multipleToString(multiple).data());
+
+    return true;
+  };
+
+  if (partitions.back() == "get-all" || partitions.back() == "getvar-all")
+    PART_MAP.doForAllPartitions(func);
+  else if (partitions.back() == "get-logicals")
+    PART_MAP.doForLogicalPartitions(func);
+  else if (partitions.back() == "get-physicals")
+    PART_MAP.doForPhysicalPartitions(func);
+  else
+    PART_MAP.doForPartitionList(partitions, func);
 
   return true;
 }
 
-bool partitionSizeFunction::isUsed() const { return cmd->parsed(); }
+IS_USED_COMMON_BODY
 
-const char *partitionSizeFunction::name() const { return SFUN; }
-} // namespace PartitionManager
+NAME { return SFUN; }
+}  // namespace PartitionManager

src/functions/RealLinkPathFunction.cpp

@@ -1,59 +0,0 @@
-/*
-        Copyright 2025 Yağız Zengin
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-           http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-*/
-
-#include "functions.hpp"
-#include <PartitionManager/PartitionManager.hpp>
-
-#define RLPFUN "realPathFunction"
-
-namespace PartitionManager {
-bool realLinkPathFunction::init(CLI::App &_app) {
-  LOGN(RLPFUN, INFO) << "Initializing variables of real link path function."
-                     << std::endl;
-  cmd = _app.add_subcommand("real-linkpath",
-                            "Tell real link paths of partition(s)");
-  cmd->add_option("partition(s)", partitions, "Partition name(s)")
-      ->required()
-      ->delimiter(',');
-  return true;
-}
-
-bool realLinkPathFunction::run() {
-  for (const auto &partition : partitions) {
-    if (!Variables->PartMap->hasPartition(partition))
-      throw Error("Couldn't find partition: %s", partition.data());
-
-    if (Variables->onLogical && !Variables->PartMap->isLogical(partition)) {
-      if (Variables->forceProcess)
-        LOGN(RLPFUN, WARNING)
-            << "Partition " << partition
-            << " is exists but not logical. Ignoring (from --force, -f)."
-            << std::endl;
-      else
-        throw Error("Used --logical (-l) flag but is not logical partition: %s",
-                    partition.data());
-    }
-
-    println("%s", Variables->PartMap->getRealPathOf(partition).data());
-  }
-
-  return true;
-}
-
-bool realLinkPathFunction::isUsed() const { return cmd->parsed(); }
-
-const char *realLinkPathFunction::name() const { return RLPFUN; }
-} // namespace PartitionManager

src/functions/RealPathFunction.cpp

@@ -14,29 +14,33 @@
    limitations under the License.
 */
 
-#include "functions.hpp"
 #include <PartitionManager/PartitionManager.hpp>
 
+#include "functions.hpp"
+
 #define RPFUN "realPathFunction"
+#define FUNCTION_CLASS realPathFunction
 
 namespace PartitionManager {
-bool realPathFunction::init(CLI::App &_app) {
+INIT {
   LOGN(RPFUN, INFO) << "Initializing variables of real path function."
                     << std::endl;
   cmd = _app.add_subcommand("real-path", "Tell real paths of partition(s)");
   cmd->add_option("partition(s)", partitions, "Partition name(s)")
       ->required()
       ->delimiter(',');
+  cmd->add_flag("--real-link-path", realLinkPath, "Print real link path(s)")
+      ->default_val(false);
   return true;
 }
 
-bool realPathFunction::run() {
-  for (const auto &partition : partitions) {
-    if (!Variables->PartMap->hasPartition(partition))
+RUN {
+  for (const auto& partition : partitions) {
+    if (!PART_MAP.hasPartition(partition))
       throw Error("Couldn't find partition: %s", partition.data());
 
-    if (Variables->onLogical && !Variables->PartMap->isLogical(partition)) {
-      if (Variables->forceProcess)
+    if (VARS.onLogical && !PART_MAP.isLogical(partition)) {
+      if (VARS.forceProcess)
         LOGN(RPFUN, WARNING)
             << "Partition " << partition
             << " is exists but not logical. Ignoring (from --force, -f)."
@@ -46,13 +50,16 @@ bool realPathFunction::run() {
                     partition.data());
     }
 
-    println("%s", Variables->PartMap->getRealPathOf(partition).data());
+    if (realLinkPath)
+      println("%s", PART_MAP.getRealLinkPathOf(partition).data());
+    else
+      println("%s", PART_MAP.getRealPathOf(partition).data());
   }
 
   return true;
 }
 
-bool realPathFunction::isUsed() const { return cmd->parsed(); }
+IS_USED_COMMON_BODY
 
-const char *realPathFunction::name() const { return RPFUN; }
-} // namespace PartitionManager
+NAME { return RPFUN; }
+}  // namespace PartitionManager

src/functions/RebootFunction.cpp

@@ -14,32 +14,37 @@ Copyright 2025 Yağız Zengin
    limitations under the License.
 */
 
-#include "functions.hpp"
 #include <PartitionManager/PartitionManager.hpp>
 
+#include "functions.hpp"
+
 #define RFUN "rebootFunction"
+#define FUNCTION_CLASS rebootFunction
 
 namespace PartitionManager {
-bool rebootFunction::init(CLI::App &_app) {
+INIT {
   LOGN(RFUN, INFO) << "Initializing variables of reboot function." << std::endl;
+  flags = {FunctionFlags::NO_MAP_CHECK, FunctionFlags::ADB_SUFFICIENT};
   cmd = _app.add_subcommand("reboot", "Reboots device");
   cmd->add_option("rebootTarget", rebootTarget,
                   "Reboot target (default: normal)");
   return true;
 }
 
-bool rebootFunction::run() {
+RUN {
   LOGN(RFUN, INFO) << "Rebooting device!!! (custom reboot target: "
                    << (rebootTarget.empty() ? "none" : rebootTarget)
                    << std::endl;
 
-  if (Helper::reboot(rebootTarget)) println("Reboot command was sent");
-  else throw Error("Cannot reboot device");
+  if (Helper::androidReboot(rebootTarget))
+    println("Reboot command was sent");
+  else
+    throw Error("Cannot reboot device");
 
   return true;
 }
 
-bool rebootFunction::isUsed() const { return cmd->parsed(); }
+IS_USED_COMMON_BODY
 
-const char *rebootFunction::name() const { return RFUN; }
-} // namespace PartitionManager
+NAME { return RFUN; }
+}  // namespace PartitionManager

src/functions/TypeFunction.cpp

@@ -14,48 +14,54 @@
    limitations under the License.
 */
 
-#include "functions.hpp"
 #include <PartitionManager/PartitionManager.hpp>
+#include <map>
+
+#include "functions.hpp"
 
 #define TFUN "typeFunction"
+#define FUNCTION_CLASS typeFunction
 
 namespace PartitionManager {
-bool typeFunction::init(CLI::App &_app) {
+INIT {
   LOGN(TFUN, INFO) << "Initializing variables of type function." << std::endl;
   cmd = _app.add_subcommand("type", "Get type of the partition(s) or image(s)");
   cmd->add_option("content(s)", contents, "Content(s)")
       ->required()
       ->delimiter(',');
   cmd->add_option("-b,--buffer-size", bufferSize,
-                  "Buffer size for max seek depth");
+                  "Buffer size for max seek depth")
+      ->transform(CLI::AsSizeValue(false))
+      ->default_val("4KB");
   cmd->add_flag("--only-check-android-magics", onlyCheckAndroidMagics,
-                "Only check Android magic values.");
+                "Only check Android magic values.")
+      ->default_val(false);
   cmd->add_flag("--only-check-filesystem-magics", onlyCheckFileSystemMagics,
-                "Only check filesystem magic values.");
+                "Only check filesystem magic values.")
+      ->default_val(false);
   return true;
 }
 
-bool typeFunction::run() {
-  std::unordered_map<uint64_t, std::string> magics;
+RUN {
+  std::map<uint64_t, std::string> magics;
   if (onlyCheckAndroidMagics)
     magics.merge(PartitionMap::Extras::AndroidMagicMap);
   else if (onlyCheckFileSystemMagics)
     magics.merge(PartitionMap::Extras::FileSystemMagicMap);
-  else magics.merge(PartitionMap::Extras::MagicMap);
+  else
+    magics.merge(PartitionMap::Extras::MagicMap);
 
-  for (const auto &content : contents) {
-    if (!Variables->PartMap->hasPartition(content) &&
-        !Helper::fileIsExists(content))
-      throw Error("Couldn't find partition or image file: %s\n",
-                  content.data());
+  for (const auto& content : contents) {
+    if (!PART_MAP.hasPartition(content) && !Helper::fileIsExists(content))
+      throw Error("Couldn't find partition or image file: %s", content.data());
 
     bool found = false;
-    for (const auto &[magic, name] : magics) {
+    for (const auto& [magic, name] : magics) {
       if (PartitionMap::Extras::hasMagic(
-              magic, bufferSize,
+              magic, static_cast<ssize_t>(bufferSize),
               Helper::fileIsExists(content)
                   ? content
-                  : Variables->PartMap->getRealPathOf(content))) {
+                  : PART_MAP.getRealPathOf(content))) {
         println("%s contains %s magic (%s)", content.data(), name.data(),
                 PartitionMap::Extras::formatMagic(magic).data());
         found = true;
@@ -64,15 +70,15 @@ bool typeFunction::run() {
     }
 
     if (!found)
-      throw Error("Couldn't determine type of %s%s\n", content.data(),
+      throw Error("Couldn't determine type of %s%s", content.data(),
                   content == "userdata" ? " (encrypted file system?)" : "");
   }
 
   return true;
 }
 
-bool typeFunction::isUsed() const { return cmd->parsed(); }
+IS_USED_COMMON_BODY
 
-const char *typeFunction::name() const { return TFUN; }
+NAME { return TFUN; }
 
-} // namespace PartitionManager
+}  // namespace PartitionManager

src/functions/functions.hpp

@@ -21,156 +21,133 @@
 #include <utility>
 #include <vector>
 
+#define INIT bool FUNCTION_CLASS::init(CLI::App& _app)
+#define RUN bool FUNCTION_CLASS::run()
+#define RUN_ASYNC pair FUNCTION_CLASS::runAsync
+#define IS_USED bool FUNCTION_CLASS::isUsed() const
+#define IS_USED_COMMON_BODY \
+  bool FUNCTION_CLASS::isUsed() const { return cmd->parsed(); }
+#define NAME const char* FUNCTION_CLASS::name() const
+
+/**
+ *   Please define FUNCTION_CLASS before using these macros!!! (INIT etc.)
+ */
+
+#define COMMON_FUNCTION_BODY()                \
+  CLI::App* cmd = nullptr;                    \
+  bool init(CLI::App& _app) override;         \
+  bool run() override;                        \
+  [[nodiscard]] bool isUsed() const override; \
+  [[nodiscard]] const char* name() const override
+
 namespace PartitionManager {
 using pair = std::pair<std::string, bool>;
 
 // Back-up function
 class backupFunction final : public FunctionBase {
-private:
+ private:
   std::vector<std::string> partitions, outputNames;
   std::string rawPartitions, rawOutputNames, outputDirectory;
-  int bufferSize = 4096;
+  uint64_t bufferSize = 0;
 
-public:
-  CLI::App *cmd = nullptr;
-
-  bool init(CLI::App &_app) override;
-  bool run() override;
-  static pair runAsync(const std::string &partitionName,
-                       const std::string &outputName, int bufferSize);
-
-  [[nodiscard]] bool isUsed() const override;
-  [[nodiscard]] const char *name() const override;
+ public:
+  COMMON_FUNCTION_BODY();
+  static pair runAsync(const std::string& partitionName,
+                       const std::string& outputName, uint64_t bufferSize);
 };
 
 // Image flasher function
 class flashFunction final : public FunctionBase {
-private:
+ private:
   std::vector<std::string> partitions, imageNames;
   std::string rawPartitions, rawImageNames, imageDirectory;
-  int bufferSize = 4096;
+  uint64_t bufferSize = 0;
+  bool deleteAfterProgress = false;
 
-public:
-  CLI::App *cmd = nullptr;
-
-  bool init(CLI::App &_app) override;
-  bool run() override;
-  static pair runAsync(const std::string &partitionName,
-                       const std::string &imageName, int bufferSize);
-
-  [[nodiscard]] bool isUsed() const override;
-  [[nodiscard]] const char *name() const override;
+ public:
+  COMMON_FUNCTION_BODY();
+  static pair runAsync(const std::string& partitionName,
+                       const std::string& imageName, uint64_t bufferSize,
+                       bool deleteAfterProgress);
 };
 
 // Eraser function (writes zero bytes to partition)
 class eraseFunction final : public FunctionBase {
-private:
+ private:
   std::vector<std::string> partitions;
-  int bufferSize = 4096;
+  uint64_t bufferSize = 0;
 
-public:
-  CLI::App *cmd = nullptr;
-
-  bool init(CLI::App &_app) override;
-  bool run() override;
-  static pair runAsync(const std::string &partitionName, int bufferSize);
-
-  [[nodiscard]] bool isUsed() const override;
-  [[nodiscard]] const char *name() const override;
+ public:
+  COMMON_FUNCTION_BODY();
+  static pair runAsync(const std::string& partitionName, uint64_t bufferSize);
 };
 
 // Partition size getter function
 class partitionSizeFunction final : public FunctionBase {
-private:
+ private:
   std::vector<std::string> partitions;
   bool onlySize = false, asByte = false, asKiloBytes = false, asMega = false,
        asGiga = false;
 
-public:
-  CLI::App *cmd = nullptr;
-
-  bool init(CLI::App &_app) override;
-  bool run() override;
-
-  [[nodiscard]] bool isUsed() const override;
-  [[nodiscard]] const char *name() const override;
+ public:
+  COMMON_FUNCTION_BODY();
 };
 
 // Partition info getter function
 class infoFunction final : public FunctionBase {
-private:
+ private:
   std::vector<std::string> partitions;
-  std::string jNamePartition = "name", jNameSize = "size",
-              jNameLogical = "isLogical";
-  bool jsonFormat = false;
+  std::string jNamePartition, jNameSize, jNameLogical;
+  int jIndentSize = 2;
+  bool jsonFormat = false, asByte = true, asKiloBytes = false, asMega = false,
+       asGiga = false;
 
-public:
-  CLI::App *cmd = nullptr;
-
-  bool init(CLI::App &_app) override;
-  bool run() override;
-
-  [[nodiscard]] bool isUsed() const override;
-  [[nodiscard]] const char *name() const override;
+ public:
+  COMMON_FUNCTION_BODY();
 };
 
 class realPathFunction final : public FunctionBase {
-private:
+ private:
   std::vector<std::string> partitions;
+  bool realLinkPath = false;
 
-public:
-  CLI::App *cmd = nullptr;
-
-  bool init(CLI::App &_app) override;
-  bool run() override;
-
-  [[nodiscard]] bool isUsed() const override;
-  [[nodiscard]] const char *name() const override;
-};
-
-class realLinkPathFunction final : public FunctionBase {
-private:
-  std::vector<std::string> partitions;
-
-public:
-  CLI::App *cmd = nullptr;
-
-  bool init(CLI::App &_app) override;
-  bool run() override;
-
-  [[nodiscard]] bool isUsed() const override;
-  [[nodiscard]] const char *name() const override;
+ public:
+  COMMON_FUNCTION_BODY();
 };
 
 class typeFunction final : public FunctionBase {
-private:
+ private:
   std::vector<std::string> contents;
   bool onlyCheckAndroidMagics = false, onlyCheckFileSystemMagics = false;
-  int bufferSize = 4096;
+  uint64_t bufferSize = 0;
 
-public:
-  CLI::App *cmd = nullptr;
-
-  bool init(CLI::App &_app) override;
-  bool run() override;
-
-  [[nodiscard]] bool isUsed() const override;
-  [[nodiscard]] const char *name() const override;
+ public:
+  COMMON_FUNCTION_BODY();
 };
 
 class rebootFunction final : public FunctionBase {
-private:
+ private:
   std::string rebootTarget;
 
-public:
-  CLI::App *cmd = nullptr;
-
-  bool init(CLI::App &_app) override;
-  bool run() override;
-
-  [[nodiscard]] bool isUsed() const override;
-  [[nodiscard]] const char *name() const override;
+ public:
+  COMMON_FUNCTION_BODY();
 };
-} // namespace PartitionManager
 
-#endif // #ifndef FUNCTIONS_HPP
+class memoryTestFunction final : public FunctionBase {
+ private:
+  uint64_t bufferSize = MB(4), /* bufferSizeRandom = KB(4),*/ testFileSize = 0;
+  std::string testPath;
+  bool doNotReadTest = false;
+
+ public:
+  COMMON_FUNCTION_BODY();
+};
+
+class cleanLogFunction final : public FunctionBase {
+ public:
+  COMMON_FUNCTION_BODY();
+};
+
+}  // namespace PartitionManager
+
+#endif  // #ifndef FUNCTIONS_HPP

srclib/libhelper/src/Checkers.cpp

@@ -14,13 +14,14 @@
    limitations under the License.
 */
 
-#include <cstdio>
-#include <cstdlib>
-#include <libhelper/lib.hpp>
 #include <private/android_filesystem_config.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include <cstdio>
+#include <cstdlib>
+#include <libhelper/lib.hpp>
+
 namespace Helper {
 bool hasSuperUser() { return (getuid() == AID_ROOT); }
 bool hasAdbPermissions() { return (getuid() == AID_SHELL); }
@@ -68,4 +69,4 @@ bool areLinked(const std::string_view entry1, const std::string_view entry2) {
 
   return (st1 == st2);
 }
-} // namespace Helper
+}  // namespace Helper

srclib/libhelper/src/Classes.cpp

@@ -14,20 +14,23 @@
    limitations under the License.
 */
 
+#include <dirent.h>
+#include <fcntl.h>
+#include <libgen.h>
+#include <unistd.h>
+
 #include <cerrno>
 #include <cstdarg>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <exception>
-#include <fcntl.h>
-#include <libgen.h>
+#include <functional>
 #include <libhelper/lib.hpp>
 #include <sstream>
-#include <unistd.h>
 
 namespace Helper {
-Error::Error(const char *format, ...) {
+Error::Error(const char* format, ...) {
   char buf[1024];
   va_list args;
   va_start(args, format);
@@ -37,20 +40,24 @@ Error::Error(const char *format, ...) {
   LOGN(HELPER, ERROR) << _message << std::endl;
 }
 
-const char *Error::what() const noexcept { return _message.data(); }
+const char* Error::what() const noexcept { return _message.data(); }
 
-Logger::Logger(const LogLevels level, const char *func, const char *file,
-               const char *name, const char *sfile, const int line)
-    : _level(level), _funcname(func), _logFile(file), _program_name(name),
-      _file(sfile), _line(line) {}
+Logger::Logger(const LogLevels level, const char* func, const char* file,
+               const char* name, const char* source_file, const int line)
+    : _level(level),
+      _function_name(func),
+      _logFile(file),
+      _program_name(name),
+      _file(source_file),
+      _line(line) {}
 
 Logger::~Logger() {
   if (LoggingProperties::DISABLE) return;
   char str[1024];
   snprintf(str, sizeof(str), "<%c> [ <prog %s> <on %s:%d> %s %s] %s(): %s",
            static_cast<char>(_level), _program_name,
-           basename(const_cast<char *>(_file)), _line, currentDate().data(),
-           currentTime().data(), _funcname, _oss.str().data());
+           basename(const_cast<char*>(_file)), _line, currentDate().data(),
+           currentTime().data(), _function_name, _oss.str().data());
 
   if (!isExists(_logFile)) {
     if (const int fd =
@@ -58,15 +65,23 @@ Logger::~Logger() {
         fd != -1)
       close(fd);
     else {
+#ifdef ANDROID_BUILD
+      LoggingProperties::setLogFile("/tmp/last_pmt_logs.log")
+#else
       LoggingProperties::setLogFile("last_logs.log");
-      LOGN(HELPER, INFO) << "Cannot create log file: " << _logFile << ": "
-                         << strerror(errno)
-                         << " New logging file: last_logs.log (this file)."
-                         << std::endl;
+#endif
+              LOGN(HELPER, INFO)
+          << "Cannot create log file: " << _logFile << ": " << strerror(errno)
+#ifdef ANDROID_BUILD
+          << " New logging file: /tmp/last_pmt_logs.log (this file)."
+#else
+          << " New logging file: last_logs.log (this file)."
+#endif
+          << std::endl;
     }
   }
 
-  if (FILE *fp = fopen(_logFile, "a"); fp != nullptr) {
+  if (FILE* fp = fopen(_logFile, "a"); fp != nullptr) {
     fprintf(fp, "%s", str);
     fclose(fp);
   } else {
@@ -81,30 +96,25 @@ Logger::~Logger() {
   if (LoggingProperties::PRINT) printf("%s", str);
 }
 
-Logger &Logger::operator<<(std::ostream &(*msg)(std::ostream &)) {
+Logger& Logger::operator<<(std::ostream& (*msg)(std::ostream&)) {
   _oss << msg;
   return *this;
 }
 
 garbageCollector::~garbageCollector() {
-  for (const auto &ptr : _ptrs_c)
-    delete[] ptr;
-  for (const auto &ptr : _ptrs_u)
-    delete[] ptr;
-  for (const auto &fd : _fds)
-    close(fd);
-  for (const auto &fp : _fps)
-    fclose(fp);
+  for (auto& ptr_func : _cleaners) ptr_func();
+  for (const auto& fd : _fds) close(fd);
+  for (const auto& fp : _fps) fclose(fp);
+  for (const auto& dp : _dps) closedir(dp);
+  for (const auto& file : _files) eraseEntry(file);
 }
 
-void garbageCollector::delAfterProgress(char *&_ptr) {
-  _ptrs_c.push_back(_ptr);
-}
-void garbageCollector::delAfterProgress(uint8_t *&_ptr) {
-  _ptrs_u.push_back(_ptr);
+void garbageCollector::delFileAfterProgress(const std::string& _path) {
+  _files.push_back(_path);
 }
 void garbageCollector::closeAfterProgress(const int _fd) {
   _fds.push_back(_fd);
 }
-void garbageCollector::closeAfterProgress(FILE *&_fp) { _fps.push_back(_fp); }
-} // namespace Helper
+void garbageCollector::closeAfterProgress(FILE* _fp) { _fps.push_back(_fp); }
+void garbageCollector::closeAfterProgress(DIR* _dp) { _dps.push_back(_dp); }
+}  // namespace Helper

srclib/libhelper/src/FileUtil.cpp

@@ -14,16 +14,17 @@
    limitations under the License.
 */
 
+#include <dirent.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
 #include <cerrno>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include <dirent.h>
-#include <fcntl.h>
 #include <libhelper/lib.hpp>
 #include <string>
-#include <sys/stat.h>
-#include <unistd.h>
 
 namespace Helper {
 bool writeFile(const std::string_view file, const std::string_view text) {
@@ -31,7 +32,7 @@ bool writeFile(const std::string_view file, const std::string_view text) {
                      << std::endl;
   garbageCollector collector;
 
-  FILE *fp = openAndAddToCloseList(file, collector, "a");
+  FILE* fp = openAndAddToCloseList(file, collector, "a");
   if (fp == nullptr) return false;
   fprintf(fp, "%s", text.data());
 
@@ -43,13 +44,12 @@ std::optional<std::string> readFile(const std::string_view file) {
   LOGN(HELPER, INFO) << "read " << file << " requested." << std::endl;
   garbageCollector collector;
 
-  FILE *fp = openAndAddToCloseList(file, collector, "r");
+  FILE* fp = openAndAddToCloseList(file, collector, "r");
   if (fp == nullptr) return std::nullopt;
 
   char buffer[1024];
   std::string str;
-  while (fgets(buffer, sizeof(buffer), fp))
-    str += buffer;
+  while (fgets(buffer, sizeof(buffer), fp)) str += buffer;
 
   LOGN(HELPER, INFO) << "read " << file << " successfully, read text: \"" << str
                      << "\"" << std::endl;
@@ -95,7 +95,7 @@ bool makeRecursiveDirectory(const std::string_view paths) {
   snprintf(tmp, sizeof(tmp), "%s", paths.data());
   if (const size_t len = strlen(tmp); tmp[len - 1] == '/') tmp[len - 1] = '\0';
 
-  for (char *p = tmp + 1; *p; p++) {
+  for (char* p = tmp + 1; *p; p++) {
     if (*p == '/') {
       *p = '\0';
       if (access(tmp, F_OK) != 0) {
@@ -150,9 +150,10 @@ bool eraseEntry(const std::string_view entry) {
 bool eraseDirectoryRecursive(const std::string_view directory) {
   LOGN(HELPER, INFO) << "erase recursive requested: " << directory << std::endl;
   struct stat buf{};
-  dirent *entry;
+  dirent* entry;
+  garbageCollector collector;
 
-  DIR *dir = opendir(directory.data());
+  DIR* dir = openAndAddToCloseList(directory.data(), collector);
   if (dir == nullptr) return false;
 
   while ((entry = readdir(dir)) != nullptr) {
@@ -164,25 +165,17 @@ bool eraseDirectoryRecursive(const std::string_view directory) {
     snprintf(fullpath, sizeof(fullpath), "%s/%s", directory.data(),
              entry->d_name);
 
-    if (lstat(fullpath, &buf) == -1) {
-      closedir(dir);
-      return false;
-    }
+    if (lstat(fullpath, &buf) == -1) return false;
 
     if (S_ISDIR(buf.st_mode)) {
-      if (!eraseDirectoryRecursive(fullpath)) {
-        closedir(dir);
-        return false;
-      }
+      if (!eraseDirectoryRecursive(fullpath)) return false;
+    } else if (S_ISREG(buf.st_mode)) {
+      if (!eraseEntry(fullpath)) return false;
     } else {
-      if (unlink(fullpath) == -1) {
-        closedir(dir);
-        return false;
-      }
+      if (unlink(fullpath) == -1) return false;
     }
   }
 
-  closedir(dir);
   if (rmdir(directory.data()) == -1) return false;
 
   LOGN(HELPER, INFO) << "\"" << directory << "\" successfully erased."
@@ -203,10 +196,10 @@ std::string readSymlink(const std::string_view entry) {
   return target;
 }
 
-size_t fileSize(const std::string_view file) {
+int64_t fileSize(const std::string_view file) {
   LOGN(HELPER, INFO) << "get file size request: " << file << std::endl;
   struct stat st{};
-  if (stat(file.data(), &st) != 0) return false;
-  return static_cast<size_t>(st.st_size);
+  if (stat(file.data(), &st) != 0) return -1;
+  return st.st_size;
 }
-} // namespace Helper
+}  // namespace Helper

srclib/libhelper/src/Sha256.cpp

@@ -14,13 +14,14 @@
    limitations under the License.
 */
 
+#include <picosha2.h>
+#include <sys/stat.h>
+
 #include <fstream>
 #include <iostream>
 #include <libhelper/lib.hpp>
 #include <optional>
-#include <picosha2.h>
 #include <string>
-#include <sys/stat.h>
 #include <vector>
 
 namespace Helper {
@@ -54,4 +55,4 @@ bool sha256Compare(const std::string_view file1, const std::string_view file2) {
       << "(): input files is contains same sha256 signature." << std::endl;
   return (*f1 == *f2);
 }
-} // namespace Helper
+}  // namespace Helper

srclib/libhelper/src/Utilities.cpp

@@ -14,50 +14,64 @@
    limitations under the License.
 */
 
+#include <cutils/android_reboot.h>
+#include <fcntl.h>
+
 #include <cstdio>
 #include <cstdlib>
 #include <ctime>
-#include <cutils/android_reboot.h>
-#include <fcntl.h>
+#ifndef ANDROID_BUILD
+#include <sys/_system_properties.h>
+
 #include <generated/buildInfo.hpp>
-#include <iostream>
+#else
+#include <sys/system_properties.h>
+#endif
+#include <cutils/android_reboot.h>
 #include <libgen.h>
-#include <libhelper/lib.hpp>
-#include <memory>
-#include <string>
-#include <string_view>
 #include <sys/_system_properties.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include <cstdarg>
+#include <iostream>
+#include <libhelper/lib.hpp>
+#include <memory>
+#include <string>
+#include <string_view>
+
+#ifdef __ANDROID__
 // From system/core/libcutils/android_reboot.cpp android16-s2-release
-int android_reboot(const unsigned cmd, int /*flags*/, const char *arg) {
+int android_reboot(const unsigned cmd, int /*flags*/, const char* arg) {
   int ret;
-  const char *restart_cmd = nullptr;
-  char *prop_value;
+  const char* restart_cmd = nullptr;
+  char* prop_value;
 
   switch (cmd) {
-  case ANDROID_RB_RESTART: // deprecated
-  case ANDROID_RB_RESTART2:
-    restart_cmd = "reboot";
-    break;
-  case ANDROID_RB_POWEROFF:
-    restart_cmd = "shutdown";
-    break;
-  case ANDROID_RB_THERMOFF:
-    restart_cmd = "shutdown,thermal";
-    break;
+    case ANDROID_RB_RESTART:  // deprecated
+    case ANDROID_RB_RESTART2:
+      restart_cmd = "reboot";
+      break;
+    case ANDROID_RB_POWEROFF:
+      restart_cmd = "shutdown";
+      break;
+    case ANDROID_RB_THERMOFF:
+      restart_cmd = "shutdown,thermal";
+      break;
   }
 
   if (!restart_cmd) return -1;
-  if (arg && arg[0]) ret = asprintf(&prop_value, "%s,%s", restart_cmd, arg);
-  else ret = asprintf(&prop_value, "%s", restart_cmd);
+  if (arg && arg[0])
+    ret = asprintf(&prop_value, "%s,%s", restart_cmd, arg);
+  else
+    ret = asprintf(&prop_value, "%s", restart_cmd);
 
   if (ret < 0) return -1;
   ret = __system_property_set(ANDROID_RB_PROPERTY, prop_value);
   free(prop_value);
   return ret;
 }
+#endif
 
 namespace Helper {
 namespace LoggingProperties {
@@ -77,17 +91,7 @@ void set(std::string_view file, std::string_view name) {
 
 void setProgramName(const std::string_view name) { NAME = name; }
 void setLogFile(const std::string_view file) { FILE = file; }
-
-void setPrinting(const int state) {
-  if (state == 1 || state == 0) PRINT = state;
-  else PRINT = NO;
-}
-
-void setLoggingState(const int state) {
-  if (state == 1 || state == 0) DISABLE = state;
-  else DISABLE = NO;
-}
-} // namespace LoggingProperties
+}  // namespace LoggingProperties
 
 bool runCommand(const std::string_view cmd) {
   LOGN(HELPER, INFO) << "run command request: " << cmd << std::endl;
@@ -117,28 +121,28 @@ std::string currentWorkingDirectory() {
 std::string currentDate() {
   const time_t t = time(nullptr);
 
-  if (const tm *date = localtime(&t))
+  if (const tm* date = localtime(&t))
     return std::string(std::to_string(date->tm_mday) + "/" +
                        std::to_string(date->tm_mon + 1) + "/" +
                        std::to_string(date->tm_year + 1900));
-  return "--/--/----";
+  return {};
 }
 
 std::string currentTime() {
   const time_t t = time(nullptr);
 
-  if (const tm *date = localtime(&t))
+  if (const tm* date = localtime(&t))
     return std::string(std::to_string(date->tm_hour) + ":" +
                        std::to_string(date->tm_min) + ":" +
                        std::to_string(date->tm_sec));
-  return "--:--:--";
+  return {};
 }
 
-std::string runCommandWithOutput(const std::string_view cmd) {
+std::pair<std::string, int> runCommandWithOutput(const std::string_view cmd) {
   LOGN(HELPER, INFO) << "run command and catch out request: " << cmd
                      << std::endl;
 
-  FILE *pipe = popen(cmd.data(), "r");
+  FILE* pipe = popen(cmd.data(), "r");
   if (!pipe) return {};
 
   std::unique_ptr<FILE, decltype(&pclose)> pipe_holder(pipe, pclose);
@@ -149,7 +153,9 @@ std::string runCommandWithOutput(const std::string_view cmd) {
   while (fgets(buffer, sizeof(buffer), pipe_holder.get()) != nullptr)
     output += buffer;
 
-  return output;
+  FILE* raw = pipe_holder.release();
+  const int status = pclose(raw);
+  return {output, (WIFEXITED(status) ? WEXITSTATUS(status) : -1)};
 }
 
 std::string pathJoin(std::string base, std::string relative) {
@@ -160,12 +166,12 @@ std::string pathJoin(std::string base, std::string relative) {
 }
 
 std::string pathBasename(const std::string_view entry) {
-  char *base = basename(const_cast<char *>(entry.data()));
+  char* base = basename(const_cast<char*>(entry.data()));
   return (base == nullptr) ? std::string() : std::string(base);
 }
 
 std::string pathDirname(const std::string_view entry) {
-  char *base = dirname(const_cast<char *>(entry.data()));
+  char* base = dirname(const_cast<char*>(entry.data()));
   return (base == nullptr) ? std::string() : std::string(base);
 }
 
@@ -182,8 +188,8 @@ bool changeOwner(const std::string_view file, const uid_t uid,
   return chown(file.data(), uid, gid) == 0;
 }
 
-int openAndAddToCloseList(const std::string_view &path,
-                          garbageCollector &collector, const int flags,
+int openAndAddToCloseList(const std::string_view& path,
+                          garbageCollector& collector, const int flags,
                           const mode_t mode) {
   const int fd =
       mode == 0 ? open(path.data(), flags) : open(path.data(), flags, mode);
@@ -191,20 +197,28 @@ int openAndAddToCloseList(const std::string_view &path,
   return fd;
 }
 
-FILE *openAndAddToCloseList(const std::string_view &path,
-                            garbageCollector &collector, const char *mode) {
-  FILE *fp = fopen(path.data(), mode);
+FILE* openAndAddToCloseList(const std::string_view& path,
+                            garbageCollector& collector, const char* mode) {
+  FILE* fp = fopen(path.data(), mode);
   collector.closeAfterProgress(fp);
   return fp;
 }
 
+DIR* openAndAddToCloseList(const std::string_view& path,
+                           garbageCollector& collector) {
+  DIR* dp = opendir(path.data());
+  collector.closeAfterProgress(dp);
+  return dp;
+}
+
+#ifdef __ANDROID__
 std::string getProperty(const std::string_view prop) {
   char val[PROP_VALUE_MAX];
   const int x = __system_property_get(prop.data(), val);
   return x > 0 ? val : "ERROR";
 }
 
-bool reboot(const std::string_view arg) {
+bool androidReboot(const std::string_view arg) {
   LOGN(HELPER, INFO) << "reboot request sent!!!" << std::endl;
 
   unsigned cmd = ANDROID_RB_RESTART2;
@@ -215,6 +229,37 @@ bool reboot(const std::string_view arg) {
 
   return android_reboot(cmd, 0, arg.empty() ? nullptr : arg.data()) != -1;
 }
+#endif
+
+uint64_t getRandomOffset(const uint64_t size, const uint64_t bufferSize) {
+  if (size <= bufferSize) return 0;
+  const uint64_t maxOffset = size - bufferSize;
+  srand(time(nullptr));
+  return rand() % maxOffset;
+}
+
+int convertTo(const uint64_t size, const sizeCastTypes type) {
+  if (type == KB) return TO_KB(size);
+  if (type == MB) return TO_MB(size);
+  if (type == GB) return TO_GB(size);
+  return static_cast<int>(size);
+}
+
+std::string multipleToString(const sizeCastTypes type) {
+  if (type == KB) return "KB";
+  if (type == MB) return "MB";
+  if (type == GB) return "GB";
+  return "B";
+}
+
+std::string format(const char* format, ...) {
+  va_list args;
+  va_start(args, format);
+  char str[1024];
+  vsnprintf(str, sizeof(str), format, args);
+  va_end(args);
+  return str;
+}
 
 std::string getLibVersion() { MKVERSION("libhelper"); }
-} // namespace Helper
+}  // namespace Helper

srclib/libhelper/tests/test.cpp

@@ -19,16 +19,16 @@
 #include <iostream>
 #include <libhelper/lib.hpp>
 
-char *TEST_DIR = nullptr;
+char* TEST_DIR = nullptr;
 
-std::string test_path(const char *file) {
+std::string test_path(const char* file) {
   std::string end = std::string(TEST_DIR) + "/" + file;
   return end;
 }
 
-int main(int argc, char **argv) {
+int main(int argc, char** argv) {
   if (argc < 2) return 2;
-  else TEST_DIR = argv[1];
+  TEST_DIR = argv[1];
 
   try {
     std::cout << "Has super user?; " << std::boolalpha << Helper::hasSuperUser()
@@ -50,12 +50,14 @@ int main(int argc, char **argv) {
               << std::endl;
 
     if (!Helper::writeFile("file.txt", "hello world"))
-      throw Helper::Error("Cannor write \"hello world\" in 'file.txt'");
-    else std::cout << "file.txt writed." << std::endl;
+      throw Helper::Error("Cannot write \"hello world\" in 'file.txt'");
+    else
+      std::cout << "file.txt writed." << std::endl;
 
-    auto content = Helper::readFile("file.txt");
-    if (!content) throw Helper::Error("Cannot read 'file.txt'");
-    else std::cout << "'file.txt': " << *content << std::endl;
+    if (const auto content = Helper::readFile("file.txt"); !content)
+      throw Helper::Error("Cannot read 'file.txt'");
+    else
+      std::cout << "'file.txt': " << *content << std::endl;
 
     std::cout << "Making directory 'dir2': " << std::boolalpha
               << Helper::makeDirectory(test_path("dir2")) << std::endl;
@@ -78,9 +80,10 @@ int main(int argc, char **argv) {
     std::cout << "Read link of 'file2lnk.txt': "
               << Helper::readSymlink(test_path("file2lnk.txt")) << std::endl;
 
-    auto sha256 = Helper::sha256Of(test_path("file2.txt"));
-    if (!sha256) throw Helper::Error("Cannot get sha256 of 'file2.txt'");
-    else std::cout << "SHA256 of 'file2.txt': " << *sha256 << std::endl;
+    if (const auto sha256 = Helper::sha256Of(test_path("file2.txt")); !sha256)
+      throw Helper::Error("Cannot get sha256 of 'file2.txt'");
+    else
+      std::cout << "SHA256 of 'file2.txt': " << *sha256 << std::endl;
 
     std::cout << "'file2.txt' and 'file2lnk.txt' same? (SHA256): "
               << std::boolalpha
@@ -95,7 +98,7 @@ int main(int argc, char **argv) {
               << Helper::runCommand("ls") << std::endl;
     std::cout << "Spawn confirm propt..." << std::endl;
 
-    bool p = Helper::confirmPropt("Please answer");
+    const bool p = Helper::confirmPropt("Please answer");
     std::cout << "Result of confirm propt: " << std::boolalpha << p
               << std::endl;
 
@@ -104,7 +107,7 @@ int main(int argc, char **argv) {
     std::cout << "Current date: " << Helper::currentDate() << std::endl;
     std::cout << "Current time: " << Helper::currentTime() << std::endl;
     std::cout << "Output of 'ls' command: "
-              << Helper::runCommandWithOutput("ls") << std::endl;
+              << Helper::runCommandWithOutput("ls").first << std::endl;
     std::cout << "Basename of " << test_path("file2.txt") << ": "
               << Helper::pathBasename(test_path("file2.txt")) << std::endl;
     std::cout << "Dirname of " << test_path("file2.txt") << ": "
@@ -119,13 +122,29 @@ int main(int argc, char **argv) {
     std::cout << "pathJoin() test 4: " << Helper::pathJoin("mydir", "/dir2")
               << std::endl;
 
+    Helper::PureTuple<int, std::string, bool> values = {
+        {1, "hi", true}, {2, "im", true}, {3, "helper", false}};
+
+    values.insert(std::make_tuple(0, "hi", false));
+    values.insert(2, "im", true);
+    values.insert({3, "helper", true});
+    values.pop({3, "helper", true});
+    values.pop_back();
+
+    std::cout << "pure tuple test: " << std::boolalpha
+              << static_cast<bool>(values.at(0)) << std::endl;
+    for (const auto& [x, y, z] : values) {
+      std::cout << std::boolalpha << "(" << x << ", " << y << ", " << z << ")"
+                << std::endl;
+    }
+
     std::cout << Helper::getLibVersion() << std::endl;
 
     LOG(INFO) << "Info message" << std::endl;
     LOG(WARNING) << "Warning message" << std::endl;
     LOG(ERROR) << "Error message" << std::endl;
     LOG(ABORT) << "Abort message" << std::endl;
-  } catch (Helper::Error &err) {
+  } catch (std::exception& err) {
     std::cout << err.what() << std::endl;
     return 1;
   }

srclib/libpartition_map/include/libpartition_map/lib.hpp

@@ -17,16 +17,17 @@
 #ifndef LIBPARTITION_MAP_LIB_HPP
 #define LIBPARTITION_MAP_LIB_HPP
 
-#include <cstdint> // for uint64_t
+#include <cstdint>  // for uint64_t
 #include <exception>
+#include <functional>
 #include <libhelper/lib.hpp>
 #include <list>
+#include <map>
 #include <memory>
 #include <optional>
 #include <string>
 #include <string_view>
-#include <unordered_map>
-#include <utility> // for std::pair
+#include <utility>  // for std::pair
 
 namespace PartitionMap {
 struct _entry {
@@ -38,77 +39,86 @@ struct _entry {
   } props;
 };
 
+struct _returnable_entry {
+  uint64_t size;
+  bool isLogical;
+};
+
+using BasicInf = _returnable_entry;
+using Info = _entry;
+
 /**
  *   The main type of the library. The Builder class is designed
  *   to be easily manipulated and modified only on this class.
  */
-class basic_partition_map final {
-private:
+class basic_partition_map {
+ private:
   void _resize_map();
 
   [[nodiscard]] int _index_of(std::string_view name) const;
 
-public:
-  _entry *_data;
+ public:
+  _entry* _data;
   size_t _count{}, _capacity{};
 
-  struct _returnable_entry {
-    uint64_t size;
-    bool isLogical;
-  };
-
-  using BasicInf = _returnable_entry;
-
-  basic_partition_map(const std::string &name, uint64_t size, bool logical);
-  basic_partition_map(const basic_partition_map &other);
+  basic_partition_map(const std::string& name, uint64_t size, bool logical);
+  basic_partition_map(const basic_partition_map& other);
+  basic_partition_map(basic_partition_map&& other) noexcept;
   basic_partition_map();
   ~basic_partition_map();
 
-  bool insert(const std::string &name, uint64_t size, bool logical);
-  void merge(const basic_partition_map &map);
+  bool insert(const std::string& name, uint64_t size, bool logical);
+  void merge(const basic_partition_map& map);
   void clear();
 
   [[nodiscard]] uint64_t get_size(std::string_view name) const;
   [[nodiscard]] bool is_logical(std::string_view name) const;
   [[nodiscard]] _returnable_entry get_all(std::string_view name) const;
   [[nodiscard]] bool find(std::string_view name) const;
-  [[nodiscard]] std::string find_(const std::string &name) const;
+  [[nodiscard]] std::string find_(const std::string& name) const;
   [[nodiscard]] size_t size() const;
   [[nodiscard]] bool empty() const;
 
-  basic_partition_map &operator=(const basic_partition_map &map);
+  basic_partition_map& operator=(const basic_partition_map& map);
 
-  bool operator==(const basic_partition_map &other) const;
-  bool operator!=(const basic_partition_map &other) const;
+  bool operator==(const basic_partition_map& other) const;
+  bool operator!=(const basic_partition_map& other) const;
+  bool operator!() const;
+  explicit operator bool() const;
+
+  Info operator[](int index) const;
+  BasicInf operator[](const std::string_view& name) const;
+
+  explicit operator std::vector<Info>() const;
+  explicit operator int() const;
 
   class iterator {
-  public:
-    _entry *ptr;
+   public:
+    _entry* ptr;
 
-    explicit iterator(_entry *p);
+    explicit iterator(_entry* p);
 
-    auto operator*() const
-        -> std::pair<std::string &, decltype(_entry::props) &>;
-    _entry *operator->() const;
-    iterator &operator++();
+    auto operator*() const -> std::pair<std::string&, decltype(_entry::props)&>;
+    _entry* operator->() const;
+    iterator& operator++();
     iterator operator++(int);
-    bool operator!=(const iterator &other) const;
-    bool operator==(const iterator &other) const;
+    bool operator!=(const iterator& other) const;
+    bool operator==(const iterator& other) const;
   };
 
   class constant_iterator {
-  public:
-    const _entry *ptr;
+   public:
+    const _entry* ptr;
 
-    explicit constant_iterator(const _entry *p);
+    explicit constant_iterator(const _entry* p);
 
     auto operator*() const
-        -> std::pair<const std::string &, const decltype(_entry::props) &>;
-    const _entry *operator->() const;
-    constant_iterator &operator++();
+        -> std::pair<const std::string&, const decltype(_entry::props)&>;
+    const _entry* operator->() const;
+    constant_iterator& operator++();
     constant_iterator operator++(int);
-    bool operator!=(const constant_iterator &other) const;
-    bool operator==(const constant_iterator &other) const;
+    bool operator!=(const constant_iterator& other) const;
+    bool operator==(const constant_iterator& other) const;
   };
 
   /* for-each support */
@@ -118,23 +128,24 @@ public:
   [[nodiscard]] constant_iterator cend() const;
 };
 
+using Partition_t = _entry;
 using Map_t = basic_partition_map;
 
 class basic_partition_map_builder final {
-private:
+ private:
   Map_t _current_map;
   std::string _workdir;
   bool _any_generating_error, _map_builded;
 
   Map_t _build_map(std::string_view path, bool logical = false);
 
-  void _insert_logicals(Map_t &&logicals);
+  void _insert_logicals(Map_t&& logicals);
   void _map_build_check() const;
 
   [[nodiscard]] static bool _is_real_block_dir(std::string_view path);
-  [[nodiscard]] uint64_t _get_size(const std::string &path);
+  [[nodiscard]] uint64_t _get_size(const std::string& path);
 
-public:
+ public:
   /**
    *   By default, it searches the directories in the
    *   defaultEntryList in PartitionMap.cpp in order and
@@ -147,9 +158,13 @@ public:
    */
   explicit basic_partition_map_builder(std::string_view path);
 
+  /**
+   *   Move constructor
+   */
+  basic_partition_map_builder(basic_partition_map_builder&& other) noexcept;
+
   /**
    *   Returns the current list content in Map_t type.
-   *   If no list is created, returns std::nullopt.
    */
   [[nodiscard]] Map_t getAll() const;
 
@@ -158,8 +173,8 @@ public:
    *   Map_temp_t type. If the partition is not in the
    *   currently created list, returns std::nullopt.
    */
-  [[nodiscard]] std::optional<std::pair<uint64_t, bool>>
-  get(std::string_view name) const;
+  [[nodiscard]] std::optional<std::pair<uint64_t, bool>> get(
+      std::string_view name) const;
 
   /**
    *   If there is a logical partition(s) in the created
@@ -167,16 +182,16 @@ public:
    *   data of type std::string). If there is no logical
    *   partition in the created list, it returns std::nullopt.
    */
-  [[nodiscard]] std::optional<std::list<std::string>>
-  getLogicalPartitionList() const;
+  [[nodiscard]] std::optional<std::list<std::string>> getLogicalPartitionList()
+      const;
 
   /**
    *   The physical partitions in the created list are
    *   returned as std::list type. If there is no content
    *   due to any problem, returns std::nullopt.
    */
-  [[nodiscard]] std::optional<std::list<std::string>>
-  getPhysicalPartitionList() const;
+  [[nodiscard]] std::optional<std::list<std::string>> getPhysicalPartitionList()
+      const;
 
   /**
    *   The partitions in the created list are returned as std::list
@@ -211,6 +226,11 @@ public:
    */
   [[nodiscard]] bool hasPartition(std::string_view name) const;
 
+  /**
+   *   Returns true if the device has dynamic partitions, false otherwise.
+   */
+  [[nodiscard]] bool hasLogicalPartitions() const;
+
   /**
    *   Returns the bool type status of whether the
    *   entered partition name is marked as logical in the
@@ -220,11 +240,51 @@ public:
    */
   [[nodiscard]] bool isLogical(std::string_view name) const;
 
+  /**
+   *   Copy partition list to vec, current vec contents are cleaned
+   */
+  bool copyPartitionsToVector(std::vector<std::string>& vec) const;
+
+  /**
+   *   Copy logical partition list to vec, current vec contents are cleaned
+   */
+  bool copyLogicalPartitionsToVector(std::vector<std::string>& vec) const;
+
+  /**
+   *   Copy physical partition list to vec, current vec contents are cleaned
+   */
+  bool copyPhysicalPartitionsToVector(std::vector<std::string>& vec) const;
+
   /**
    *   The created list and the current search index name are cleared.
    */
   void clear();
 
+  /**
+   *   Do input function (lambda) for all partitions.
+   */
+  bool doForAllPartitions(
+      const std::function<bool(std::string, BasicInf)>& func) const;
+
+  /**
+   *   Do input function (lambda) for physical partitions.
+   */
+  bool doForPhysicalPartitions(
+      const std::function<bool(std::string, BasicInf)>& func) const;
+
+  /**
+   *   Do input function (lambda) for logical partitions.
+   */
+  bool doForLogicalPartitions(
+      const std::function<bool(std::string, BasicInf)>& func) const;
+
+  /**
+   *   Do input function (lambda) for input partition list.
+   */
+  bool doForPartitionList(
+      const std::vector<std::string>& partitions,
+      const std::function<bool(std::string, BasicInf)>& func) const;
+
   /**
    *   The entered path is defined as the new search
    *   directory and the search is performed in the entered
@@ -256,14 +316,14 @@ public:
    *   the same (checked only according to the partition
    *   names), true is returned, otherwise false is returned
    */
-  friend bool operator==(const basic_partition_map_builder &lhs,
-                         const basic_partition_map_builder &rhs);
+  friend bool operator==(const basic_partition_map_builder& lhs,
+                         const basic_partition_map_builder& rhs);
 
   /**
    *   The opposite logic of the == operator.
    */
-  friend bool operator!=(const basic_partition_map_builder &lhs,
-                         const basic_partition_map_builder &rhs);
+  friend bool operator!=(const basic_partition_map_builder& lhs,
+                         const basic_partition_map_builder& rhs);
 
   /**
    *   You can check whether the object was created
@@ -282,6 +342,41 @@ public:
    *   Build map with input path. Implementation of readDirectory().
    */
   bool operator()(std::string_view path);
+
+  /**
+   *   Get Map_t object reference
+   */
+  Map_t& operator*();
+
+  /**
+   *   Get constant Map_t object reference
+   */
+  const Map_t& operator*() const;
+
+  /**
+   *  Get Info structure with given index
+   */
+  Info operator[](int index) const;
+
+  /**
+   *  Get BasicInfo structure with given index
+   */
+  BasicInf operator[](const std::string_view& name) const;
+
+  /**
+   *   Get map contents as vector (PartitionManager::Info type).
+   */
+  [[nodiscard]] explicit operator std::vector<Info>() const;
+
+  /**
+   *   Get total partition count in map (int type).
+   */
+  [[nodiscard]] explicit operator int() const;
+
+  /**
+   *   Get current working directory.
+   */
+  [[nodiscard]] explicit operator std::string() const;
 };
 
 using Error = Helper::Error;
@@ -306,7 +401,7 @@ constexpr uint64_t FAT16_FS = 0x3631544146;
 constexpr uint64_t FAT32_FS = 0x3233544146;
 constexpr uint64_t NTFS_FS = 0x5346544E;
 constexpr uint64_t MSDOS_FS = 0x4d44;
-} // namespace FileSystemMagic
+}  // namespace FileSystemMagic
 
 namespace AndroidMagic {
 constexpr uint64_t BOOT_IMAGE = 0x2144494F52444E41;
@@ -317,20 +412,23 @@ constexpr uint64_t VBMETA_IMAGE = 0x425641;
 constexpr uint64_t SUPER_IMAGE = 0x7265797573;
 constexpr uint64_t SPARSE_IMAGE = 0x3AFF26ED;
 constexpr uint64_t ELF =
-    0x464C457F; // It makes more sense than between file systems
+    0x464C457F;  // It makes more sense than between file systems
 constexpr uint64_t RAW = 0x00000000;
-} // namespace AndroidMagic
+}  // namespace AndroidMagic
 
-extern std::unordered_map<uint64_t, std::string> FileSystemMagicMap;
-extern std::unordered_map<uint64_t, std::string> AndroidMagicMap;
-extern std::unordered_map<uint64_t, std::string> MagicMap;
+extern std::map<uint64_t, std::string> FileSystemMagicMap;
+extern std::map<uint64_t, std::string> AndroidMagicMap;
+extern std::map<uint64_t, std::string> MagicMap;
 
 size_t getMagicLength(uint64_t magic);
-bool hasMagic(uint64_t magic, ssize_t buf, const std::string &path);
+bool hasMagic(uint64_t magic, ssize_t buf, const std::string& path);
 std::string formatMagic(uint64_t magic);
-} // namespace Extras
-} // namespace PartitionMap
+}  // namespace Extras
+}  // namespace PartitionMap
 
 #define MAP "libpartition_map"
 
-#endif // #ifndef LIBPARTITION_MAP_LIB_HPP
+#define COMMON_LAMBDA_PARAMS \
+  (const std::string& partition, const PartitionMap::BasicInf props)
+
+#endif  // #ifndef LIBPARTITION_MAP_LIB_HPP

srclib/libpartition_map/src/Getters.cpp

@@ -25,8 +25,8 @@ Map_t basic_partition_map_builder::getAll() const {
   return _current_map;
 }
 
-std::optional<std::pair<uint64_t, bool>>
-basic_partition_map_builder::get(const std::string_view name) const {
+std::optional<std::pair<uint64_t, bool>> basic_partition_map_builder::get(
+    const std::string_view name) const {
   _map_build_check();
 
   if (!_current_map.find(name)) return std::nullopt;
@@ -39,7 +39,7 @@ basic_partition_map_builder::getLogicalPartitionList() const {
   _map_build_check();
 
   std::list<std::string> logicals;
-  for (const auto &[name, props] : _current_map)
+  for (const auto& [name, props] : _current_map)
     if (props.isLogical) logicals.push_back(name);
 
   if (logicals.empty()) return std::nullopt;
@@ -51,7 +51,7 @@ basic_partition_map_builder::getPhysicalPartitionList() const {
   _map_build_check();
 
   std::list<std::string> physicals;
-  for (const auto &[name, props] : _current_map)
+  for (const auto& [name, props] : _current_map)
     if (!props.isLogical) physicals.push_back(name);
 
   if (physicals.empty()) return std::nullopt;
@@ -63,8 +63,7 @@ basic_partition_map_builder::getPartitionList() const {
   _map_build_check();
 
   std::list<std::string> partitions;
-  for (const auto &[name, props] : _current_map)
-    partitions.push_back(name);
+  for (const auto& [name, props] : _current_map) partitions.push_back(name);
 
   if (partitions.empty()) return std::nullopt;
   return partitions;
@@ -78,8 +77,8 @@ std::string basic_partition_map_builder::getRealLinkPathOf(
   return std::string(_workdir + "/" + name.data());
 }
 
-std::string
-basic_partition_map_builder::getRealPathOf(const std::string_view name) const {
+std::string basic_partition_map_builder::getRealPathOf(
+    const std::string_view name) const {
   _map_build_check();
 
   const std::string full = (isLogical(name))
@@ -93,4 +92,4 @@ basic_partition_map_builder::getRealPathOf(const std::string_view name) const {
 std::string basic_partition_map_builder::getCurrentWorkDir() const {
   return _workdir;
 }
-} // namespace PartitionMap
+}  // namespace PartitionMap

srclib/libpartition_map/src/Magic.cpp

@@ -15,17 +15,18 @@
 */
 
 #include <fcntl.h>
+#include <unistd.h>
+
 #include <libhelper/lib.hpp>
 #include <libpartition_map/lib.hpp>
+#include <map>
 #include <sstream>
 #include <string>
-#include <unistd.h>
-#include <unordered_map>
 
 #include "PartitionManager/PartitionManager.hpp"
 
 namespace PartitionMap::Extras {
-std::unordered_map<uint64_t, std::string> FileSystemMagicMap = {
+std::map<uint64_t, std::string> FileSystemMagicMap = {
     {FileSystemMagic::EXTFS_FS, "EXT2/3/4"},
     {FileSystemMagic::F2FS_FS, "F2FS"},
     {FileSystemMagic::EROFS_FS, "EROFS"},
@@ -36,7 +37,7 @@ std::unordered_map<uint64_t, std::string> FileSystemMagicMap = {
     {FileSystemMagic::NTFS_FS, "NTFS"},
     {FileSystemMagic::MSDOS_FS, "MSDOS"}};
 
-std::unordered_map<uint64_t, std::string> AndroidMagicMap = {
+std::map<uint64_t, std::string> AndroidMagicMap = {
     {AndroidMagic::BOOT_IMAGE, "Android Boot Image"},
     {AndroidMagic::VBOOT_IMAGE, "Android Vendor Boot Image"},
     {AndroidMagic::LK_IMAGE, "Android LK (Bootloader)"},
@@ -47,7 +48,7 @@ std::unordered_map<uint64_t, std::string> AndroidMagicMap = {
     {AndroidMagic::ELF, "ELF"},
     {AndroidMagic::RAW, "Raw Data"}};
 
-std::unordered_map<uint64_t, std::string> MagicMap = {
+std::map<uint64_t, std::string> MagicMap = {
     {AndroidMagic::BOOT_IMAGE, "Android Boot Image"},
     {AndroidMagic::VBOOT_IMAGE, "Android Vendor Boot Image"},
     {AndroidMagic::LK_IMAGE, "Android LK (Bootloader)"},
@@ -76,7 +77,7 @@ size_t getMagicLength(const uint64_t magic) {
 }
 
 bool hasMagic(const uint64_t magic, const ssize_t buf,
-              const std::string &path) {
+              const std::string& path) {
   LOGN(MAP, INFO) << "Checking magic of " << path << " with using " << buf
                   << " byte buffer size (has magic 0x" << std::hex << magic
                   << "?)" << std::endl;
@@ -89,7 +90,7 @@ bool hasMagic(const uint64_t magic, const ssize_t buf,
     return false;
   }
 
-  auto *buffer = new uint8_t[buf];
+  auto* buffer = new (std::nothrow) uint8_t[buf];
   collector.delAfterProgress(buffer);
 
   const ssize_t bytesRead = read(fd, buffer, buf);
@@ -120,4 +121,4 @@ std::string formatMagic(const uint64_t magic) {
      << magic;
   return ss.str();
 }
-} // namespace PartitionMap::Extras
+}  // namespace PartitionMap::Extras

srclib/libpartition_map/src/PartitionMap.cpp

@@ -14,22 +14,26 @@
    limitations under the License.
 */
 
+#include <fcntl.h>
+
 #include <algorithm>
 #include <array>
 #include <cerrno>
 #include <cstring>
-#include <fcntl.h>
 #include <filesystem>
+#ifndef ANDROID_BUILD
 #include <generated/buildInfo.hpp>
-#include <iostream>
-#include <libpartition_map/lib.hpp>
+#endif
 #include <linux/fs.h>
-#include <memory>
-#include <string>
-#include <string_view>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <unistd.h>
+
+#include <iostream>
+#include <libpartition_map/lib.hpp>
+#include <memory>
+#include <string>
+#include <string_view>
 #include <vector>
 
 static constexpr std::array<std::string_view, 3> defaultEntryList = {
@@ -47,21 +51,27 @@ bool basic_partition_map_builder::_is_real_block_dir(
 }
 
 Map_t basic_partition_map_builder::_build_map(std::string_view path,
-                                              bool logical) {
+                                              const bool logical) {
+  if (!Helper::directoryIsExists(path) && logical) {
+    LOGN(MAP, WARNING) << "This device not contains logical partitions."
+                       << std::endl;
+    return {};
+  }
+
   Map_t map;
   std::vector<std::filesystem::directory_entry> entries{
       std::filesystem::directory_iterator(path),
       std::filesystem::directory_iterator()};
-  std::sort(entries.begin(), entries.end(), [](const auto &a, const auto &b) {
+  std::sort(entries.begin(), entries.end(), [](const auto& a, const auto& b) {
     return a.path().filename() < b.path().filename();
   });
 
   LOGN_IF(MAP, WARNING, entries.empty())
-      << "" << path
-      << "is exists but generated vector is empty "
+      << path
+      << " is exists but generated vector is empty "
          "(std::vector<std::filesystem::directory_entry>)."
       << std::endl;
-  for (const auto &entry : entries) {
+  for (const auto& entry : entries) {
     if (entry.path().filename() != "by-uuid" &&
         std::string(entry.path()).find("com.") == std::string::npos)
       map.insert(entry.path().filename().string(), _get_size(entry.path()),
@@ -74,18 +84,21 @@ Map_t basic_partition_map_builder::_build_map(std::string_view path,
   return map;
 }
 
-void basic_partition_map_builder::_insert_logicals(Map_t &&logicals) {
+void basic_partition_map_builder::_insert_logicals(Map_t&& logicals) {
   LOGN(MAP, INFO)
       << "merging created logical partition list to this object's variable."
       << std::endl;
   _current_map.merge(logicals);
+  LOGN(MAP, INFO) << "Cleaning created logical partition because not need more."
+                  << std::endl;
+  logicals.clear();
 }
 
 void basic_partition_map_builder::_map_build_check() const {
   if (!_map_builded) throw Error("Please build partition map before!");
 }
 
-uint64_t basic_partition_map_builder::_get_size(const std::string &path) {
+uint64_t basic_partition_map_builder::_get_size(const std::string& path) {
   const std::string real = std::filesystem::read_symlink(path);
   Helper::garbageCollector collector;
 
@@ -109,7 +122,7 @@ uint64_t basic_partition_map_builder::_get_size(const std::string &path) {
 basic_partition_map_builder::basic_partition_map_builder() {
   LOGN(MAP, INFO) << "default constructor called. Starting build." << std::endl;
 
-  for (const auto &path : defaultEntryList) {
+  for (const auto& path : defaultEntryList) {
     if (std::filesystem::exists(path)) {
       _current_map = _build_map(path);
       if (_current_map.empty()) {
@@ -125,8 +138,7 @@ basic_partition_map_builder::basic_partition_map_builder() {
     LOGN(MAP, ERROR) << "Cannot build map by any default search entry."
                      << std::endl;
 
-  LOGN(MAP, INFO) << "default constructor successfully ended work."
-                  << std::endl;
+  LOGN(MAP, INFO) << "default constructor ended work." << std::endl;
   _insert_logicals(_build_map("/dev/block/mapper", true));
   _map_builded = true;
 }
@@ -139,8 +151,10 @@ basic_partition_map_builder::basic_partition_map_builder(
   if (std::filesystem::exists(path)) {
     if (!_is_real_block_dir(path)) return;
     _current_map = _build_map(path);
-    if (_current_map.empty()) _any_generating_error = true;
-    else _workdir = path;
+    if (_current_map.empty())
+      _any_generating_error = true;
+    else
+      _workdir = path;
   } else
     throw Error("Cannot find directory: %s. Cannot build partition map!",
                 path.data());
@@ -151,12 +165,29 @@ basic_partition_map_builder::basic_partition_map_builder(
   _map_builded = true;
 }
 
+basic_partition_map_builder::basic_partition_map_builder(
+    basic_partition_map_builder&& other) noexcept {
+  _current_map = Map_t(std::move(other._current_map));
+  _workdir = std::move(other._workdir);
+  _any_generating_error = other._any_generating_error;
+  _map_builded = other._map_builded;
+  other.clear();
+}
+
 bool basic_partition_map_builder::hasPartition(
     const std::string_view name) const {
   _map_build_check();
   return _current_map.find(name);
 }
 
+bool basic_partition_map_builder::hasLogicalPartitions() const {
+  _map_build_check();
+  for (const auto& [name, props] : _current_map)
+    if (props.isLogical) return true;
+
+  return false;
+}
+
 bool basic_partition_map_builder::isLogical(const std::string_view name) const {
   _map_build_check();
   return _current_map.is_logical(name);
@@ -178,12 +209,13 @@ bool basic_partition_map_builder::readDirectory(const std::string_view path) {
     if (_current_map.empty()) {
       _any_generating_error = true;
       return false;
-    } else _workdir = path;
+    } else
+      _workdir = path;
   } else
     throw Error("Cannot find directory: %s. Cannot build partition map!",
                 path.data());
 
-  LOGN(MAP, INFO) << "read " << path << " successfull." << std::endl;
+  LOGN(MAP, INFO) << "read " << path << " successfully." << std::endl;
   _insert_logicals(_build_map("/dev/block/mapper", true));
   _map_builded = true;
   return true;
@@ -193,7 +225,7 @@ bool basic_partition_map_builder::readDefaultDirectories() {
   _map_builded = false;
   LOGN(MAP, INFO) << "read default directories request." << std::endl;
 
-  for (const auto &path : defaultEntryList) {
+  for (const auto& path : defaultEntryList) {
     if (std::filesystem::exists(path)) {
       _current_map = _build_map(path);
       if (_current_map.empty()) {
@@ -210,30 +242,162 @@ bool basic_partition_map_builder::readDefaultDirectories() {
     LOGN(MAP, ERROR) << "Cannot build map by any default search entry."
                      << std::endl;
 
-  LOGN(MAP, INFO) << "read default directories successfull." << std::endl;
+  LOGN(MAP, INFO) << "read default directories successfully." << std::endl;
   _insert_logicals(_build_map("/dev/block/mapper", true));
   _map_builded = true;
   return true;
 }
 
+bool basic_partition_map_builder::copyPartitionsToVector(
+    std::vector<std::string>& vec) const {
+  if (_current_map.empty()) {
+    LOGN(MAP, ERROR) << "Current map is empty.";
+    return false;
+  }
+  vec.clear();
+  for (const auto& [name, props] : _current_map) vec.push_back(name);
+  return true;
+}
+
+bool basic_partition_map_builder::copyLogicalPartitionsToVector(
+    std::vector<std::string>& vec) const {
+  if (_current_map.empty()) {
+    LOGN(MAP, ERROR) << "Current map is empty.";
+    return false;
+  }
+  std::vector<std::string> vec2;
+  for (const auto& [name, props] : _current_map)
+    if (props.isLogical) vec2.push_back(name);
+
+  if (vec2.empty()) {
+    LOGN(MAP, ERROR) << "Cannot find logical partitions in current map.";
+    return false;
+  } else
+    vec = vec2;
+  return true;
+}
+
+bool basic_partition_map_builder::copyPhysicalPartitionsToVector(
+    std::vector<std::string>& vec) const {
+  if (_current_map.empty()) {
+    LOGN(MAP, ERROR) << "Current map is empty.";
+    return false;
+  }
+  std::vector<std::string> vec2;
+  for (const auto& [name, props] : _current_map)
+    if (!props.isLogical) vec2.push_back(name);
+
+  if (vec2.empty()) {
+    LOGN(MAP, ERROR) << "Cannot find physical partitions in current map.";
+    return false;
+  } else
+    vec = vec2;
+  return true;
+}
+
 bool basic_partition_map_builder::empty() const {
   _map_build_check();
   return _current_map.empty();
 }
 
-uint64_t
-basic_partition_map_builder::sizeOf(const std::string_view name) const {
+bool basic_partition_map_builder::doForAllPartitions(
+    const std::function<bool(std::string, BasicInf)>& func) const {
+  _map_build_check();
+  bool err = false;
+
+  LOGN(MAP, INFO) << "Doing input function for all partitions." << std::endl;
+  for (const auto& [name, props] : _current_map) {
+    if (func(name, {props.size, props.isLogical}))
+      LOGN(MAP, INFO) << "Done progress for " << name << " partition."
+                      << std::endl;
+    else {
+      err = true;
+      LOGN(MAP, ERROR) << "Failed progress for " << name << " partition."
+                       << std::endl;
+    }
+  }
+
+  return err;
+}
+
+bool basic_partition_map_builder::doForPhysicalPartitions(
+    const std::function<bool(std::string, BasicInf)>& func) const {
+  _map_build_check();
+  bool err = false;
+
+  LOGN(MAP, INFO) << "Doing input function for physical partitions."
+                  << std::endl;
+  for (const auto& [name, props] : _current_map) {
+    if (props.isLogical) continue;
+    if (func(name, {props.size, props.isLogical}))
+      LOGN(MAP, INFO) << "Done progress for " << name << " partition."
+                      << std::endl;
+    else {
+      err = true;
+      LOGN(MAP, ERROR) << "Failed progress for " << name << " partition."
+                       << std::endl;
+    }
+  }
+
+  return err;
+}
+
+bool basic_partition_map_builder::doForLogicalPartitions(
+    const std::function<bool(std::string, BasicInf)>& func) const {
+  _map_build_check();
+  bool err = false;
+
+  LOGN(MAP, INFO) << "Doing input function for logical partitions."
+                  << std::endl;
+  for (const auto& [name, props] : _current_map) {
+    if (!props.isLogical) continue;
+    if (func(name, {props.size, props.isLogical}))
+      LOGN(MAP, INFO) << "Done progress for " << name << " partition."
+                      << std::endl;
+    else {
+      err = true;
+      LOGN(MAP, ERROR) << "Failed progress for " << name << " partition."
+                       << std::endl;
+    }
+  }
+
+  return err;
+}
+
+bool basic_partition_map_builder::doForPartitionList(
+    const std::vector<std::string>& partitions,
+    const std::function<bool(std::string, BasicInf)>& func) const {
+  _map_build_check();
+  bool err = false;
+
+  LOGN(MAP, INFO) << "Doing input function for input partition list."
+                  << std::endl;
+  for (const auto& partition : partitions) {
+    if (!hasPartition(partition))
+      throw Error("Couldn't find partition: %s", partition.data());
+    if (!func(partition, _current_map[partition])) {
+      err = true;
+      LOGN(MAP, ERROR) << "Failed progress for " << partition << " partition."
+                       << std::endl;
+    }
+  }
+
+  return err;
+}
+
+uint64_t basic_partition_map_builder::sizeOf(
+    const std::string_view name) const {
   _map_build_check();
   return _current_map.get_size(name);
 }
 
-bool operator==(const basic_partition_map_builder &lhs,
-                const basic_partition_map_builder &rhs) {
+bool operator==(const basic_partition_map_builder& lhs,
+                const basic_partition_map_builder& rhs) {
   return lhs._current_map == rhs._current_map;
 }
 
-bool operator!=(const basic_partition_map_builder &lhs,
-                const basic_partition_map_builder &rhs) {
+bool operator!=(const basic_partition_map_builder& lhs,
+                const basic_partition_map_builder& rhs) {
   return !(lhs == rhs);
 }
 
@@ -251,5 +415,30 @@ bool basic_partition_map_builder::operator()(const std::string_view path) {
   return readDirectory(path);
 }
 
+Map_t& basic_partition_map_builder::operator*() { return _current_map; }
+
+const Map_t& basic_partition_map_builder::operator*() const {
+  return _current_map;
+}
+
+Info basic_partition_map_builder::operator[](const int index) const {
+  return _current_map[index];
+}
+
+BasicInf basic_partition_map_builder::operator[](
+    const std::string_view& name) const {
+  return _current_map[name];
+}
+
+basic_partition_map_builder::operator std::vector<Info>() const {
+  return static_cast<std::vector<Info>>(_current_map);
+}
+
+basic_partition_map_builder::operator int() const {
+  return static_cast<int>(_current_map);
+}
+
+basic_partition_map_builder::operator std::string() const { return _workdir; }
+
 std::string getLibVersion() { MKVERSION("libpartition_map"); }
-} // namespace PartitionMap
+}  // namespace PartitionMap

srclib/libpartition_map/src/Type.cpp

@@ -20,16 +20,16 @@
 #include <utility>
 
 namespace PartitionMap {
-basic_partition_map::iterator::iterator(_entry *p) : ptr(p) {}
+basic_partition_map::iterator::iterator(_entry* p) : ptr(p) {}
 
 auto basic_partition_map::iterator::operator*() const
-    -> std::pair<std::string &, decltype(_entry::props) &> {
+    -> std::pair<std::string&, decltype(_entry::props)&> {
   return {ptr->name, ptr->props};
 }
 
-_entry *basic_partition_map::iterator::operator->() const { return ptr; }
+_entry* basic_partition_map::iterator::operator->() const { return ptr; }
 
-basic_partition_map::iterator &basic_partition_map::iterator::operator++() {
+basic_partition_map::iterator& basic_partition_map::iterator::operator++() {
   ++ptr;
   return *this;
 }
@@ -40,27 +40,27 @@ basic_partition_map::iterator basic_partition_map::iterator::operator++(int) {
   return tmp;
 }
 
-bool basic_partition_map::iterator::operator==(const iterator &other) const {
+bool basic_partition_map::iterator::operator==(const iterator& other) const {
   return ptr == other.ptr;
 }
 
-bool basic_partition_map::iterator::operator!=(const iterator &other) const {
+bool basic_partition_map::iterator::operator!=(const iterator& other) const {
   return ptr != other.ptr;
 }
 
-basic_partition_map::constant_iterator::constant_iterator(const _entry *p)
+basic_partition_map::constant_iterator::constant_iterator(const _entry* p)
     : ptr(p) {}
 
 auto basic_partition_map::constant_iterator::operator*() const
-    -> std::pair<const std::string &, const decltype(_entry::props) &> {
+    -> std::pair<const std::string&, const decltype(_entry::props)&> {
   return {ptr->name, ptr->props};
 }
 
-const _entry *basic_partition_map::constant_iterator::operator->() const {
+const _entry* basic_partition_map::constant_iterator::operator->() const {
   return ptr;
 }
 
-basic_partition_map::constant_iterator &
+basic_partition_map::constant_iterator&
 basic_partition_map::constant_iterator::operator++() {
   ++ptr;
   return *this;
@@ -74,21 +74,20 @@ basic_partition_map::constant_iterator::operator++(int) {
 }
 
 bool basic_partition_map::constant_iterator::operator==(
-    const constant_iterator &other) const {
+    const constant_iterator& other) const {
   return ptr == other.ptr;
 }
 
 bool basic_partition_map::constant_iterator::operator!=(
-    const constant_iterator &other) const {
+    const constant_iterator& other) const {
   return ptr != other.ptr;
 }
 
 void basic_partition_map::_resize_map() {
   const size_t new_capacity = _capacity * 2;
-  auto *new_data = new _entry[new_capacity];
+  auto* new_data = new _entry[new_capacity];
 
-  for (size_t i = 0; i < _count; i++)
-    new_data[i] = _data[i];
+  for (size_t i = 0; i < _count; i++) new_data[i] = _data[i];
 
   delete[] _data;
   _data = new_data;
@@ -103,26 +102,35 @@ int basic_partition_map::_index_of(const std::string_view name) const {
   return 0;
 }
 
-basic_partition_map::basic_partition_map(const std::string &name,
+basic_partition_map::basic_partition_map(const std::string& name,
                                          const uint64_t size,
                                          const bool logical) {
   _data = new _entry[_capacity];
   insert(name, size, logical);
 }
 
-basic_partition_map::basic_partition_map(const basic_partition_map &other)
-    : _data(new _entry[other._capacity]), _count(other._count),
+basic_partition_map::basic_partition_map(const basic_partition_map& other)
+    : _data(new _entry[other._capacity]),
+      _count(other._count),
       _capacity(other._capacity) {
   std::copy(other._data, other._data + _count, _data);
 }
 
+basic_partition_map::basic_partition_map(basic_partition_map&& other) noexcept
+    : _data(new _entry[other._capacity]),
+      _count(other._count),
+      _capacity(other._capacity) {
+  std::copy(other._data, other._data + _count, _data);
+  other.clear();
+}
+
 basic_partition_map::basic_partition_map() : _capacity(6) {
   _data = new _entry[_capacity];
 }
 
 basic_partition_map::~basic_partition_map() { delete[] _data; }
 
-bool basic_partition_map::insert(const std::string &name, const uint64_t size,
+bool basic_partition_map::insert(const std::string& name, const uint64_t size,
                                  const bool logical) {
   if (name == _data[_index_of(name)].name) return false;
   if (_count == _capacity) _resize_map();
@@ -134,9 +142,9 @@ bool basic_partition_map::insert(const std::string &name, const uint64_t size,
   return true;
 }
 
-void basic_partition_map::merge(const basic_partition_map &map) {
+void basic_partition_map::merge(const basic_partition_map& map) {
   LOGN(MAP, INFO) << "map merge request." << std::endl;
-  for (const auto &[name, props] : map)
+  for (const auto& [name, props] : map)
     insert(name, props.size, props.isLogical);
   LOGN(MAP, INFO) << "map merged successfully." << std::endl;
 }
@@ -155,8 +163,8 @@ bool basic_partition_map::is_logical(const std::string_view name) const {
   return false;
 }
 
-basic_partition_map::_returnable_entry
-basic_partition_map::get_all(const std::string_view name) const {
+_returnable_entry basic_partition_map::get_all(
+    const std::string_view name) const {
   if (const int pos = _index_of(name); name == _data[pos].name)
     return _returnable_entry{_data[pos].props.size, _data[pos].props.isLogical};
 
@@ -169,7 +177,7 @@ bool basic_partition_map::find(const std::string_view name) const {
   return false;
 }
 
-std::string basic_partition_map::find_(const std::string &name) const {
+std::string basic_partition_map::find_(const std::string& name) const {
   if (name == _data[_index_of(name)].name) return name;
 
   return {};
@@ -177,21 +185,18 @@ std::string basic_partition_map::find_(const std::string &name) const {
 
 size_t basic_partition_map::size() const { return _count; }
 
-bool basic_partition_map::empty() const {
-  if (_count > 0) return false;
-  return true;
-}
+bool basic_partition_map::empty() const { return _count == 0; }
 
 void basic_partition_map::clear() {
-  LOGN(MAP, INFO) << "map clean requested. Map is empty now." << std::endl;
+  LOGN(MAP, INFO) << "map clean requested. Cleaning..." << std::endl;
   delete[] _data;
   _count = 0;
   _capacity = 6;
   _data = new _entry[_capacity];
 }
 
-basic_partition_map &
-basic_partition_map::operator=(const basic_partition_map &map) {
+basic_partition_map& basic_partition_map::operator=(
+    const basic_partition_map& map) {
   if (this != &map) {
     delete[] _data;
 
@@ -204,7 +209,7 @@ basic_partition_map::operator=(const basic_partition_map &map) {
   return *this;
 }
 
-bool basic_partition_map::operator==(const basic_partition_map &other) const {
+bool basic_partition_map::operator==(const basic_partition_map& other) const {
   if (this->_capacity != other._capacity || this->_count != other._count)
     return false;
 
@@ -213,15 +218,45 @@ bool basic_partition_map::operator==(const basic_partition_map &other) const {
         _data[i].props.size == other._data[i].props.size &&
         _data[i].props.isLogical == other._data[i].props.isLogical)
       continue;
-    else return false;
+    else
+      return false;
 
   return true;
 }
 
-bool basic_partition_map::operator!=(const basic_partition_map &other) const {
+bool basic_partition_map::operator!=(const basic_partition_map& other) const {
   return !(*this == other);
 }
 
+basic_partition_map::operator bool() const { return _count > 0; }
+
+bool basic_partition_map::operator!() const { return _count == 0; }
+
+Info basic_partition_map::operator[](const int index) const {
+  if (_count == 0 || index >= _count) return {};
+  return _data[index];
+}
+
+BasicInf basic_partition_map::operator[](const std::string_view& name) const {
+  if (_count == 0) return {};
+
+  if (const int i = _index_of(name); name == _data[i].name)
+    return {_data[i].props.size, _data[i].props.isLogical};
+
+  return {};
+}
+
+basic_partition_map::operator std::vector<Info>() const {
+  std::vector<Info> v;
+  if (_count == 0) return {};
+  for (size_t i = 0; i < _count; i++)
+    v.push_back(
+        {_data[i].name, {_data[i].props.size, _data[i].props.isLogical}});
+  return v;
+}
+
+basic_partition_map::operator int() const { return static_cast<int>(_count); }
+
 basic_partition_map::iterator basic_partition_map::begin() const {
   return iterator(_data);
 }
@@ -237,4 +272,4 @@ basic_partition_map::constant_iterator basic_partition_map::cbegin() const {
 basic_partition_map::constant_iterator basic_partition_map::cend() const {
   return constant_iterator(_data + _count);
 }
-} // namespace PartitionMap
+}  // namespace PartitionMap

srclib/libpartition_map/tests/test.cpp

@@ -14,9 +14,11 @@
    limitations under the License.
 */
 
+#include <unistd.h>
+
+#include <fstream>
 #include <iostream>
 #include <libpartition_map/lib.hpp>
-#include <unistd.h>
 
 int main() {
   if (getuid() != 0) return 2;
@@ -30,7 +32,7 @@ int main() {
 
     const auto map = MyMap.getAll();
     if (map.empty()) throw PartitionMap::Error("getAll() empty");
-    for (const auto &[name, props] : map) {
+    for (const auto& [name, props] : map) {
       std::cout << "Partition: " << name << ", size: " << props.size
                 << ", logical: " << props.isLogical << std::endl;
     }
@@ -44,20 +46,40 @@ int main() {
     if (!logicals)
       throw PartitionMap::Error("getLogicalPartitionList() returned nullopt");
     std::cout << "Logical partitions: " << std::endl;
-    for (const auto &name : *logicals)
+    for (const auto& name : *logicals)
       std::cout << "   - " << name << std::endl;
 
     const auto physicals = MyMap.getPhysicalPartitionList();
     if (!physicals)
       throw PartitionMap::Error("getPhysicalPartitionList() returned nullopt");
     std::cout << "Physical partitions: " << std::endl;
-    for (const auto &name : *physicals)
+    for (const auto& name : *physicals)
       std::cout << "   - " << name << std::endl;
 
+    if (const std::vector<PartitionMap::Info> parts =
+            static_cast<std::vector<PartitionMap::Info>>(MyMap);
+        parts.empty())
+      throw PartitionMap::Error(
+          "operator std::vector<PartitionMap::Info>() returned empty vector");
+
+    auto func = [](const std::string& partition,
+                   const PartitionMap::BasicInf props) -> bool {
+      std::ofstream f("parts.txt");
+      f << "Partition: " << partition << ", size: " << props.size
+        << ", logical: " << props.isLogical;
+      f.exceptions(std::ios_base::failbit | std::ios_base::badbit);
+      return !f.fail();
+    };
+    if (!MyMap.doForAllPartitions(func))
+      throw PartitionMap::Error("doForAllPartitions() progress failed");
+
+    std::cout << "Total partitions count: " << (int)MyMap << std::endl;
     std::cout << "Boot: " << MyMap.getRealLinkPathOf("boot") << std::endl;
     std::cout << "Boot (realpath): " << MyMap.getRealPathOf("boot")
               << std::endl;
     std::cout << "Search dir: " << MyMap.getCurrentWorkDir() << std::endl;
+    std::cout << "Search dir test 2: " << static_cast<std::string>(MyMap)
+              << std::endl;
     std::cout << "Has partition cache? = " << MyMap.hasPartition("cache")
               << std::endl;
     std::cout << "system partition is logical? = " << MyMap.isLogical("system")
@@ -75,9 +97,12 @@ int main() {
     if (MyMap != MyMap2) std::cout << "map1 != map2" << std::endl;
 
     std::cout << PartitionMap::getLibVersion() << std::endl;
-  } catch (PartitionMap::Error &error) {
+  } catch (PartitionMap::Error& error) {
     std::cerr << error.what() << std::endl;
     return 1;
+  } catch (std::ios_base::failure& error) {
+    std::cerr << "fstream error: " << error.what() << std::endl;
+    return 1;
   }
 
   return 0;