fix: applies pre-filter to download options

assets/controllers/loading_icon_controller.js

@@ -41,6 +41,8 @@ export default class extends Controller {
         if (this.countValue === this.totalValue) {
             this.toggleIcon();
             this.countValue = 0;
+            console.log('filtering')
+            document.getElementById('filter').filterResults();
         }
     }
 }

assets/controllers/result_filter_controller.js

@@ -12,14 +12,14 @@ export default class extends Controller {
     seasons = []
 
     activeFilter = {
-        "resolution": "",
-        "codec": "",
-        "language": "",
-        "provider": "",
-        "quality": "",
+        "resolution": [],
+        "codec": [],
+        "language": [],
+        "provider": [],
+        "quality": [],
     }
 
-    defaultOptions = '<option value="n/a">n/a</option><option value="-">-</option>';
+    defaultOptions = '<option value="-">-</option>';
 
     static outlets = ['tv-episode-list']
     static targets = ['resolution', 'codec', 'language', 'provider', 'season', 'quality', 'loadingIcon', 'selectAll', 'downloadSelected']
@@ -31,13 +31,21 @@ export default class extends Controller {
     }
 
     async connect() {
+        await this.setInitialFilter();
+        this.setTimerToStopLoadingIcon();
+        this.element.filterResults = this.filter.bind(this);
+        document.addEventListener('optionsLoaded', this.loadOptions.bind(this));
+    }
+
+    async setInitialFilter() {
+        const response = await fetch('/api/user/filters');
+        const filters = await response.json();
+        if (filters.length > 0) {
+            this.activeFilter = filters[0];
+        }
         if (this.mediaTypeValue === "tvshows") {
             this.activeFilter['season'] = 1;
         }
-        this.filter();
-        this.setTimerToStopLoadingIcon();
-
-        document.addEventListener('optionsLoaded', this.loadOptions.bind(this));
     }
 
     setTimerToStopLoadingIcon() {
@@ -45,13 +53,10 @@ export default class extends Controller {
     }
 
     // Event is fired from movies/tvshows controllers to populate this data
-    loadOptions({detail: { options }}) {
-        options.forEach((option) => {
-            this.addLanguages(option);
-            this.addProviders(option);
-            this.addQualities(option);
+    async loadOptions({detail: { options }}) {
+        await options.forEach((option) => {
+            option.filter({detail: {activeFilter: this.activeFilter }});
         })
-        this.filter();
     }
 
     selectAllEpisodes() {
@@ -66,41 +71,6 @@ export default class extends Controller {
         document.dispatchEvent(new CustomEvent('downloadSelectedEpisodes', {}));
     }
 
-    addLanguages(option) {
-        option.languages.forEach((language) => {
-            if (!this.languages.includes(language)) {
-                this.languages.push(language);
-            }
-        });
-        const preferred = JSON.parse(this.languageTarget.dataset.preferred) ?? [];
-        this.languageTarget.innerHTML = this.#serializeSelectOptions(this.languages);
-        this.languageTarget.tomselect.items = preferred;
-    }
-
-    addProviders(option) {
-        if (!this.providers.includes(option.provider)) {
-            this.providers.push(option.provider);
-        }
-        const preferred = JSON.parse(this.providerTarget.dataset.preferred) ?? [];
-        this.providerTarget.innerHTML = this.#serializeSelectOptions(this.providers);
-        this.providerTarget.tomselect.items = preferred;
-
-    }
-
-    addQualities(option) {
-        if (option.quality.toLowerCase() in this.reverseMappedQualitiesValue) {
-            let quality = this.reverseMappedQualitiesValue[option.quality.toLowerCase()];
-            // converts api returned quality with a value the system recognizes
-            option.quality = quality;
-            if (!this.qualities.includes(option.quality)) {
-                this.qualities.push(quality);
-            }
-        }
-        const preferred = JSON.parse(this.qualityTarget.dataset.preferred) ?? [];
-        this.qualityTarget.innerHTML = this.#serializeSelectOptions(this.qualities);
-        this.qualityTarget.tomselect.items = preferred;
-    }
-
     filter() {
         const downloadSeasonSpan = document.querySelector("#downloadSeasonModal");
 

assets/controllers/tv_results_controller.js

@@ -30,11 +30,11 @@ export default class extends Controller {
                 option.querySelector('.download-btn').dataset['title'] = this.titleValue
             );
             this.element.options[0].querySelector('input[type="checkbox"]').checked = true;
-            this.loadingIconOutlet.increaseCount();
             document.dispatchEvent(new CustomEvent('optionsLoaded', {detail: {options: this.element.options}}));
         } else {
             this.countTarget.innerText = 0;
             this.episodeSelectorTarget.disabled = true;
         }
+        this.loadingIconOutlet.increaseCount();
     }
 }