Compare commits

...

7 Commits

Author SHA1 Message Date
Flaminel
88f40438af Fix validations and increased strikes limits (#212) 2025-07-01 13:18:50 +03:00
Flaminel
0a9ec06841 removed forgotten release step from MacOS workflow 2025-07-01 11:05:00 +03:00
Flaminel
a0ca6ec4b8 Add curl to the Docker image (#211) 2025-07-01 10:06:22 +03:00
Flaminel
eb6cf96470 Fix cron expression inputs (#203) 2025-07-01 01:00:43 +03:00
Flaminel
2ca0616771 Add date on dashboard logs and events (#205) 2025-07-01 01:00:30 +03:00
Flaminel
bc85144e60 Improve deploy workflows (#206) 2025-07-01 01:00:16 +03:00
Flaminel
236e31c841 Add download client name on debug logs (#207) 2025-07-01 00:59:52 +03:00
34 changed files with 340 additions and 306 deletions

View File

@@ -134,22 +134,4 @@ jobs:
./artifacts/*.zip
retention-days: 30
- name: Release
if: startsWith(github.ref, 'refs/tags/')
id: release
uses: softprops/action-gh-release@v2
with:
name: ${{ env.releaseVersion }}
tag_name: ${{ env.releaseVersion }}
repository: ${{ env.githubRepository }}
token: ${{ env.REPO_READONLY_PAT }}
make_latest: true
fail_on_unmatched_files: true
target_commitish: main
generate_release_notes: true
files: |
./artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-win-amd64.zip
./artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-linux-amd64.zip
./artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-linux-arm64.zip
./artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-osx-amd64.zip
./artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-osx-arm64.zip
# Removed individual release step - handled by main release workflow

View File

@@ -363,14 +363,4 @@ jobs:
path: '${{ env.pkgName }}'
retention-days: 30
- name: Release
if: startsWith(github.ref, 'refs/tags/')
uses: softprops/action-gh-release@v2
with:
name: ${{ env.releaseVersion }}
tag_name: ${{ env.releaseVersion }}
repository: ${{ env.githubRepository }}
token: ${{ env.REPO_READONLY_PAT }}
make_latest: true
files: |
${{ env.pkgName }}
# Removed individual release step - handled by main release workflow

View File

@@ -363,14 +363,4 @@ jobs:
path: '${{ env.pkgName }}'
retention-days: 30
- name: Release
if: startsWith(github.ref, 'refs/tags/')
uses: softprops/action-gh-release@v2
with:
name: ${{ env.releaseVersion }}
tag_name: ${{ env.releaseVersion }}
repository: ${{ env.githubRepository }}
token: ${{ env.REPO_READONLY_PAT }}
make_latest: true
files: |
${{ env.pkgName }}
# Removed individual release step - handled by main release workflow

View File

@@ -88,19 +88,6 @@ jobs:
run: |
dotnet publish code/backend/${{ env.executableName }}/${{ env.executableName }}.csproj -c Release --runtime win-x64 --self-contained -o dist /p:PublishSingleFile=true /p:Version=${{ env.appVersion }} /p:DebugType=None /p:DebugSymbols=false
- name: Create sample configuration
shell: pwsh
run: |
# Create config directory
New-Item -ItemType Directory -Force -Path "config"
$config = @{
"HTTP_PORTS" = 11011
"BASE_PATH" = "/"
}
$config | ConvertTo-Json | Out-File -FilePath "config/cleanuparr.json" -Encoding UTF8
- name: Setup Inno Setup
shell: pwsh
run: |
@@ -158,14 +145,4 @@ jobs:
path: installer/${{ env.installerName }}
retention-days: 30
- name: Release
if: startsWith(github.ref, 'refs/tags/')
uses: softprops/action-gh-release@v2
with:
name: ${{ env.releaseVersion }}
tag_name: ${{ env.releaseVersion }}
repository: ${{ env.githubRepository }}
token: ${{ env.REPO_READONLY_PAT }}
make_latest: true
files: |
installer/${{ env.installerName }}
# Removed individual release step - handled by main release workflow

View File

@@ -45,6 +45,7 @@ FROM mcr.microsoft.com/dotnet/aspnet:9.0-bookworm-slim
# Install required packages for user management and timezone support
RUN apt-get update && apt-get install -y \
curl \
tzdata \
gosu \
&& rm -rf /var/lib/apt/lists/*

View File

@@ -21,7 +21,7 @@ public partial class DelugeService
if (download?.Hash is null)
{
_logger.LogDebug("failed to find torrent {hash} in the download client", hash);
_logger.LogDebug("failed to find torrent {hash} in the {name} download client", hash, _downloadClientConfig.Name);
return result;
}
@@ -52,7 +52,7 @@ public partial class DelugeService
}
catch (Exception exception)
{
_logger.LogDebug(exception, "failed to find torrent {hash} in the download client", hash);
_logger.LogDebug(exception, "failed to find files in the download client | {name}", download.Name);
}
if (contents is null)

View File

@@ -25,7 +25,7 @@ public partial class DelugeService
if (download?.Hash is null)
{
_logger.LogDebug("failed to find torrent {hash} in the download client", hash);
_logger.LogDebug("failed to find torrent {hash} in the {name} download client", hash, _downloadClientConfig.Name);
return result;
}
@@ -44,7 +44,7 @@ public partial class DelugeService
}
catch (Exception exception)
{
_logger.LogDebug(exception, "failed to find torrent {hash} in the download client", hash);
_logger.LogDebug(exception, "failed to find files in the download client | {name}", download.Name);
}

View File

@@ -20,7 +20,7 @@ public partial class QBitService
if (download is null)
{
_logger.LogDebug("failed to find torrent {hash} in the download client", hash);
_logger.LogDebug("failed to find torrent {hash} in the {name} download client", hash, _downloadClientConfig.Name);
return result;
}
@@ -39,7 +39,7 @@ public partial class QBitService
if (torrentProperties is null)
{
_logger.LogDebug("failed to find torrent properties {hash} in the download client", hash);
_logger.LogDebug("failed to find torrent properties {name}", download.Name);
return result;
}

View File

@@ -97,7 +97,7 @@ public partial class QBitService
if (torrentProperties is null)
{
_logger.LogDebug("failed to find torrent properties in the download client | {name}", download.Name);
_logger.LogDebug("failed to find torrent properties | {name}", download.Name);
return;
}

View File

@@ -19,7 +19,7 @@ public partial class QBitService
if (download is null)
{
_logger.LogDebug("failed to find torrent {hash} in the download client", hash);
_logger.LogDebug("failed to find torrent {hash} in the {name} download client", hash, _downloadClientConfig.Name);
return result;
}
@@ -38,7 +38,7 @@ public partial class QBitService
if (torrentProperties is null)
{
_logger.LogDebug("failed to find torrent properties {hash} in the download client", hash);
_logger.LogDebug("failed to find torrent properties {hash}", download.Name);
return result;
}

View File

@@ -19,7 +19,7 @@ public partial class TransmissionService
if (download?.FileStats is null || download.FileStats.Length == 0)
{
_logger.LogDebug("failed to find torrent {hash} in the download client", hash);
_logger.LogDebug("failed to find torrent {hash} in the {name} download client", hash, _downloadClientConfig.Name);
return result;
}

View File

@@ -22,7 +22,7 @@ public partial class TransmissionService
if (download is null)
{
_logger.LogDebug("failed to find torrent {hash} in the download client", hash);
_logger.LogDebug("failed to find torrent {hash} in the {name} download client", hash, _downloadClientConfig.Name);
return result;
}

View File

@@ -64,7 +64,10 @@ export class ConfigurationService {
* Update queue cleaner configuration
*/
updateQueueCleanerConfig(config: QueueCleanerConfig): Observable<QueueCleanerConfig> {
config.cronExpression = this.convertJobScheduleToCron(config.jobSchedule!);
// Generate cron expression if using basic scheduling
if (!config.useAdvancedScheduling && config.jobSchedule) {
config.cronExpression = this.convertJobScheduleToCron(config.jobSchedule);
}
return this.http.put<QueueCleanerConfig>(this.ApplicationPathService.buildApiUrl('/configuration/queue_cleaner'), config).pipe(
catchError((error) => {
console.error("Error updating queue cleaner config:", error);
@@ -113,32 +116,32 @@ export class ConfigurationService {
*/
private tryExtractJobScheduleFromCron(cronExpression: string): JobSchedule | undefined {
// Patterns we support:
// Seconds: */n * * ? * * *
// Minutes: 0 */n * ? * * *
// Hours: 0 0 */n ? * * *
// Seconds: */n * * ? * * * or 0/n * * ? * * * (Quartz.NET format)
// Minutes: 0 */n * ? * * * or 0 0/n * ? * * * (Quartz.NET format)
// Hours: 0 0 */n ? * * * or 0 0 0/n ? * * * (Quartz.NET format)
try {
const parts = cronExpression.split(" ");
if (parts.length !== 7) return undefined;
// Every n seconds
if (parts[0].startsWith("*/") && parts[1] === "*") {
// Every n seconds - handle both */n and 0/n formats
if ((parts[0].startsWith("*/") || parts[0].startsWith("0/")) && parts[1] === "*") {
const seconds = parseInt(parts[0].substring(2));
if (!isNaN(seconds) && seconds > 0 && seconds < 60) {
return { every: seconds, type: ScheduleUnit.Seconds };
}
}
// Every n minutes
if (parts[0] === "0" && parts[1].startsWith("*/")) {
// Every n minutes - handle both */n and 0/n formats
if (parts[0] === "0" && (parts[1].startsWith("*/") || parts[1].startsWith("0/"))) {
const minutes = parseInt(parts[1].substring(2));
if (!isNaN(minutes) && minutes > 0 && minutes < 60) {
return { every: minutes, type: ScheduleUnit.Minutes };
}
}
// Every n hours
if (parts[0] === "0" && parts[1] === "0" && parts[2].startsWith("*/")) {
// Every n hours - handle both */n and 0/n formats
if (parts[0] === "0" && parts[1] === "0" && (parts[2].startsWith("*/") || parts[2].startsWith("0/"))) {
const hours = parseInt(parts[2].substring(2));
if (!isNaN(hours) && hours > 0 && hours < 24) {
return { every: hours, type: ScheduleUnit.Hours };
@@ -156,31 +159,31 @@ export class ConfigurationService {
*/
private convertJobScheduleToCron(schedule: JobSchedule): string {
if (!schedule || schedule.every <= 0) {
return "0 0/5 * * * ?"; // Default: every 5 minutes
return "0 0/5 * * * ?"; // Default: every 5 minutes (Quartz.NET format)
}
switch (schedule.type) {
case ScheduleUnit.Seconds:
if (schedule.every < 60) {
return `*/${schedule.every} * * ? * * *`;
return `0/${schedule.every} * * ? * * *`; // Quartz.NET format
}
break;
case ScheduleUnit.Minutes:
if (schedule.every < 60) {
return `0 */${schedule.every} * ? * * *`;
return `0 0/${schedule.every} * ? * * *`; // Quartz.NET format
}
break;
case ScheduleUnit.Hours:
if (schedule.every < 24) {
return `0 0 */${schedule.every} ? * * *`;
return `0 0 0/${schedule.every} ? * * *`; // Quartz.NET format
}
break;
}
// Fallback to default
return "0 0/5 * * * ?";
return "0 0/5 * * * ?"; // Default: every 5 minutes (Quartz.NET format)
}
/**
@@ -189,32 +192,32 @@ export class ConfigurationService {
*/
private tryExtractContentBlockerJobScheduleFromCron(cronExpression: string): ContentBlockerJobSchedule | undefined {
// Patterns we support:
// Seconds: */n * * ? * * *
// Minutes: 0 */n * ? * * *
// Hours: 0 0 */n ? * * *
// Seconds: */n * * ? * * * or 0/n * * ? * * * (Quartz.NET format)
// Minutes: 0 */n * ? * * * or 0 0/n * ? * * * (Quartz.NET format)
// Hours: 0 0 */n ? * * * or 0 0 0/n ? * * * (Quartz.NET format)
try {
const parts = cronExpression.split(" ");
if (parts.length !== 7) return undefined;
// Every n seconds
if (parts[0].startsWith("*/") && parts[1] === "*") {
// Every n seconds - handle both */n and 0/n formats
if ((parts[0].startsWith("*/") || parts[0].startsWith("0/")) && parts[1] === "*") {
const seconds = parseInt(parts[0].substring(2));
if (!isNaN(seconds) && seconds > 0 && seconds < 60) {
return { every: seconds, type: ContentBlockerScheduleUnit.Seconds };
}
}
// Every n minutes
if (parts[0] === "0" && parts[1].startsWith("*/")) {
// Every n minutes - handle both */n and 0/n formats
if (parts[0] === "0" && (parts[1].startsWith("*/") || parts[1].startsWith("0/"))) {
const minutes = parseInt(parts[1].substring(2));
if (!isNaN(minutes) && minutes > 0 && minutes < 60) {
return { every: minutes, type: ContentBlockerScheduleUnit.Minutes };
}
}
// Every n hours
if (parts[0] === "0" && parts[1] === "0" && parts[2].startsWith("*/")) {
// Every n hours - handle both */n and 0/n formats
if (parts[0] === "0" && parts[1] === "0" && (parts[2].startsWith("*/") || parts[2].startsWith("0/"))) {
const hours = parseInt(parts[2].substring(2));
if (!isNaN(hours) && hours > 0 && hours < 24) {
return { every: hours, type: ContentBlockerScheduleUnit.Hours };
@@ -232,31 +235,31 @@ export class ConfigurationService {
*/
private convertContentBlockerJobScheduleToCron(schedule: ContentBlockerJobSchedule): string {
if (!schedule || schedule.every <= 0) {
return "0 0/5 * * * ?"; // Default: every 5 minutes
return "0/5 * * * * ?"; // Default: every 5 seconds (Quartz.NET format)
}
switch (schedule.type) {
case ContentBlockerScheduleUnit.Seconds:
if (schedule.every < 60) {
return `*/${schedule.every} * * ? * * *`;
return `0/${schedule.every} * * ? * * *`; // Quartz.NET format
}
break;
case ContentBlockerScheduleUnit.Minutes:
if (schedule.every < 60) {
return `0 */${schedule.every} * ? * * *`;
return `0 0/${schedule.every} * ? * * *`; // Quartz.NET format
}
break;
case ContentBlockerScheduleUnit.Hours:
if (schedule.every < 24) {
return `0 0 */${schedule.every} ? * * *`;
return `0 0 0/${schedule.every} ? * * *`; // Quartz.NET format
}
break;
}
// Fallback to default
return "0 0/5 * * * ?";
return "0/5 * * * * ?"; // Default: every 5 seconds (Quartz.NET format)
}
/**

View File

@@ -46,7 +46,7 @@
<p-tag [severity]="getLogSeverity(log.level)" [value]="log.level"></p-tag>
<span class="text-xs text-color-secondary" *ngIf="log.category">{{log.category}}</span>
</div>
<span class="text-xs text-color-secondary">{{log.timestamp | date:'HH:mm:ss'}}</span>
<span class="text-xs text-color-secondary">{{ log.timestamp | date: 'yyyy-MM-dd HH:mm:ss' }}</span>
</div>
<div class="timeline-message"
[pTooltip]="log.message"
@@ -112,7 +112,7 @@
<p-tag [severity]="getEventSeverity(event.severity)" [value]="event.severity"></p-tag>
<span class="text-xs text-color-secondary">{{formatEventType(event.eventType)}}</span>
</div>
<span class="text-xs text-color-secondary">{{event.timestamp | date:'HH:mm:ss'}}</span>
<span class="text-xs text-color-secondary">{{event.timestamp | date: 'yyyy-MM-dd HH:mm:ss'}}</span>
</div>
<div class="timeline-message"
[pTooltip]="event.message"

View File

@@ -122,22 +122,22 @@ export class ContentBlockerConfigStore extends signalStore(
*/
generateCronExpression(schedule: JobSchedule): string {
if (!schedule) {
return "0/5 * * * * ?"; // Default: every 5 seconds
return "0/5 * * * * ?"; // Default: every 5 seconds (Quartz.NET format)
}
// Cron format: Seconds Minutes Hours Day-of-month Month Day-of-week Year
switch (schedule.type) {
case ScheduleUnit.Seconds:
return `0/${schedule.every} * * ? * * *`; // Every n seconds
return `0/${schedule.every} * * ? * * *`; // Every n seconds (Quartz.NET format)
case ScheduleUnit.Minutes:
return `0 0/${schedule.every} * ? * * *`; // Every n minutes
return `0 0/${schedule.every} * ? * * *`; // Every n minutes (Quartz.NET format)
case ScheduleUnit.Hours:
return `0 0 0/${schedule.every} ? * * *`; // Every n hours
return `0 0 0/${schedule.every} ? * * *`; // Every n hours (Quartz.NET format)
default:
return "0/5 * * * * ?"; // Default: every 5 seconds
return "0/5 * * * * ?"; // Default: every 5 seconds (Quartz.NET format)
}
}
})),

View File

@@ -101,7 +101,7 @@
<div class="field-input">
<input type="text" pInputText formControlName="cronExpression" placeholder="0 0/5 * ? * * *" />
</div>
<small *ngIf="contentBlockerForm.get('cronExpression')?.hasError('required') && contentBlockerForm.get('cronExpression')?.touched" class="p-error">Cron expression is required</small>
<small *ngIf="hasError('cronExpression', 'required')" class="p-error">Cron expression is required</small>
<small class="form-helper-text">Enter a valid Quartz cron expression (e.g., "0 0/5 * ? * * *" runs every 5 minutes)</small>
</div>
</div>

View File

@@ -127,7 +127,7 @@ export class ContentBlockerSettingsComponent implements OnDestroy, CanComponentD
cronExpression: [{ value: '', disabled: true }, [Validators.required]],
jobSchedule: this.formBuilder.group({
every: [{ value: 5, disabled: true }, [Validators.required, Validators.min(1)]],
type: [{ value: ScheduleUnit.Minutes, disabled: true }],
type: [{ value: ScheduleUnit.Seconds, disabled: true }],
}),
ignorePrivate: [{ value: false, disabled: true }],
@@ -167,7 +167,7 @@ export class ContentBlockerSettingsComponent implements OnDestroy, CanComponentD
cronExpression: config.cronExpression,
jobSchedule: config.jobSchedule || {
every: 5,
type: ScheduleUnit.Minutes
type: ScheduleUnit.Seconds
},
ignorePrivate: config.ignorePrivate,
deletePrivate: config.deletePrivate,
@@ -569,6 +569,11 @@ export class ContentBlockerSettingsComponent implements OnDestroy, CanComponentD
blocklistPath: "",
blocklistType: BlocklistType.Blacklist,
},
readarr: {
enabled: false,
blocklistPath: "",
blocklistType: BlocklistType.Blacklist,
},
});
// Manually update control states after reset
@@ -576,6 +581,7 @@ export class ContentBlockerSettingsComponent implements OnDestroy, CanComponentD
this.updateBlocklistDependentControls('sonarr', false);
this.updateBlocklistDependentControls('radarr', false);
this.updateBlocklistDependentControls('lidarr', false);
this.updateBlocklistDependentControls('readarr', false);
// Mark form as dirty so the save button is enabled after reset
this.contentBlockerForm.markAsDirty();
@@ -599,7 +605,7 @@ export class ContentBlockerSettingsComponent implements OnDestroy, CanComponentD
*/
hasError(controlName: string, errorName: string): boolean {
const control = this.contentBlockerForm.get(controlName);
return control ? control.touched && control.hasError(errorName) : false;
return control ? control.dirty && control.hasError(errorName) : false;
}
/**
@@ -614,7 +620,7 @@ export class ContentBlockerSettingsComponent implements OnDestroy, CanComponentD
} else if (scheduleType === ScheduleUnit.Hours) {
return this.scheduleValueOptions[ScheduleUnit.Hours];
}
return this.scheduleValueOptions[ScheduleUnit.Minutes]; // Default to minutes
return this.scheduleValueOptions[ScheduleUnit.Seconds]; // Default to seconds
}
/**
@@ -627,7 +633,7 @@ export class ContentBlockerSettingsComponent implements OnDestroy, CanComponentD
}
const control = parentControl.get(controlName);
return control ? control.touched && control.hasError(errorName) : false;
return control ? control.dirty && control.hasError(errorName) : false;
}

View File

@@ -101,7 +101,7 @@
<div class="field-input">
<input type="text" pInputText formControlName="cronExpression" placeholder="0 0/5 * ? * * *" />
</div>
<small *ngIf="downloadCleanerForm.get('cronExpression')?.hasError('required') && downloadCleanerForm.get('cronExpression')?.touched" class="p-error">Cron expression is required</small>
<small *ngIf="hasError('cronExpression', 'required')" class="p-error">Cron expression is required</small>
<small class="form-helper-text">Enter a valid Quartz cron expression (e.g., "0 0/5 * ? * * *" runs every 5 minutes)</small>
</div>
</div>

View File

@@ -362,21 +362,27 @@ export class DownloadCleanerSettingsComponent implements OnDestroy, CanComponent
.pipe(takeUntil(this.destroy$))
.subscribe(useAdvanced => {
const enabled = this.downloadCleanerForm.get('enabled')?.value || false;
if (enabled) {
const cronExpressionControl = this.downloadCleanerForm.get('cronExpression');
const jobScheduleGroup = this.downloadCleanerForm.get('jobSchedule') as FormGroup;
const everyControl = jobScheduleGroup?.get('every');
const typeControl = jobScheduleGroup?.get('type');
if (useAdvanced) {
if (cronExpressionControl) cronExpressionControl.enable();
if (everyControl) everyControl.disable();
if (typeControl) typeControl.disable();
} else {
if (cronExpressionControl) cronExpressionControl.disable();
if (everyControl) everyControl.enable();
if (typeControl) typeControl.enable();
}
const cronExpressionControl = this.downloadCleanerForm.get('cronExpression');
const jobScheduleGroup = this.downloadCleanerForm.get('jobSchedule') as FormGroup;
const everyControl = jobScheduleGroup?.get('every');
const typeControl = jobScheduleGroup?.get('type');
// Update scheduling controls based on mode, regardless of enabled state
if (useAdvanced) {
if (cronExpressionControl) cronExpressionControl.enable();
if (everyControl) everyControl.disable();
if (typeControl) typeControl.disable();
} else {
if (cronExpressionControl) cronExpressionControl.disable();
if (everyControl) everyControl.enable();
if (typeControl) typeControl.enable();
}
// Then respect the main enabled state - if disabled, disable all scheduling controls
if (!enabled) {
cronExpressionControl?.disable();
everyControl?.disable();
typeControl?.disable();
}
});
}
@@ -463,19 +469,14 @@ export class DownloadCleanerSettingsComponent implements OnDestroy, CanComponent
* Update form control disabled states based on the configuration
*/
private updateFormControlDisabledStates(config: DownloadCleanerConfig): void {
// Update main controls based on enabled state
// Update main form controls based on the 'enabled' state
this.updateMainControlsState(config.enabled);
// Update schedule controls based on advanced scheduling
const cronControl = this.downloadCleanerForm.get('cronExpression');
const jobScheduleControl = this.downloadCleanerForm.get('jobSchedule');
if (config.useAdvancedScheduling) {
jobScheduleControl?.disable({ emitEvent: false });
cronControl?.enable({ emitEvent: false });
} else {
cronControl?.disable({ emitEvent: false });
jobScheduleControl?.enable({ emitEvent: false });
// Update other dependent controls only if the main feature is enabled
if (config.enabled) {
// Update unlinked controls based on current unlinkedEnabled value
const unlinkedEnabled = config.unlinkedEnabled || false;
this.updateUnlinkedControlsState(unlinkedEnabled);
}
}
@@ -552,14 +553,17 @@ export class DownloadCleanerSettingsComponent implements OnDestroy, CanComponent
// Get form values including disabled controls
const formValues = this.downloadCleanerForm.getRawValue();
// Determine the correct cron expression to use
const cronExpression: string = formValues.useAdvancedScheduling ?
formValues.cronExpression :
// If in basic mode, generate cron expression from the schedule
this.downloadCleanerStore.generateCronExpression(formValues.jobSchedule);
// Create config object from form values
const config: DownloadCleanerConfig = {
enabled: formValues.enabled,
useAdvancedScheduling: formValues.useAdvancedScheduling,
cronExpression: formValues.useAdvancedScheduling ?
formValues.cronExpression :
// If in basic mode, generate cron expression from the schedule
this.downloadCleanerStore.generateCronExpression(formValues.jobSchedule),
cronExpression: cronExpression,
jobSchedule: formValues.jobSchedule,
categories: formValues.categories,
deletePrivate: formValues.deletePrivate,
@@ -656,14 +660,14 @@ export class DownloadCleanerSettingsComponent implements OnDestroy, CanComponent
*/
hasError(controlName: string, errorName: string): boolean {
const control = this.downloadCleanerForm.get(controlName);
return control ? control.touched && control.hasError(errorName) : false;
return control ? control.dirty && control.hasError(errorName) : false;
}
/**
* Check if the form has the unlinked categories validation error
*/
hasUnlinkedCategoriesError(): boolean {
return this.downloadCleanerForm.touched && this.downloadCleanerForm.hasError('unlinkedCategoriesRequired');
return this.downloadCleanerForm.dirty && this.downloadCleanerForm.hasError('unlinkedCategoriesRequired');
}
/**
@@ -691,7 +695,7 @@ export class DownloadCleanerSettingsComponent implements OnDestroy, CanComponent
}
const control = parentControl.get(controlName);
return control ? control.touched && control.hasError(errorName) : false;
return control ? control.dirty && control.hasError(errorName) : false;
}
/**
@@ -702,7 +706,7 @@ export class DownloadCleanerSettingsComponent implements OnDestroy, CanComponent
if (!categoryGroup) return false;
const control = categoryGroup.get(controlName);
return control ? control.touched && control.hasError(errorName) : false;
return control ? control.dirty && control.hasError(errorName) : false;
}
/**
@@ -711,7 +715,7 @@ export class DownloadCleanerSettingsComponent implements OnDestroy, CanComponent
hasCategoryControlError(categoryIndex: number, controlName: string, errorName: string): boolean {
const categoryGroup = this.categoriesFormArray.at(categoryIndex);
const control = categoryGroup.get(controlName);
return control ? control.touched && control.hasError(errorName) : false;
return control ? control.dirty && control.hasError(errorName) : false;
}
/**
@@ -719,7 +723,7 @@ export class DownloadCleanerSettingsComponent implements OnDestroy, CanComponent
*/
hasCategoryGroupError(categoryIndex: number, errorName: string): boolean {
const categoryGroup = this.categoriesFormArray.at(categoryIndex);
return categoryGroup ? categoryGroup.touched && categoryGroup.hasError(errorName) : false;
return categoryGroup ? categoryGroup.dirty && categoryGroup.hasError(errorName) : false;
}
/**

View File

@@ -156,7 +156,7 @@ export class DownloadClientSettingsComponent implements OnDestroy, CanComponentD
*/
hasError(form: FormGroup, controlName: string, errorName: string): boolean {
const control = form.get(controlName);
return control !== null && control.hasError(errorName) && control.touched;
return control !== null && control.hasError(errorName) && control.dirty;
}
/**

View File

@@ -27,7 +27,7 @@
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('displaySupportBanner')"
title="View documentation for support banner display">
title="Click for documentation">
</i>
Display Support Banner
</label>
@@ -42,7 +42,7 @@
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('dryRun')"
title="View documentation for dry run mode">
title="Click for documentation">
</i>
Dry Run
</label>
@@ -57,7 +57,7 @@
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('httpMaxRetries')"
title="View documentation for HTTP retry configuration">
title="Click for documentation">
</i>
Maximum HTTP Retries
</label>
@@ -81,7 +81,7 @@
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('httpTimeout')"
title="View documentation for HTTP timeout configuration">
title="Click for documentation">
</i>
HTTP Timeout (seconds)
</label>
@@ -105,7 +105,7 @@
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('httpCertificateValidation')"
title="View documentation for certificate validation options">
title="Click for documentation">
</i>
Certificate Validation
</label>
@@ -126,7 +126,7 @@
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('searchEnabled')"
title="View documentation for automatic search functionality">
title="Click for documentation">
</i>
Enable Search
</label>
@@ -140,7 +140,7 @@
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('searchDelay')"
title="View documentation for search delay configuration">
title="Click for documentation">
</i>
Search Delay (seconds)
</label>
@@ -165,7 +165,7 @@
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('logLevel')"
title="View documentation for log level configuration">
title="Click for documentation">
</i>
Log Level
</label>
@@ -186,7 +186,7 @@
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('ignoredDownloads')"
title="View documentation for download ignore patterns">
title="Click for documentation">
</i>
Ignored Downloads
</label>

View File

@@ -355,7 +355,7 @@ export class GeneralSettingsComponent implements OnDestroy, CanComponentDeactiva
*/
hasError(controlName: string, errorName: string): boolean {
const control = this.generalForm.get(controlName);
return control ? control.touched && control.hasError(errorName) : false;
return control ? control.dirty && control.hasError(errorName) : false;
}
/**

View File

@@ -42,6 +42,9 @@
decrementButtonIcon="pi pi-minus"
></p-inputNumber>
</div>
<small *ngIf="hasError('failedImportMaxStrikes', 'required')" class="p-error">This field is required</small>
<small *ngIf="hasError('failedImportMaxStrikes', 'min')" class="p-error">Value cannot be less than -1</small>
<small *ngIf="hasError('failedImportMaxStrikes', 'max')" class="p-error">Value cannot exceed 5000</small>
<small class="form-helper-text">Maximum number of strikes before removing a failed import (-1 to use global setting; 0 to disable)</small>
</div>
</div>

View File

@@ -82,7 +82,7 @@ export class LidarrSettingsComponent implements OnDestroy, CanComponentDeactivat
constructor() {
// Initialize forms
this.globalForm = this.formBuilder.group({
failedImportMaxStrikes: [-1],
failedImportMaxStrikes: [-1, [Validators.required, Validators.min(-1), Validators.max(5000)]],
});
this.instanceForm = this.formBuilder.group({
@@ -211,11 +211,31 @@ export class LidarrSettingsComponent implements OnDestroy, CanComponentDeactivat
}
/**
* Check if a form control has an error
* Check if a form control has an error after it's been touched
*/
hasError(form: FormGroup, controlName: string, errorName: string): boolean {
const control = form.get(controlName);
return control !== null && control.hasError(errorName) && control.touched;
hasError(formOrControlName: FormGroup | string, controlNameOrErrorName: string, errorName?: string): boolean {
if (formOrControlName instanceof FormGroup) {
// For instance form
const control = formOrControlName.get(controlNameOrErrorName);
return control !== null && control.hasError(errorName!) && control.dirty;
} else {
// For global form
const control = this.globalForm.get(formOrControlName);
return control ? control.dirty && control.hasError(controlNameOrErrorName) : false;
}
}
/**
* Get nested form control errors
*/
hasNestedError(parentName: string, controlName: string, errorName: string): boolean {
const parentControl = this.globalForm.get(parentName);
if (!parentControl || !(parentControl instanceof FormGroup)) {
return false;
}
const control = parentControl.get(controlName);
return control ? control.dirty && control.hasError(errorName) : false;
}
/**
@@ -406,8 +426,6 @@ export class LidarrSettingsComponent implements OnDestroy, CanComponentDeactivat
});
}
/**
* Get modal title based on mode
*/

View File

@@ -35,7 +35,7 @@
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('notifiarr.apiKey')"
title="View documentation for Notifiarr API key setup">
title="Click for documentation">
</i>
API Key
</label>
@@ -50,12 +50,12 @@
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('notifiarr.channelId')"
title="View documentation for Discord channel ID setup">
title="Click for documentation">
</i>
Channel ID
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('notifiarr.channelId')"
title="View documentation for Discord channel ID setup">
title="Click for documentation">
</i>
</label>
<div class="field-input">
@@ -69,7 +69,7 @@
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('eventTriggers')"
title="View documentation for notification event types">
title="Click for documentation">
</i>
Event Triggers
</label>
@@ -115,7 +115,7 @@
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('apprise.url')"
title="View documentation for Apprise server URL setup">
title="Click for documentation">
</i>
URL
</label>
@@ -130,7 +130,7 @@
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('apprise.key')"
title="View documentation for Apprise configuration key">
title="Click for documentation">
</i>
Key
</label>
@@ -145,7 +145,7 @@
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('eventTriggers')"
title="View documentation for notification event types">
title="Click for documentation">
</i>
Event Triggers
</label>

View File

@@ -311,7 +311,7 @@ export class NotificationSettingsComponent implements OnDestroy, CanComponentDea
*/
hasError(controlName: string, errorName: string): boolean {
const control = this.notificationForm.get(controlName);
return control ? control.touched && control.hasError(errorName) : false;
return control ? control.dirty && control.hasError(errorName) : false;
}
/**
@@ -319,7 +319,7 @@ export class NotificationSettingsComponent implements OnDestroy, CanComponentDea
*/
hasNestedError(groupName: string, controlName: string, errorName: string): boolean {
const control = this.notificationForm.get(`${groupName}.${controlName}`);
return control ? control.touched && control.hasError(errorName) : false;
return control ? control.dirty && control.hasError(errorName) : false;
}
/**

View File

@@ -26,9 +26,8 @@
<div class="field-row">
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('enabled')"
title="View documentation for this setting">
</i>
(click)="openFieldDocs('enabled')"
title="Click for documentation"></i>
Enable Queue Cleaner
</label>
<div class="field-input">
@@ -41,9 +40,8 @@
<div class="field-row">
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('useAdvancedScheduling')"
title="View documentation for scheduling modes">
</i>
(click)="openFieldDocs('useAdvancedScheduling')"
title="Click for documentation"></i>
Scheduling Mode
</label>
<div class="field-input">
@@ -95,16 +93,15 @@
<div class="field-row" *ngIf="queueCleanerForm.get('useAdvancedScheduling')?.value">
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('cronExpression')"
title="View cron expression documentation and examples">
</i>
(click)="openFieldDocs('cronExpression')"
title="Click for documentation"></i>
Cron Expression
</label>
<div>
<div class="field-input">
<input type="text" pInputText formControlName="cronExpression" placeholder="0 0/5 * ? * * *" />
</div>
<small *ngIf="queueCleanerForm.get('cronExpression')?.hasError('required') && queueCleanerForm.get('cronExpression')?.touched" class="p-error">Cron expression is required</small>
<small *ngIf="hasError('cronExpression', 'required')" class="p-error">Cron expression is required</small>
<small class="form-helper-text">Enter a valid Quartz cron expression (e.g., "0 0/5 * ? * * *" runs every 5 minutes)</small>
</div>
</div>
@@ -127,20 +124,22 @@
<div class="field-row" formGroupName="failedImport">
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('failedImport.maxStrikes')"
title="View documentation for failed import strike system">
</i>
(click)="openFieldDocs('failedImport.maxStrikes')"
title="Click for documentation"></i>
Max Strikes
</label>
<div class="field-input">
<p-inputNumber
formControlName="maxStrikes"
[showButtons]="true"
[min]="0"
[max]="10"
buttonLayout="horizontal"
>
</p-inputNumber>
<div>
<div class="field-input">
<p-inputNumber
formControlName="maxStrikes"
[showButtons]="true"
[min]="0"
buttonLayout="horizontal"
>
</p-inputNumber>
</div>
<small *ngIf="hasNestedError('failedImport', 'maxStrikes', 'required')" class="p-error">This field is required</small>
<small *ngIf="hasNestedError('failedImport', 'maxStrikes', 'max')" class="p-error">Value cannot exceed 5000</small>
<small class="form-helper-text"
>Number of strikes before action is taken (0 to disable, min 3 to enable)</small
>
@@ -150,9 +149,8 @@
<div class="field-row" formGroupName="failedImport">
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('failedImport.ignorePrivate')"
title="View documentation for private torrent handling">
</i>
(click)="openFieldDocs('failedImport.ignorePrivate')"
title="Click for documentation"></i>
Ignore Private
</label>
<div class="field-input">
@@ -164,9 +162,8 @@
<div class="field-row" formGroupName="failedImport">
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('failedImport.deletePrivate')"
title="View documentation for private torrent deletion">
</i>
(click)="openFieldDocs('failedImport.deletePrivate')"
title="Click for documentation"></i>
Delete Private
</label>
<div class="field-input">
@@ -178,9 +175,8 @@
<div class="field-row" formGroupName="failedImport">
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('failedImport.ignoredPatterns')"
title="View documentation for pattern matching and examples">
</i>
(click)="openFieldDocs('failedImport.ignoredPatterns')"
title="Click for documentation"></i>
Ignored Patterns
</label>
<div class="field-input">
@@ -224,9 +220,8 @@
<div class="field-row" formGroupName="stalled">
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('stalled.maxStrikes')"
title="View documentation for stalled download strike system">
</i>
(click)="openFieldDocs('stalled.maxStrikes')"
title="Click for documentation"></i>
Max Strikes
</label>
<div>
@@ -240,7 +235,7 @@
</p-inputNumber>
</div>
<small *ngIf="hasNestedError('stalled', 'maxStrikes', 'required')" class="p-error">This field is required</small>
<small *ngIf="hasNestedError('stalled', 'maxStrikes', 'max')" class="p-error">Value cannot exceed 100</small>
<small *ngIf="hasNestedError('stalled', 'maxStrikes', 'max')" class="p-error">Value cannot exceed 5000</small>
<small class="form-helper-text"
>Number of strikes before action is taken (0 to disable, min 3 to enable)</small
>
@@ -250,9 +245,8 @@
<div class="field-row" formGroupName="stalled">
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('stalled.resetStrikesOnProgress')"
title="View documentation for strike reset behavior">
</i>
(click)="openFieldDocs('stalled.resetStrikesOnProgress')"
title="Click for documentation"></i>
Reset Strikes On Progress
</label>
<div class="field-input">
@@ -264,9 +258,8 @@
<div class="field-row" formGroupName="stalled">
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('stalled.ignorePrivate')"
title="View documentation for private torrent handling">
</i>
(click)="openFieldDocs('stalled.ignorePrivate')"
title="Click for documentation"></i>
Ignore Private
</label>
<div class="field-input">
@@ -278,9 +271,8 @@
<div class="field-row" formGroupName="stalled">
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('stalled.deletePrivate')"
title="View documentation for private torrent deletion">
</i>
(click)="openFieldDocs('stalled.deletePrivate')"
title="Click for documentation"></i>
Delete Private
</label>
<div class="field-input">
@@ -307,9 +299,8 @@
<div class="field-row" formGroupName="stalled">
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('stalled.downloadingMetadataMaxStrikes')"
title="View documentation for metadata download handling">
</i>
(click)="openFieldDocs('stalled.downloadingMetadataMaxStrikes')"
title="Click for documentation"></i>
Max Strikes for Downloading Metadata
</label>
<div>
@@ -323,7 +314,7 @@
</p-inputNumber>
</div>
<small *ngIf="hasNestedError('stalled', 'downloadingMetadataMaxStrikes', 'required')" class="p-error">This field is required</small>
<small *ngIf="hasNestedError('stalled', 'downloadingMetadataMaxStrikes', 'max')" class="p-error">Value cannot exceed 100</small>
<small *ngIf="hasNestedError('stalled', 'downloadingMetadataMaxStrikes', 'max')" class="p-error">Value cannot exceed 5000</small>
<small class="form-helper-text"
>Number of strikes before action is taken (0 to disable, min 3 to enable)</small
>
@@ -348,9 +339,8 @@
<div class="field-row" formGroupName="slow">
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('slow.maxStrikes')"
title="View documentation for slow download strike system">
</i>
(click)="openFieldDocs('slow.maxStrikes')"
title="Click for documentation"></i>
Max Strikes
</label>
<div>
@@ -364,7 +354,7 @@
</p-inputNumber>
</div>
<small *ngIf="hasNestedError('slow', 'maxStrikes', 'required')" class="p-error">This field is required</small>
<small *ngIf="hasNestedError('slow', 'maxStrikes', 'max')" class="p-error">Value cannot exceed 100</small>
<small *ngIf="hasNestedError('slow', 'maxStrikes', 'max')" class="p-error">Value cannot exceed 5000</small>
<small class="form-helper-text"
>Number of strikes before action is taken (0 to disable, min 3 to enable)</small
>
@@ -374,9 +364,8 @@
<div class="field-row" formGroupName="slow">
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('slow.resetStrikesOnProgress')"
title="View documentation for strike reset behavior">
</i>
(click)="openFieldDocs('slow.resetStrikesOnProgress')"
title="Click for documentation"></i>
Reset Strikes On Progress
</label>
<div class="field-input">
@@ -388,9 +377,8 @@
<div class="field-row" formGroupName="slow">
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('slow.ignorePrivate')"
title="View documentation for private torrent handling">
</i>
(click)="openFieldDocs('slow.ignorePrivate')"
title="Click for documentation"></i>
Ignore Private
</label>
<div class="field-input">
@@ -402,9 +390,8 @@
<div class="field-row" formGroupName="slow">
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('slow.deletePrivate')"
title="View documentation for private torrent deletion">
</i>
(click)="openFieldDocs('slow.deletePrivate')"
title="Click for documentation"></i>
Delete Private
</label>
<div class="field-input">
@@ -416,9 +403,8 @@
<div class="field-row" formGroupName="slow">
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('slow.minSpeed')"
title="View speed threshold guidelines and recommendations">
</i>
(click)="openFieldDocs('slow.minSpeed')"
title="Click for documentation"></i>
Minimum Speed
</label>
<div class="field-input">
@@ -435,21 +421,22 @@
<div class="field-row" formGroupName="slow">
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('slow.maxTime')"
title="View documentation for maximum slow download time">
</i>
(click)="openFieldDocs('slow.maxTime')"
title="Click for documentation"></i>
Maximum Time (hours)
</label>
<div class="field-input">
<p-inputNumber
formControlName="maxTime"
[showButtons]="true"
[min]="0"
buttonLayout="horizontal"
>
</p-inputNumber>
<div>
<div class="field-input">
<p-inputNumber
formControlName="maxTime"
[showButtons]="true"
[min]="0"
buttonLayout="horizontal"
>
</p-inputNumber>
</div>
<small *ngIf="hasNestedError('slow', 'maxTime', 'required')" class="p-error">This field is required</small>
<small *ngIf="hasNestedError('slow', 'maxTime', 'max')" class="p-error">Value cannot exceed 168</small>
<small *ngIf="hasNestedError('slow', 'maxTime', 'max')" class="p-error">Value cannot exceed 1000</small>
<small class="form-helper-text">Maximum time allowed for slow downloads (0 means disabled)</small>
</div>
</div>
@@ -457,9 +444,8 @@
<div class="field-row" formGroupName="slow">
<label class="field-label">
<i class="pi pi-info-circle field-info-icon"
(click)="openFieldDocs('slow.ignoreAboveSize')"
title="View size exemption strategy and recommended thresholds">
</i>
(click)="openFieldDocs('slow.ignoreAboveSize')"
title="Click for documentation"></i>
Ignore Above Size
</label>
<div class="field-input">

View File

@@ -142,7 +142,7 @@ export class QueueCleanerSettingsComponent implements OnDestroy, CanComponentDea
// Failed Import settings - nested group
failedImport: this.formBuilder.group({
maxStrikes: [0, [Validators.required, Validators.min(0), Validators.max(100)]],
maxStrikes: [0, [Validators.required, Validators.min(0), Validators.max(5000)]],
ignorePrivate: [{ value: false, disabled: true }],
deletePrivate: [{ value: false, disabled: true }],
ignoredPatterns: [{ value: [], disabled: true }],
@@ -150,21 +150,21 @@ export class QueueCleanerSettingsComponent implements OnDestroy, CanComponentDea
// Stalled settings - nested group
stalled: this.formBuilder.group({
maxStrikes: [0, [Validators.required, Validators.min(0), Validators.max(100)]],
maxStrikes: [0, [Validators.required, Validators.min(0), Validators.max(5000)]],
resetStrikesOnProgress: [{ value: false, disabled: true }],
ignorePrivate: [{ value: false, disabled: true }],
deletePrivate: [{ value: false, disabled: true }],
downloadingMetadataMaxStrikes: [0, [Validators.required, Validators.min(0), Validators.max(100)]],
downloadingMetadataMaxStrikes: [0, [Validators.required, Validators.min(0), Validators.max(5000)]],
}),
// Slow Download settings - nested group
slow: this.formBuilder.group({
maxStrikes: [0, [Validators.required, Validators.min(0), Validators.max(100)]],
maxStrikes: [0, [Validators.required, Validators.min(0), Validators.max(5000)]],
resetStrikesOnProgress: [{ value: false, disabled: true }],
ignorePrivate: [{ value: false, disabled: true }],
deletePrivate: [{ value: false, disabled: true }],
minSpeed: [{ value: "", disabled: true }],
maxTime: [{ value: 0, disabled: true }, [Validators.required, Validators.min(0), Validators.max(168)]],
maxTime: [{ value: 0, disabled: true }, [Validators.required, Validators.min(0), Validators.max(1000)]],
ignoreAboveSize: [{ value: "", disabled: true }],
}),
@@ -262,21 +262,27 @@ export class QueueCleanerSettingsComponent implements OnDestroy, CanComponentDea
advancedControl.valueChanges.pipe(takeUntil(this.destroy$))
.subscribe((useAdvanced: boolean) => {
const enabled = this.queueCleanerForm.get('enabled')?.value || false;
if (enabled) {
const cronExpressionControl = this.queueCleanerForm.get('cronExpression');
const jobScheduleGroup = this.queueCleanerForm.get('jobSchedule') as FormGroup;
const everyControl = jobScheduleGroup?.get('every');
const typeControl = jobScheduleGroup?.get('type');
if (useAdvanced) {
if (cronExpressionControl) cronExpressionControl.enable();
if (everyControl) everyControl.disable();
if (typeControl) typeControl.disable();
} else {
if (cronExpressionControl) cronExpressionControl.disable();
if (everyControl) everyControl.enable();
if (typeControl) typeControl.enable();
}
const cronExpressionControl = this.queueCleanerForm.get('cronExpression');
const jobScheduleGroup = this.queueCleanerForm.get('jobSchedule') as FormGroup;
const everyControl = jobScheduleGroup?.get('every');
const typeControl = jobScheduleGroup?.get('type');
// Update scheduling controls based on mode, regardless of enabled state
if (useAdvanced) {
if (cronExpressionControl) cronExpressionControl.enable();
if (everyControl) everyControl.disable();
if (typeControl) typeControl.disable();
} else {
if (cronExpressionControl) cronExpressionControl.disable();
if (everyControl) everyControl.enable();
if (typeControl) typeControl.enable();
}
// Then respect the main enabled state - if disabled, disable all scheduling controls
if (!enabled) {
cronExpressionControl?.disable();
everyControl?.disable();
typeControl?.disable();
}
});
}
@@ -521,14 +527,17 @@ export class QueueCleanerSettingsComponent implements OnDestroy, CanComponentDea
// Make a copy of the form values
const formValue = this.queueCleanerForm.getRawValue();
// Determine the correct cron expression to use
const cronExpression: string = formValue.useAdvancedScheduling ?
formValue.cronExpression :
// If in basic mode, generate cron expression from the schedule
this.queueCleanerStore.generateCronExpression(formValue.jobSchedule);
// Create the config object to be saved
const queueCleanerConfig: QueueCleanerConfig = {
enabled: formValue.enabled,
useAdvancedScheduling: formValue.useAdvancedScheduling,
cronExpression: formValue.useAdvancedScheduling ?
formValue.cronExpression :
// If in basic mode, generate cron expression from the schedule
this.queueCleanerStore.generateCronExpression(formValue.jobSchedule),
cronExpression: cronExpression,
jobSchedule: formValue.jobSchedule,
failedImport: {
maxStrikes: formValue.failedImport?.maxStrikes || 0,
@@ -666,7 +675,7 @@ export class QueueCleanerSettingsComponent implements OnDestroy, CanComponentDea
*/
hasError(controlName: string, errorName: string): boolean {
const control = this.queueCleanerForm.get(controlName);
return control ? control.touched && control.hasError(errorName) : false;
return control ? control.dirty && control.hasError(errorName) : false;
}
/**
@@ -694,7 +703,7 @@ export class QueueCleanerSettingsComponent implements OnDestroy, CanComponentDea
}
const control = parentControl.get(controlName);
return control ? control.touched && control.hasError(errorName) : false;
return control ? control.dirty && control.hasError(errorName) : false;
}

View File

@@ -42,6 +42,9 @@
decrementButtonIcon="pi pi-minus"
></p-inputNumber>
</div>
<small *ngIf="hasError('failedImportMaxStrikes', 'required')" class="p-error">This field is required</small>
<small *ngIf="hasError('failedImportMaxStrikes', 'min')" class="p-error">Value cannot be less than -1</small>
<small *ngIf="hasError('failedImportMaxStrikes', 'max')" class="p-error">Value cannot exceed 5000</small>
<small class="form-helper-text">Maximum number of strikes before removing a failed import (-1 to use global setting; 0 to disable)</small>
</div>
</div>

View File

@@ -82,7 +82,7 @@ export class RadarrSettingsComponent implements OnDestroy, CanComponentDeactivat
constructor() {
// Initialize forms
this.globalForm = this.formBuilder.group({
failedImportMaxStrikes: [-1],
failedImportMaxStrikes: [-1, [Validators.required, Validators.min(-1), Validators.max(5000)]],
});
this.instanceForm = this.formBuilder.group({
@@ -211,11 +211,31 @@ export class RadarrSettingsComponent implements OnDestroy, CanComponentDeactivat
}
/**
* Check if a form control has an error
* Check if a form control has an error after it's been touched
*/
hasError(form: FormGroup, controlName: string, errorName: string): boolean {
const control = form.get(controlName);
return control !== null && control.hasError(errorName) && control.touched;
hasError(formOrControlName: FormGroup | string, controlNameOrErrorName: string, errorName?: string): boolean {
if (formOrControlName instanceof FormGroup) {
// For instance form
const control = formOrControlName.get(controlNameOrErrorName);
return control !== null && control.hasError(errorName!) && control.dirty;
} else {
// For global form
const control = this.globalForm.get(formOrControlName);
return control ? control.dirty && control.hasError(controlNameOrErrorName) : false;
}
}
/**
* Get nested form control errors
*/
hasNestedError(parentName: string, controlName: string, errorName: string): boolean {
const parentControl = this.globalForm.get(parentName);
if (!parentControl || !(parentControl instanceof FormGroup)) {
return false;
}
const control = parentControl.get(controlName);
return control ? control.dirty && control.hasError(errorName) : false;
}
/**
@@ -406,8 +426,6 @@ export class RadarrSettingsComponent implements OnDestroy, CanComponentDeactivat
});
}
/**
* Get modal title based on mode
*/

View File

@@ -42,6 +42,9 @@
decrementButtonIcon="pi pi-minus"
></p-inputNumber>
</div>
<small *ngIf="hasError('failedImportMaxStrikes', 'required')" class="p-error">This field is required</small>
<small *ngIf="hasError('failedImportMaxStrikes', 'min')" class="p-error">Value cannot be less than -1</small>
<small *ngIf="hasError('failedImportMaxStrikes', 'max')" class="p-error">Value cannot exceed 5000</small>
<small class="form-helper-text">Maximum number of strikes before removing a failed import (-1 to use global setting; 0 to disable)</small>
</div>
</div>

View File

@@ -82,7 +82,7 @@ export class ReadarrSettingsComponent implements OnDestroy, CanComponentDeactiva
constructor() {
// Initialize forms
this.globalForm = this.formBuilder.group({
failedImportMaxStrikes: [-1],
failedImportMaxStrikes: [-1, [Validators.required, Validators.min(-1), Validators.max(5000)]],
});
this.instanceForm = this.formBuilder.group({
@@ -211,11 +211,18 @@ export class ReadarrSettingsComponent implements OnDestroy, CanComponentDeactiva
}
/**
* Check if a form control has an error
* Check if a form control has an error after it's been touched
*/
hasError(form: FormGroup, controlName: string, errorName: string): boolean {
const control = form.get(controlName);
return control !== null && control.hasError(errorName) && control.touched;
hasError(formOrControlName: FormGroup | string, controlNameOrErrorName: string, errorName?: string): boolean {
if (formOrControlName instanceof FormGroup) {
// For instance form
const control = formOrControlName.get(controlNameOrErrorName);
return control !== null && control.hasError(errorName!) && control.dirty;
} else {
// For global form
const control = this.globalForm.get(formOrControlName);
return control ? control.dirty && control.hasError(controlNameOrErrorName) : false;
}
}
/**
@@ -412,4 +419,17 @@ export class ReadarrSettingsComponent implements OnDestroy, CanComponentDeactiva
get modalTitle(): string {
return this.modalMode === 'add' ? 'Add Readarr Instance' : 'Edit Readarr Instance';
}
/**
* Get nested form control errors
*/
hasNestedError(parentName: string, controlName: string, errorName: string): boolean {
const parentControl = this.globalForm.get(parentName);
if (!parentControl || !(parentControl instanceof FormGroup)) {
return false;
}
const control = parentControl.get(controlName);
return control ? control.dirty && control.hasError(errorName) : false;
}
}

View File

@@ -42,6 +42,9 @@
decrementButtonIcon="pi pi-minus"
></p-inputNumber>
</div>
<small *ngIf="hasError('failedImportMaxStrikes', 'required')" class="p-error">This field is required</small>
<small *ngIf="hasError('failedImportMaxStrikes', 'min')" class="p-error">Value cannot be less than -1</small>
<small *ngIf="hasError('failedImportMaxStrikes', 'max')" class="p-error">Value cannot exceed 5000</small>
<small class="form-helper-text">Maximum number of strikes before removing a failed import (-1 to use global setting; 0 to disable)</small>
</div>
</div>

View File

@@ -82,7 +82,7 @@ export class SonarrSettingsComponent implements OnDestroy, CanComponentDeactivat
constructor() {
// Initialize forms
this.globalForm = this.formBuilder.group({
failedImportMaxStrikes: [-1],
failedImportMaxStrikes: [-1, [Validators.required, Validators.min(-1), Validators.max(5000)]],
});
this.instanceForm = this.formBuilder.group({
@@ -211,11 +211,31 @@ export class SonarrSettingsComponent implements OnDestroy, CanComponentDeactivat
}
/**
* Check if a form control has an error
* Check if a form control has an error after it's been touched
*/
hasError(form: FormGroup, controlName: string, errorName: string): boolean {
const control = form.get(controlName);
return control !== null && control.hasError(errorName) && control.touched;
hasError(formOrControlName: FormGroup | string, controlNameOrErrorName: string, errorName?: string): boolean {
if (formOrControlName instanceof FormGroup) {
// For instance form
const control = formOrControlName.get(controlNameOrErrorName);
return control !== null && control.hasError(errorName!) && control.dirty;
} else {
// For global form
const control = this.globalForm.get(formOrControlName);
return control ? control.dirty && control.hasError(controlNameOrErrorName) : false;
}
}
/**
* Get nested form control errors
*/
hasNestedError(parentName: string, controlName: string, errorName: string): boolean {
const parentControl = this.globalForm.get(parentName);
if (!parentControl || !(parentControl instanceof FormGroup)) {
return false;
}
const control = parentControl.get(controlName);
return control ? control.dirty && control.hasError(errorName) : false;
}
/**
@@ -406,8 +426,6 @@ export class SonarrSettingsComponent implements OnDestroy, CanComponentDeactivat
});
}
/**
* Get modal title based on mode
*/