From 10d65f9db650eceea729e3e0d55719f6ee1aa20e Mon Sep 17 00:00:00 2001 From: meisnate12 Date: Fri, 2 Dec 2022 10:01:52 -0500 Subject: [PATCH] [39] fix only_filter_missing --- VERSION | 2 +- defaults/both/content_rating_cs.yml | 24 ++++++++++++------------ defaults/both/content_rating_mal.yml | 3 +++ defaults/both/content_rating_uk.yml | 2 +- defaults/overlays/audio_codec.yml | 1 - defaults/overlays/commonsense.yml | 26 +++++++++++++------------- defaults/overlays/language_count.yml | 1 - defaults/overlays/mediastinger.yml | 1 - defaults/overlays/resolution.yml | 1 - defaults/overlays/status.yml | 1 - defaults/overlays/video_format.yml | 1 - modules/builder.py | 2 +- 12 files changed, 31 insertions(+), 34 deletions(-) diff --git a/VERSION b/VERSION index 4dd21059..02b5a085 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.18.0-develop38 +1.18.0-develop39 diff --git a/defaults/both/content_rating_cs.yml b/defaults/both/content_rating_cs.yml index e66f0fc4..3e1efb3f 100644 --- a/defaults/both/content_rating_cs.yml +++ b/defaults/both/content_rating_cs.yml @@ -88,6 +88,7 @@ dynamic_collections: - gb/U - gb/0+ - G + - TV-G - TV-Y - E - gb/E @@ -101,6 +102,7 @@ dynamic_collections: - gb/U - gb/0+ - G + - TV-G - TV-Y - E - gb/E @@ -114,6 +116,7 @@ dynamic_collections: - gb/U - gb/0+ - G + - TV-G - TV-Y - E - gb/E @@ -127,6 +130,7 @@ dynamic_collections: - gb/U - gb/0+ - G + - TV-G - TV-Y - E - gb/E @@ -140,6 +144,7 @@ dynamic_collections: - gb/U - gb/0+ - G + - TV-G - TV-Y - E - gb/E @@ -153,6 +158,7 @@ dynamic_collections: - gb/U - gb/0+ - G + - TV-G - TV-Y - E - gb/E @@ -244,7 +250,6 @@ dynamic_collections: - 12+ - PG-13 - TV-14 - - 13 - PG-13 - Teens 13 or older - no/11 - no/12 @@ -252,8 +257,6 @@ dynamic_collections: - gb/15 - gb/14+ - TV-14 - - 13 - - 14 - PG-13 - Teens 13 or older - no/15 - no/16 @@ -261,21 +264,20 @@ dynamic_collections: - gb/15 - gb/14+ - TV-14 - - 13 - - 14 - - 15 - PG-13 - Teens 13 or older - no/15 - no/16 17: + - gb/18 - gb/15 - gb/14+ - TV-14 - - 13 - - 14 - - 15 - - 16 + - R - R - 17+ (violence & profanity) + - TVMA + - TV-MA + - MA-17 + - no/18 - no/15 - no/16 18: @@ -284,8 +286,6 @@ dynamic_collections: - TVMA - TV-MA - R - - 16 - - 17 - gb/R18 - gb/X - X diff --git a/defaults/both/content_rating_mal.yml b/defaults/both/content_rating_mal.yml index ea607baa..0efcabf9 100644 --- a/defaults/both/content_rating_mal.yml +++ b/defaults/both/content_rating_mal.yml @@ -58,12 +58,14 @@ dynamic_collections: - gb/0+ - U - G + - 0 - 1 - 2 - 3 - 4 - 5 - 6 + - "0" - "01" - "02" - "03" @@ -71,6 +73,7 @@ dynamic_collections: - "05" - "06" - G - All Ages + - TV-G - A - no/A PG: diff --git a/defaults/both/content_rating_uk.yml b/defaults/both/content_rating_uk.yml index 3e91619a..3224c360 100644 --- a/defaults/both/content_rating_uk.yml +++ b/defaults/both/content_rating_uk.yml @@ -140,11 +140,11 @@ dynamic_collections: - 17 - 18 - R - 17+ (violence & profanity) - - R+ - Mild Nudity - no/18 R18: - gb/R18 - gb/X - X - NC-17 + - R+ - Mild Nudity - Rx - Hentai \ No newline at end of file diff --git a/defaults/overlays/audio_codec.yml b/defaults/overlays/audio_codec.yml index 1adf1375..f7bc328e 100644 --- a/defaults/overlays/audio_codec.yml +++ b/defaults/overlays/audio_codec.yml @@ -68,7 +68,6 @@ templates: value: '(?i)\bOPUS(\b|\d)' ignore_blank_results: true plex_all: true - only_filter_missing: false filters: - audio_track_title.regex: <>>> - filepath.regex: <>>> diff --git a/defaults/overlays/commonsense.yml b/defaults/overlays/commonsense.yml index fe9b0f11..6bdf6f4d 100644 --- a/defaults/overlays/commonsense.yml +++ b/defaults/overlays/commonsense.yml @@ -49,7 +49,7 @@ overlays: 1: template: - name: standard - - {name: commonsense, rating: "1, 0, 01, 00, G, TV-G, TV-Y"} + - {name: commonsense, rating: "1, 01, G, TV-G, TV-Y, G - All Ages, gb/U, gb/0+, E, gb/E, A, no/A, no/5, no/05"} 2: template: - name: standard @@ -69,11 +69,11 @@ overlays: 6: template: - name: standard - - {name: commonsense, rating: "6, 06, GP, PG, M/PG, TV-PG"} + - {name: commonsense, rating: "6, 06, GP, PG, PG - Children, M/PG, gb/PG, TV-PG, no/6, no/06"} 7: template: - name: standard - - {name: commonsense, rating: "7, 07, TV-Y7, TV-Y7-FV"} + - {name: commonsense, rating: "7, 07, TV-Y7, TV-Y7-FV, no/7, no/07"} 8: template: - name: standard @@ -81,43 +81,43 @@ overlays: 9: template: - name: standard - - {name: commonsense, rating: "9, 09"} + - {name: commonsense, rating: "9, 09, gb/9+, no/9, no/09"} 10: template: - name: standard - - {name: commonsense, rating: "10"} + - {name: commonsense, rating: "10, no/10"} 11: template: - name: standard - - {name: commonsense, rating: "11"} + - {name: commonsense, rating: "11, no/11"} 12: template: - name: standard - - {name: commonsense, rating: "12"} + - {name: commonsense, rating: "12, 12+, gb/12, gb/12A, no/12"} 13: template: - name: standard - - {name: commonsense, rating: "13, PG-13"} + - {name: commonsense, rating: "13, PG-13, PG-13 - Teens 13 or older"} 14: template: - name: standard - - {name: commonsense, rating: "14, TV-14"} + - {name: commonsense, rating: "14, TV-14, gb/14+"} 15: template: - name: standard - - {name: commonsense, rating: "15"} + - {name: commonsense, rating: "15, gb/15, no/15"} 16: template: - name: standard - - {name: commonsense, rating: "16, Passed, Approved, Open"} + - {name: commonsense, rating: "16, no/16, Passed, Approved, Open"} 17: template: - name: standard - - {name: commonsense, rating: "17"} + - {name: commonsense, rating: "17, R, R - 17+ (violence & profanity), TVMA, TV-MA, MA-17"} 18: template: - name: standard - - {name: commonsense, rating: "18, NC-17, M, TV-MA, R, X"} + - {name: commonsense, rating: "18, gb/18, gb/R18, gb/X, no/18, NC-17, X, R+ - Mild Nudity, Rx - Hentai"} NR: template: - {name: standard, key: nr} diff --git a/defaults/overlays/language_count.yml b/defaults/overlays/language_count.yml index 6995384a..b516a27d 100644 --- a/defaults/overlays/language_count.yml +++ b/defaults/overlays/language_count.yml @@ -38,7 +38,6 @@ templates: optional: - lt ignore_blank_results: true - only_filter_missing: false plex_all: true filters: <>.count_gte: <> diff --git a/defaults/overlays/mediastinger.yml b/defaults/overlays/mediastinger.yml index 166a43f8..38e890ac 100644 --- a/defaults/overlays/mediastinger.yml +++ b/defaults/overlays/mediastinger.yml @@ -23,6 +23,5 @@ overlays: template: name: standard plex_all: true - only_filter_missing: false filters: tmdb_keyword: aftercreditsstinger, duringcreditsstinger diff --git a/defaults/overlays/resolution.yml b/defaults/overlays/resolution.yml index 59802706..4e884e8f 100644 --- a/defaults/overlays/resolution.yml +++ b/defaults/overlays/resolution.yml @@ -171,7 +171,6 @@ templates: - <> - <> ignore_blank_results: true - only_filter_missing: false plex_all: <> plex_search: all: diff --git a/defaults/overlays/status.yml b/defaults/overlays/status.yml index f4d55237..33a1898c 100644 --- a/defaults/overlays/status.yml +++ b/defaults/overlays/status.yml @@ -35,7 +35,6 @@ templates: - key: [ended, returning, canceled] value: <> ignore_blank_results: true - only_filter_missing: false plex_search: any: episode_air_date: <> diff --git a/defaults/overlays/video_format.yml b/defaults/overlays/video_format.yml index 674472da..953474ec 100644 --- a/defaults/overlays/video_format.yml +++ b/defaults/overlays/video_format.yml @@ -41,7 +41,6 @@ templates: - key: sdtv value: '(?i)SD[ ._-]?TV' ignore_blank_results: true - only_filter_missing: false plex_all: true filters: filepath.regex: <>>> diff --git a/modules/builder.py b/modules/builder.py index d6e00529..ae6ca239 100644 --- a/modules/builder.py +++ b/modules/builder.py @@ -351,7 +351,7 @@ class CollectionBuilder: "show_missing": self.library.show_missing, "save_report": self.library.save_report, "missing_only_released": self.library.missing_only_released, - "only_filter_missing": self.library.only_filter_missing, + "only_filter_missing": False if self.overlay else self.library.only_filter_missing, "asset_folders": self.library.asset_folders, "create_asset_folders": self.library.create_asset_folders, "delete_below_minimum": self.library.delete_below_minimum,