mirror of
https://github.com/Cleanuparr/Cleanuparr.git
synced 2026-03-26 10:03:12 -04:00
Add option to remove only specified failed import message patterns (#297)
This commit is contained in:
@@ -22,7 +22,8 @@ export class DocumentationService {
|
||||
'failedImport.maxStrikes': 'failed-import-max-strikes',
|
||||
'failedImport.ignorePrivate': 'failed-import-ignore-private',
|
||||
'failedImport.deletePrivate': 'failed-import-delete-private',
|
||||
'failedImport.ignoredPatterns': 'failed-import-ignored-patterns',
|
||||
'failedImport.pattern-mode': 'failed-import-pattern-mode',
|
||||
'failedImport.patterns': 'failed-import-patterns',
|
||||
'downloadingMetadataMaxStrikes': 'downloading-metadata-max-strikes',
|
||||
// Stall rule fields
|
||||
'stallRule.name': 'stall-rule-name',
|
||||
|
||||
@@ -212,20 +212,40 @@
|
||||
<div class="field-row" formGroupName="failedImport">
|
||||
<label class="field-label">
|
||||
<i class="pi pi-question-circle field-info-icon"
|
||||
(click)="openFieldDocs('failedImport.ignoredPatterns')"
|
||||
(click)="openFieldDocs('failedImport.pattern-mode')"
|
||||
title="Click for documentation"></i>
|
||||
Ignored Patterns
|
||||
Pattern Mode
|
||||
</label>
|
||||
<div class="field-input">
|
||||
<p-selectButton
|
||||
formControlName="patternMode"
|
||||
[options]="[{ label: PatternMode.Include, value: PatternMode.Include }, { label: PatternMode.Exclude, value: PatternMode.Exclude }]"
|
||||
optionLabel="label"
|
||||
optionValue="value"
|
||||
[allowEmpty]="false"
|
||||
[multiple]="false"
|
||||
></p-selectButton>
|
||||
<small class="form-helper-text">Choose how the patterns are applied to failed imports</small>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="field-row" formGroupName="failedImport">
|
||||
<label class="field-label">
|
||||
<i class="pi pi-question-circle field-info-icon"
|
||||
(click)="openFieldDocs('failedImport.patterns')"
|
||||
title="Click for documentation"></i>
|
||||
{{ queueCleanerForm.get('failedImport.patternMode')?.value === PatternMode.Include ? 'Included Patterns' : 'Excluded Patterns' }}
|
||||
</label>
|
||||
<div class="field-input">
|
||||
<!-- Mobile-friendly autocomplete -->
|
||||
<app-mobile-autocomplete
|
||||
formControlName="ignoredPatterns"
|
||||
formControlName="patterns"
|
||||
placeholder="Add pattern"
|
||||
></app-mobile-autocomplete>
|
||||
|
||||
<!-- Desktop autocomplete -->
|
||||
<p-autocomplete
|
||||
formControlName="ignoredPatterns"
|
||||
formControlName="patterns"
|
||||
multiple
|
||||
fluid
|
||||
[typeahead]="false"
|
||||
@@ -233,9 +253,12 @@
|
||||
class="desktop-only"
|
||||
>
|
||||
</p-autocomplete>
|
||||
<small class="form-helper-text"
|
||||
>Failed imports containing these patterns will be skipped (e.g. <code>sample</code>)</small
|
||||
>
|
||||
<small class="form-helper-text">
|
||||
{{ queueCleanerForm.get('failedImport.patternMode')?.value === PatternMode.Include ?
|
||||
'Only failed imports containing these patterns will be removed and everything else will be skipped' :
|
||||
'Failed imports containing these patterns will be skipped and everything else will be removed'
|
||||
}}
|
||||
</small>
|
||||
</div>
|
||||
</div>
|
||||
</p-accordion-content>
|
||||
|
||||
@@ -9,6 +9,8 @@ import {
|
||||
ScheduleUnit,
|
||||
ScheduleOptions
|
||||
} from "../../shared/models/queue-cleaner-config.model";
|
||||
import { PatternMode } from "../../shared/models/queue-cleaner-config.model";
|
||||
import { SettingsCardComponent } from "../components/settings-card/settings-card.component";
|
||||
import { ByteSizeInputComponent } from "../../shared/components/byte-size-input/byte-size-input.component";
|
||||
import { MobileAutocompleteComponent } from "../../shared/components/mobile-autocomplete/mobile-autocomplete.component";
|
||||
|
||||
@@ -112,6 +114,8 @@ export class QueueCleanerSettingsComponent implements OnDestroy, CanComponentDea
|
||||
{ label: 'Basic', value: false },
|
||||
{ label: 'Advanced', value: true }
|
||||
];
|
||||
// Expose PatternMode enum for template comparisons
|
||||
PatternMode = PatternMode;
|
||||
|
||||
// Privacy type options for rules
|
||||
privacyTypeOptions = [
|
||||
@@ -553,7 +557,8 @@ export class QueueCleanerSettingsComponent implements OnDestroy, CanComponentDea
|
||||
maxStrikes: [0, [Validators.required, Validators.min(0), Validators.max(5000)]],
|
||||
ignorePrivate: [{ value: false, disabled: true }],
|
||||
deletePrivate: [{ value: false, disabled: true }],
|
||||
ignoredPatterns: [{ value: [], disabled: true }],
|
||||
patterns: [{ value: [], disabled: true }],
|
||||
patternMode: [{ value: PatternMode.Include, disabled: true }],
|
||||
}),
|
||||
|
||||
downloadingMetadataMaxStrikes: [{ value: 0, disabled: true }, [Validators.required, Validators.min(0), Validators.max(5000)]],
|
||||
@@ -1015,7 +1020,8 @@ export class QueueCleanerSettingsComponent implements OnDestroy, CanComponentDea
|
||||
|
||||
if (enable) {
|
||||
this.queueCleanerForm.get("failedImport")?.get("ignorePrivate")?.enable(options);
|
||||
this.queueCleanerForm.get("failedImport")?.get("ignoredPatterns")?.enable(options);
|
||||
this.queueCleanerForm.get("failedImport")?.get("patterns")?.enable(options);
|
||||
this.queueCleanerForm.get("failedImport")?.get("patternMode")?.enable(options);
|
||||
|
||||
// Only enable deletePrivate if ignorePrivate is false
|
||||
const ignorePrivate = this.queueCleanerForm.get("failedImport.ignorePrivate")?.value || false;
|
||||
@@ -1029,7 +1035,8 @@ export class QueueCleanerSettingsComponent implements OnDestroy, CanComponentDea
|
||||
} else {
|
||||
this.queueCleanerForm.get("failedImport")?.get("ignorePrivate")?.disable(options);
|
||||
this.queueCleanerForm.get("failedImport")?.get("deletePrivate")?.disable(options);
|
||||
this.queueCleanerForm.get("failedImport")?.get("ignoredPatterns")?.disable(options);
|
||||
this.queueCleanerForm.get("failedImport")?.get("patterns")?.disable(options);
|
||||
this.queueCleanerForm.get("failedImport")?.get("patternMode")?.disable(options);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1061,7 +1068,8 @@ export class QueueCleanerSettingsComponent implements OnDestroy, CanComponentDea
|
||||
maxStrikes: formValue.failedImport?.maxStrikes || 0,
|
||||
ignorePrivate: formValue.failedImport?.ignorePrivate || false,
|
||||
deletePrivate: formValue.failedImport?.deletePrivate || false,
|
||||
ignoredPatterns: formValue.failedImport?.ignoredPatterns || [],
|
||||
patterns: formValue.failedImport?.patterns || [],
|
||||
patternMode: formValue.failedImport?.patternMode || PatternMode.Include,
|
||||
},
|
||||
downloadingMetadataMaxStrikes: formValue.downloadingMetadataMaxStrikes || 0,
|
||||
stallRules: formValue.stallRules || [],
|
||||
@@ -1126,7 +1134,8 @@ export class QueueCleanerSettingsComponent implements OnDestroy, CanComponentDea
|
||||
maxStrikes: 0,
|
||||
ignorePrivate: false,
|
||||
deletePrivate: false,
|
||||
ignoredPatterns: [],
|
||||
patterns: [],
|
||||
patternMode: PatternMode.Include,
|
||||
},
|
||||
|
||||
downloadingMetadataMaxStrikes: 0,
|
||||
|
||||
@@ -7,6 +7,11 @@ export enum ScheduleUnit {
|
||||
Hours = 'Hours'
|
||||
}
|
||||
|
||||
export enum PatternMode {
|
||||
Exclude = 'Exclude',
|
||||
Include = 'Include'
|
||||
}
|
||||
|
||||
/**
|
||||
* Valid values for each schedule unit
|
||||
*/
|
||||
@@ -25,7 +30,8 @@ export interface FailedImportConfig {
|
||||
maxStrikes: number;
|
||||
ignorePrivate: boolean;
|
||||
deletePrivate: boolean;
|
||||
ignoredPatterns: string[];
|
||||
patterns: string[];
|
||||
patternMode?: PatternMode;
|
||||
}
|
||||
|
||||
export interface QueueCleanerConfig {
|
||||
|
||||
Reference in New Issue
Block a user