From dc5f964211f80842a433885346066aea10605f2a Mon Sep 17 00:00:00 2001 From: lardbit Date: Fri, 16 Aug 2024 08:57:24 -0500 Subject: [PATCH] create quality profiles --- src/frontend/src/app/api.service.ts | 9 ++++ .../settings/quality-profiles.component.html | 3 ++ .../settings/quality-profiles.component.ts | 46 +++++++++++++------ .../migrations/0096_auto_20240816_1352.py | 23 ++++++++++ .../migrations/0097_auto_20240816_1353.py | 23 ++++++++++ src/nefarious/models.py | 7 +-- 6 files changed, 95 insertions(+), 16 deletions(-) create mode 100644 src/nefarious/migrations/0096_auto_20240816_1352.py create mode 100644 src/nefarious/migrations/0097_auto_20240816_1353.py diff --git a/src/frontend/src/app/api.service.ts b/src/frontend/src/app/api.service.ts index 3694c3f5..1a22e7be 100644 --- a/src/frontend/src/app/api.service.ts +++ b/src/frontend/src/app/api.service.ts @@ -379,6 +379,15 @@ export class ApiService { ); } + public createQualityProfile(data: any): Observable { + return this.http.post(this.API_URL_QUALITY_PROFILES, data, {headers: this._requestHeaders()}).pipe( + map((data: any) => { + // append this new quality profile + this.qualityProfiles.push(data); + }), + ); + } + public searchTorrents(query: string, mediaType: string): Observable { return this.http.get(`${this.API_URL_SEARCH_TORRENTS}?q=${query}&media_type=${mediaType}`, {headers: this._requestHeaders()}).pipe( map((data: any) => { diff --git a/src/frontend/src/app/settings/quality-profiles.component.html b/src/frontend/src/app/settings/quality-profiles.component.html index a080e1ed..e17c1439 100644 --- a/src/frontend/src/app/settings/quality-profiles.component.html +++ b/src/frontend/src/app/settings/quality-profiles.component.html @@ -4,6 +4,9 @@

Quality Profiles

+
+ +
diff --git a/src/frontend/src/app/settings/quality-profiles.component.ts b/src/frontend/src/app/settings/quality-profiles.component.ts index 4521f69c..a0af47c1 100644 --- a/src/frontend/src/app/settings/quality-profiles.component.ts +++ b/src/frontend/src/app/settings/quality-profiles.component.ts @@ -1,10 +1,10 @@ import {Component, OnInit} from '@angular/core'; import {NgbActiveModal} from "@ng-bootstrap/ng-bootstrap"; import {ApiService} from "../api.service"; -import {FormArray, FormBuilder, FormControl, FormGroup, Validators} from "@angular/forms"; +import {FormArray, FormBuilder, FormGroup, Validators} from "@angular/forms"; import {ToastrService} from 'ngx-toastr'; +import {Observable} from "rxjs"; -// TODO - add/remove profiles @Component({ selector: 'app-quality-profiles', @@ -25,24 +25,32 @@ export class QualityProfilesComponent implements OnInit { ngOnInit() { this.form = this.fb.group({ - profiles: this.fb.array(this.apiService.qualityProfiles.map(p => this.fb.group({ - id: p.id, - name: this.fb.control(p.name, [Validators.required, Validators.minLength(2)]), - quality: this.fb.control(p.quality, [Validators.required]), - min_size_gb: this.fb.control(p.min_size_gb, [Validators.min(0)]), - max_size_gb: this.fb.control(p.max_size_gb, [Validators.min(0)]), - require_hdr: p.require_hdr, - require_five_point_one: p.require_five_point_one, - }))), + profiles: this.fb.array(this.apiService.qualityProfiles.map(p => this._getNewFormGroup(p))), }); } + public add() { + this.form.controls.profiles.insert(0, this._getNewFormGroup()); + } + public save(profileFormGroup: FormGroup) { this.isLoading = true; + let update$: Observable; + let updateVerb: string; const data = profileFormGroup.value; - this.apiService.updateQualityProfile(data.id, data).subscribe({ + // update + if (data.id) { + update$ = this.apiService.updateQualityProfile(data.id, data); + updateVerb = 'updated'; + } + // create + else { + update$ = this.apiService.createQualityProfile(data); + updateVerb = 'created'; + } + update$.subscribe({ next: () => { - this.toastr.success('Successfully updated quality profile'); + this.toastr.success(`Successfully ${updateVerb} quality profile`); this.isLoading = false; }, error: (error) => { @@ -76,4 +84,16 @@ export class QualityProfilesComponent implements OnInit { } }) } + + protected _getNewFormGroup(data?: any): FormGroup { + return this.fb.group({ + id: data?.id, + name: this.fb.control(data?.name, [Validators.required, Validators.minLength(2)]), + quality: this.fb.control(data?.quality, [Validators.required]), + min_size_gb: this.fb.control(data?.min_size_gb, [Validators.min(0)]), + max_size_gb: this.fb.control(data?.max_size_gb, [Validators.min(0)]), + require_hdr: data?.require_hdr, + require_five_point_one: data?.require_five_point_one, + }) + } } diff --git a/src/nefarious/migrations/0096_auto_20240816_1352.py b/src/nefarious/migrations/0096_auto_20240816_1352.py new file mode 100644 index 00000000..d31b4556 --- /dev/null +++ b/src/nefarious/migrations/0096_auto_20240816_1352.py @@ -0,0 +1,23 @@ +# Generated by Django 3.0.2 on 2024-08-16 13:52 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('nefarious', '0095_auto_20240816_1302'), + ] + + operations = [ + migrations.AlterField( + model_name='qualityprofile', + name='require_five_point_one', + field=models.BooleanField(blank=True, default=False, help_text='media must be in 5.1 surround sound (e.g. Dolby 5.1)'), + ), + migrations.AlterField( + model_name='qualityprofile', + name='require_hdr', + field=models.BooleanField(blank=True, default=False, help_text='media must be in HDR (High Dynamic Range)'), + ), + ] diff --git a/src/nefarious/migrations/0097_auto_20240816_1353.py b/src/nefarious/migrations/0097_auto_20240816_1353.py new file mode 100644 index 00000000..ee0fa387 --- /dev/null +++ b/src/nefarious/migrations/0097_auto_20240816_1353.py @@ -0,0 +1,23 @@ +# Generated by Django 3.0.2 on 2024-08-16 13:53 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('nefarious', '0096_auto_20240816_1352'), + ] + + operations = [ + migrations.AlterField( + model_name='qualityprofile', + name='require_five_point_one', + field=models.BooleanField(default=False, help_text='media must be in 5.1 surround sound (e.g. Dolby 5.1)', null=True), + ), + migrations.AlterField( + model_name='qualityprofile', + name='require_hdr', + field=models.BooleanField(default=False, help_text='media must be in HDR (High Dynamic Range)', null=True), + ), + ] diff --git a/src/nefarious/models.py b/src/nefarious/models.py index 56518c2a..095e6238 100644 --- a/src/nefarious/models.py +++ b/src/nefarious/models.py @@ -30,8 +30,8 @@ class QualityProfile(models.Model): null=True, blank=True, max_digits=10, decimal_places=2, validators=[MinValueValidator(0)], help_text='minimum size (gb) to download') max_size_gb = models.DecimalField( null=True, blank=True, max_digits=10, decimal_places=2, validators=[MinValueValidator(0)], help_text='maximum size (gb) to download') - require_hdr = models.BooleanField(default=False, help_text='media must be in HDR (High Dynamic Range)') - require_five_point_one = models.BooleanField(default=False, help_text='media must be in 5.1 surround sound (e.g. Dolby 5.1)') + require_hdr = models.BooleanField(default=False, null=True, help_text='media must be in HDR (High Dynamic Range)') + require_five_point_one = models.BooleanField(default=False, null=True, help_text='media must be in 5.1 surround sound (e.g. Dolby 5.1)') def __str__(self): if self.name == self.quality: @@ -62,7 +62,7 @@ class NefariousSettings(models.Model): transmission_tv_download_dir = models.CharField(max_length=500, default='tv/', help_text='Relative to download path') transmission_movie_download_dir = models.CharField(max_length=500, default='movies/', help_text='Relative to download path') - # tmbd - the movie database + # tmdb - the movie database tmdb_token = models.CharField(max_length=500, default=settings.TMDB_API_TOKEN) tmdb_configuration = JSONField(blank=True, null=True) tmdb_languages = JSONField(blank=True, null=True) # type: list @@ -81,6 +81,7 @@ class NefariousSettings(models.Model): # whether to allow hardcoded subtitles allow_hardcoded_subs = models.BooleanField(default=False) + # TODO - move to quality profile # whether to enable video detection features (e.g. fake/spam) enable_video_detection = models.BooleanField(default=False)