diff --git a/src/frontend/app/ui/settings/jobs/jobs.settings.component.html b/src/frontend/app/ui/settings/jobs/jobs.settings.component.html index 375fee97..4eb9e68a 100644 --- a/src/frontend/app/ui/settings/jobs/jobs.settings.component.html +++ b/src/frontend/app/ui/settings/jobs/jobs.settings.component.html @@ -30,12 +30,12 @@ @@ -121,14 +121,14 @@
diff --git a/src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.html b/src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.html index b5cdfbd4..89b07347 100644 --- a/src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.html +++ b/src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.html @@ -40,7 +40,7 @@ aria-valuemin="0" aria-valuemax="100" style="min-width: 2em;" - [style.width.%]="(progress.steps.processed+progress.steps.skipped/(progress.steps.all))*100"> + [style.width.%]="((progress.steps.processed+progress.steps.skipped)/progress.steps.all)*100"> {{progress.steps.processed}}+{{progress.steps.skipped}}/{{progress.steps.all}}
- implements OnInit { + extends SettingsComponent<{ server: ServerConfig.ThumbnailConfig, client: ClientConfig.ThumbnailConfig }> + implements OnInit { JobProgressStates = JobProgressStates; constructor(_authService: AuthenticationService, @@ -44,12 +44,13 @@ export class ThumbnailSettingsComponent value = value.replace(new RegExp(',', 'g'), ';'); value = value.replace(new RegExp(' ', 'g'), ';'); this.settings.client.thumbnailSizes = value.split(';') - .map(s => parseInt(s, 10)) - .filter(i => !isNaN(i) && i > 0); + .map(s => parseInt(s, 10)) + .filter(i => !isNaN(i) && i > 0); } get Progress() { - return this.jobsService.progress.value[JobDTO.getHashName(DefaultsJobs[DefaultsJobs['Thumbnail Generation']])]; + return this.jobsService.progress.value[JobDTO.getHashName(DefaultsJobs[DefaultsJobs['Thumbnail Generation']], + {sizes: this.original.client.thumbnailSizes[0]})]; } ngOnInit() { diff --git a/src/frontend/app/ui/settings/video/video.settings.component.ts b/src/frontend/app/ui/settings/video/video.settings.component.ts index ee4d7115..917a46ba 100644 --- a/src/frontend/app/ui/settings/video/video.settings.component.ts +++ b/src/frontend/app/ui/settings/video/video.settings.component.ts @@ -84,7 +84,7 @@ export class VideoSettingsComponent extends SettingsComponent<{ server: ServerCo updateBitRate() { this.settings.server.transcoding.bitRate = this.getRecommendedBitRate(this.settings.server.transcoding.resolution, - this.settings.server.transcoding.fps); + this.settings.server.transcoding.fps); } formatChanged(format: ServerConfig.formatType) {