open-source-mirrors
/
recyclarr
mirror of https://github.com/recyclarr/recyclarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: Update code style using CSharpier

Browse Source
pull/387/head
Robert Dailey 4 months ago
parent 40125ee895
commit adccca6686
352 changed files with 6066 additions and 6019 deletions
Show Stats Download Patch File Download Diff File

22
.config/dotnet-tools.json
Unescape View File

@ -6,13 +6,29 @@
"version": "6.0.4",
"commands": [
"dotnet-gitversion"
]
],
"rollForward": false
},
"dotnet-sonarscanner": {
"version": "9.0.1",
"commands": [
"dotnet-sonarscanner"
]
],
"rollForward": false
},
"csharpier": {
"version": "0.30.3",
"commands": [
"dotnet-csharpier"
],
"rollForward": false
},
"jetbrains.resharper.globaltools": {
"version": "2024.3.2",
"commands": [
"jb"
],
"rollForward": false
}
}
}
}

1593
.editorconfig
View File

File diff suppressed because it is too large Load Diff

1
.github/workflows/build.yml vendored
Unescape View File

@ -170,7 +170,6 @@ jobs:
uses: gittools/actions/gitversion/setup@v0
with:
versionSpec: 6.x
includePrerelease: true # Remove this once v6 goes stable
- name: Determine Version
uses: gittools/actions/gitversion/execute@v0

31
.github/workflows/inspect-code.yml vendored
Unescape View File

@ -46,6 +46,9 @@ jobs:
cleanup:
name: Resharper Code Cleanup
runs-on: ubuntu-latest
# Temporarily disable this job until this issue is resolved:
# https://youtrack.jetbrains.com/issue/RSRP-499679
if: false
steps:
- name: Checkout Source Code
uses: actions/checkout@v4
@ -57,14 +60,13 @@ jobs:
with:
dotnet-version: ${{ env.dotnetVersion }}
- name: Install Resharper Tools
run: dotnet tool install -g JetBrains.ReSharper.GlobalTools
- name: Build
run: dotnet build
# - name: Build
# run: dotnet build
- name: Run Code Cleanup
run: ci/code_cleanup.sh "${{ env.baseRef }}"
run: |
dotnet tool restore
ci/code_cleanup.sh
- name: Check Diff
run: |
@ -78,3 +80,20 @@ jobs:
with:
name: code-cleanup-patch-files
path: '*.patch'
style:
name: CSharpier Style
runs-on: ubuntu-latest
steps:
- name: Checkout Source Code
uses: actions/checkout@v4
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.dotnetVersion }}
- name: Run CSharpier
run: |
dotnet tool restore
dotnet csharpier --check .

1
.github/workflows/reusable-docker.yml vendored
Unescape View File

@ -26,7 +26,6 @@ jobs:
uses: gittools/actions/gitversion/setup@v0
with:
versionSpec: 6.x
includePrerelease: true # Remove this once v6 goes stable
- name: Determine Version
uses: gittools/actions/gitversion/execute@v0

7
.idea/.idea.Recyclarr/.idea/CSharpierPlugin.xml
Unescape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="com.intellij.csharpier">
<option name="customPath" value="" />
<option name="runOnSave" value="true" />
</component>
</project>

1
.idea/.idea.Recyclarr/.idea/inspectionProfiles/Project_Default.xml
Unescape View File

@ -1,6 +1,7 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="EditorConfigKeyCorrectness" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="JsonStandardCompliance" enabled="false" level="ERROR" enabled_by_default="false" />
<inspection_tool class="SqlNoDataSourceInspection" enabled="false" level="WARNING" enabled_by_default="false" />
</profile>

1
Recyclarr.sln
Unescape View File

@ -25,6 +25,7 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{18E17C53-F600-40AE-82C1-3CD1E547C307}"
ProjectSection(SolutionItems) = preProject
tests\Directory.Build.props = tests\Directory.Build.props
tests\.editorconfig = tests\.editorconfig
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Tests.TestLibrary", "tests\Recyclarr.Tests.TestLibrary\Recyclarr.Tests.TestLibrary.csproj", "{DE198BA1-2906-43BB-9CDB-977B9218A670}"

84
Recyclarr.sln.DotSettings
Unescape View File

@ -1,6 +1,7 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=My_0020Cleanup/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="My Cleanup"&gt;&lt;CppCodeStyleCleanupDescriptor ArrangeBraces="True" ArrangeAuto="True" ArrangeFunctionDeclarations="True" ArrangeNestedNamespaces="True" ArrangeTypeAliases="True" ArrangeCVQualifiers="True" ArrangeSlashesInIncludeDirectives="True" ArrangeOverridingFunctions="True" SortIncludeDirectives="True" SortMemberInitializers="True" /&gt;&lt;CSCodeStyleAttributes ArrangeVarStyle="True" ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" ArrangeArgumentsStyle="True" RemoveRedundantParentheses="True" AddMissingParentheses="True" ArrangeBraces="True" ArrangeAttributes="True" ArrangeCodeBodyStyle="True" ArrangeTrailingCommas="True" ArrangeObjectCreation="True" ArrangeDefaultValue="True" ArrangeNamespaces="True" /&gt;&lt;Xaml.RedundantFreezeAttribute&gt;True&lt;/Xaml.RedundantFreezeAttribute&gt;&lt;Xaml.RemoveRedundantModifiersAttribute&gt;True&lt;/Xaml.RemoveRedundantModifiersAttribute&gt;&lt;Xaml.RemoveRedundantNameAttribute&gt;True&lt;/Xaml.RemoveRedundantNameAttribute&gt;&lt;Xaml.RemoveRedundantResource&gt;True&lt;/Xaml.RemoveRedundantResource&gt;&lt;Xaml.RemoveRedundantCollectionProperty&gt;True&lt;/Xaml.RemoveRedundantCollectionProperty&gt;&lt;Xaml.RemoveRedundantAttachedPropertySetter&gt;True&lt;/Xaml.RemoveRedundantAttachedPropertySetter&gt;&lt;Xaml.RemoveRedundantStyledValue&gt;True&lt;/Xaml.RemoveRedundantStyledValue&gt;&lt;Xaml.RemoveRedundantNamespaceAlias&gt;True&lt;/Xaml.RemoveRedundantNamespaceAlias&gt;&lt;Xaml.RemoveForbiddenResourceName&gt;True&lt;/Xaml.RemoveForbiddenResourceName&gt;&lt;Xaml.RemoveRedundantGridDefinitionsAttribute&gt;True&lt;/Xaml.RemoveRedundantGridDefinitionsAttribute&gt;&lt;Xaml.RemoveRedundantUpdateSourceTriggerAttribute&gt;True&lt;/Xaml.RemoveRedundantUpdateSourceTriggerAttribute&gt;&lt;Xaml.RemoveRedundantBindingModeAttribute&gt;True&lt;/Xaml.RemoveRedundantBindingModeAttribute&gt;&lt;Xaml.RemoveRedundantGridSpanAttribut&gt;True&lt;/Xaml.RemoveRedundantGridSpanAttribut&gt;&lt;XMLReformatCode&gt;True&lt;/XMLReformatCode&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;HtmlReformatCode&gt;True&lt;/HtmlReformatCode&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;FormatAttributeQuoteDescriptor&gt;True&lt;/FormatAttributeQuoteDescriptor&gt;&lt;IDEA_SETTINGS&gt;&amp;lt;profile version="1.0"&amp;gt;&#xD;
&amp;lt;option name="myName" value="My Cleanup" /&amp;gt;&#xD;
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Recyclarr_0020Cleanup/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Recyclarr Cleanup"&gt;&lt;CppCodeStyleCleanupDescriptor /&gt;&lt;CSCodeStyleAttributes ArrangeVarStyle="True" ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" ArrangeArgumentsStyle="True" RemoveRedundantParentheses="True" AddMissingParentheses="True" ArrangeBraces="True" ArrangeTrailingCommas="True" ArrangeObjectCreation="True" ArrangeDefaultValue="True" ArrangeNamespaces="True" /&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;FormatAttributeQuoteDescriptor&gt;True&lt;/FormatAttributeQuoteDescriptor&gt;&lt;IDEA_SETTINGS&gt;&amp;lt;profile version="1.0"&amp;gt;&#xD;
&amp;lt;option name="myName" value="Recyclarr Cleanup" /&amp;gt;&#xD;
&amp;lt;inspection_tool class="ES6ShorthandObjectProperty" enabled="false" level="INFORMATION" enabled_by_default="false" /&amp;gt;&#xD;
&amp;lt;inspection_tool class="JSArrowFunctionBracesCanBeRemoved" enabled="false" level="INFORMATION" enabled_by_default="false" /&amp;gt;&#xD;
&amp;lt;inspection_tool class="JSPrimitiveTypeWrapperUsage" enabled="false" level="WARNING" enabled_by_default="false" /&amp;gt;&#xD;
@ -15,100 +16,61 @@
&amp;lt;inspection_tool class="WrongPropertyKeyValueDelimiter" enabled="false" level="WEAK WARNING" enabled_by_default="false" /&amp;gt;&#xD;
&amp;lt;/profile&amp;gt;&lt;/IDEA_SETTINGS&gt;&lt;RIDER_SETTINGS&gt;&amp;lt;profile&amp;gt;&#xD;
&amp;lt;Language id="CSS"&amp;gt;&#xD;
&amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
&amp;lt;Reformat&amp;gt;false&amp;lt;/Reformat&amp;gt;&#xD;
&amp;lt;Rearrange&amp;gt;false&amp;lt;/Rearrange&amp;gt;&#xD;
&amp;lt;/Language&amp;gt;&#xD;
&amp;lt;Language id="EditorConfig"&amp;gt;&#xD;
&amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
&amp;lt;Reformat&amp;gt;false&amp;lt;/Reformat&amp;gt;&#xD;
&amp;lt;/Language&amp;gt;&#xD;
&amp;lt;Language id="HTML"&amp;gt;&#xD;
&amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
&amp;lt;Reformat&amp;gt;false&amp;lt;/Reformat&amp;gt;&#xD;
&amp;lt;Rearrange&amp;gt;false&amp;lt;/Rearrange&amp;gt;&#xD;
&amp;lt;OptimizeImports&amp;gt;false&amp;lt;/OptimizeImports&amp;gt;&#xD;
&amp;lt;/Language&amp;gt;&#xD;
&amp;lt;Language id="HTTP Request"&amp;gt;&#xD;
&amp;lt;Reformat&amp;gt;false&amp;lt;/Reformat&amp;gt;&#xD;
&amp;lt;/Language&amp;gt;&#xD;
&amp;lt;Language id="Handlebars"&amp;gt;&#xD;
&amp;lt;Reformat&amp;gt;false&amp;lt;/Reformat&amp;gt;&#xD;
&amp;lt;/Language&amp;gt;&#xD;
&amp;lt;Language id="Ini"&amp;gt;&#xD;
&amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
&amp;lt;Reformat&amp;gt;false&amp;lt;/Reformat&amp;gt;&#xD;
&amp;lt;/Language&amp;gt;&#xD;
&amp;lt;Language id="JSON"&amp;gt;&#xD;
&amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
&amp;lt;Reformat&amp;gt;false&amp;lt;/Reformat&amp;gt;&#xD;
&amp;lt;/Language&amp;gt;&#xD;
&amp;lt;Language id="JavaScript"&amp;gt;&#xD;
&amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
&amp;lt;Reformat&amp;gt;false&amp;lt;/Reformat&amp;gt;&#xD;
&amp;lt;Rearrange&amp;gt;false&amp;lt;/Rearrange&amp;gt;&#xD;
&amp;lt;OptimizeImports&amp;gt;false&amp;lt;/OptimizeImports&amp;gt;&#xD;
&amp;lt;/Language&amp;gt;&#xD;
&amp;lt;Language id="Markdown"&amp;gt;&#xD;
&amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
&amp;lt;/Language&amp;gt;&#xD;
&amp;lt;Language id="Properties"&amp;gt;&#xD;
&amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
&amp;lt;/Language&amp;gt;&#xD;
&amp;lt;Language id="RELAX-NG"&amp;gt;&#xD;
&amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
&amp;lt;/Language&amp;gt;&#xD;
&amp;lt;Language id="XML"&amp;gt;&#xD;
&amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
&amp;lt;Rearrange&amp;gt;false&amp;lt;/Rearrange&amp;gt;&#xD;
&amp;lt;OptimizeImports&amp;gt;false&amp;lt;/OptimizeImports&amp;gt;&#xD;
&amp;lt;/Language&amp;gt;&#xD;
&amp;lt;Language id="yaml"&amp;gt;&#xD;
&amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
&amp;lt;/Language&amp;gt;&#xD;
&amp;lt;/profile&amp;gt;&lt;/RIDER_SETTINGS&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;/Profile&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Recyclarr_0020Cleanup/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Recyclarr Cleanup"&gt;&lt;CppCodeStyleCleanupDescriptor /&gt;&lt;CSCodeStyleAttributes ArrangeVarStyle="True" ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" ArrangeArgumentsStyle="True" RemoveRedundantParentheses="True" AddMissingParentheses="True" ArrangeBraces="True" ArrangeTrailingCommas="True" ArrangeObjectCreation="True" ArrangeDefaultValue="True" ArrangeNamespaces="True" /&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;FormatAttributeQuoteDescriptor&gt;True&lt;/FormatAttributeQuoteDescriptor&gt;&lt;IDEA_SETTINGS&gt;&amp;lt;profile version="1.0"&amp;gt;&#xD;
&amp;lt;option name="myName" value="Recyclarr Cleanup" /&amp;gt;&#xD;
&amp;lt;inspection_tool class="ES6ShorthandObjectProperty" enabled="false" level="INFORMATION" enabled_by_default="false" /&amp;gt;&#xD;
&amp;lt;inspection_tool class="JSArrowFunctionBracesCanBeRemoved" enabled="false" level="INFORMATION" enabled_by_default="false" /&amp;gt;&#xD;
&amp;lt;inspection_tool class="JSPrimitiveTypeWrapperUsage" enabled="false" level="WARNING" enabled_by_default="false" /&amp;gt;&#xD;
&amp;lt;inspection_tool class="JSRemoveUnnecessaryParentheses" enabled="false" level="INFORMATION" enabled_by_default="false" /&amp;gt;&#xD;
&amp;lt;inspection_tool class="JSUnnecessarySemicolon" enabled="false" level="WARNING" enabled_by_default="false" /&amp;gt;&#xD;
&amp;lt;inspection_tool class="TypeScriptExplicitMemberType" enabled="false" level="INFORMATION" enabled_by_default="false" /&amp;gt;&#xD;
&amp;lt;inspection_tool class="UnnecessaryContinueJS" enabled="false" level="WARNING" enabled_by_default="false" /&amp;gt;&#xD;
&amp;lt;inspection_tool class="UnnecessaryLabelJS" enabled="false" level="WARNING" enabled_by_default="false" /&amp;gt;&#xD;
&amp;lt;inspection_tool class="UnnecessaryLabelOnBreakStatementJS" enabled="false" level="WARNING" enabled_by_default="false" /&amp;gt;&#xD;
&amp;lt;inspection_tool class="UnnecessaryLabelOnContinueStatementJS" enabled="false" level="WARNING" enabled_by_default="false" /&amp;gt;&#xD;
&amp;lt;inspection_tool class="UnnecessaryReturnJS" enabled="false" level="WARNING" enabled_by_default="false" /&amp;gt;&#xD;
&amp;lt;inspection_tool class="WrongPropertyKeyValueDelimiter" enabled="false" level="WEAK WARNING" enabled_by_default="false" /&amp;gt;&#xD;
&amp;lt;/profile&amp;gt;&lt;/IDEA_SETTINGS&gt;&lt;RIDER_SETTINGS&gt;&amp;lt;profile&amp;gt;&#xD;
&amp;lt;Language id="CSS"&amp;gt;&#xD;
&amp;lt;Reformat&amp;gt;false&amp;lt;/Reformat&amp;gt;&#xD;
&amp;lt;Rearrange&amp;gt;false&amp;lt;/Rearrange&amp;gt;&#xD;
&amp;lt;/Language&amp;gt;&#xD;
&amp;lt;Language id="EditorConfig"&amp;gt;&#xD;
&amp;lt;Reformat&amp;gt;false&amp;lt;/Reformat&amp;gt;&#xD;
&amp;lt;/Language&amp;gt;&#xD;
&amp;lt;Language id="HTML"&amp;gt;&#xD;
&amp;lt;OptimizeImports&amp;gt;false&amp;lt;/OptimizeImports&amp;gt;&#xD;
&amp;lt;Reformat&amp;gt;false&amp;lt;/Reformat&amp;gt;&#xD;
&amp;lt;Rearrange&amp;gt;false&amp;lt;/Rearrange&amp;gt;&#xD;
&amp;lt;/Language&amp;gt;&#xD;
&amp;lt;Language id="Handlebars"&amp;gt;&#xD;
&amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
&amp;lt;/Language&amp;gt;&#xD;
&amp;lt;Language id="Ini"&amp;gt;&#xD;
&amp;lt;Language id="Properties"&amp;gt;&#xD;
&amp;lt;Reformat&amp;gt;false&amp;lt;/Reformat&amp;gt;&#xD;
&amp;lt;/Language&amp;gt;&#xD;
&amp;lt;Language id="JSON"&amp;gt;&#xD;
&amp;lt;Language id="RELAX-NG"&amp;gt;&#xD;
&amp;lt;Reformat&amp;gt;false&amp;lt;/Reformat&amp;gt;&#xD;
&amp;lt;/Language&amp;gt;&#xD;
&amp;lt;Language id="Markdown"&amp;gt;&#xD;
&amp;lt;Language id="Razor"&amp;gt;&#xD;
&amp;lt;Reformat&amp;gt;false&amp;lt;/Reformat&amp;gt;&#xD;
&amp;lt;/Language&amp;gt;&#xD;
&amp;lt;Language id="Properties"&amp;gt;&#xD;
&amp;lt;Language id="SQL"&amp;gt;&#xD;
&amp;lt;Reformat&amp;gt;false&amp;lt;/Reformat&amp;gt;&#xD;
&amp;lt;/Language&amp;gt;&#xD;
&amp;lt;Language id="RELAX-NG"&amp;gt;&#xD;
&amp;lt;Language id="VueExpr"&amp;gt;&#xD;
&amp;lt;Reformat&amp;gt;false&amp;lt;/Reformat&amp;gt;&#xD;
&amp;lt;/Language&amp;gt;&#xD;
&amp;lt;Language id="XML"&amp;gt;&#xD;
&amp;lt;OptimizeImports&amp;gt;false&amp;lt;/OptimizeImports&amp;gt;&#xD;
&amp;lt;Reformat&amp;gt;false&amp;lt;/Reformat&amp;gt;&#xD;
&amp;lt;Rearrange&amp;gt;false&amp;lt;/Rearrange&amp;gt;&#xD;
&amp;lt;OptimizeImports&amp;gt;false&amp;lt;/OptimizeImports&amp;gt;&#xD;
&amp;lt;/Language&amp;gt;&#xD;
&amp;lt;Language id="yaml"&amp;gt;&#xD;
&amp;lt;Reformat&amp;gt;false&amp;lt;/Reformat&amp;gt;&#xD;
&amp;lt;/Language&amp;gt;&#xD;
&amp;lt;/profile&amp;gt;&lt;/RIDER_SETTINGS&gt;&lt;CSharpFormatDocComments&gt;True&lt;/CSharpFormatDocComments&gt;&lt;XAMLCollapseEmptyTags&gt;False&lt;/XAMLCollapseEmptyTags&gt;&lt;RemoveCodeRedundancies&gt;True&lt;/RemoveCodeRedundancies&gt;&lt;CSMakeFieldReadonly&gt;True&lt;/CSMakeFieldReadonly&gt;&lt;/Profile&gt;</s:String>
&amp;lt;/profile&amp;gt;&lt;/RIDER_SETTINGS&gt;&lt;XAMLCollapseEmptyTags&gt;False&lt;/XAMLCollapseEmptyTags&gt;&lt;RemoveCodeRedundancies&gt;True&lt;/RemoveCodeRedundancies&gt;&lt;CSMakeFieldReadonly&gt;True&lt;/CSMakeFieldReadonly&gt;&lt;/Profile&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/CodeCleanup/SilentCleanupProfile/@EntryValue">Recyclarr Cleanup</s:String>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Listers/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Persister/@EntryIndexedValue">True</s:Boolean>
@ -117,4 +79,4 @@
<s:Boolean x:Key="/Default/UserDictionary/Words/=Recyclarr/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Recyclarr_0027s/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Servarr/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Sonarr/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Sonarr/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

19
ci/code_cleanup.sh
Unescape View File

@ -1,18 +1,5 @@
#!/usr/bin/env bash
ref="$1"
changed_files="$(git diff --relative --name-only --diff-filter=d $ref... | egrep '\.cs$')"
if [[ -z "$changed_files" ]]; then
echo "No changed files detected; skipping code cleanup"
exit 0
fi
echo '--------------------------------------------------'
echo 'Files to be checked for code cleanup:'
echo
echo "$changed_files"
echo '--------------------------------------------------'
jb cleanupcode Recyclarr.sln \
dotnet jb cleanupcode Recyclarr.sln \
--settings="Recyclarr.sln.DotSettings" \
--profile="Recyclarr Cleanup" \
--include="$(echo "$changed_files" | tr '\n' ';')"
--include="**.cs"

19
src/Recyclarr.Cli/CompositionRoot.cs
Unescape View File

@ -62,9 +62,8 @@ public static class CompositionRoot
// Delete
builder.RegisterType<DeleteCustomFormatsProcessor>().As<IDeleteCustomFormatsProcessor>();
builder.RegisterTypes(
typeof(TemplateConfigCreator),
typeof(LocalConfigCreator))
builder
.RegisterTypes(typeof(TemplateConfigCreator), typeof(LocalConfigCreator))
.As<IConfigCreator>()
.OrderByRegistration();
}
@ -74,9 +73,8 @@ public static class CompositionRoot
builder.RegisterType<MigrationExecutor>().As<IMigrationExecutor>();
// Migration Steps
builder.RegisterTypes(
typeof(MoveOsxAppDataDotnet8),
typeof(DeleteRepoDirMigrationStep))
builder
.RegisterTypes(typeof(MoveOsxAppDataDotnet8), typeof(DeleteRepoDirMigrationStep))
.As<IMigrationStep>()
.OrderByRegistration();
}
@ -101,15 +99,18 @@ public static class CompositionRoot
builder.RegisterType<CommandSetupInterceptor>().As<ICommandInterceptor>();
builder.RegisterComposite<CompositeGlobalSetupTask, IGlobalSetupTask>();
builder.RegisterTypes(
builder
.RegisterTypes(
typeof(AppDataDirSetupTask), // This must be first; ILogger creation depends on IAppPaths
typeof(LoggerSetupTask),
typeof(ProgramInformationDisplayTask),
typeof(JanitorCleanupTask))
typeof(JanitorCleanupTask)
)
.As<IGlobalSetupTask>()
.OrderByRegistration();
builder.RegisterAssemblyTypes(Assembly.GetExecutingAssembly())
builder
.RegisterAssemblyTypes(Assembly.GetExecutingAssembly())
.AssignableTo<CommandSettings>();
}
}

34
src/Recyclarr.Cli/Console/AutofacTypeRegistrar.cs
Unescape View File

@ -26,22 +26,24 @@ internal class AutofacTypeRegistrar(ILifetimeScope scope) : ITypeRegistrar
public ITypeResolver Build()
{
return new AutofacTypeResolver(scope.BeginLifetimeScope(builder =>
{
foreach (var (service, impl) in _typeRegistrations)
return new AutofacTypeResolver(
scope.BeginLifetimeScope(builder =>
{
builder.RegisterType(impl).As(service).SingleInstance();
}
foreach (var (service, implementation) in _instanceRegistrations)
{
builder.RegisterInstance(implementation).As(service);
}
foreach (var (service, factory) in _lazyRegistrations)
{
builder.Register(_ => factory()).As(service).SingleInstance();
}
}));
foreach (var (service, impl) in _typeRegistrations)
{
builder.RegisterType(impl).As(service).SingleInstance();
}
foreach (var (service, implementation) in _instanceRegistrations)
{
builder.RegisterInstance(implementation).As(service);
}
foreach (var (service, factory) in _lazyRegistrations)
{
builder.Register(_ => factory()).As(service).SingleInstance();
}
})
);
}
}

65
src/Recyclarr.Cli/Console/CliSetup.cs
Unescape View File

@ -16,31 +16,45 @@ public static class CliSetup
cli.AddCommand<MigrateCommand>("migrate");
cli.AddBranch("list", list =>
{
list.SetDescription("List information from the guide");
list.AddCommand<ListCustomFormatsCommand>("custom-formats");
list.AddCommand<ListQualitiesCommand>("qualities");
list.AddCommand<ListMediaNamingCommand>("naming");
});
cli.AddBranch(
"list",
list =>
{
list.SetDescription("List information from the guide");
list.AddCommand<ListCustomFormatsCommand>("custom-formats");
list.AddCommand<ListQualitiesCommand>("qualities");
list.AddCommand<ListMediaNamingCommand>("naming");
}
);
cli.AddBranch("config", config =>
{
config.SetDescription("Operations for configuration files");
config.AddCommand<ConfigCreateCommand>("create");
config.AddBranch("list", list =>
cli.AddBranch(
"config",
config =>
{
list.SetDescription("List configuration files in various ways");
list.AddCommand<ConfigListLocalCommand>("local");
list.AddCommand<ConfigListTemplatesCommand>("templates");
});
});
config.SetDescription("Operations for configuration files");
config.AddCommand<ConfigCreateCommand>("create");
config.AddBranch(
"list",
list =>
{
list.SetDescription("List configuration files in various ways");
list.AddCommand<ConfigListLocalCommand>("local");
list.AddCommand<ConfigListTemplatesCommand>("templates");
}
);
}
);
cli.AddBranch("delete", delete =>
{
delete.SetDescription("Delete operations for remote services (e.g. Radarr, Sonarr)");
delete.AddCommand<DeleteCustomFormatsCommand>("custom-formats");
});
cli.AddBranch(
"delete",
delete =>
{
delete.SetDescription(
"Delete operations for remote services (e.g. Radarr, Sonarr)"
);
delete.AddCommand<DeleteCustomFormatsCommand>("custom-formats");
}
);
}
public static async Task<int> Run(ILifetimeScope scope, IEnumerable<string> args)
@ -48,9 +62,9 @@ public static class CliSetup
var app = scope.Resolve<CommandApp>();
app.Configure(config =>
{
#if DEBUG
#if DEBUG
config.ValidateExamples();
#endif
#endif
config.ConfigureConsole(scope.Resolve<IAnsiConsole>());
config.PropagateExceptions();
@ -58,7 +72,8 @@ public static class CliSetup
config.SetApplicationName("recyclarr");
config.SetApplicationVersion(
$"v{GitVersionInformation.SemVer} ({GitVersionInformation.FullBuildMetaData})");
$"v{GitVersionInformation.SemVer} ({GitVersionInformation.FullBuildMetaData})"
);
AddCommands(config);
});

32
src/Recyclarr.Cli/Console/Commands/ConfigCreateCommand.cs
Unescape View File

@ -10,13 +10,19 @@ namespace Recyclarr.Cli.Console.Commands;
[UsedImplicitly]
[Description("Create a starter configuration file.")]
public class ConfigCreateCommand(ILogger log, IConfigCreationProcessor processor, IMultiRepoUpdater repoUpdater)
: AsyncCommand<ConfigCreateCommand.CliSettings>
public class ConfigCreateCommand(
ILogger log,
IConfigCreationProcessor processor,
IMultiRepoUpdater repoUpdater
) : AsyncCommand<ConfigCreateCommand.CliSettings>
{
[UsedImplicitly]
[SuppressMessage("Design", "CA1034:Nested types should not be visible")]
[SuppressMessage("Performance", "CA1819:Properties should not return arrays",
Justification = "Spectre.Console requires it")]
[SuppressMessage(
"Performance",
"CA1819:Properties should not return arrays",
Justification = "Spectre.Console requires it"
)]
public class CliSettings : BaseCommandSettings, ICreateConfigSettings
{
[CommandOption("-p|--path")]
@ -26,8 +32,9 @@ public class ConfigCreateCommand(ILogger log, IConfigCreationProcessor processor
[CommandOption("-t|--template")]
[Description(
"One or more template configuration files to create. Use `config list templates` to get a list of " +
"names accepted here.")]
"One or more template configuration files to create. Use `config list templates` to get a list of "
+ "names accepted here."
)]
[UsedImplicitly(ImplicitUseKindFlags.Assign)]
public string[] TemplatesOption { get; init; } = [];
public IReadOnlyCollection<string> Templates => TemplatesOption;
@ -44,15 +51,18 @@ public class ConfigCreateCommand(ILogger log, IConfigCreationProcessor processor
{
await repoUpdater.UpdateAllRepositories(settings.CancellationToken);
processor.Process(settings);
return (int) ExitStatus.Succeeded;
return (int)ExitStatus.Succeeded;
}
catch (FileExistsException e)
{
log.Error(e,
"The file {ConfigFile} already exists. Please choose another path or " +
"delete/move the existing file and run this command again", e.AttemptedPath);
log.Error(
e,
"The file {ConfigFile} already exists. Please choose another path or "
+ "delete/move the existing file and run this command again",
e.AttemptedPath
);
}
return (int) ExitStatus.Failed;
return (int)ExitStatus.Failed;
}
}

8
src/Recyclarr.Cli/Console/Commands/ConfigListLocalCommand.cs
Unescape View File

@ -9,8 +9,10 @@ namespace Recyclarr.Cli.Console.Commands;
[UsedImplicitly]
[Description("List local configuration files.")]
public class ConfigListLocalCommand(ConfigListLocalProcessor processor, IMultiRepoUpdater repoUpdater)
: AsyncCommand<ConfigListLocalCommand.CliSettings>
public class ConfigListLocalCommand(
ConfigListLocalProcessor processor,
IMultiRepoUpdater repoUpdater
) : AsyncCommand<ConfigListLocalCommand.CliSettings>
{
[SuppressMessage("Design", "CA1034:Nested types should not be visible")]
public class CliSettings : BaseCommandSettings;
@ -19,6 +21,6 @@ public class ConfigListLocalCommand(ConfigListLocalProcessor processor, IMultiRe
{
await repoUpdater.UpdateAllRepositories(settings.CancellationToken);
processor.Process();
return (int) ExitStatus.Succeeded;
return (int)ExitStatus.Succeeded;
}
}

11
src/Recyclarr.Cli/Console/Commands/ConfigListTemplatesCommand.cs
Unescape View File

@ -9,15 +9,18 @@ namespace Recyclarr.Cli.Console.Commands;
[UsedImplicitly]
[Description("List local configuration files.")]
public class ConfigListTemplatesCommand(ConfigListTemplateProcessor processor, IMultiRepoUpdater repoUpdater)
: AsyncCommand<ConfigListTemplatesCommand.CliSettings>
public class ConfigListTemplatesCommand(
ConfigListTemplateProcessor processor,
IMultiRepoUpdater repoUpdater
) : AsyncCommand<ConfigListTemplatesCommand.CliSettings>
{
[SuppressMessage("Design", "CA1034:Nested types should not be visible")]
public class CliSettings : BaseCommandSettings, IConfigListTemplatesSettings
{
[CommandOption("-i|--includes")]
[Description(
"List templates that may be included in YAML, instead of root templates used with `config create`.")]
"List templates that may be included in YAML, instead of root templates used with `config create`."
)]
[UsedImplicitly(ImplicitUseKindFlags.Assign)]
public bool Includes { get; init; }
}
@ -26,7 +29,7 @@ public class ConfigListTemplatesCommand(ConfigListTemplateProcessor processor, I
{
await repoUpdater.UpdateAllRepositories(settings.CancellationToken);
processor.Process(settings);
return (int) ExitStatus.Succeeded;
return (int)ExitStatus.Succeeded;
}
}

13
src/Recyclarr.Cli/Console/Commands/DeleteCustomFormatsCommand.cs
Unescape View File

@ -14,8 +14,11 @@ public class DeleteCustomFormatsCommand(IDeleteCustomFormatsProcessor processor)
{
[UsedImplicitly]
[SuppressMessage("Design", "CA1034:Nested types should not be visible")]
[SuppressMessage("Performance", "CA1819:Properties should not return arrays",
Justification = "Spectre.Console requires it")]
[SuppressMessage(
"Performance",
"CA1819:Properties should not return arrays",
Justification = "Spectre.Console requires it"
)]
public class CliSettings : BaseCommandSettings, IDeleteCustomFormatSettings
{
[CommandArgument(0, "<instance_name>")]
@ -23,7 +26,9 @@ public class DeleteCustomFormatsCommand(IDeleteCustomFormatsProcessor processor)
public string InstanceName { get; init; } = "";
[CommandArgument(0, "[cf_names]")]
[Description("One or more custom format names to delete. Optional only if `--all` is used.")]
[Description(
"One or more custom format names to delete. Optional only if `--all` is used."
)]
public string[] CustomFormatNamesOption { get; init; } = [];
public IReadOnlyCollection<string> CustomFormatNames => CustomFormatNamesOption;
@ -44,6 +49,6 @@ public class DeleteCustomFormatsCommand(IDeleteCustomFormatsProcessor processor)
public override async Task<int> ExecuteAsync(CommandContext context, CliSettings settings)
{
await processor.Process(settings, settings.CancellationToken);
return (int) ExitStatus.Succeeded;
return (int)ExitStatus.Succeeded;
}
}

10
src/Recyclarr.Cli/Console/Commands/ListCustomFormatsCommand.cs
Unescape View File

@ -27,11 +27,15 @@ public class ListCustomFormatsCommand(CustomFormatDataLister lister, IMultiRepoU
public SupportedServices Service { get; init; }
[CommandOption("--score-sets")]
[Description("Instead of listing custom formats, list the score sets all custom formats are part of.")]
[Description(
"Instead of listing custom formats, list the score sets all custom formats are part of."
)]
public bool ScoreSets { get; init; } = false;
[CommandOption("--raw")]
[Description("Omit any boilerplate text or colored formatting. This option primarily exists for scripts.")]
[Description(
"Omit any boilerplate text or colored formatting. This option primarily exists for scripts."
)]
public bool Raw { get; init; } = false;
}
@ -39,6 +43,6 @@ public class ListCustomFormatsCommand(CustomFormatDataLister lister, IMultiRepoU
{
await repoUpdater.UpdateAllRepositories(settings.CancellationToken, settings.Raw);
lister.List(settings);
return (int) ExitStatus.Succeeded;
return (int)ExitStatus.Succeeded;
}
}

2
src/Recyclarr.Cli/Console/Commands/ListMediaNamingCommand.cs
Unescape View File

@ -28,6 +28,6 @@ public class ListMediaNamingCommand(MediaNamingDataLister lister, IMultiRepoUpda
{
await repoUpdater.UpdateAllRepositories(settings.CancellationToken);
lister.ListNaming(settings.Service);
return (int) ExitStatus.Succeeded;
return (int)ExitStatus.Succeeded;
}
}

2
src/Recyclarr.Cli/Console/Commands/ListQualitiesCommand.cs
Unescape View File

@ -29,6 +29,6 @@ public class ListQualitiesCommand(QualitySizeDataLister lister, IMultiRepoUpdate
{
await repoUpdater.UpdateAllRepositories(settings.CancellationToken);
lister.ListQualities(settings.Service);
return (int) ExitStatus.Succeeded;
return (int)ExitStatus.Succeeded;
}
}

22
src/Recyclarr.Cli/Console/Commands/MigrateCommand.cs
Unescape View File

@ -1,5 +1,6 @@
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.Text;
using Recyclarr.Cli.Migration;
using Recyclarr.Cli.Processors;
@ -12,9 +13,8 @@ namespace Recyclarr.Cli.Console.Commands;
[UsedImplicitly]
[Description("Perform migration steps that may be needed between versions")]
public class MigrateCommand(
IAnsiConsole console,
IMigrationExecutor migration) : Command<MigrateCommand.CliSettings>
public class MigrateCommand(IAnsiConsole console, IMigrationExecutor migration)
: Command<MigrateCommand.CliSettings>
{
[UsedImplicitly]
[SuppressMessage("Design", "CA1034:Nested types should not be visible")]
@ -26,14 +26,20 @@ public class MigrateCommand(
{
migration.PerformAllMigrationSteps(settings.Debug);
console.WriteLine("All migration steps completed");
return (int) ExitStatus.Succeeded;
return (int)ExitStatus.Succeeded;
}
catch (MigrationException e)
{
var msg = new StringBuilder();
msg.AppendLine("Fatal exception during migration step. Details are below.\n");
msg.AppendLine($"Step That Failed: {e.OperationDescription}");
msg.AppendLine($"Failure Reason: {e.OriginalException.Message}");
msg.AppendLine(
CultureInfo.InvariantCulture,
$"Step That Failed: {e.OperationDescription}"
);
msg.AppendLine(
CultureInfo.InvariantCulture,
$"Failure Reason: {e.OriginalException.Message}"
);
// ReSharper disable once InvertIf
if (e.Remediation.Count != 0)
@ -41,7 +47,7 @@ public class MigrateCommand(
msg.AppendLine("\nPossible remediation steps:");
foreach (var remedy in e.Remediation)
{
msg.AppendLine($" - {remedy}");
msg.AppendLine(CultureInfo.InvariantCulture, $" - {remedy}");
}
}
@ -52,6 +58,6 @@ public class MigrateCommand(
console.WriteLine($"ERROR: {ex.Message}");
}
return (int) ExitStatus.Failed;
return (int)ExitStatus.Failed;
}
}

24
src/Recyclarr.Cli/Console/Commands/SyncCommand.cs
Unescape View File

@ -12,17 +12,25 @@ namespace Recyclarr.Cli.Console.Commands;
[Description("Sync the guide to services")]
[UsedImplicitly]
public class SyncCommand(IMigrationExecutor migration, IMultiRepoUpdater repoUpdater, ISyncProcessor syncProcessor)
: AsyncCommand<SyncCommand.CliSettings>
public class SyncCommand(
IMigrationExecutor migration,
IMultiRepoUpdater repoUpdater,
ISyncProcessor syncProcessor
) : AsyncCommand<SyncCommand.CliSettings>
{
[UsedImplicitly]
[SuppressMessage("Design", "CA1034:Nested types should not be visible")]
[SuppressMessage("Performance", "CA1819:Properties should not return arrays",
Justification = "Spectre.Console requires it")]
[SuppressMessage(
"Performance",
"CA1819:Properties should not return arrays",
Justification = "Spectre.Console requires it"
)]
public class CliSettings : BaseCommandSettings, ISyncSettings
{
[CommandArgument(0, "[service]")]
[EnumDescription<SupportedServices>("The service to sync. If not specified, all services are synced.")]
[EnumDescription<SupportedServices>(
"The service to sync. If not specified, all services are synced."
)]
[UsedImplicitly(ImplicitUseKindFlags.Assign)]
public SupportedServices? Service { get; init; }
@ -38,7 +46,9 @@ public class SyncCommand(IMigrationExecutor migration, IMultiRepoUpdater repoUpd
public bool Preview { get; init; }
[CommandOption("-i|--instance")]
[Description("One or more instance names to sync. If not specified, all instances will be synced.")]
[Description(
"One or more instance names to sync. If not specified, all instances will be synced."
)]
[UsedImplicitly(ImplicitUseKindFlags.Assign)]
public string[] InstancesOption { get; init; } = [];
public IReadOnlyCollection<string> Instances => InstancesOption;
@ -52,6 +62,6 @@ public class SyncCommand(IMigrationExecutor migration, IMultiRepoUpdater repoUpd
await repoUpdater.UpdateAllRepositories(settings.CancellationToken);
return (int) await syncProcessor.Process(settings, settings.CancellationToken);
return (int)await syncProcessor.Process(settings, settings.CancellationToken);
}
}

11
src/Recyclarr.Cli/Console/Helpers/EnumDescriptionAttribute.cs
Unescape View File

@ -1,4 +1,6 @@
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.Text;
namespace Recyclarr.Cli.Console.Helpers;
@ -9,13 +11,16 @@ public sealed class EnumDescriptionAttribute<TEnum> : DescriptionAttribute
{
public override string Description { get; }
[SuppressMessage("Globalization", "CA1308:Normalize strings to uppercase")]
public EnumDescriptionAttribute(string description)
{
var enumNames = Enum.GetNames(typeof(TEnum))
.Select(x => x.ToLowerInvariant());
var enumNames = Enum.GetNames(typeof(TEnum)).Select(x => x.ToLowerInvariant());
var str = new StringBuilder(description.Trim());
str.Append($" (Valid Values: {string.Join(", ", enumNames)})");
str.Append(
CultureInfo.InvariantCulture,
$" (Valid Values: {string.Join(", ", enumNames)})"
);
Description = str.ToString();
}
}

4
src/Recyclarr.Cli/Console/Setup/AppDataDirSetupTask.cs
Unescape View File

@ -10,7 +10,5 @@ public class AppDataDirSetupTask(IAppDataSetup appDataSetup) : IGlobalSetupTask
appDataSetup.SetAppDataDirectoryOverride(cmd.AppData ?? "");
}
public void OnFinish()
{
}
public void OnFinish() { }
}

8
src/Recyclarr.Cli/Console/Setup/CommandSetupInterceptor.cs
Unescape View File

@ -8,9 +8,7 @@ internal sealed class CommandSetupInterceptor : ICommandInterceptor, IDisposable
private readonly ConsoleAppCancellationTokenSource _ct = new();
private readonly Lazy<IGlobalSetupTask> _globalTaskSetup;
public CommandSetupInterceptor(
Lazy<ILogger> log,
Lazy<IGlobalSetupTask> globalTaskSetup)
public CommandSetupInterceptor(Lazy<ILogger> log, Lazy<IGlobalSetupTask> globalTaskSetup)
{
_globalTaskSetup = globalTaskSetup;
_ct.CancelPressed.Subscribe(_ => log.Value.Information("Exiting due to signal interrupt"));
@ -21,7 +19,9 @@ internal sealed class CommandSetupInterceptor : ICommandInterceptor, IDisposable
{
if (settings is not BaseCommandSettings cmd)
{
throw new InvalidOperationException("Command settings must be of type BaseCommandSettings");
throw new InvalidOperationException(
"Command settings must be of type BaseCommandSettings"
);
}
cmd.CancellationToken = _ct.Token;

3
src/Recyclarr.Cli/Console/Setup/CompositeGlobalSetupTask.cs
Unescape View File

@ -3,7 +3,8 @@ using Recyclarr.Cli.Console.Commands;
namespace Recyclarr.Cli.Console.Setup;
[UsedImplicitly]
public class CompositeGlobalSetupTask(IOrderedEnumerable<Lazy<IGlobalSetupTask>> tasks) : IGlobalSetupTask
public class CompositeGlobalSetupTask(IOrderedEnumerable<Lazy<IGlobalSetupTask>> tasks)
: IGlobalSetupTask
{
public void OnStart(BaseCommandSettings cmd)
{

11
src/Recyclarr.Cli/Console/Setup/JanitorCleanupTask.cs
Unescape View File

@ -4,12 +4,13 @@ using Recyclarr.Settings;
namespace Recyclarr.Cli.Console.Setup;
public class JanitorCleanupTask(LogJanitor janitor, ILogger log, ISettings<LogJanitorSettings> settings)
: IGlobalSetupTask
public class JanitorCleanupTask(
LogJanitor janitor,
ILogger log,
ISettings<LogJanitorSettings> settings
) : IGlobalSetupTask
{
public void OnStart(BaseCommandSettings cmd)
{
}
public void OnStart(BaseCommandSettings cmd) { }
public void OnFinish()
{

10
src/Recyclarr.Cli/Console/Setup/LoggerSetupTask.cs
Unescape View File

@ -9,21 +9,19 @@ namespace Recyclarr.Cli.Console.Setup;
public class LoggerSetupTask(
LoggingLevelSwitch loggingLevelSwitch,
LoggerFactory loggerFactory,
IEnumerable<ILogConfigurator> logConfigurators)
: IGlobalSetupTask
IEnumerable<ILogConfigurator> logConfigurators
) : IGlobalSetupTask
{
public void OnStart(BaseCommandSettings cmd)
{
loggingLevelSwitch.MinimumLevel = cmd.Debug switch
{
true => LogEventLevel.Debug,
_ => LogEventLevel.Information
_ => LogEventLevel.Information,
};
loggerFactory.AddLogConfiguration(logConfigurators);
}
public void OnFinish()
{
}
public void OnFinish() { }
}

4
src/Recyclarr.Cli/Console/Setup/ProgramInformationDisplayTask.cs
Unescape View File

@ -11,7 +11,5 @@ public class ProgramInformationDisplayTask(ILogger log, IAppPaths paths) : IGlob
log.Debug("App Data Dir: {AppData}", paths.AppDataDirectory);
}
public void OnFinish()
{
}
public void OnFinish() { }
}

2
src/Recyclarr.Cli/GlobalUsings.cs
Unescape View File

@ -1,2 +1,2 @@
global using SuperLinq;
global using Serilog;
global using SuperLinq;

17
src/Recyclarr.Cli/Logging/FileLogSinkConfigurator.cs
Unescape View File

@ -15,12 +15,13 @@ internal class FileLogSinkConfigurator(IAppPaths paths) : ILogConfigurator
var template = BuildExpressionTemplate();
config
.WriteTo.Logger(c => c
.MinimumLevel.Debug()
.WriteTo.File(template, LogFilePath("debug")))
.WriteTo.Logger(c => c
.Filter.ByIncludingOnly(e => e.Level == LogEventLevel.Verbose)
.WriteTo.File(template, LogFilePath("verbose")));
.WriteTo.Logger(c =>
c.MinimumLevel.Debug().WriteTo.File(template, LogFilePath("debug"))
)
.WriteTo.Logger(c =>
c.Filter.ByIncludingOnly(e => e.Level == LogEventLevel.Verbose)
.WriteTo.File(template, LogFilePath("verbose"))
);
return;
@ -32,8 +33,8 @@ internal class FileLogSinkConfigurator(IAppPaths paths) : ILogConfigurator
private static ExpressionTemplate BuildExpressionTemplate()
{
var template = "[{@t:HH:mm:ss} {@l:u3}] " + LogSetup.BaseTemplate +
"{Inspect(@x).StackTrace}";
var template =
"[{@t:HH:mm:ss} {@l:u3}] " + LogSetup.BaseTemplate + "{Inspect(@x).StackTrace}";
return new ExpressionTemplate(template);
}

9
src/Recyclarr.Cli/Logging/LogJanitor.cs
Unescape View File

@ -6,9 +6,12 @@ public class LogJanitor(IAppPaths paths)
{
public void DeleteOldestLogFiles(int numberOfNewestToKeep)
{
foreach (var file in paths.LogDirectory.GetFiles()
.OrderByDescending(f => f.Name)
.Skip(numberOfNewestToKeep))
foreach (
var file in paths
.LogDirectory.GetFiles()
.OrderByDescending(f => f.Name)
.Skip(numberOfNewestToKeep)
)
{
file.Delete();
}

11
src/Recyclarr.Cli/Logging/LoggerFactory.cs
Unescape View File

@ -8,9 +8,11 @@ namespace Recyclarr.Cli.Logging;
public class LoggerFactory(IEnvironment env, LoggingLevelSwitch levelSwitch)
{
public ILogger Logger { get; private set; } = LogSetup.BaseConfiguration()
.WriteTo.Console(BuildExpressionTemplate(env), levelSwitch: levelSwitch)
.CreateLogger();
public ILogger Logger { get; private set; } =
LogSetup
.BaseConfiguration()
.WriteTo.Console(BuildExpressionTemplate(env), levelSwitch: levelSwitch)
.CreateLogger();
private static ExpressionTemplate BuildExpressionTemplate(IEnvironment env)
{
@ -22,8 +24,7 @@ public class LoggerFactory(IEnvironment env, LoggingLevelSwitch levelSwitch)
public void AddLogConfiguration(IEnumerable<ILogConfigurator> configurators)
{
var config = LogSetup.BaseConfiguration()
.WriteTo.Logger(Logger);
var config = LogSetup.BaseConfiguration().WriteTo.Logger(Logger);
foreach (var configurator in configurators)
{

4
src/Recyclarr.Cli/Migration/MigrationException.cs
Unescape View File

@ -3,8 +3,8 @@ namespace Recyclarr.Cli.Migration;
public class MigrationException(
Exception originalException,
string operationDescription,
IReadOnlyCollection<string> remediation)
: Exception
IReadOnlyCollection<string> remediation
) : Exception
{
public Exception OriginalException { get; } = originalException;
public string OperationDescription { get; } = operationDescription;

9
src/Recyclarr.Cli/Migration/MigrationExecutor.cs
Unescape View File

@ -3,8 +3,10 @@ using Spectre.Console;
namespace Recyclarr.Cli.Migration;
public class MigrationExecutor(IOrderedEnumerable<IMigrationStep> migrationSteps, IAnsiConsole console)
: IMigrationExecutor
public class MigrationExecutor(
IOrderedEnumerable<IMigrationStep> migrationSteps,
IAnsiConsole console
) : IMigrationExecutor
{
public void PerformAllMigrationSteps(bool withDiagnostics)
{
@ -49,7 +51,8 @@ public class MigrationExecutor(IOrderedEnumerable<IMigrationStep> migrationSteps
}
console.WriteLine(
"\nRun the `migrate` subcommand to perform the above migration steps automatically\n");
"\nRun the `migrate` subcommand to perform the above migration steps automatically\n"
);
if (wereAnyRequired)
{

8
src/Recyclarr.Cli/Migration/Steps/DeleteRepoDirMigrationStep.cs
Unescape View File

@ -10,10 +10,10 @@ public class DeleteRepoDirMigrationStep(IAppPaths paths) : IMigrationStep
{
public string Description => "Delete old repo directory";
public IReadOnlyCollection<string> Remediation =>
[
$"Ensure Recyclarr has permission to recursively delete {RepoDir}",
$"Delete {RepoDir} manually if Recyclarr can't do it"
];
[
$"Ensure Recyclarr has permission to recursively delete {RepoDir}",
$"Delete {RepoDir} manually if Recyclarr can't do it",
];
public bool Required => false;
private IDirectoryInfo RepoDir => paths.AppDataDirectory.SubDirectory("repo");

19
src/Recyclarr.Cli/Migration/Steps/MoveOsxAppDataDotnet8.cs
Unescape View File

@ -9,21 +9,22 @@ public class MoveOsxAppDataDotnet8(
IAppPaths paths,
IEnvironment env,
IRuntimeInformation runtimeInfo,
IFileSystem fs)
: IMigrationStep
IFileSystem fs
) : IMigrationStep
{
public string Description => "Migrate OSX app data to 'Library/Application Support'";
public IReadOnlyCollection<string> Remediation =>
[
$"Ensure Recyclarr has permission to move {OldAppDataDir} to {NewAppDataDir} and try again",
$"Move {OldAppDataDir} to {NewAppDataDir} manually if Recyclarr can't do it"
];
[
$"Ensure Recyclarr has permission to move {OldAppDataDir} to {NewAppDataDir} and try again",
$"Move {OldAppDataDir} to {NewAppDataDir} manually if Recyclarr can't do it",
];
public bool Required => true;
private IDirectoryInfo OldAppDataDir => fs.DirectoryInfo
.New(env.GetFolderPath(Environment.SpecialFolder.UserProfile))
.SubDirectory(".config", AppPaths.DefaultAppDataDirectoryName);
private IDirectoryInfo OldAppDataDir =>
fs
.DirectoryInfo.New(env.GetFolderPath(Environment.SpecialFolder.UserProfile))
.SubDirectory(".config", AppPaths.DefaultAppDataDirectoryName);
private IDirectoryInfo NewAppDataDir => paths.AppDataDirectory;

27
src/Recyclarr.Cli/Pipelines/CustomFormat/Cache/CustomFormatCache.cs
Unescape View File

@ -9,7 +9,11 @@ public record TrashIdMapping(string TrashId, string CustomFormatName, int Custom
[CacheObjectName("custom-format-cache")]
[SuppressMessage("Design", "CA1002:Do not expose generic lists", Justification = "POCO")]
[SuppressMessage("Usage", "CA2227:Collection properties should be read only", Justification = "POCO")]
[SuppressMessage(
"Usage",
"CA2227:Collection properties should be read only",
Justification = "POCO"
)]
public record CustomFormatCacheObject() : CacheObject(1)
{
public List<TrashIdMapping> TrashIdMappings { get; set; } = [];
@ -24,14 +28,17 @@ public class CustomFormatCache(CustomFormatCacheObject cacheObject) : BaseCache(
// Assume that RemoveStale() is called before this method, and that TrashIdMappings contains existing CFs
// in the remote service that we want to keep and update.
var existingCfs = transactions.UpdatedCustomFormats
.Concat(transactions.UnchangedCustomFormats)
var existingCfs = transactions
.UpdatedCustomFormats.Concat(transactions.UnchangedCustomFormats)
.Concat(transactions.NewCustomFormats);
cacheObject.TrashIdMappings = cacheObject.TrashIdMappings
.DistinctBy(x => x.CustomFormatId)
.Where(x => transactions.DeletedCustomFormats.All(y => y.CustomFormatId != x.CustomFormatId))
.FullOuterHashJoin(existingCfs,
cacheObject.TrashIdMappings = cacheObject
.TrashIdMappings.DistinctBy(x => x.CustomFormatId)
.Where(x =>
transactions.DeletedCustomFormats.All(y => y.CustomFormatId != x.CustomFormatId)
)
.FullOuterHashJoin(
existingCfs,
l => l.CustomFormatId,
r => r.Id,
// Keep existing service CFs, even if they aren't in user config
@ -39,7 +46,8 @@ public class CustomFormatCache(CustomFormatCacheObject cacheObject) : BaseCache(
// Add a new mapping for CFs in user's config
r => new TrashIdMapping(r.TrashId, r.Name, r.Id),
// Update existing mappings for CFs in user's config
(l, r) => l with {TrashId = r.TrashId, CustomFormatName = r.Name})
(l, r) => l with { TrashId = r.TrashId, CustomFormatName = r.Name }
)
.Where(x => x.CustomFormatId != 0)
.OrderBy(x => x.CustomFormatId)
.ToList();
@ -48,7 +56,8 @@ public class CustomFormatCache(CustomFormatCacheObject cacheObject) : BaseCache(
public void RemoveStale(IEnumerable<CustomFormatData> serviceCfs)
{
cacheObject.TrashIdMappings.RemoveAll(x =>
x.CustomFormatId == 0 || serviceCfs.All(y => y.Id != x.CustomFormatId));
x.CustomFormatId == 0 || serviceCfs.All(y => y.Id != x.CustomFormatId)
);
}
public int? FindId(CustomFormatData cf)

4
src/Recyclarr.Cli/Pipelines/CustomFormat/Cache/CustomFormatCachePersister.cs
Unescape View File

@ -6,8 +6,8 @@ namespace Recyclarr.Cli.Pipelines.CustomFormat.Cache;
public class CustomFormatCachePersister(
ILogger log,
ICacheStoragePath storagePath,
IServiceConfiguration config)
: CachePersister<CustomFormatCacheObject, CustomFormatCache>(log, storagePath, config)
IServiceConfiguration config
) : CachePersister<CustomFormatCacheObject, CustomFormatCache>(log, storagePath, config)
{
protected override string CacheName => "Custom Format Cache";

18
src/Recyclarr.Cli/Pipelines/CustomFormat/CustomFormatDataLister.cs
Unescape View File

@ -11,7 +11,7 @@ public class CustomFormatDataLister(IAnsiConsole console, ICustomFormatGuideServ
{
switch (settings)
{
case {ScoreSets: true}:
case { ScoreSets: true }:
ListScoreSets(settings.Service, settings.Raw);
break;
@ -26,13 +26,15 @@ public class CustomFormatDataLister(IAnsiConsole console, ICustomFormatGuideServ
if (!raw)
{
console.WriteLine(
"\nThe following score sets are available. Use these with the `score_set` property in any " +
"quality profile defined under the top-level `quality_profiles` list.");
"\nThe following score sets are available. Use these with the `score_set` property in any "
+ "quality profile defined under the top-level `quality_profiles` list."
);
console.WriteLine();
}
var scoreSets = guide.GetCustomFormatData(serviceType)
var scoreSets = guide
.GetCustomFormatData(serviceType)
.SelectMany(x => x.TrashScores.Keys)
.Distinct(StringComparer.InvariantCultureIgnoreCase)
.Order(StringComparer.InvariantCultureIgnoreCase);
@ -52,7 +54,8 @@ public class CustomFormatDataLister(IAnsiConsole console, ICustomFormatGuideServ
console.WriteLine();
}
var categories = guide.GetCustomFormatData(serviceType)
var categories = guide
.GetCustomFormatData(serviceType)
.Where(x => !string.IsNullOrWhiteSpace(x.TrashId))
.OrderBy(x => x.Name)
.ToLookup(x => x.Category)
@ -75,8 +78,9 @@ public class CustomFormatDataLister(IAnsiConsole console, ICustomFormatGuideServ
if (!raw)
{
console.WriteLine(
"The above Custom Formats are in YAML format and ready to be copied & pasted " +
"under the `trash_ids:` property.");
"The above Custom Formats are in YAML format and ready to be copied & pasted "
+ "under the `trash_ids:` property."
);
}
}
}

5
src/Recyclarr.Cli/Pipelines/CustomFormat/CustomFormatPipelineContext.cs
Unescape View File

@ -10,10 +10,7 @@ public class CustomFormatPipelineContext : IPipelineContext
{
public string PipelineDescription => "Custom Format";
public IReadOnlyCollection<SupportedServices> SupportedServiceTypes { get; } =
[
SupportedServices.Sonarr,
SupportedServices.Radarr
];
[SupportedServices.Sonarr, SupportedServices.Radarr];
public IList<CustomFormatData> ConfigOutput { get; init; } = [];
public IList<CustomFormatData> ApiFetchOutput { get; init; } = [];

23
src/Recyclarr.Cli/Pipelines/CustomFormat/CustomFormatTransactionLogger.cs
Unescape View File

@ -11,10 +11,13 @@ internal class CustomFormatTransactionLogger(ILogger log, NotificationEmitter no
foreach (var (guideCf, conflictingId) in transactions.ConflictingCustomFormats)
{
log.Warning(
"Custom Format with name {Name} (Trash ID: {TrashId}) will be skipped because another " +
"CF already exists with that name (ID: {ConflictId}). To fix the conflict, delete or " +
"rename the CF with the mentioned name",
guideCf.Name, guideCf.TrashId, conflictingId);
"Custom Format with name {Name} (Trash ID: {TrashId}) will be skipped because another "
+ "CF already exists with that name (ID: {ConflictId}). To fix the conflict, delete or "
+ "rename the CF with the mentioned name",
guideCf.Name,
guideCf.TrashId,
conflictingId
);
}
var created = transactions.NewCustomFormats;
@ -43,8 +46,10 @@ internal class CustomFormatTransactionLogger(ILogger log, NotificationEmitter no
if (skipped.Count > 0)
{
log.Information("Skipped {Count} Custom Formats that did not change", skipped.Count);
log.Debug("Custom Formats Skipped: {CustomFormats}",
skipped.ToDictionary(k => k.TrashId, v => v.Name));
log.Debug(
"Custom Formats Skipped: {CustomFormats}",
skipped.ToDictionary(k => k.TrashId, v => v.Name)
);
// Do not print skipped CFs to console; they are too verbose
}
@ -56,7 +61,11 @@ internal class CustomFormatTransactionLogger(ILogger log, NotificationEmitter no
foreach (var mapping in deleted)
{
log.Debug("> Deleted: {TrashId} ({CustomFormatName})", mapping.TrashId, mapping.CustomFormatName);
log.Debug(
"> Deleted: {TrashId} ({CustomFormatName})",
mapping.TrashId,
mapping.CustomFormatName
);
}
}

5
src/Recyclarr.Cli/Pipelines/CustomFormat/Models/ConflictingCustomFormat.cs
Unescape View File

@ -2,7 +2,4 @@ using Recyclarr.TrashGuide.CustomFormat;
namespace Recyclarr.Cli.Pipelines.CustomFormat.Models;
public record ConflictingCustomFormat(
CustomFormatData GuideCf,
int ConflictingId
);
public record ConflictingCustomFormat(CustomFormatData GuideCf, int ConflictingId);

7
src/Recyclarr.Cli/Pipelines/CustomFormat/Models/ProcessedConfigData.cs
Unescape View File

@ -5,9 +5,6 @@ namespace Recyclarr.Cli.Pipelines.CustomFormat.Models;
public class ProcessedConfigData
{
public ICollection<CustomFormatData> CustomFormats { get; init; }
= new List<CustomFormatData>();
public ICollection<AssignScoresToConfig> QualityProfiles { get; init; }
= new List<AssignScoresToConfig>();
public ICollection<CustomFormatData> CustomFormats { get; init; } = [];
public ICollection<AssignScoresToConfig> QualityProfiles { get; init; } = [];
}

4
src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatApiPersistencePhase.cs
Unescape View File

@ -7,8 +7,8 @@ namespace Recyclarr.Cli.Pipelines.CustomFormat.PipelinePhases;
public class CustomFormatApiPersistencePhase(
ICustomFormatApiService api,
ICachePersister<CustomFormatCache> cachePersister)
: IApiPersistencePipelinePhase<CustomFormatPipelineContext>
ICachePersister<CustomFormatCache> cachePersister
) : IApiPersistencePipelinePhase<CustomFormatPipelineContext>
{
public async Task Execute(CustomFormatPipelineContext context, CancellationToken ct)
{

14
src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatConfigPhase.cs
Unescape View File

@ -12,8 +12,8 @@ public class CustomFormatConfigPhase(
ICustomFormatGuideService guide,
ProcessedCustomFormatCache cache,
ICachePersister<CustomFormatCache> cachePersister,
IServiceConfiguration config)
: IConfigPipelinePhase<CustomFormatPipelineContext>
IServiceConfiguration config
) : IConfigPipelinePhase<CustomFormatPipelineContext>
{
public Task Execute(CustomFormatPipelineContext context, CancellationToken ct)
{
@ -24,13 +24,15 @@ public class CustomFormatConfigPhase(
//
// The ToLookup() at the end finds TrashIDs provided in the config that do not match anything in the guide.
// These will yield a warning in the logs.
var processedCfs = config.CustomFormats
.SelectMany(x => x.TrashIds)
var processedCfs = config
.CustomFormats.SelectMany(x => x.TrashIds)
.Distinct(StringComparer.InvariantCultureIgnoreCase)
.GroupJoin(guide.GetCustomFormatData(config.ServiceType),
.GroupJoin(
guide.GetCustomFormatData(config.ServiceType),
x => x,
x => x.TrashId,
(id, cf) => (Id: id, CustomFormats: cf))
(id, cf) => (Id: id, CustomFormats: cf)
)
.ToLookup(x => x.Item2.Any());
context.InvalidFormats = processedCfs[false].Select(x => x.Id).ToList();

10
src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatLogPhase.cs
Unescape View File

@ -10,17 +10,17 @@ internal class CustomFormatLogPhase(CustomFormatTransactionLogger cfLogger, ILog
{
if (context.InvalidFormats.Count != 0)
{
log.Warning("These Custom Formats do not exist in the guide and will be skipped: {Cfs}",
context.InvalidFormats);
log.Warning(
"These Custom Formats do not exist in the guide and will be skipped: {Cfs}",
context.InvalidFormats
);
}
// Do not exit when the config has zero custom formats. We still may need to delete old custom formats.
return false;
}
public void LogTransactionNotices(CustomFormatPipelineContext context)
{
}
public void LogTransactionNotices(CustomFormatPipelineContext context) { }
public void LogPersistenceResults(CustomFormatPipelineContext context)
{

47
src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatTransactionPhase.cs
Unescape View File

@ -15,7 +15,11 @@ public class CustomFormatTransactionPhase(ILogger log, IServiceConfiguration con
foreach (var guideCf in context.ConfigOutput)
{
log.Debug("Process transaction for guide CF {TrashId} ({Name})", guideCf.TrashId, guideCf.Name);
log.Debug(
"Process transaction for guide CF {TrashId} ({Name})",
guideCf.TrashId,
guideCf.Name
);
guideCf.Id = context.Cache.FindId(guideCf) ?? 0;
@ -42,11 +46,14 @@ public class CustomFormatTransactionPhase(ILogger log, IServiceConfiguration con
if (config.DeleteOldCustomFormats)
{
transactions.DeletedCustomFormats.AddRange(context.Cache.TrashIdMappings
// Custom format must be in the cache but NOT in the user's config
.Where(map => context.ConfigOutput.All(cf => cf.TrashId != map.TrashId))
// Also, that cache-only CF must exist in the service (otherwise there is nothing to delete)
.Where(map => context.ApiFetchOutput.Any(cf => cf.Id == map.CustomFormatId)));
transactions.DeletedCustomFormats.AddRange(
context
.Cache.TrashIdMappings
// Custom format must be in the cache but NOT in the user's config
.Where(map => context.ConfigOutput.All(cf => cf.TrashId != map.TrashId))
// Also, that cache-only CF must exist in the service (otherwise there is nothing to delete)
.Where(map => context.ApiFetchOutput.Any(cf => cf.Id == map.CustomFormatId))
);
}
context.TransactionOutput = transactions;
@ -55,7 +62,8 @@ public class CustomFormatTransactionPhase(ILogger log, IServiceConfiguration con
private void ProcessExistingCf(
CustomFormatData guideCf,
CustomFormatData serviceCf,
CustomFormatTransactionData transactions)
CustomFormatTransactionData transactions
)
{
if (config.ReplaceExistingCustomFormats)
{
@ -64,9 +72,12 @@ public class CustomFormatTransactionPhase(ILogger log, IServiceConfiguration con
if (guideCf.Id != serviceCf.Id)
{
log.Debug(
"Format IDs for CF {Name} did not match which indicates a manually-created CF is " +
"replaced, or that the cache is out of sync with the service ({GuideId} != {ServiceId})",
serviceCf.Name, guideCf.Id, serviceCf.Id);
"Format IDs for CF {Name} did not match which indicates a manually-created CF is "
+ "replaced, or that the cache is out of sync with the service ({GuideId} != {ServiceId})",
serviceCf.Name,
guideCf.Id,
serviceCf.Id
);
guideCf.Id = serviceCf.Id;
}
@ -80,7 +91,8 @@ public class CustomFormatTransactionPhase(ILogger log, IServiceConfiguration con
if (guideCf.Id != serviceCf.Id)
{
transactions.ConflictingCustomFormats.Add(
new ConflictingCustomFormat(guideCf, serviceCf.Id));
new ConflictingCustomFormat(guideCf, serviceCf.Id)
);
}
else
{
@ -92,7 +104,8 @@ public class CustomFormatTransactionPhase(ILogger log, IServiceConfiguration con
private static void AddUpdatedCustomFormat(
CustomFormatData guideCf,
CustomFormatData serviceCf,
CustomFormatTransactionData transactions)
CustomFormatTransactionData transactions
)
{
if (guideCf != serviceCf)
{
@ -104,12 +117,18 @@ public class CustomFormatTransactionPhase(ILogger log, IServiceConfiguration con
}
}
private static CustomFormatData? FindServiceCfByName(IEnumerable<CustomFormatData> serviceCfs, string cfName)
private static CustomFormatData? FindServiceCfByName(
IEnumerable<CustomFormatData> serviceCfs,
string cfName
)
{
return serviceCfs.FirstOrDefault(rcf => cfName.EqualsIgnoreCase(rcf.Name));
}
private static CustomFormatData? FindServiceCfById(IEnumerable<CustomFormatData> serviceCfs, int cfId)
private static CustomFormatData? FindServiceCfById(
IEnumerable<CustomFormatData> serviceCfs,
int cfId
)
{
return serviceCfs.FirstOrDefault(rcf => cfId == rcf.Id);
}

5
src/Recyclarr.Cli/Pipelines/Generic/GenericSyncPipeline.cs
Unescape View File

@ -18,7 +18,10 @@ public class GenericSyncPipeline<TContext>(
if (!context.SupportedServiceTypes.Contains(config.ServiceType))
{
log.Debug("Skipping this pipeline because it does not support service type {Service}", config.ServiceType);
log.Debug(
"Skipping this pipeline because it does not support service type {Service}",
config.ServiceType
);
return;
}

49
src/Recyclarr.Cli/Pipelines/MediaNaming/MediaNamingDataLister.cs
Unescape View File

@ -1,13 +1,12 @@
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using Recyclarr.TrashGuide;
using Recyclarr.TrashGuide.MediaNaming;
using Spectre.Console;
namespace Recyclarr.Cli.Pipelines.MediaNaming;
public class MediaNamingDataLister(
IAnsiConsole console,
IMediaNamingGuideService guide)
public class MediaNamingDataLister(IAnsiConsole console, IMediaNamingGuideService guide)
{
public void ListNaming(SupportedServices serviceType)
{
@ -45,19 +44,23 @@ public class MediaNamingDataLister(
console.WriteLine();
console.Write(DictionaryToTableSonarr("Series Folder Format", guideData.Series));
console.WriteLine();
console.Write(DictionaryToTableSonarr("Standard Episode Format", guideData.Episodes.Standard));
console.Write(
DictionaryToTableSonarr("Standard Episode Format", guideData.Episodes.Standard)
);
console.WriteLine();
console.Write(DictionaryToTableSonarr("Daily Episode Format", guideData.Episodes.Daily));
console.WriteLine();
console.Write(DictionaryToTableSonarr("Anime Episode Format", guideData.Episodes.Anime));
}
private static Rows DictionaryToTableRadarr(string title, IReadOnlyDictionary<string, string> formats)
private static Rows DictionaryToTableRadarr(
string title,
IReadOnlyDictionary<string, string> formats
)
{
var table = new Table()
.AddColumns("Key", "Format");
var table = new Table().AddColumns("Key", "Format");
var alternatingColors = new[] {"white", "paleturquoise4"};
var alternatingColors = new[] { "white", "paleturquoise4" };
var colorIndex = 0;
foreach (var (key, value) in formats)
@ -65,19 +68,25 @@ public class MediaNamingDataLister(
var color = alternatingColors[colorIndex];
table.AddRow(
$"[{color}]{Markup.Escape(TransformKey(key))}[/]",
$"[{color}]{Markup.Escape(value)}[/]");
$"[{color}]{Markup.Escape(value)}[/]"
);
colorIndex = 1 - colorIndex;
}
return new Rows(Markup.FromInterpolated($"[orange3]{title}[/]"), table);
return new Rows(
Markup.FromInterpolated(CultureInfo.InvariantCulture, $"[orange3]{title}[/]"),
table
);
}
private static Rows DictionaryToTableSonarr(string title, IReadOnlyDictionary<string, string> formats)
private static Rows DictionaryToTableSonarr(
string title,
IReadOnlyDictionary<string, string> formats
)
{
var table = new Table()
.AddColumns("Key", "Sonarr Version", "Format");
var table = new Table().AddColumns("Key", "Sonarr Version", "Format");
var alternatingColors = new[] {"white", "paleturquoise4"};
var alternatingColors = new[] { "white", "paleturquoise4" };
var colorIndex = 0;
foreach (var (key, value) in formats)
@ -85,19 +94,23 @@ public class MediaNamingDataLister(
var split = key.Split(':');
var version = split switch
{
{Length: 1} => "All",
_ => $"v{split[1]}"
{ Length: 1 } => "All",
_ => $"v{split[1]}",
};
var color = alternatingColors[colorIndex];
table.AddRow(
$"[{color}]{Markup.Escape(split[0])}[/]",
$"[{color}]{Markup.Escape(version)}[/]",
$"[{color}]{Markup.Escape(value)}[/]");
$"[{color}]{Markup.Escape(value)}[/]"
);
colorIndex = 1 - colorIndex;
}
return new Rows(Markup.FromInterpolated($"[orange3]{title}[/]"), table);
return new Rows(
Markup.FromInterpolated(CultureInfo.InvariantCulture, $"[orange3]{title}[/]"),
table
);
}
[SuppressMessage("ReSharper", "ConvertIfStatementToReturnStatement")]

5
src/Recyclarr.Cli/Pipelines/MediaNaming/MediaNamingPipelineContext.cs
Unescape View File

@ -9,10 +9,7 @@ public class MediaNamingPipelineContext : IPipelineContext
{
public string PipelineDescription => "Media Naming";
public IReadOnlyCollection<SupportedServices> SupportedServiceTypes { get; } =
[
SupportedServices.Sonarr,
SupportedServices.Radarr
];
[SupportedServices.Sonarr, SupportedServices.Radarr];
public ProcessedNamingConfig ConfigOutput { get; set; } = default!;
public MediaNamingDto ApiFetchOutput { get; set; } = default!;

11
src/Recyclarr.Cli/Pipelines/MediaNaming/PipelinePhases/Config/NamingFormatLookup.cs
Unescape View File

@ -1,3 +1,5 @@
using System.Diagnostics.CodeAnalysis;
namespace Recyclarr.Cli.Pipelines.MediaNaming.PipelinePhases.Config;
public class NamingFormatLookup
@ -8,16 +10,19 @@ public class NamingFormatLookup
public string? ObtainFormat(
IReadOnlyDictionary<string, string> guideFormats,
string? configFormatKey,
string errorDescription)
string errorDescription
)
{
return ObtainFormat(guideFormats, configFormatKey, null, errorDescription);
}
[SuppressMessage("Globalization", "CA1308:Normalize strings to uppercase")]
public string? ObtainFormat(
IReadOnlyDictionary<string, string> guideFormats,
string? configFormatKey,
string? keySuffix,
string errorDescription)
string errorDescription
)
{
if (configFormatKey is null)
{
@ -28,7 +33,7 @@ public class NamingFormatLookup
// dictionary. The MediaNamingGuideService converts all parsed guide JSON keys to lower case.
var lowerKey = configFormatKey.ToLowerInvariant();
var keys = new List<string> {lowerKey};
var keys = new List<string> { lowerKey };
if (keySuffix is not null)
{
// Put the more specific key first

31
src/Recyclarr.Cli/Pipelines/MediaNaming/PipelinePhases/Config/RadarrMediaNamingConfigPhase.cs
Unescape View File

@ -4,19 +4,32 @@ using Recyclarr.TrashGuide.MediaNaming;
namespace Recyclarr.Cli.Pipelines.MediaNaming.PipelinePhases.Config;
public class RadarrMediaNamingConfigPhase(RadarrConfiguration config) : IServiceBasedMediaNamingConfigPhase
public class RadarrMediaNamingConfigPhase(RadarrConfiguration config)
: IServiceBasedMediaNamingConfigPhase
{
public Task<MediaNamingDto> ProcessNaming(IMediaNamingGuideService guide, NamingFormatLookup lookup)
public Task<MediaNamingDto> ProcessNaming(
IMediaNamingGuideService guide,
NamingFormatLookup lookup
)
{
var guideData = guide.GetRadarrNamingData();
var configData = config.MediaNaming;
return Task.FromResult<MediaNamingDto>(new RadarrMediaNamingDto
{
StandardMovieFormat =
lookup.ObtainFormat(guideData.File, configData.Movie?.Standard, "Standard Movie Format"),
MovieFolderFormat = lookup.ObtainFormat(guideData.Folder, configData.Folder, "Movie Folder Format"),
RenameMovies = configData.Movie?.Rename
});
return Task.FromResult<MediaNamingDto>(
new RadarrMediaNamingDto
{
StandardMovieFormat = lookup.ObtainFormat(
guideData.File,
configData.Movie?.Standard,
"Standard Movie Format"
),
MovieFolderFormat = lookup.ObtainFormat(
guideData.Folder,
configData.Folder,
"Movie Folder Format"
),
RenameMovies = configData.Movie?.Rename,
}
);
}
}

63
src/Recyclarr.Cli/Pipelines/MediaNaming/PipelinePhases/Config/SonarrMediaNamingConfigPhase.cs
Unescape View File

@ -4,34 +4,51 @@ using Recyclarr.TrashGuide.MediaNaming;
namespace Recyclarr.Cli.Pipelines.MediaNaming.PipelinePhases.Config;
public class SonarrMediaNamingConfigPhase(SonarrConfiguration config) : IServiceBasedMediaNamingConfigPhase
public class SonarrMediaNamingConfigPhase(SonarrConfiguration config)
: IServiceBasedMediaNamingConfigPhase
{
public Task<MediaNamingDto> ProcessNaming(IMediaNamingGuideService guide, NamingFormatLookup lookup)
public Task<MediaNamingDto> ProcessNaming(
IMediaNamingGuideService guide,
NamingFormatLookup lookup
)
{
var guideData = guide.GetSonarrNamingData();
var configData = config.MediaNaming;
const string keySuffix = ":4";
return Task.FromResult<MediaNamingDto>(new SonarrMediaNamingDto
{
SeasonFolderFormat = lookup.ObtainFormat(guideData.Season, configData.Season, "Season Folder Format"),
SeriesFolderFormat = lookup.ObtainFormat(guideData.Series, configData.Series, "Series Folder Format"),
StandardEpisodeFormat = lookup.ObtainFormat(
guideData.Episodes.Standard,
configData.Episodes?.Standard,
keySuffix,
"Standard Episode Format"),
DailyEpisodeFormat = lookup.ObtainFormat(
guideData.Episodes.Daily,
configData.Episodes?.Daily,
keySuffix,
"Daily Episode Format"),
AnimeEpisodeFormat = lookup.ObtainFormat(
guideData.Episodes.Anime,
configData.Episodes?.Anime,
keySuffix,
"Anime Episode Format"),
RenameEpisodes = configData.Episodes?.Rename
});
return Task.FromResult<MediaNamingDto>(
new SonarrMediaNamingDto
{
SeasonFolderFormat = lookup.ObtainFormat(
guideData.Season,
configData.Season,
"Season Folder Format"
),
SeriesFolderFormat = lookup.ObtainFormat(
guideData.Series,
configData.Series,
"Series Folder Format"
),
StandardEpisodeFormat = lookup.ObtainFormat(
guideData.Episodes.Standard,
configData.Episodes?.Standard,
keySuffix,
"Standard Episode Format"
),
DailyEpisodeFormat = lookup.ObtainFormat(
guideData.Episodes.Daily,
configData.Episodes?.Daily,
keySuffix,
"Daily Episode Format"
),
AnimeEpisodeFormat = lookup.ObtainFormat(
guideData.Episodes.Anime,
configData.Episodes?.Anime,
keySuffix,
"Anime Episode Format"
),
RenameEpisodes = configData.Episodes?.Rename,
}
);
}
}

3
src/Recyclarr.Cli/Pipelines/MediaNaming/PipelinePhases/MediaNamingApiFetchPhase.cs
Unescape View File

@ -3,7 +3,8 @@ using Recyclarr.ServarrApi.MediaNaming;
namespace Recyclarr.Cli.Pipelines.MediaNaming.PipelinePhases;
public class MediaNamingApiFetchPhase(IMediaNamingApiService api) : IApiFetchPipelinePhase<MediaNamingPipelineContext>
public class MediaNamingApiFetchPhase(IMediaNamingApiService api)
: IApiFetchPipelinePhase<MediaNamingPipelineContext>
{
public async Task Execute(MediaNamingPipelineContext context, CancellationToken ct)
{

12
src/Recyclarr.Cli/Pipelines/MediaNaming/PipelinePhases/MediaNamingConfigPhase.cs
Unescape View File

@ -13,14 +13,14 @@ public record InvalidNamingConfig(string Type, string ConfigValue);
public record ProcessedNamingConfig
{
public required MediaNamingDto Dto { get; init; }
public IReadOnlyCollection<InvalidNamingConfig> InvalidNaming { get; init; } = new List<InvalidNamingConfig>();
public IReadOnlyCollection<InvalidNamingConfig> InvalidNaming { get; init; } = [];
}
public class MediaNamingConfigPhase(
IMediaNamingGuideService guide,
IIndex<SupportedServices, IServiceBasedMediaNamingConfigPhase> configPhaseStrategyFactory,
IServiceConfiguration config)
: IConfigPipelinePhase<MediaNamingPipelineContext>
IServiceConfiguration config
) : IConfigPipelinePhase<MediaNamingPipelineContext>
{
public async Task Execute(MediaNamingPipelineContext context, CancellationToken ct)
{
@ -28,6 +28,10 @@ public class MediaNamingConfigPhase(
var strategy = configPhaseStrategyFactory[config.ServiceType];
var dto = await strategy.ProcessNaming(guide, lookup);
context.ConfigOutput = new ProcessedNamingConfig {Dto = dto, InvalidNaming = lookup.Errors};
context.ConfigOutput = new ProcessedNamingConfig
{
Dto = dto,
InvalidNaming = lookup.Errors,
};
}
}

18
src/Recyclarr.Cli/Pipelines/MediaNaming/PipelinePhases/MediaNamingLogPhase.cs
Unescape View File

@ -16,7 +16,11 @@ public class MediaNamingLogPhase(ILogger log, NotificationEmitter notificationEm
{
foreach (var (topic, invalidValue) in config.InvalidNaming)
{
log.Error("An invalid media naming format is specified for {Topic}: {Value}", topic, invalidValue);
log.Error(
"An invalid media naming format is specified for {Topic}: {Value}",
topic,
invalidValue
);
}
return true;
@ -26,7 +30,9 @@ public class MediaNamingLogPhase(ILogger log, NotificationEmitter notificationEm
{
RadarrMediaNamingDto x => x.GetDifferences(new RadarrMediaNamingDto()),
SonarrMediaNamingDto x => x.GetDifferences(new SonarrMediaNamingDto()),
_ => throw new ArgumentException("Unsupported configuration type in LogConfigPhase method")
_ => throw new ArgumentException(
"Unsupported configuration type in LogConfigPhase method"
),
};
if (differences.Count == 0)
@ -38,9 +44,7 @@ public class MediaNamingLogPhase(ILogger log, NotificationEmitter notificationEm
return false;
}
public void LogTransactionNotices(MediaNamingPipelineContext context)
{
}
public void LogTransactionNotices(MediaNamingPipelineContext context) { }
public void LogPersistenceResults(MediaNamingPipelineContext context)
{
@ -48,7 +52,9 @@ public class MediaNamingLogPhase(ILogger log, NotificationEmitter notificationEm
{
RadarrMediaNamingDto x => x.GetDifferences(context.TransactionOutput),
SonarrMediaNamingDto x => x.GetDifferences(context.TransactionOutput),
_ => throw new ArgumentException("Unsupported configuration type in LogPersistenceResults method")
_ => throw new ArgumentException(
"Unsupported configuration type in LogPersistenceResults method"
),
};
if (differences.Count != 0)

3
src/Recyclarr.Cli/Pipelines/MediaNaming/PipelinePhases/MediaNamingPreviewPhase.cs
Unescape View File

@ -4,7 +4,8 @@ using Spectre.Console;
namespace Recyclarr.Cli.Pipelines.MediaNaming.PipelinePhases;
public class MediaNamingPreviewPhase(IAnsiConsole console) : IPreviewPipelinePhase<MediaNamingPipelineContext>
public class MediaNamingPreviewPhase(IAnsiConsole console)
: IPreviewPipelinePhase<MediaNamingPipelineContext>
{
private Table? _table;

22
src/Recyclarr.Cli/Pipelines/MediaNaming/PipelinePhases/MediaNamingTransactionPhase.cs
Unescape View File

@ -11,24 +11,32 @@ public class MediaNamingTransactionPhase : ITransactionPipelinePhase<MediaNaming
{
RadarrMediaNamingDto dto => UpdateRadarrDto(dto, context.ConfigOutput),
SonarrMediaNamingDto dto => UpdateSonarrDto(dto, context.ConfigOutput),
_ => throw new ArgumentException("Config type not supported in media naming transation phase")
_ => throw new ArgumentException(
"Config type not supported in media naming transation phase"
),
};
}
private static RadarrMediaNamingDto UpdateRadarrDto(RadarrMediaNamingDto serviceDto, ProcessedNamingConfig config)
private static RadarrMediaNamingDto UpdateRadarrDto(
RadarrMediaNamingDto serviceDto,
ProcessedNamingConfig config
)
{
var configDto = (RadarrMediaNamingDto) config.Dto;
var configDto = (RadarrMediaNamingDto)config.Dto;
return serviceDto with
{
RenameMovies = configDto.RenameMovies,
MovieFolderFormat = configDto.MovieFolderFormat,
StandardMovieFormat = configDto.StandardMovieFormat
StandardMovieFormat = configDto.StandardMovieFormat,
};
}
private static SonarrMediaNamingDto UpdateSonarrDto(SonarrMediaNamingDto serviceDto, ProcessedNamingConfig config)
private static SonarrMediaNamingDto UpdateSonarrDto(
SonarrMediaNamingDto serviceDto,
ProcessedNamingConfig config
)
{
var configDto = (SonarrMediaNamingDto) config.Dto;
var configDto = (SonarrMediaNamingDto)config.Dto;
return serviceDto with
{
RenameEpisodes = configDto.RenameEpisodes,
@ -36,7 +44,7 @@ public class MediaNamingTransactionPhase : ITransactionPipelinePhase<MediaNaming
SeasonFolderFormat = configDto.SeasonFolderFormat,
StandardEpisodeFormat = configDto.StandardEpisodeFormat,
DailyEpisodeFormat = configDto.DailyEpisodeFormat,
AnimeEpisodeFormat = configDto.AnimeEpisodeFormat
AnimeEpisodeFormat = configDto.AnimeEpisodeFormat,
};
}
}

45
src/Recyclarr.Cli/Pipelines/PipelineAutofacModule.cs
Unescape View File

@ -26,13 +26,15 @@ public class PipelineAutofacModule : Module
{
builder.RegisterGeneric(typeof(GenericPipelinePhases<>));
builder.RegisterComposite<CompositeSyncPipeline, ISyncPipeline>();
builder.RegisterTypes(
builder
.RegisterTypes(
// ORDER HERE IS IMPORTANT!
// There are indirect dependencies between pipelines.
typeof(GenericSyncPipeline<CustomFormatPipelineContext>),
typeof(GenericSyncPipeline<QualityProfilePipelineContext>),
typeof(GenericSyncPipeline<QualitySizePipelineContext>),
typeof(GenericSyncPipeline<MediaNamingPipelineContext>))
typeof(GenericSyncPipeline<MediaNamingPipelineContext>)
)
.As<ISyncPipeline>()
.OrderByRegistration();
@ -46,18 +48,22 @@ public class PipelineAutofacModule : Module
{
builder.RegisterType<MediaNamingDataLister>();
builder.RegisterType<RadarrMediaNamingConfigPhase>()
builder
.RegisterType<RadarrMediaNamingConfigPhase>()
.Keyed<IServiceBasedMediaNamingConfigPhase>(SupportedServices.Radarr);
builder.RegisterType<SonarrMediaNamingConfigPhase>()
builder
.RegisterType<SonarrMediaNamingConfigPhase>()
.Keyed<IServiceBasedMediaNamingConfigPhase>(SupportedServices.Sonarr);
builder.RegisterTypes(
builder
.RegisterTypes(
typeof(MediaNamingConfigPhase),
typeof(MediaNamingApiFetchPhase),
typeof(MediaNamingTransactionPhase),
typeof(MediaNamingPreviewPhase),
typeof(MediaNamingApiPersistencePhase),
typeof(MediaNamingLogPhase))
typeof(MediaNamingLogPhase)
)
.AsImplementedInterfaces();
}
@ -65,13 +71,15 @@ public class PipelineAutofacModule : Module
{
builder.RegisterType<QualityProfileStatCalculator>();
builder.RegisterTypes(
builder
.RegisterTypes(
typeof(QualityProfileConfigPhase),
typeof(QualityProfilePreviewPhase),
typeof(QualityProfileApiFetchPhase),
typeof(QualityProfileTransactionPhase),
typeof(QualityProfileApiPersistencePhase),
typeof(QualityProfileLogPhase))
typeof(QualityProfileLogPhase)
)
.AsImplementedInterfaces();
}
@ -81,26 +89,31 @@ public class PipelineAutofacModule : Module
// Setup factory for creation of concrete IQualityItemLimits types
builder.RegisterType<QualityItemLimitFactory>().As<IQualityItemLimitFactory>();
builder.RegisterType<RadarrQualityItemLimitFetcher>()
builder
.RegisterType<RadarrQualityItemLimitFetcher>()
.Keyed<IQualityItemLimitFetcher>(SupportedServices.Radarr)
.InstancePerLifetimeScope();
builder.RegisterType<SonarrQualityItemLimitFetcher>()
builder
.RegisterType<SonarrQualityItemLimitFetcher>()
.Keyed<IQualityItemLimitFetcher>(SupportedServices.Sonarr)
.InstancePerLifetimeScope();
builder.RegisterTypes(
builder
.RegisterTypes(
typeof(QualitySizeConfigPhase),
typeof(QualitySizePreviewPhase),
typeof(QualitySizeApiFetchPhase),
typeof(QualitySizeTransactionPhase),
typeof(QualitySizeApiPersistencePhase),
typeof(QualitySizeLogPhase))
typeof(QualitySizeLogPhase)
)
.AsImplementedInterfaces();
}
private static void RegisterCustomFormat(ContainerBuilder builder)
{
builder.RegisterType<ProcessedCustomFormatCache>()
builder
.RegisterType<ProcessedCustomFormatCache>()
.As<IPipelineCache>()
.AsSelf()
.InstancePerLifetimeScope();
@ -109,13 +122,15 @@ public class PipelineAutofacModule : Module
builder.RegisterType<CustomFormatCachePersister>().As<ICachePersister<CustomFormatCache>>();
builder.RegisterType<CustomFormatTransactionLogger>();
builder.RegisterTypes(
builder
.RegisterTypes(
typeof(CustomFormatConfigPhase),
typeof(CustomFormatApiFetchPhase),
typeof(CustomFormatTransactionPhase),
typeof(CustomFormatPreviewPhase),
typeof(CustomFormatApiPersistencePhase),
typeof(CustomFormatLogPhase))
typeof(CustomFormatLogPhase)
)
.AsImplementedInterfaces();
}
}

4
src/Recyclarr.Cli/Pipelines/QualityProfile/Models/ProcessedQualityProfileData.cs
Unescape View File

@ -9,6 +9,6 @@ public record ProcessedQualityProfileData
{
public required QualityProfileConfig Profile { get; init; }
public bool ShouldCreate { get; init; } = true;
public IList<ProcessedQualityProfileScore> CfScores { get; init; } = new List<ProcessedQualityProfileScore>();
public IList<CustomFormatData> ScorelessCfs { get; } = new List<CustomFormatData>();
public IList<ProcessedQualityProfileScore> CfScores { get; init; } = [];
public IList<CustomFormatData> ScorelessCfs { get; } = [];
}

13
src/Recyclarr.Cli/Pipelines/QualityProfile/Models/QualityProfileTransactionData.cs
Unescape View File

@ -3,13 +3,16 @@ using FluentValidation.Results;
namespace Recyclarr.Cli.Pipelines.QualityProfile.Models;
public record InvalidProfileData(UpdatedQualityProfile Profile, IReadOnlyCollection<ValidationFailure> Errors);
public record InvalidProfileData(
UpdatedQualityProfile Profile,
IReadOnlyCollection<ValidationFailure> Errors
);
[SuppressMessage("Usage", "CA2227:Collection properties should be read only")]
public record QualityProfileTransactionData
{
public ICollection<string> NonExistentProfiles { get; init; } = new List<string>();
public ICollection<InvalidProfileData> InvalidProfiles { get; init; } = new List<InvalidProfileData>();
public ICollection<ProfileWithStats> UnchangedProfiles { get; set; } = new List<ProfileWithStats>();
public ICollection<ProfileWithStats> ChangedProfiles { get; set; } = new List<ProfileWithStats>();
public ICollection<string> NonExistentProfiles { get; init; } = [];
public ICollection<InvalidProfileData> InvalidProfiles { get; init; } = [];
public ICollection<ProfileWithStats> UnchangedProfiles { get; set; } = [];
public ICollection<ProfileWithStats> ChangedProfiles { get; set; } = [];
}

2
src/Recyclarr.Cli/Pipelines/QualityProfile/Models/QualityProfileUpdateReason.cs
Unescape View File

@ -3,5 +3,5 @@ namespace Recyclarr.Cli.Pipelines.QualityProfile.Models;
public enum QualityProfileUpdateReason
{
New,
Changed
Changed,
}

5
src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileApiFetchPhase.cs
Unescape View File

@ -3,7 +3,10 @@ using Recyclarr.ServarrApi.QualityProfile;
namespace Recyclarr.Cli.Pipelines.QualityProfile.PipelinePhases;
public record QualityProfileServiceData(IReadOnlyList<QualityProfileDto> Profiles, QualityProfileDto Schema);
public record QualityProfileServiceData(
IReadOnlyList<QualityProfileDto> Profiles,
QualityProfileDto Schema
);
public class QualityProfileApiFetchPhase(IQualityProfileApiService api)
: IApiFetchPipelinePhase<QualityProfilePipelineContext>

4
src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileApiPersistencePhase.cs
Unescape View File

@ -25,7 +25,9 @@ public class QualityProfileApiPersistencePhase(IQualityProfileApiService api)
break;
default:
throw new InvalidOperationException($"Unsupported UpdateReason: {profile.UpdateReason}");
throw new InvalidOperationException(
$"Unsupported UpdateReason: {profile.UpdateReason}"
);
}
}
}

82
src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileConfigPhase.cs
Unescape View File

@ -7,42 +7,45 @@ using Recyclarr.TrashGuide.CustomFormat;
namespace Recyclarr.Cli.Pipelines.QualityProfile.PipelinePhases;
public class QualityProfileConfigPhase(ILogger log, ProcessedCustomFormatCache cache, IServiceConfiguration config)
: IConfigPipelinePhase<QualityProfilePipelineContext>
public class QualityProfileConfigPhase(
ILogger log,
ProcessedCustomFormatCache cache,
IServiceConfiguration config
) : IConfigPipelinePhase<QualityProfilePipelineContext>
{
public Task Execute(QualityProfilePipelineContext context, CancellationToken ct)
{
// 1. For each group of CFs that has a quality profile specified
// 2. For each quality profile score config in that CF group
// 3. For each CF in the group above, match it to a Guide CF object and pair it with the quality profile config
var profileAndCfs = config.CustomFormats
.SelectMany(x => x.AssignScoresTo
.Select(y => (Profile: y, x.TrashIds)))
.SelectMany(x => x.TrashIds
.Select(cache.LookupByTrashId)
.NotNull()
.Select(y => (x.Profile, Cf: y)));
var allProfiles = config.QualityProfiles
.Select(x => new ProcessedQualityProfileData {Profile = x})
var profileAndCfs = config
.CustomFormats.SelectMany(x => x.AssignScoresTo.Select(y => (Profile: y, x.TrashIds)))
.SelectMany(x =>
x.TrashIds.Select(cache.LookupByTrashId).NotNull().Select(y => (x.Profile, Cf: y))
);
var allProfiles = config
.QualityProfiles.Select(x => new ProcessedQualityProfileData { Profile = x })
.ToDictionary(x => x.Profile.Name, x => x, StringComparer.InvariantCultureIgnoreCase);
foreach (var (profile, cf) in profileAndCfs)
{
if (!allProfiles.TryGetValue(profile.Name, out var profileCfs))
{
log.Debug("Implicitly adding quality profile config for {ProfileName}", profile.Name);
log.Debug(
"Implicitly adding quality profile config for {ProfileName}",
profile.Name
);
// If the user did not specify a quality profile in their config, we still create the QP object
// for consistency (at the very least for the name).
allProfiles[profile.Name] = profileCfs =
new ProcessedQualityProfileData
{
Profile = new QualityProfileConfig {Name = profile.Name},
// The user must explicitly specify a profile in the top-level `quality_profiles` section of
// their config, otherwise we do not implicitly create them in the service.
ShouldCreate = false
};
allProfiles[profile.Name] = profileCfs = new ProcessedQualityProfileData
{
Profile = new QualityProfileConfig { Name = profile.Name },
// The user must explicitly specify a profile in the top-level `quality_profiles` section of
// their config, otherwise we do not implicitly create them in the service.
ShouldCreate = false,
};
}
AddCustomFormatScoreData(profileCfs, profile, cf);
@ -68,14 +71,19 @@ public class QualityProfileConfigPhase(ILogger log, ProcessedCustomFormatCache c
foreach (var (name, trashId) in scoreless)
{
log.Debug("CF has no score in the guide or config YAML: {Name} ({TrashId})", name, trashId);
log.Debug(
"CF has no score in the guide or config YAML: {Name} ({TrashId})",
name,
trashId
);
}
}
private void AddCustomFormatScoreData(
ProcessedQualityProfileData profile,
AssignScoresToConfig scoreConfig,
CustomFormatData cf)
CustomFormatData cf
)
{
var existingScoreData = profile.CfScores;
@ -86,15 +94,22 @@ public class QualityProfileConfigPhase(ILogger log, ProcessedCustomFormatCache c
return;
}
var existingScore = existingScoreData.FirstOrDefault(x => x.TrashId.EqualsIgnoreCase(cf.TrashId));
var existingScore = existingScoreData.FirstOrDefault(x =>
x.TrashId.EqualsIgnoreCase(cf.TrashId)
);
if (existingScore is not null)
{
if (existingScore.Score != scoreToUse)
{
log.Warning(
"Custom format {Name} ({TrashId}) is duplicated in quality profile {ProfileName} with a score " +
"of {NewScore}, which is different from the original score of {OriginalScore}",
cf.Name, cf.TrashId, scoreConfig.Name, scoreToUse, existingScore.Score);
"Custom format {Name} ({TrashId}) is duplicated in quality profile {ProfileName} with a score "
+ "of {NewScore}, which is different from the original score of {OriginalScore}",
cf.Name,
cf.TrashId,
scoreConfig.Name,
scoreToUse,
existingScore.Score
);
}
else
{
@ -104,13 +119,16 @@ public class QualityProfileConfigPhase(ILogger log, ProcessedCustomFormatCache c
return;
}
existingScoreData.Add(new ProcessedQualityProfileScore(cf.TrashId, cf.Name, cf.Id, scoreToUse.Value));
existingScoreData.Add(
new ProcessedQualityProfileScore(cf.TrashId, cf.Name, cf.Id, scoreToUse.Value)
);
}
private int? DetermineScore(
QualityProfileConfig profile,
AssignScoresToConfig scoreConfig,
CustomFormatData cf)
CustomFormatData cf
)
{
if (scoreConfig.Score is not null)
{
@ -124,7 +142,11 @@ public class QualityProfileConfigPhase(ILogger log, ProcessedCustomFormatCache c
return scoreFromSet;
}
log.Debug("CF {CfName} has no Score Set with name '{ScoreSetName}'", cf.Name, profile.ScoreSet);
log.Debug(
"CF {CfName} has no Score Set with name '{ScoreSetName}'",
cf.Name,
profile.ScoreSet
);
}
return cf.DefaultScore;

67
src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileLogPhase.cs
Unescape View File

@ -8,8 +8,8 @@ namespace Recyclarr.Cli.Pipelines.QualityProfile.PipelinePhases;
public class QualityProfileLogPhase(
ILogger log,
ValidationLogger validationLogger,
NotificationEmitter notificationEmitter)
: ILogPipelinePhase<QualityProfilePipelineContext>
NotificationEmitter notificationEmitter
) : ILogPipelinePhase<QualityProfilePipelineContext>
{
public bool LogConfigPhaseAndExitIfNeeded(QualityProfilePipelineContext context)
{
@ -29,17 +29,20 @@ public class QualityProfileLogPhase(
if (transactions.NonExistentProfiles.Count > 0)
{
log.Warning(
"The following quality profile names have no definition in the top-level `quality_profiles` " +
"list *and* do not exist in the remote service. Either create them manually in the service *or* add " +
"them to the top-level `quality_profiles` section so that Recyclarr can create the profiles for " +
"you: {QualityProfileNames}", transactions.NonExistentProfiles);
"The following quality profile names have no definition in the top-level `quality_profiles` "
+ "list *and* do not exist in the remote service. Either create them manually in the service *or* add "
+ "them to the top-level `quality_profiles` section so that Recyclarr can create the profiles for "
+ "you: {QualityProfileNames}",
transactions.NonExistentProfiles
);
}
if (transactions.InvalidProfiles.Count > 0)
{
log.Warning(
"The following validation errors occurred for one or more quality profiles. " +
"These profiles will *not* be synced");
"The following validation errors occurred for one or more quality profiles. "
+ "These profiles will *not* be synced"
);
foreach (var (profile, errors) in transactions.InvalidProfiles)
{
@ -54,24 +57,33 @@ public class QualityProfileLogPhase(
var invalidQualityNames = profile.UpdatedQualities.InvalidQualityNames;
if (invalidQualityNames.Count != 0)
{
log.Warning("Quality profile '{ProfileName}' references invalid quality names: {InvalidNames}",
profile.ProfileName, invalidQualityNames);
log.Warning(
"Quality profile '{ProfileName}' references invalid quality names: {InvalidNames}",
profile.ProfileName,
invalidQualityNames
);
}
var invalidCfExceptNames = profile.InvalidExceptCfNames;
if (invalidCfExceptNames.Count != 0)
{
log.Warning(
"`except` under `reset_unmatched_scores` in quality profile '{ProfileName}' has invalid " +
"CF names: {CfNames}", profile.ProfileName, invalidCfExceptNames);
"`except` under `reset_unmatched_scores` in quality profile '{ProfileName}' has invalid "
+ "CF names: {CfNames}",
profile.ProfileName,
invalidCfExceptNames
);
}
var missingQualities = profile.MissingQualities;
if (missingQualities.Count != 0)
{
log.Information(
"Recyclarr detected that the following required qualities are missing from profile " +
"'{ProfileName}' and will re-add them: {QualityNames}", profile.ProfileName, missingQualities);
"Recyclarr detected that the following required qualities are missing from profile "
+ "'{ProfileName}' and will re-add them: {QualityNames}",
profile.ProfileName,
missingQualities
);
}
}
}
@ -84,8 +96,10 @@ public class QualityProfileLogPhase(
var unchangedProfiles = context.TransactionOutput.UnchangedProfiles;
if (unchangedProfiles.Count != 0)
{
log.Debug("These profiles have no changes and will not be persisted: {Profiles}",
unchangedProfiles.Select(x => x.Profile.ProfileName));
log.Debug(
"These profiles have no changes and will not be persisted: {Profiles}",
unchangedProfiles.Select(x => x.Profile.ProfileName)
);
}
var createdProfiles = changedProfiles
@ -95,7 +109,11 @@ public class QualityProfileLogPhase(
if (createdProfiles.Count > 0)
{
log.Information("Created {Count} Profiles: {Names}", createdProfiles.Count, createdProfiles);
log.Information(
"Created {Count} Profiles: {Names}",
createdProfiles.Count,
createdProfiles
);
}
var updatedProfiles = changedProfiles
@ -105,7 +123,11 @@ public class QualityProfileLogPhase(
if (updatedProfiles.Count > 0)
{
log.Information("Updated {Count} Profiles: {Names}", updatedProfiles.Count, updatedProfiles);
log.Information(
"Updated {Count} Profiles: {Names}",
updatedProfiles.Count,
updatedProfiles
);
}
if (changedProfiles.Count != 0)
@ -115,9 +137,12 @@ public class QualityProfileLogPhase(
var numScores = changedProfiles.Count(x => x.ScoresChanged);
log.Information(
"A total of {NumProfiles} profiles were synced. {NumQuality} contain quality changes and " +
"{NumScores} contain updated scores",
numProfiles, numQuality, numScores);
"A total of {NumProfiles} profiles were synced. {NumQuality} contain quality changes and "
+ "{NumScores} contain updated scores",
numProfiles,
numQuality,
numScores
);
notificationEmitter.SendStatistic("Quality Profiles Synced", numProfiles);
}

78
src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfilePreviewPhase.cs
Unescape View File

@ -1,3 +1,4 @@
using System.Globalization;
using Recyclarr.Cli.Pipelines.Generic;
using Recyclarr.ServarrApi.QualityProfile;
using Spectre.Console;
@ -5,7 +6,8 @@ using Spectre.Console.Rendering;
namespace Recyclarr.Cli.Pipelines.QualityProfile.PipelinePhases;
public class QualityProfilePreviewPhase(IAnsiConsole console) : IPreviewPipelinePhase<QualityProfilePipelineContext>
public class QualityProfilePreviewPhase(IAnsiConsole console)
: IPreviewPipelinePhase<QualityProfilePipelineContext>
{
public void Execute(QualityProfilePipelineContext context)
{
@ -13,21 +15,25 @@ public class QualityProfilePreviewPhase(IAnsiConsole console) : IPreviewPipeline
foreach (var profile in context.TransactionOutput.ChangedProfiles.Select(x => x.Profile))
{
var profileTree = new Tree(Markup.FromInterpolated(
$"[yellow]{profile.ProfileName}[/] (Change Reason: [green]{profile.UpdateReason}[/])"));
var profileTree = new Tree(
Markup.FromInterpolated(
CultureInfo.InvariantCulture,
$"[yellow]{profile.ProfileName}[/] (Change Reason: [green]{profile.UpdateReason}[/])"
)
);
profileTree.AddNode(new Rows(
new Markup("[b]Profile Updates[/]"),
SetupProfileTable(profile)));
profileTree.AddNode(
new Rows(new Markup("[b]Profile Updates[/]"), SetupProfileTable(profile))
);
if (profile.ProfileConfig.Profile.Qualities.Count != 0)
{
profileTree.AddNode(SetupQualityItemTable(profile));
}
profileTree.AddNode(new Rows(
new Markup("[b]Score Updates[/]"),
SetupScoreTable(profile)));
profileTree.AddNode(
new Rows(new Markup("[b]Score Updates[/]"), SetupScoreTable(profile))
);
tree.AddNode(profileTree);
}
@ -48,19 +54,31 @@ public class QualityProfilePreviewPhase(IAnsiConsole console) : IPreviewPipeline
var newDto = profile.BuildUpdatedDto();
table.AddRow("Name", oldDto.Name, newDto.Name);
table.AddRow("Upgrades Allowed?", YesNo(oldDto.UpgradeAllowed), YesNo(newDto.UpgradeAllowed));
table.AddRow("Minimum Format Score", Null(oldDto.MinFormatScore), Null(newDto.MinFormatScore));
table.AddRow(
"Upgrades Allowed?",
YesNo(oldDto.UpgradeAllowed),
YesNo(newDto.UpgradeAllowed)
);
table.AddRow(
"Minimum Format Score",
Null(oldDto.MinFormatScore),
Null(newDto.MinFormatScore)
);
// ReSharper disable once InvertIf
if (newDto.UpgradeAllowed is true)
{
table.AddRow("Upgrade Until Quality",
table.AddRow(
"Upgrade Until Quality",
Null(oldDto.Items.FindCutoff(oldDto.Cutoff)),
Null(newDto.Items.FindCutoff(newDto.Cutoff)));
Null(newDto.Items.FindCutoff(newDto.Cutoff))
);
table.AddRow("Upgrade Until Score",
table.AddRow(
"Upgrade Until Score",
Null(oldDto.CutoffFormatScore),
Null(newDto.CutoffFormatScore));
Null(newDto.CutoffFormatScore)
);
}
return table;
@ -75,7 +93,7 @@ public class QualityProfilePreviewPhase(IAnsiConsole console) : IPreviewPipeline
{
var allowedChar = item.Allowed is true ? ":check_mark:" : ":cross_mark:";
var name = item.Quality?.Name ?? item.Name ?? "NO NAME!";
return Markup.FromInterpolated($"{allowedChar} {name}");
return Markup.FromInterpolated(CultureInfo.InvariantCulture, $"{allowedChar} {name}");
}
static IRenderable BuildTree(ProfileItemDto item)
@ -96,8 +114,11 @@ public class QualityProfilePreviewPhase(IAnsiConsole console) : IPreviewPipeline
static IRenderable MakeTree(IEnumerable<ProfileItemDto> items, string header)
{
var headerMarkup = Markup.FromInterpolated($"[bold][underline]{header}[/][/]");
var rows = new Rows(new[] {headerMarkup}.Concat(items.Select(MakeNode)));
var headerMarkup = Markup.FromInterpolated(
CultureInfo.InvariantCulture,
$"[bold][underline]{header}[/][/]"
);
var rows = new Rows(new[] { headerMarkup }.Concat(items.Select(MakeNode)));
var panel = new Panel(rows).NoBorder();
panel.Width = 23;
return panel;
@ -112,14 +133,20 @@ public class QualityProfilePreviewPhase(IAnsiConsole console) : IPreviewPipeline
var sortMode = profile.ProfileConfig.Profile.QualitySort;
return new Rows(
Markup.FromInterpolated($"[b]Quality Updates (Sort Mode: [green]{sortMode}[/])[/]"),
table);
Markup.FromInterpolated(
CultureInfo.InvariantCulture,
$"[b]Quality Updates (Sort Mode: [green]{sortMode}[/])[/]"
),
table
);
}
private static IRenderable SetupScoreTable(UpdatedQualityProfile profile)
{
var updatedScores = profile.UpdatedScores
.Where(x => x.Reason != FormatScoreUpdateReason.NoChange && x.Dto.Score != x.NewScore)
var updatedScores = profile
.UpdatedScores.Where(x =>
x.Reason != FormatScoreUpdateReason.NoChange && x.Dto.Score != x.NewScore
)
.ToList();
if (updatedScores.Count == 0)
@ -137,9 +164,10 @@ public class QualityProfilePreviewPhase(IAnsiConsole console) : IPreviewPipeline
{
table.AddRow(
score.Dto.Name,
score.Dto.Score.ToString(),
score.NewScore.ToString(),
score.Reason.ToString());
score.Dto.Score.ToString(CultureInfo.InvariantCulture),
score.NewScore.ToString(CultureInfo.InvariantCulture),
score.Reason.ToString()
);
}
return table;

77
src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileTransactionPhase.cs
Unescape View File

@ -14,7 +14,11 @@ public class QualityProfileTransactionPhase(QualityProfileStatCalculator statCal
{
var transactions = new QualityProfileTransactionData();
var updatedProfiles = BuildUpdatedProfiles(transactions, context.ConfigOutput, context.ApiFetchOutput);
var updatedProfiles = BuildUpdatedProfiles(
transactions,
context.ConfigOutput,
context.ApiFetchOutput
);
UpdateProfileScores(updatedProfiles);
updatedProfiles = ValidateProfiles(updatedProfiles, transactions.InvalidProfiles);
@ -25,7 +29,8 @@ public class QualityProfileTransactionPhase(QualityProfileStatCalculator statCal
private void AssignProfiles(
QualityProfileTransactionData transactions,
IEnumerable<UpdatedQualityProfile> updatedProfiles)
IEnumerable<UpdatedQualityProfile> updatedProfiles
)
{
var profilesWithStats = updatedProfiles
.Select(statCalculator.Calculate)
@ -37,31 +42,36 @@ public class QualityProfileTransactionPhase(QualityProfileStatCalculator statCal
private static List<UpdatedQualityProfile> ValidateProfiles(
IEnumerable<UpdatedQualityProfile> transactions,
ICollection<InvalidProfileData> invalidProfiles)
ICollection<InvalidProfileData> invalidProfiles
)
{
var validator = new UpdatedQualityProfileValidator();
return transactions
.IsValid(validator, (errors, profile) =>
invalidProfiles.Add(new InvalidProfileData(profile, errors)))
.IsValid(
validator,
(errors, profile) => invalidProfiles.Add(new InvalidProfileData(profile, errors))
)
.ToList();
}
private static List<UpdatedQualityProfile> BuildUpdatedProfiles(
QualityProfileTransactionData transactions,
IEnumerable<ProcessedQualityProfileData> processedConfig,
QualityProfileServiceData serviceData)
QualityProfileServiceData serviceData
)
{
// Match quality profiles in the user's config to profiles in the service.
// For each match, we return a tuple including the list of custom format scores ("formatItems").
// Using GroupJoin() because we want a LEFT OUTER JOIN so we can list which quality profiles in config
// do not match profiles in Radarr.
var matchedProfiles = processedConfig
.GroupJoin(serviceData.Profiles,
x => x.Profile.Name,
x => x.Name,
(x, y) => (x, y.FirstOrDefault()),
StringComparer.InvariantCultureIgnoreCase);
var matchedProfiles = processedConfig.GroupJoin(
serviceData.Profiles,
x => x.Profile.Name,
x => x.Name,
(x, y) => (x, y.FirstOrDefault()),
StringComparer.InvariantCultureIgnoreCase
);
var updatedProfiles = new List<UpdatedQualityProfile>();
@ -90,13 +100,15 @@ public class QualityProfileTransactionPhase(QualityProfileStatCalculator statCal
void AddDto(QualityProfileDto newDto, QualityProfileUpdateReason reason)
{
updatedProfiles.Add(new UpdatedQualityProfile
{
ProfileConfig = config,
ProfileDto = newDto,
UpdateReason = reason,
UpdatedQualities = organizer.OrganizeItems(newDto, config.Profile)
});
updatedProfiles.Add(
new UpdatedQualityProfile
{
ProfileConfig = config,
ProfileDto = newDto,
UpdateReason = reason,
UpdatedQualities = organizer.OrganizeItems(newDto, config.Profile),
}
);
}
}
@ -105,7 +117,8 @@ public class QualityProfileTransactionPhase(QualityProfileStatCalculator statCal
private static List<string> FixupMissingQualities(
QualityProfileDto dto,
QualityProfileDto schema)
QualityProfileDto schema
)
{
// There's a very rare bug in Sonarr & Radarr that results in core qualities being lost in an existing profile.
// It's unclear how this happens; but what ends up happening is that you get an error "Must contain all
@ -115,9 +128,9 @@ public class QualityProfileTransactionPhase(QualityProfileStatCalculator statCal
// so there's value in having Recyclarr transparently fix this for users.
//
// See: https://github.com/Radarr/Radarr/issues/9738
var missingQualities = schema.Items.FlattenQualities().LeftOuterHashJoin(dto.Items.FlattenQualities(),
l => l.Quality!.Id,
r => r.Quality!.Id)
var missingQualities = schema
.Items.FlattenQualities()
.LeftOuterHashJoin(dto.Items.FlattenQualities(), l => l.Quality!.Id, r => r.Quality!.Id)
.Where(x => x.Right is null)
.Select(x => x.Left)
.ToList();
@ -131,7 +144,9 @@ public class QualityProfileTransactionPhase(QualityProfileStatCalculator statCal
foreach (var profile in updatedProfiles)
{
profile.InvalidExceptCfNames = GetInvalidExceptCfNames(
profile.ProfileConfig.Profile.ResetUnmatchedScores, profile.ProfileDto);
profile.ProfileConfig.Profile.ResetUnmatchedScores,
profile.ProfileDto
);
profile.UpdatedScores = ProcessScoreUpdates(profile.ProfileConfig, profile.ProfileDto);
}
@ -139,7 +154,8 @@ public class QualityProfileTransactionPhase(QualityProfileStatCalculator statCal
private static IReadOnlyCollection<string> GetInvalidExceptCfNames(
ResetUnmatchedScoresConfig resetConfig,
QualityProfileDto profileDto)
QualityProfileDto profileDto
)
{
var except = resetConfig.Except;
if (except.Count == 0)
@ -156,10 +172,12 @@ public class QualityProfileTransactionPhase(QualityProfileStatCalculator statCal
private static List<UpdatedFormatScore> ProcessScoreUpdates(
ProcessedQualityProfileData profileData,
QualityProfileDto profileDto)
QualityProfileDto profileDto
)
{
var scoreMap = profileData.CfScores
.FullOuterHashJoin(profileDto.FormatItems,
var scoreMap = profileData
.CfScores.FullOuterHashJoin(
profileDto.FormatItems,
x => x.FormatId,
x => x.Format,
// Exists in config, but not in service (these are unusual and should be errors)
@ -168,7 +186,8 @@ public class QualityProfileTransactionPhase(QualityProfileStatCalculator statCal
// Exists in service, but not in config
r => UpdatedFormatScore.Reset(r, profileData),
// Exists in both service and config
(l, r) => UpdatedFormatScore.Updated(r, l))
(l, r) => UpdatedFormatScore.Updated(r, l)
)
.ToList();
return scoreMap;

63
src/Recyclarr.Cli/Pipelines/QualityProfile/QualityItemOrganizer.cs
Unescape View File

@ -21,15 +21,19 @@ public class QualityItemOrganizer
{
InvalidQualityNames = _invalidItemNames,
NumWantedItems = wanted.Count,
Items = combined
Items = combined,
};
}
[SuppressMessage("SonarLint", "S1751", Justification =
"'continue' used here is for separating local methods")]
[SuppressMessage(
"SonarLint",
"S1751",
Justification = "'continue' used here is for separating local methods"
)]
private List<ProfileItemDto> GetWantedItems(
IReadOnlyCollection<ProfileItemDto> dtoItems,
IReadOnlyCollection<QualityProfileQualityConfig> configQualities)
IReadOnlyCollection<QualityProfileQualityConfig> configQualities
)
{
var updatedItems = new List<ProfileItemDto>();
@ -38,10 +42,9 @@ public class QualityItemOrganizer
// If the nested qualities list is NOT empty, then this is considered a quality group.
if (configQuality.Qualities.IsNotEmpty())
{
var dtoGroup = dtoItems.FindGroupByName(configQuality.Name) ?? new ProfileItemDto
{
Name = configQuality.Name
};
var dtoGroup =
dtoItems.FindGroupByName(configQuality.Name)
?? new ProfileItemDto { Name = configQuality.Name };
var updatedGroupItems = new List<ProfileItemDto>();
@ -50,11 +53,13 @@ public class QualityItemOrganizer
AddQualityFromDto(updatedGroupItems, groupQuality);
}
updatedItems.Add(dtoGroup with
{
Allowed = configQuality.Enabled,
Items = updatedGroupItems
});
updatedItems.Add(
dtoGroup with
{
Allowed = configQuality.Enabled,
Items = updatedGroupItems,
}
);
continue;
}
@ -71,7 +76,7 @@ public class QualityItemOrganizer
return;
}
items.Add(dtoItem with {Allowed = configQuality.Enabled});
items.Add(dtoItem with { Allowed = configQuality.Enabled });
}
}
@ -80,7 +85,8 @@ public class QualityItemOrganizer
private static IEnumerable<ProfileItemDto> FilterUnwantedItems(
ProfileItemDto dto,
IReadOnlyCollection<ProfileItemDto> wantedItems)
IReadOnlyCollection<ProfileItemDto> wantedItems
)
{
// Quality
if (dto.Quality is not null)
@ -96,8 +102,9 @@ public class QualityItemOrganizer
{
// If this is actually a quality instead of a group, this will effectively be a no-op since the Items
// array will already be empty.
var unwantedQualities = dto.Items
.Where(y => wantedItems.FindQualityByName(y.Quality?.Name) is null);
var unwantedQualities = dto.Items.Where(y =>
wantedItems.FindQualityByName(y.Quality?.Name) is null
);
// If the group is in the wanted list, then we only want to add qualities inside it that are NOT wanted
if (wantedItems.FindGroupByName(dto.Name) is not null)
@ -110,10 +117,8 @@ public class QualityItemOrganizer
[
dto with
{
Items = unwantedQualities
.Select(y => y with {Allowed = false})
.ToList()
}
Items = unwantedQualities.Select(y => y with { Allowed = false }).ToList(),
},
];
}
@ -122,27 +127,31 @@ public class QualityItemOrganizer
private static IEnumerable<ProfileItemDto> GetUnwantedItems(
IEnumerable<ProfileItemDto> dtoItems,
IReadOnlyCollection<ProfileItemDto> wantedItems)
IReadOnlyCollection<ProfileItemDto> wantedItems
)
{
return dtoItems
.SelectMany(x => FilterUnwantedItems(x, wantedItems))
.Select(x => x with {Allowed = false})
.Select(x => x with { Allowed = false })
// Find item groups that have less than 2 nested qualities remaining in them. Those get flattened out.
// If Count == 0, that gets handled by the `Where()` below.
.Select(x => x.Items.Count == 1 ? x.Items.First() : x)
.Where(x => x is not {Quality: null, Items.Count: 0});
.Where(x => x is not { Quality: null, Items.Count: 0 });
}
private static List<ProfileItemDto> CombineAndSortItems(
QualitySortAlgorithm sortAlgorithm,
IEnumerable<ProfileItemDto> wantedItems,
IEnumerable<ProfileItemDto> unwantedItems)
IEnumerable<ProfileItemDto> unwantedItems
)
{
return sortAlgorithm switch
{
QualitySortAlgorithm.Top => wantedItems.Concat(unwantedItems).ToList(),
QualitySortAlgorithm.Bottom => unwantedItems.Concat(wantedItems).ToList(),
_ => throw new ArgumentOutOfRangeException($"Unsupported Quality Sort: {sortAlgorithm}")
_ => throw new ArgumentOutOfRangeException(
$"Unsupported Quality Sort: {sortAlgorithm}"
),
};
}
@ -150,7 +159,7 @@ public class QualityItemOrganizer
{
// Add the IDs at the very end since we need all groups to know which IDs are taken
var nextItemId = combinedItems.NewItemId();
foreach (var item in combinedItems.Where(item => item is {Id: null, Quality: null}))
foreach (var item in combinedItems.Where(item => item is { Id: null, Quality: null }))
{
item.Id = nextItemId++;
}

37
src/Recyclarr.Cli/Pipelines/QualityProfile/QualityProfileExtensions.cs
Unescape View File

@ -10,10 +10,11 @@ public static class QualityProfileExtensions
return items.Flatten(x => x.Items);
}
public static IEnumerable<ProfileItemDto> FlattenQualities(this IEnumerable<ProfileItemDto> items)
public static IEnumerable<ProfileItemDto> FlattenQualities(
this IEnumerable<ProfileItemDto> items
)
{
return FlattenItems(items)
.Where(x => x.Quality is not null);
return FlattenItems(items).Where(x => x.Quality is not null);
}
public static ProfileItemDto? FindGroupById(this IEnumerable<ProfileItemDto> items, int? id)
@ -23,12 +24,13 @@ public static class QualityProfileExtensions
return null;
}
return FlattenItems(items)
.Where(x => x.Quality is null)
.FirstOrDefault(x => x.Id == id);
return FlattenItems(items).Where(x => x.Quality is null).FirstOrDefault(x => x.Id == id);
}
public static ProfileItemDto? FindGroupByName(this IEnumerable<ProfileItemDto> items, string? name)
public static ProfileItemDto? FindGroupByName(
this IEnumerable<ProfileItemDto> items,
string? name
)
{
if (name is null)
{
@ -52,7 +54,10 @@ public static class QualityProfileExtensions
.FirstOrDefault(x => x.Quality!.Id == id);
}
public static ProfileItemDto? FindQualityByName(this IEnumerable<ProfileItemDto> items, string? name)
public static ProfileItemDto? FindQualityByName(
this IEnumerable<ProfileItemDto> items,
string? name
)
{
if (name is null)
{
@ -64,7 +69,9 @@ public static class QualityProfileExtensions
.FirstOrDefault(x => x.Quality!.Name.EqualsIgnoreCase(name));
}
private static IEnumerable<(string? Name, int? Id)> GetEligibleCutoffs(IEnumerable<ProfileItemDto> items)
private static IEnumerable<(string? Name, int? Id)> GetEligibleCutoffs(
IEnumerable<ProfileItemDto> items
)
{
return items
.Where(x => x.Allowed is true)
@ -79,8 +86,7 @@ public static class QualityProfileExtensions
return null;
}
var result = GetEligibleCutoffs(items)
.FirstOrDefault(x => x.Name.EqualsIgnoreCase(name));
var result = GetEligibleCutoffs(items).FirstOrDefault(x => x.Name.EqualsIgnoreCase(name));
return result.Id;
}
@ -92,8 +98,7 @@ public static class QualityProfileExtensions
return null;
}
var result = GetEligibleCutoffs(items)
.FirstOrDefault(x => x.Id == id);
var result = GetEligibleCutoffs(items).FirstOrDefault(x => x.Id == id);
return result.Name;
}
@ -109,11 +114,7 @@ public static class QualityProfileExtensions
// This calculation will be applied to new quality item groups.
// See `getQualityItemGroupId()` here:
// https://github.com/Radarr/Radarr/blob/c214a6b67bf747e02462066cd1c6db7bc06db1f0/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContentConnector.js#L11C8-L11C8
var maxExisting = FlattenItems(items)
.Select(x => x.Id)
.NotNull()
.DefaultIfEmpty(0)
.Max();
var maxExisting = FlattenItems(items).Select(x => x.Id).NotNull().DefaultIfEmpty(0).Max();
return Math.Max(1000, maxExisting) + 1;
}

12
src/Recyclarr.Cli/Pipelines/QualityProfile/QualityProfilePipelineContext.cs
Unescape View File

@ -6,16 +6,16 @@ using Recyclarr.TrashGuide;
namespace Recyclarr.Cli.Pipelines.QualityProfile;
[SuppressMessage("Usage", "CA2227:Collection properties should be read only", Justification =
"Context objects are similar to DTOs; for usability we want to assign not append")]
[SuppressMessage(
"Usage",
"CA2227:Collection properties should be read only",
Justification = "Context objects are similar to DTOs; for usability we want to assign not append"
)]
public class QualityProfilePipelineContext : IPipelineContext
{
public string PipelineDescription => "Quality Definition";
public IReadOnlyCollection<SupportedServices> SupportedServiceTypes { get; } =
[
SupportedServices.Sonarr,
SupportedServices.Radarr
];
[SupportedServices.Sonarr, SupportedServices.Radarr];
public IList<ProcessedQualityProfileData> ConfigOutput { get; set; } = default!;
public QualityProfileServiceData ApiFetchOutput { get; set; } = default!;

40
src/Recyclarr.Cli/Pipelines/QualityProfile/QualityProfileStatCalculator.cs
Unescape View File

@ -20,7 +20,7 @@ public class QualityProfileStatCalculator(ILogger log)
{
log.Debug("Updates for profile {ProfileName}", profile.ProfileName);
var stats = new ProfileWithStats {Profile = profile};
var stats = new ProfileWithStats { Profile = profile };
var oldDto = profile.ProfileDto;
var newDto = profile.BuildUpdatedDto();
@ -31,10 +31,18 @@ public class QualityProfileStatCalculator(ILogger log)
return stats;
}
private void ProfileUpdates(ProfileWithStats stats, QualityProfileDto oldDto, QualityProfileDto newDto)
private void ProfileUpdates(
ProfileWithStats stats,
QualityProfileDto oldDto,
QualityProfileDto newDto
)
{
Log("Upgrade Allowed", oldDto.UpgradeAllowed, newDto.UpgradeAllowed);
Log("Cutoff", oldDto.Items.FindCutoff(oldDto.Cutoff), newDto.Items.FindCutoff(newDto.Cutoff));
Log(
"Cutoff",
oldDto.Items.FindCutoff(oldDto.Cutoff),
newDto.Items.FindCutoff(newDto.Cutoff)
);
Log("Cutoff Score", oldDto.CutoffFormatScore, newDto.CutoffFormatScore);
Log("Minimum Score", oldDto.MinFormatScore, newDto.MinFormatScore);
@ -47,21 +55,25 @@ public class QualityProfileStatCalculator(ILogger log)
}
}
private static void QualityUpdates(ProfileWithStats stats, QualityProfileDto oldDto, QualityProfileDto newDto)
private static void QualityUpdates(
ProfileWithStats stats,
QualityProfileDto oldDto,
QualityProfileDto newDto
)
{
using var oldJson = JsonSerializer.SerializeToDocument(oldDto.Items);
using var newJson = JsonSerializer.SerializeToDocument(newDto.Items);
stats.QualitiesChanged = stats.Profile.MissingQualities.Count > 0 || !oldJson.DeepEquals(newJson);
stats.QualitiesChanged =
stats.Profile.MissingQualities.Count > 0 || !oldJson.DeepEquals(newJson);
}
private void ScoreUpdates(
ProfileWithStats stats,
QualityProfileDto profileDto,
IReadOnlyCollection<UpdatedFormatScore> updatedScores)
IReadOnlyCollection<UpdatedFormatScore> updatedScores
)
{
var scores = updatedScores
.Where(y => y.Dto.Score != y.NewScore)
.ToList();
var scores = updatedScores.Where(y => y.Dto.Score != y.NewScore).ToList();
if (scores.Count == 0)
{
@ -72,8 +84,14 @@ public class QualityProfileStatCalculator(ILogger log)
foreach (var (dto, newScore, reason) in scores)
{
log.Debug(" - {Name} ({Id}): {OldScore} -> {NewScore} ({Reason})",
dto.Name, dto.Format, dto.Score, newScore, reason);
log.Debug(
" - {Name} ({Id}): {OldScore} -> {NewScore} ({Reason})",
dto.Name,
dto.Format,
dto.Score,
newScore,
reason
);
}
stats.ScoresChanged = true;

25
src/Recyclarr.Cli/Pipelines/QualityProfile/UpdatedFormatScore.cs
Unescape View File

@ -26,18 +26,25 @@ public enum FormatScoreUpdateReason
/// `--preview` runs since new custom formats that aren't synced yet won't be available when
/// processing quality profiles.
/// </summary>
New
New,
}
public record UpdatedFormatScore(ProfileFormatItemDto Dto, int NewScore, FormatScoreUpdateReason Reason)
public record UpdatedFormatScore(
ProfileFormatItemDto Dto,
int NewScore,
FormatScoreUpdateReason Reason
)
{
public static UpdatedFormatScore New(ProcessedQualityProfileScore score)
{
var dto = new ProfileFormatItemDto {Format = score.FormatId, Name = score.CfName};
var dto = new ProfileFormatItemDto { Format = score.FormatId, Name = score.CfName };
return new UpdatedFormatScore(dto, score.Score, FormatScoreUpdateReason.New);
}
public static UpdatedFormatScore Reset(ProfileFormatItemDto dto, ProcessedQualityProfileData profileData)
public static UpdatedFormatScore Reset(
ProfileFormatItemDto dto,
ProcessedQualityProfileData profileData
)
{
var reset = profileData.Profile.ResetUnmatchedScores;
var shouldReset = reset.Enabled && reset.Except.All(x => !dto.Name.EqualsIgnoreCase(x));
@ -47,9 +54,15 @@ public record UpdatedFormatScore(ProfileFormatItemDto Dto, int NewScore, FormatS
return new UpdatedFormatScore(dto, score, reason);
}
public static UpdatedFormatScore Updated(ProfileFormatItemDto dto, ProcessedQualityProfileScore score)
public static UpdatedFormatScore Updated(
ProfileFormatItemDto dto,
ProcessedQualityProfileScore score
)
{
var reason = dto.Score == score.Score ? FormatScoreUpdateReason.NoChange : FormatScoreUpdateReason.Updated;
var reason =
dto.Score == score.Score
? FormatScoreUpdateReason.NoChange
: FormatScoreUpdateReason.Updated;
return new UpdatedFormatScore(dto, score.Score, reason);
}
}

12
src/Recyclarr.Cli/Pipelines/QualityProfile/UpdatedQualityProfile.cs
Unescape View File

@ -5,8 +5,8 @@ namespace Recyclarr.Cli.Pipelines.QualityProfile;
public record UpdatedQualities
{
public ICollection<string> InvalidQualityNames { get; init; } = new List<string>();
public IReadOnlyCollection<ProfileItemDto> Items { get; init; } = new List<ProfileItemDto>();
public ICollection<string> InvalidQualityNames { get; init; } = [];
public IReadOnlyCollection<ProfileItemDto> Items { get; init; } = [];
public int NumWantedItems { get; init; }
}
@ -15,7 +15,8 @@ public record UpdatedQualityProfile
public required QualityProfileDto ProfileDto { get; init; }
public required ProcessedQualityProfileData ProfileConfig { get; init; }
public required QualityProfileUpdateReason UpdateReason { get; set; }
public IReadOnlyCollection<UpdatedFormatScore> UpdatedScores { get; set; } = Array.Empty<UpdatedFormatScore>();
public IReadOnlyCollection<UpdatedFormatScore> UpdatedScores { get; set; } =
Array.Empty<UpdatedFormatScore>();
public UpdatedQualities UpdatedQualities { get; init; } = new();
public IReadOnlyCollection<string> InvalidExceptCfNames { get; set; } = Array.Empty<string>();
public IReadOnlyCollection<string> MissingQualities { get; set; } = Array.Empty<string>();
@ -43,7 +44,7 @@ public record UpdatedQualityProfile
UpgradeAllowed = config.UpgradeAllowed,
MinFormatScore = config.MinFormatScore,
CutoffFormatScore = config.UpgradeUntilScore,
FormatItems = UpdatedScores.Select(x => x.Dto with {Score = x.NewScore}).ToList()
FormatItems = UpdatedScores.Select(x => x.Dto with { Score = x.NewScore }).ToList(),
};
if (UpdatedQualities.NumWantedItems > 0)
@ -56,7 +57,8 @@ public record UpdatedQualityProfile
//
// Also: It's important that we assign the cutoff *after* we set Items. Because we pull from a different list of
// items depending on if the `qualities` property is set in config.
newDto.Cutoff = newDto.Items.FindCutoff(config.UpgradeUntilQuality) ?? newDto.Items.FirstCutoffId();
newDto.Cutoff =
newDto.Items.FindCutoff(config.UpgradeUntilQuality) ?? newDto.Items.FirstCutoffId();
return newDto;
}

29
src/Recyclarr.Cli/Pipelines/QualityProfile/UpdatedQualityProfileValidator.cs
Unescape View File

@ -8,8 +8,7 @@ public class UpdatedQualityProfileValidator : AbstractValidator<UpdatedQualityPr
{
public UpdatedQualityProfileValidator()
{
RuleFor(x => x.ProfileConfig.Profile.MinFormatScore)
.Custom(ValidateMinScoreSatisfied);
RuleFor(x => x.ProfileConfig.Profile.MinFormatScore).Custom(ValidateMinScoreSatisfied);
RuleFor(x => x.ProfileConfig.Profile.UpgradeUntilQuality)
.Custom(ValidateCutoff!)
@ -21,19 +20,26 @@ public class UpdatedQualityProfileValidator : AbstractValidator<UpdatedQualityPr
.WithMessage("`qualities` is required when creating profiles for the first time");
}
private static void ValidateMinScoreSatisfied(int? minScore, ValidationContext<UpdatedQualityProfile> context)
private static void ValidateMinScoreSatisfied(
int? minScore,
ValidationContext<UpdatedQualityProfile> context
)
{
var scores = context.InstanceToValidate.UpdatedScores;
var totalScores = scores.Select(x => x.NewScore).Where(x => x > 0).Sum();
if (totalScores < minScore)
{
context.AddFailure(
$"Minimum Custom Format Score of {minScore} can never be satisfied because the total of all " +
$"positive scores is {totalScores}");
$"Minimum Custom Format Score of {minScore} can never be satisfied because the total of all "
+ $"positive scores is {totalScores}"
);
}
}
private static void ValidateCutoff(string untilQuality, ValidationContext<UpdatedQualityProfile> context)
private static void ValidateCutoff(
string untilQuality,
ValidationContext<UpdatedQualityProfile> context
)
{
var profile = context.InstanceToValidate;
@ -43,13 +49,16 @@ public class UpdatedQualityProfileValidator : AbstractValidator<UpdatedQualityPr
return;
}
var items = profile.UpdatedQualities.NumWantedItems > 0
? profile.UpdatedQualities.Items
: profile.ProfileDto.Items;
var items =
profile.UpdatedQualities.NumWantedItems > 0
? profile.UpdatedQualities.Items
: profile.ProfileDto.Items;
if (items.FindCutoff(untilQuality) is null)
{
context.AddFailure("'until_quality' must refer to an existing and enabled quality or group");
context.AddFailure(
"'until_quality' must refer to an existing and enabled quality or group"
);
}
}
}

5
src/Recyclarr.Cli/Pipelines/QualitySize/Models/ProcessedQualitySizeData.cs
Unescape View File

@ -2,4 +2,7 @@ using Recyclarr.TrashGuide.QualitySize;
namespace Recyclarr.Cli.Pipelines.QualitySize.Models;
public record ProcessedQualitySizeData(string Type, IReadOnlyCollection<QualityItemWithLimits> Qualities);
public record ProcessedQualitySizeData(
string Type,
IReadOnlyCollection<QualityItemWithLimits> Qualities
);

12
src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/Limits/QualityItemLimitFactory.cs
Unescape View File

@ -4,15 +4,19 @@ using Recyclarr.TrashGuide.QualitySize;
namespace Recyclarr.Cli.Pipelines.QualitySize.PipelinePhases.Limits;
public class QualityItemLimitFactory(IIndex<SupportedServices, IQualityItemLimitFetcher> limitFactory)
: IQualityItemLimitFactory
public class QualityItemLimitFactory(
IIndex<SupportedServices, IQualityItemLimitFetcher> limitFactory
) : IQualityItemLimitFactory
{
public async Task<QualityItemLimits> Create(SupportedServices serviceType, CancellationToken ct)
{
if (!limitFactory.TryGetValue(serviceType, out var limitFetcher))
{
throw new ArgumentOutOfRangeException(nameof(serviceType), serviceType,
"No quality item limits defined for this service type");
throw new ArgumentOutOfRangeException(
nameof(serviceType),
serviceType,
"No quality item limits defined for this service type"
);
}
return await limitFetcher.GetLimits(ct);

7
src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/Limits/RadarrQualityItemLimitFetcher.cs
Unescape View File

@ -3,7 +3,8 @@ using Recyclarr.TrashGuide.QualitySize;
namespace Recyclarr.Cli.Pipelines.QualitySize.PipelinePhases.Limits;
public class RadarrQualityItemLimitFetcher(IRadarrCapabilityFetcher capabilityFetcher) : IQualityItemLimitFetcher
public class RadarrQualityItemLimitFetcher(IRadarrCapabilityFetcher capabilityFetcher)
: IQualityItemLimitFetcher
{
private QualityItemLimits? _cachedLimits;
@ -15,8 +16,8 @@ public class RadarrQualityItemLimitFetcher(IRadarrCapabilityFetcher capabilityFe
var capabilities = await capabilityFetcher.GetCapabilities(ct);
_cachedLimits = capabilities switch
{
{QualityDefinitionLimitsIncreased: true} => new QualityItemLimits(2000m, 1999m),
_ => new QualityItemLimits(400m, 399m)
{ QualityDefinitionLimitsIncreased: true } => new QualityItemLimits(2000m, 1999m),
_ => new QualityItemLimits(400m, 399m),
};
}

7
src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/Limits/SonarrQualityItemLimitFetcher.cs
Unescape View File

@ -3,7 +3,8 @@ using Recyclarr.TrashGuide.QualitySize;
namespace Recyclarr.Cli.Pipelines.QualitySize.PipelinePhases.Limits;
public class SonarrQualityItemLimitFetcher(ISonarrCapabilityFetcher capabilityFetcher) : IQualityItemLimitFetcher
public class SonarrQualityItemLimitFetcher(ISonarrCapabilityFetcher capabilityFetcher)
: IQualityItemLimitFetcher
{
private QualityItemLimits? _cachedLimits;
@ -15,8 +16,8 @@ public class SonarrQualityItemLimitFetcher(ISonarrCapabilityFetcher capabilityFe
var capabilities = await capabilityFetcher.GetCapabilities(ct);
_cachedLimits = capabilities switch
{
{QualityDefinitionLimitsIncreased: true} => new QualityItemLimits(1000m, 995m),
_ => new QualityItemLimits(400m, 395m)
{ QualityDefinitionLimitsIncreased: true } => new QualityItemLimits(1000m, 995m),
_ => new QualityItemLimits(400m, 395m),
};
}

41
src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeConfigPhase.cs
Unescape View File

@ -11,8 +11,8 @@ public class QualitySizeConfigPhase(
ILogger log,
IQualitySizeGuideService guide,
IServiceConfiguration config,
IQualityItemLimitFactory limitFactory)
: IConfigPipelinePhase<QualitySizePipelineContext>
IQualityItemLimitFactory limitFactory
) : IConfigPipelinePhase<QualitySizePipelineContext>
{
public async Task Execute(QualitySizePipelineContext context, CancellationToken ct)
{
@ -23,41 +23,54 @@ public class QualitySizeConfigPhase(
return;
}
var guideSizeData = guide.GetQualitySizeData(config.ServiceType)
var guideSizeData = guide
.GetQualitySizeData(config.ServiceType)
.FirstOrDefault(x => x.Type.EqualsIgnoreCase(configSizeData.Type));
if (guideSizeData == null)
{
context.ConfigError = $"The specified quality definition type does not exist: {configSizeData.Type}";
context.ConfigError =
$"The specified quality definition type does not exist: {configSizeData.Type}";
return;
}
var itemLimits = await limitFactory.Create(config.ServiceType, ct);
var sizeDataWithThresholds = guideSizeData.Qualities
.Select(x => new QualityItemWithLimits(x, itemLimits))
var sizeDataWithThresholds = guideSizeData
.Qualities.Select(x => new QualityItemWithLimits(x, itemLimits))
.ToList();
AdjustPreferredRatio(configSizeData, sizeDataWithThresholds);
context.ConfigOutput = new ProcessedQualitySizeData(configSizeData.Type, sizeDataWithThresholds);
context.ConfigOutput = new ProcessedQualitySizeData(
configSizeData.Type,
sizeDataWithThresholds
);
}
private void AdjustPreferredRatio(QualityDefinitionConfig configSizeData, List<QualityItemWithLimits> guideSizeData)
private void AdjustPreferredRatio(
QualityDefinitionConfig configSizeData,
List<QualityItemWithLimits> guideSizeData
)
{
if (configSizeData.PreferredRatio is null)
{
return;
}
log.Information("Using an explicit preferred ratio which will override values from the guide");
log.Information(
"Using an explicit preferred ratio which will override values from the guide"
);
// Fix an out of range ratio and warn the user
if (configSizeData.PreferredRatio is < 0 or > 1)
{
var clampedRatio = Math.Clamp(configSizeData.PreferredRatio.Value, 0, 1);
log.Warning("Your `preferred_ratio` of {CurrentRatio} is out of range. " +
"It must be a decimal between 0.0 and 1.0. It has been clamped to {ClampedRatio}",
configSizeData.PreferredRatio, clampedRatio);
log.Warning(
"Your `preferred_ratio` of {CurrentRatio} is out of range. "
+ "It must be a decimal between 0.0 and 1.0. It has been clamped to {ClampedRatio}",
configSizeData.PreferredRatio,
clampedRatio
);
configSizeData.PreferredRatio = clampedRatio;
}
@ -65,7 +78,9 @@ public class QualitySizeConfigPhase(
// Apply a calculated preferred size
foreach (var quality in guideSizeData)
{
quality.Item.Preferred = quality.InterpolatedPreferred(configSizeData.PreferredRatio.Value);
quality.Item.Preferred = quality.InterpolatedPreferred(
configSizeData.PreferredRatio.Value
);
}
}
}

18
src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeLogPhase.cs
Unescape View File

@ -14,7 +14,7 @@ public class QualitySizeLogPhase(ILogger log, NotificationEmitter notificationEm
return true;
}
if (context.ConfigOutput is not {Qualities.Count: > 0})
if (context.ConfigOutput is not { Qualities.Count: > 0 })
{
log.Debug("No Quality Definitions to process");
return true;
@ -23,9 +23,7 @@ public class QualitySizeLogPhase(ILogger log, NotificationEmitter notificationEm
return false;
}
public void LogTransactionNotices(QualitySizePipelineContext context)
{
}
public void LogTransactionNotices(QualitySizePipelineContext context) { }
public void LogPersistenceResults(QualitySizePipelineContext context)
{
@ -35,13 +33,19 @@ public class QualitySizeLogPhase(ILogger log, NotificationEmitter notificationEm
var totalCount = context.TransactionOutput.Count;
if (totalCount > 0)
{
log.Information("Total of {Count} sizes were synced for quality definition {Name}", totalCount,
qualityDefinitionName);
log.Information(
"Total of {Count} sizes were synced for quality definition {Name}",
totalCount,
qualityDefinitionName
);
notificationEmitter.SendStatistic("Quality Sizes Synced", totalCount);
}
else
{
log.Information("All sizes for quality definition {Name} are already up to date!", qualityDefinitionName);
log.Information(
"All sizes for quality definition {Name} are already up to date!",
qualityDefinitionName
);
}
}
}

3
src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizePreviewPhase.cs
Unescape View File

@ -3,7 +3,8 @@ using Spectre.Console;
namespace Recyclarr.Cli.Pipelines.QualitySize.PipelinePhases;
public class QualitySizePreviewPhase(IAnsiConsole console) : IPreviewPipelinePhase<QualitySizePipelineContext>
public class QualitySizePreviewPhase(IAnsiConsole console)
: IPreviewPipelinePhase<QualitySizePipelineContext>
{
public void Execute(QualitySizePipelineContext context)
{

40
src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeTransactionPhase.cs
Unescape View File

@ -5,7 +5,8 @@ using Recyclarr.TrashGuide.QualitySize;
namespace Recyclarr.Cli.Pipelines.QualitySize.PipelinePhases;
public class QualitySizeTransactionPhase(ILogger log) : ITransactionPipelinePhase<QualitySizePipelineContext>
public class QualitySizeTransactionPhase(ILogger log)
: ITransactionPipelinePhase<QualitySizePipelineContext>
{
public void Execute(QualitySizePipelineContext context)
{
@ -16,26 +17,37 @@ public class QualitySizeTransactionPhase(ILogger log) : ITransactionPipelinePhas
var newQuality = new Collection<ServiceQualityDefinitionItem>();
foreach (var qualityData in guideQuality)
{
var serverEntry = serverQuality.FirstOrDefault(q => q.Quality?.Name == qualityData.Item.Quality);
var serverEntry = serverQuality.FirstOrDefault(q =>
q.Quality?.Name == qualityData.Item.Quality
);
if (serverEntry == null)
{
log.Warning("Server lacks quality definition for {Quality}; it will be skipped",
qualityData.Item.Quality);
log.Warning(
"Server lacks quality definition for {Quality}; it will be skipped",
qualityData.Item.Quality
);
continue;
}
var isDifferent = QualityIsDifferent(serverEntry, qualityData);
log.Debug("Processed Quality {Name}: " +
"[IsDifferent: {IsDifferent}] " +
"[Min: {Min1}, {Min2}] " +
"[Max: {Max1}, {Max2} ({MaxLimit})] " +
"[Preferred: {Preferred1}, {Preferred2} ({PreferredLimit})]",
log.Debug(
"Processed Quality {Name}: "
+ "[IsDifferent: {IsDifferent}] "
+ "[Min: {Min1}, {Min2}] "
+ "[Max: {Max1}, {Max2} ({MaxLimit})] "
+ "[Preferred: {Preferred1}, {Preferred2} ({PreferredLimit})]",
serverEntry.Quality?.Name,
isDifferent,
serverEntry.MinSize, qualityData.Item.Min,
serverEntry.MaxSize, qualityData.Item.Max, qualityData.Limits.MaxLimit,
serverEntry.PreferredSize, qualityData.Item.Preferred, qualityData.Limits.PreferredLimit);
serverEntry.MinSize,
qualityData.Item.Min,
serverEntry.MaxSize,
qualityData.Item.Max,
qualityData.Limits.MaxLimit,
serverEntry.PreferredSize,
qualityData.Item.Preferred,
qualityData.Limits.PreferredLimit
);
if (!isDifferent)
{
@ -54,6 +66,8 @@ public class QualitySizeTransactionPhase(ILogger log) : ITransactionPipelinePhas
private static bool QualityIsDifferent(ServiceQualityDefinitionItem a, QualityItemWithLimits b)
{
return b.IsMinDifferent(a.MinSize) || b.IsMaxDifferent(a.MaxSize) || b.IsPreferredDifferent(a.PreferredSize);
return b.IsMinDifferent(a.MinSize)
|| b.IsMaxDifferent(a.MaxSize)
|| b.IsPreferredDifferent(a.PreferredSize);
}
}

12
src/Recyclarr.Cli/Pipelines/QualitySize/QualitySizeDataLister.cs
Unescape View File

@ -4,20 +4,20 @@ using Spectre.Console;
namespace Recyclarr.Cli.Pipelines.QualitySize;
public class QualitySizeDataLister(
IAnsiConsole console,
IQualitySizeGuideService guide)
public class QualitySizeDataLister(IAnsiConsole console, IQualitySizeGuideService guide)
{
public void ListQualities(SupportedServices serviceType)
{
console.WriteLine("\nList of Quality Definition types in the TRaSH Guides:\n");
guide.GetQualitySizeData(serviceType)
guide
.GetQualitySizeData(serviceType)
.Select(x => x.Type)
.ForEach(x => console.WriteLine($" - {x}"));
console.WriteLine(
"\nThe above quality definition types can be used with the `quality_definition:` property in your " +
"recyclarr.yml file.");
"\nThe above quality definition types can be used with the `quality_definition:` property in your "
+ "recyclarr.yml file."
);
}
}

12
src/Recyclarr.Cli/Pipelines/QualitySize/QualitySizePipelineContext.cs
Unescape View File

@ -6,16 +6,16 @@ using Recyclarr.TrashGuide;
namespace Recyclarr.Cli.Pipelines.QualitySize;
[SuppressMessage("Usage", "CA2227:Collection properties should be read only", Justification =
"Context objects are similar to DTOs; for usability we want to assign not append")]
[SuppressMessage(
"Usage",
"CA2227:Collection properties should be read only",
Justification = "Context objects are similar to DTOs; for usability we want to assign not append"
)]
public class QualitySizePipelineContext : IPipelineContext
{
public string PipelineDescription => "Quality Definition";
public IReadOnlyCollection<SupportedServices> SupportedServiceTypes { get; } =
[
SupportedServices.Sonarr,
SupportedServices.Radarr
];
[SupportedServices.Sonarr, SupportedServices.Radarr];
public ProcessedQualitySizeData? ConfigOutput { get; set; }
public IList<ServiceQualityDefinitionItem> ApiFetchOutput { get; set; } = default!;

3
src/Recyclarr.Cli/Processors/Config/ConfigCreationProcessor.cs
Unescape View File

@ -2,7 +2,8 @@ using Recyclarr.Cli.Console.Settings;
namespace Recyclarr.Cli.Processors.Config;
public class ConfigCreationProcessor(IOrderedEnumerable<IConfigCreator> creators) : IConfigCreationProcessor
public class ConfigCreationProcessor(IOrderedEnumerable<IConfigCreator> creators)
: IConfigCreationProcessor
{
public void Process(ICreateConfigSettings settings)
{

25
src/Recyclarr.Cli/Processors/Config/ConfigListLocalProcessor.cs
Unescape View File

@ -1,3 +1,4 @@
using System.Globalization;
using System.IO.Abstractions;
using Recyclarr.Config;
using Recyclarr.Config.Models;
@ -13,7 +14,8 @@ public class ConfigListLocalProcessor(
IAnsiConsole console,
IConfigurationFinder configFinder,
IConfigurationLoader configLoader,
IAppPaths paths)
IAppPaths paths
)
{
public void Process()
{
@ -32,7 +34,12 @@ public class ConfigListLocalProcessor(
rows.Add(new Markup("([red]Empty[/])"));
}
var configTree = new Tree(Markup.FromInterpolated($"[b]{MakeRelative(configPath)}[/]"));
var configTree = new Tree(
Markup.FromInterpolated(
CultureInfo.InvariantCulture,
$"[b]{MakeRelative(configPath)}[/]"
)
);
foreach (var r in rows)
{
configTree.AddNode(r);
@ -55,7 +62,8 @@ public class ConfigListLocalProcessor(
private static void BuildInstanceTree(
List<IRenderable> rows,
IReadOnlyCollection<IServiceConfiguration> registry,
SupportedServices service)
SupportedServices service
)
{
var configs = registry.GetConfigsOfType(service).ToList();
if (configs.Count == 0)
@ -63,9 +71,14 @@ public class ConfigListLocalProcessor(
return;
}
var tree = new Tree(Markup.FromInterpolated($"[red]{service}[/]"));
tree.AddNodes(configs.Select(c =>
Markup.FromInterpolated($"[blue]{c.InstanceName}[/]")));
var tree = new Tree(
Markup.FromInterpolated(CultureInfo.InvariantCulture, $"[red]{service}[/]")
);
tree.AddNodes(
configs.Select(c =>
Markup.FromInterpolated(CultureInfo.InvariantCulture, $"[blue]{c.InstanceName}[/]")
)
);
rows.Add(tree);
}

14
src/Recyclarr.Cli/Processors/Config/ConfigListTemplateProcessor.cs
Unescape View File

@ -1,10 +1,14 @@
using System.Globalization;
using Recyclarr.Cli.Console.Commands;
using Recyclarr.TrashGuide;
using Spectre.Console;
namespace Recyclarr.Cli.Processors.Config;
public class ConfigListTemplateProcessor(IAnsiConsole console, IConfigTemplateGuideService guideService)
public class ConfigListTemplateProcessor(
IAnsiConsole console,
IConfigTemplateGuideService guideService
)
{
public void Process(IConfigListTemplatesSettings settings)
{
@ -24,8 +28,7 @@ public class ConfigListTemplateProcessor(IAnsiConsole console, IConfigTemplateGu
var sonarrRowItems = RenderTemplates(table, data, SupportedServices.Sonarr);
var radarrRowItems = RenderTemplates(table, data, SupportedServices.Radarr);
var items = sonarrRowItems
.ZipLongest(radarrRowItems, (s, r) => (s ?? empty, r ?? empty));
var items = sonarrRowItems.ZipLongest(radarrRowItems, (s, r) => (s ?? empty, r ?? empty));
foreach (var (s, r) in items)
{
@ -38,11 +41,12 @@ public class ConfigListTemplateProcessor(IAnsiConsole console, IConfigTemplateGu
private static List<Markup> RenderTemplates(
Table table,
IEnumerable<TemplatePath> templatePaths,
SupportedServices service)
SupportedServices service
)
{
var paths = templatePaths
.Where(x => x.Service == service && !x.Hidden)
.Select(x => Markup.FromInterpolated($"[blue]{x.Id}[/]"))
.Select(x => Markup.FromInterpolated(CultureInfo.InvariantCulture, $"[blue]{x.Id}[/]"))
.ToList();
table.AddColumn(service.ToString());

19
src/Recyclarr.Cli/Processors/Config/ConfigManipulator.cs
Unescape View File

@ -15,12 +15,13 @@ public class ConfigManipulator(
IAnsiConsole console,
ConfigParser configParser,
ConfigSaver configSaver,
ConfigValidationExecutor validator)
: IConfigManipulator
ConfigValidationExecutor validator
) : IConfigManipulator
{
private static Dictionary<string, TConfig> InvokeCallbackForEach<TConfig>(
Func<string, ServiceConfigYaml, ServiceConfigYaml> editCallback,
IReadOnlyDictionary<string, TConfig>? configs)
IReadOnlyDictionary<string, TConfig>? configs
)
where TConfig : ServiceConfigYaml
{
var newConfigs = new Dictionary<string, TConfig>();
@ -32,7 +33,7 @@ public class ConfigManipulator(
foreach (var (instanceName, config) in configs)
{
newConfigs[instanceName] = (TConfig) editCallback(instanceName, config);
newConfigs[instanceName] = (TConfig)editCallback(instanceName, config);
}
return newConfigs;
@ -41,7 +42,8 @@ public class ConfigManipulator(
public void LoadAndSave(
IFileInfo source,
IFileInfo destinationFile,
Func<string, ServiceConfigYaml, ServiceConfigYaml> editCallback)
Func<string, ServiceConfigYaml, ServiceConfigYaml> editCallback
)
{
// Parse & save the template file to address the following:
// - Find & report any syntax errors
@ -58,14 +60,15 @@ public class ConfigManipulator(
config = new RootConfigYaml
{
Radarr = InvokeCallbackForEach(editCallback, config.Radarr),
Sonarr = InvokeCallbackForEach(editCallback, config.Sonarr)
Sonarr = InvokeCallbackForEach(editCallback, config.Sonarr),
};
if (!validator.Validate(config, YamlValidatorRuleSets.RootConfig))
{
console.WriteLine(
"The configuration file will still be created, despite the previous validation errors. " +
"You must open the file and correct the above issues before running a sync command.");
"The configuration file will still be created, despite the previous validation errors. "
+ "You must open the file and correct the above issues before running a sync command."
);
}
configSaver.Save(config, destinationFile);

3
src/Recyclarr.Cli/Processors/Config/FileExistsException.cs
Unescape View File

@ -1,6 +1,7 @@
namespace Recyclarr.Cli.Processors.Config;
public class FileExistsException(string attemptedPath) : Exception($"File already exists: {attemptedPath}")
public class FileExistsException(string attemptedPath)
: Exception($"File already exists: {attemptedPath}")
{
public string AttemptedPath { get; } = attemptedPath;
}

3
src/Recyclarr.Cli/Processors/Config/IConfigManipulator.cs
Unescape View File

@ -8,5 +8,6 @@ public interface IConfigManipulator
void LoadAndSave(
IFileInfo source,
IFileInfo destinationFile,
Func<string, ServiceConfigYaml, ServiceConfigYaml> editCallback);
Func<string, ServiceConfigYaml, ServiceConfigYaml> editCallback
);
}

8
src/Recyclarr.Cli/Processors/Config/LocalConfigCreator.cs
Unescape View File

@ -6,8 +6,12 @@ using Recyclarr.Platform;
namespace Recyclarr.Cli.Processors.Config;
public class LocalConfigCreator(ILogger log, IAppPaths paths, IFileSystem fs, IResourceDataReader resources)
: IConfigCreator
public class LocalConfigCreator(
ILogger log,
IAppPaths paths,
IFileSystem fs,
IResourceDataReader resources
) : IConfigCreator
{
public bool CanHandle(ICreateConfigSettings settings)
{

13
src/Recyclarr.Cli/Processors/Config/TemplateConfigCreator.cs
Unescape View File

@ -9,8 +9,8 @@ namespace Recyclarr.Cli.Processors.Config;
public class TemplateConfigCreator(
ILogger log,
IConfigTemplateGuideService templates,
IAppPaths paths)
: IConfigCreator
IAppPaths paths
) : IConfigCreator
{
public bool CanHandle(ICreateConfigSettings settings)
{
@ -21,8 +21,13 @@ public class TemplateConfigCreator(
{
log.Debug("Creating config from templates: {Templates}", settings.Templates);
var matchingTemplateData = templates.GetTemplateData()
.IntersectBy(settings.Templates, path => path.Id, StringComparer.CurrentCultureIgnoreCase)
var matchingTemplateData = templates
.GetTemplateData()
.IntersectBy(
settings.Templates,
path => path.Id,
StringComparer.CurrentCultureIgnoreCase
)
.Select(x => x.TemplateFile);
foreach (var templateFile in matchingTemplateData)

136
src/Recyclarr.Cli/Processors/Delete/DeleteCustomFormatsProcessor.cs
Unescape View File

@ -1,4 +1,5 @@
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using Autofac;
using Recyclarr.Cli.Console;
using Recyclarr.Cli.Console.Settings;
@ -13,19 +14,22 @@ namespace Recyclarr.Cli.Processors.Delete;
[UsedImplicitly]
internal class CustomFormatConfigurationScope(ILifetimeScope scope) : ConfigurationScope(scope)
{
public ICustomFormatApiService CustomFormatApi { get; } = scope.Resolve<ICustomFormatApiService>();
public ICustomFormatApiService CustomFormatApi { get; } =
scope.Resolve<ICustomFormatApiService>();
}
public class DeleteCustomFormatsProcessor(
ILogger log,
IAnsiConsole console,
IConfigurationRegistry configRegistry,
ConfigurationScopeFactory scopeFactory)
: IDeleteCustomFormatsProcessor
ConfigurationScopeFactory scopeFactory
) : IDeleteCustomFormatsProcessor
{
public async Task Process(IDeleteCustomFormatSettings settings, CancellationToken ct)
{
using var scope = scopeFactory.Start<CustomFormatConfigurationScope>(GetTargetConfig(settings));
using var scope = scopeFactory.Start<CustomFormatConfigurationScope>(
GetTargetConfig(settings)
);
var cfs = await ObtainCustomFormats(scope.CustomFormatApi, ct);
@ -33,7 +37,9 @@ public class DeleteCustomFormatsProcessor(
{
if (settings.CustomFormatNames.Count == 0)
{
throw new CommandException("Custom format names must be specified if the `--all` option is not used.");
throw new CommandException(
"Custom format names must be specified if the `--all` option is not used."
);
}
cfs = ProcessManuallySpecifiedFormats(settings, cfs);
@ -53,8 +59,12 @@ public class DeleteCustomFormatsProcessor(
return;
}
if (!settings.Force &&
!console.Confirm("\nAre you sure you want to [bold red]permanently delete[/] the above custom formats?"))
if (
!settings.Force
&& !console.Confirm(
"\nAre you sure you want to [bold red]permanently delete[/] the above custom formats?"
)
)
{
console.WriteLine("Aborted!");
return;
@ -64,53 +74,73 @@ public class DeleteCustomFormatsProcessor(
}
[SuppressMessage("Design", "CA1031:Do not catch general exception types")]
private async Task DeleteCustomFormats(ICustomFormatApiService api, ICollection<CustomFormatData> cfs)
private async Task DeleteCustomFormats(
ICustomFormatApiService api,
ICollection<CustomFormatData> cfs
)
{
await console.Progress().StartAsync(async ctx =>
{
var task = ctx.AddTask("Deleting Custom Formats").MaxValue(cfs.Count);
var options = new ParallelOptions {MaxDegreeOfParallelism = 8};
await Parallel.ForEachAsync(cfs, options, async (cf, token) =>
await console
.Progress()
.StartAsync(async ctx =>
{
try
{
await api.DeleteCustomFormat(cf.Id, token);
log.Debug("Deleted {Name}", cf.Name);
}
catch (Exception e)
{
log.Debug(e, "Failed to delete CF");
console.WriteLine($"Failed to delete CF: {cf.Name}");
}
task.Increment(1);
var task = ctx.AddTask("Deleting Custom Formats").MaxValue(cfs.Count);
var options = new ParallelOptions { MaxDegreeOfParallelism = 8 };
await Parallel.ForEachAsync(
cfs,
options,
async (cf, token) =>
{
try
{
await api.DeleteCustomFormat(cf.Id, token);
log.Debug("Deleted {Name}", cf.Name);
}
catch (Exception e)
{
log.Debug(e, "Failed to delete CF");
console.WriteLine($"Failed to delete CF: {cf.Name}");
}
task.Increment(1);
}
);
});
});
}
private async Task<IList<CustomFormatData>> ObtainCustomFormats(ICustomFormatApiService api, CancellationToken ct)
private async Task<IList<CustomFormatData>> ObtainCustomFormats(
ICustomFormatApiService api,
CancellationToken ct
)
{
IList<CustomFormatData> cfs = new List<CustomFormatData>();
IList<CustomFormatData> cfs = [];
await console.Status().StartAsync("Obtaining custom formats...", async _ =>
{
cfs = await api.GetCustomFormats(ct);
});
await console
.Status()
.StartAsync(
"Obtaining custom formats...",
async _ =>
{
cfs = await api.GetCustomFormats(ct);
}
);
return cfs;
}
private IList<CustomFormatData> ProcessManuallySpecifiedFormats(
IDeleteCustomFormatSettings settings,
IList<CustomFormatData> cfs)
IList<CustomFormatData> cfs
)
{
ILookup<bool, (string Name, IEnumerable<CustomFormatData> Cfs)> result = settings.CustomFormatNames
.GroupJoin(cfs,
ILookup<bool, (string Name, IEnumerable<CustomFormatData> Cfs)> result = settings
.CustomFormatNames.GroupJoin(
cfs,
x => x,
x => x.Name,
(x, y) => (Name: x, Cf: y),
StringComparer.InvariantCultureIgnoreCase)
StringComparer.InvariantCultureIgnoreCase
)
.ToLookup(x => x.Cf.Any());
// 'false' means there were no CFs matched to this CF name
@ -120,7 +150,9 @@ public class DeleteCustomFormatsProcessor(
log.Debug("Unmatched CFs: {Names}", cfNames);
foreach (var name in cfNames)
{
console.MarkupLineInterpolated($"[yellow]Warning[/]: Unmatched CF Name: [teal]{name}[/]");
console.MarkupLineInterpolated(
$"[yellow]Warning[/]: Unmatched CF Name: [teal]{name}[/]"
);
}
}
@ -135,8 +167,7 @@ public class DeleteCustomFormatsProcessor(
console.MarkupLine("The following custom formats will be [bold red]DELETED[/]:");
console.WriteLine();
var cfNames = cfs
.Select(x => x.Name)
var cfNames = cfs.Select(x => x.Name)
.Order(StringComparer.InvariantCultureIgnoreCase)
.Chunk(Math.Max(15, cfs.Count / 3)) // Minimum row size is 15 for the table
.ToList();
@ -145,9 +176,13 @@ public class DeleteCustomFormatsProcessor(
foreach (var rowItems in cfNames.Transpose())
{
grid.AddRow(rowItems
.Select(x => Markup.FromInterpolated($"[bold white]{x}[/]"))
.ToArray());
var rows = rowItems
.Select(x =>
Markup.FromInterpolated(CultureInfo.InvariantCulture, $"[bold white]{x}[/]")
)
.ToArray();
grid.AddRow(rows);
}
console.Write(grid);
@ -156,18 +191,21 @@ public class DeleteCustomFormatsProcessor(
private IServiceConfiguration GetTargetConfig(IDeleteCustomFormatSettings settings)
{
var configs = configRegistry.FindAndLoadConfigs(new ConfigFilterCriteria
{
Instances = [settings.InstanceName]
});
var configs = configRegistry.FindAndLoadConfigs(
new ConfigFilterCriteria { Instances = [settings.InstanceName] }
);
switch (configs.Count)
{
case 0:
throw new ArgumentException($"No configuration found with name: {settings.InstanceName}");
throw new ArgumentException(
$"No configuration found with name: {settings.InstanceName}"
);
case > 1:
throw new ArgumentException($"More than one instance found with this name: {settings.InstanceName}");
throw new ArgumentException(
$"More than one instance found with this name: {settings.InstanceName}"
);
}
return configs.Single();

28
src/Recyclarr.Cli/Processors/ErrorHandling/ConsoleExceptionHandler.cs
Unescape View File

@ -17,13 +17,19 @@ public class ConsoleExceptionHandler(ILogger log)
switch (sourceException)
{
case GitCmdException e:
log.Error(e, "Non-zero exit code {ExitCode} while executing Git command", e.ExitCode);
log.Error(
e,
"Non-zero exit code {ExitCode} while executing Git command",
e.ExitCode
);
break;
case FlurlHttpException e:
log.Error(e, "HTTP error");
var httpExceptionHandler = new FlurlHttpExceptionHandler(log);
await httpExceptionHandler.ProcessServiceErrorMessages(new ServiceErrorMessageExtractor(e));
await httpExceptionHandler.ProcessServiceErrorMessages(
new ServiceErrorMessageExtractor(e)
);
break;
case NoConfigurationFilesException:
@ -40,15 +46,21 @@ public class ConsoleExceptionHandler(ILogger log)
break;
case SplitInstancesException e:
log.Error("The following configs share the same `base_url`, which isn't allowed: {Instances}",
e.InstanceNames);
log.Error(
"Consolidate the config files manually to fix. " +
"See: <https://recyclarr.dev/wiki/yaml/config-examples/#merge-single-instance>");
"The following configs share the same `base_url`, which isn't allowed: {Instances}",
e.InstanceNames
);
log.Error(
"Consolidate the config files manually to fix. "
+ "See: <https://recyclarr.dev/wiki/yaml/config-examples/#merge-single-instance>"
);
break;
case InvalidConfigurationFilesException e:
log.Error("Manually-specified configuration files do not exist: {Files}", e.InvalidFiles);
log.Error(
"Manually-specified configuration files do not exist: {Files}",
e.InvalidFiles
);
break;
case PostProcessingException e:
@ -76,7 +88,7 @@ public class ConsoleExceptionHandler(ILogger log)
e.LogErrors(new ValidationLogger(log));
break;
case DependencyResolutionException {InnerException: not null} e:
case DependencyResolutionException { InnerException: not null } e:
return await HandleException(e.InnerException!);
default:

9
src/Recyclarr.Cli/Processors/ErrorHandling/ErrorResponseParser.cs
Unescape View File

@ -7,7 +7,8 @@ namespace Recyclarr.Cli.Processors.ErrorHandling;
public sealed class ErrorResponseParser(ILogger log, string responseBody)
{
private readonly Func<Stream> _streamFactory = () => new MemoryStream(Encoding.UTF8.GetBytes(responseBody));
private readonly Func<Stream> _streamFactory = () =>
new MemoryStream(Encoding.UTF8.GetBytes(responseBody));
private readonly JsonSerializerOptions _jsonSettings = GlobalJsonSerializerSettings.Services;
[SuppressMessage("Design", "CA1031:Do not catch general exception types")]
@ -74,7 +75,11 @@ public sealed class ErrorResponseParser(ILogger log, string responseBody)
log.Error("Error message from remote service: {Message:l}", value.Title);
foreach (var (topic, msg) in value.Errors.SelectMany(x => x.Value.Select(y => (x.Key, Msg: y))))
foreach (
var (topic, msg) in value.Errors.SelectMany(x =>
x.Value.Select(y => (x.Key, Msg: y))
)
)
{
log.Error("{Topic:l}: {Message:l}", topic, msg);
}

18
src/Recyclarr.Cli/Processors/ErrorHandling/FlurlHttpExceptionHandler.cs
Unescape View File

@ -8,7 +8,7 @@ public class FlurlHttpExceptionHandler(ILogger log)
[SuppressMessage("Design", "CA1031:Do not catch general exception types")]
public async Task ProcessServiceErrorMessages(IServiceErrorMessageExtractor extractor)
{
if (extractor.ExceptionMessage.Contains("task was canceled"))
if (extractor.ExceptionMessage.Contains("task was canceled", StringComparison.Ordinal))
{
log.Error("Reason: User canceled the operation");
return;
@ -17,7 +17,9 @@ public class FlurlHttpExceptionHandler(ILogger log)
switch (extractor.HttpStatusCode)
{
case 401:
log.Error("Reason: Recyclarr is unauthorized to talk to the service. Is your `api_key` correct?");
log.Error(
"Reason: Recyclarr is unauthorized to talk to the service. Is your `api_key` correct?"
);
return;
case null:
@ -33,9 +35,12 @@ public class FlurlHttpExceptionHandler(ILogger log)
var parser = new ErrorResponseParser(log, responseBody);
// Try to parse validation errors
if (parser.DeserializeList(s => s
.Select(x => x.GetProperty("errorMessage").GetString())
.NotNull(x => !string.IsNullOrEmpty(x))))
if (
parser.DeserializeList(s =>
s.Select(x => x.GetProperty("errorMessage").GetString())
.NotNull(x => !string.IsNullOrEmpty(x))
)
)
{
return;
}
@ -54,6 +59,7 @@ public class FlurlHttpExceptionHandler(ILogger log)
// Last resort
log.Error(
"Reason: Unable to determine. Please report this as a bug and attach your `debug.log` and `verbose.log` files.");
"Reason: Unable to determine. Please report this as a bug and attach your `debug.log` and `verbose.log` files."
);
}
}

2
src/Recyclarr.Cli/Processors/ExitStatus.cs
Unescape View File

@ -3,5 +3,5 @@ namespace Recyclarr.Cli.Processors;
public enum ExitStatus
{
Succeeded = 0,
Failed
Failed,
}

3
src/Recyclarr.Cli/Processors/FatalException.cs
Unescape View File

@ -1,3 +1,4 @@
namespace Recyclarr.Cli.Processors;
public class FatalException(string? message, Exception? innerException = null) : Exception(message, innerException);
public class FatalException(string? message, Exception? innerException = null)
: Exception(message, innerException);

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save