Merge remote-tracking branch 'origin/development' into development

morpheus65535 · Aug 29, 2024 · 8e83111 · 8e83111
2 parents cfa9004 + fb3722f
commit 8e83111
Show file tree

Hide file tree

Showing 20 changed files with 607 additions and 1,524 deletions.
diff --git a/bazarr/app/config.py b/bazarr/app/config.py
@@ -96,6 +96,7 @@ def check_parser_binary(value):
     Validator('general.path_mappings_movie', must_exist=True, default=[], is_type_of=list),
     Validator('general.serie_tag_enabled', must_exist=True, default=False, is_type_of=bool),
     Validator('general.movie_tag_enabled', must_exist=True, default=False, is_type_of=bool),
+    Validator('general.remove_profile_tags', must_exist=True, default=[], is_type_of=list, condition=validate_tags),
     Validator('general.serie_default_enabled', must_exist=True, default=False, is_type_of=bool),
     Validator('general.serie_default_profile', must_exist=True, default='', is_type_of=(int, str)),
     Validator('general.movie_default_enabled', must_exist=True, default=False, is_type_of=bool),
@@ -468,6 +469,7 @@ def write_config():
               'enabled_integrations',
               'path_mappings',
               'path_mappings_movie',
+              'remove_profile_tags',
               'language_equals',
               'blacklisted_languages',
               'blacklisted_providers']

diff --git a/bazarr/radarr/sync/parser.py b/bazarr/radarr/sync/parser.py
@@ -152,6 +152,10 @@ def movieParser(movie, action, tags_dict, language_profiles, movie_default_profi
             tag_profile = get_matching_profile(tags, language_profiles)
             if tag_profile:
                 parsed_movie['profileId'] = tag_profile
+            remove_profile_tags_list = settings.general.remove_profile_tags
+            if len(remove_profile_tags_list) > 0:
+                if set(tags) & set(remove_profile_tags_list):
+                    parsed_movie['profileId'] = None
 
         return parsed_movie
 

diff --git a/bazarr/sonarr/sync/parser.py b/bazarr/sonarr/sync/parser.py
@@ -78,7 +78,11 @@ def seriesParser(show, action, tags_dict, language_profiles, serie_default_profi
         tag_profile = get_matching_profile(tags, language_profiles)
         if tag_profile:
             parsed_series['profileId'] = tag_profile
-
+        remove_profile_tags_list = settings.general.remove_profile_tags
+        if len(remove_profile_tags_list) > 0:
+            if set(tags) & set(remove_profile_tags_list):
+                parsed_series['profileId'] = None
+
     return parsed_series
 
 

diff --git a/frontend/.eslintrc.json b/frontend/.eslintrc.json
@@ -15,12 +15,11 @@
     "@typescript-eslint/no-unused-vars": "warn"
   },
   "extends": [
-    "react-app",
-    "plugin:react-hooks/recommended",
     "eslint:recommended",
+    "plugin:react-hooks/recommended",
     "plugin:@typescript-eslint/recommended"
   ],
-  "plugins": ["testing-library", "simple-import-sort"],
+  "plugins": ["testing-library", "simple-import-sort", "react-refresh"],
   "overrides": [
     {
       "files": [
@@ -63,6 +62,7 @@
       }
     }
   ],
+  "parser": "@typescript-eslint/parser",
   "parserOptions": {
     "sourceType": "module",
     "ecmaVersion": "latest"