From 3cf561ca9b5567023d8fa8e11f7609ae23a0a5f5 Mon Sep 17 00:00:00 2001
From: meisnate12 <meisnate12@gmail.com>
Date: Fri, 28 May 2021 22:44:01 -0400
Subject: [PATCH] remove .and

---
 modules/builder.py |  6 +++---
 modules/plex.py    | 43 +++++++++++++++++++++----------------------
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/modules/builder.py b/modules/builder.py
index 82ec60b3..2ad30050 100644
--- a/modules/builder.py
+++ b/modules/builder.py
@@ -1176,7 +1176,7 @@ class CollectionBuilder:
                     display_line = f"{indent}{param_s} {mod_s} {arg_s}"
                     return f"{arg_key}{mod}={arg}&", display_line
 
-                if final not in plex.searches and final not in ["any", "all"] and modifier != ".and":
+                if final not in plex.searches and final not in ["any", "all"]:
                     raise Failed(f"Collection Error: {final} is not a valid {method} attribute")
                 elif final in plex.movie_only_searches and self.library.is_show:
                     raise Failed(f"Collection Error: {final} {method} attribute only works for movie libraries")
@@ -1251,13 +1251,13 @@ class CollectionBuilder:
     def validate_attribute(self, attribute, modifier, final, data, validate, smart=False):
         def smart_pair(list_to_pair):
             return [(t, t) for t in list_to_pair] if smart else list_to_pair
-        if attribute in ["title", "studio", "episode_title", "audio_track_title"] and modifier in ["", ".and", ".not", ".begins", ".ends"]:
+        if attribute in ["title", "studio", "episode_title", "audio_track_title"] and modifier in ["", ".not", ".begins", ".ends"]:
             return smart_pair(util.get_list(data, split=False))
         elif attribute == "original_language":
             return util.get_list(data, lower=True)
         elif attribute == "filepath":
             return util.get_list(data)
-        elif attribute in plex.tags and modifier in ["", ".and", ".not"]:
+        elif attribute in plex.tags and modifier in ["", ".not"]:
             if attribute in plex.tmdb_attributes:
                 final_values = []
                 for value in util.get_list(data):
diff --git a/modules/plex.py b/modules/plex.py
index 19d7ad9e..eaa65b28 100644
--- a/modules/plex.py
+++ b/modules/plex.py
@@ -77,20 +77,20 @@ item_advance_keys = {
 }
 new_plex_agents = ["tv.plex.agents.movie", "tv.plex.agents.series"]
 searches = [
-    "title", "title.and", "title.not", "title.begins", "title.ends",
-    "studio", "studio.and", "studio.not", "studio.begins", "studio.ends",
-    "actor", "actor.and", "actor.not",
-    "audio_language", "audio_language.and", "audio_language.not",
-    "collection", "collection.and", "collection.not",
-    "content_rating", "content_rating.and", "content_rating.not",
-    "country", "country.and", "country.not",
-    "director", "director.and", "director.not",
-    "genre", "genre.and", "genre.not",
-    "label", "label.and", "label.not",
-    "network", "network.and", "network.not",
-    "producer", "producer.and", "producer.not",
-    "subtitle_language", "subtitle_language.and", "subtitle_language.not",
-    "writer", "writer.and", "writer.not",
+    "title", "title.not", "title.begins", "title.ends",
+    "studio", "studio.not", "studio.begins", "studio.ends",
+    "actor", "actor.not",
+    "audio_language", "audio_language.not",
+    "collection", "collection.not",
+    "content_rating", "content_rating.not",
+    "country", "country.not",
+    "director", "director.not",
+    "genre", "genre.not",
+    "label", "label.not",
+    "network", "network.not",
+    "producer", "producer.not",
+    "subtitle_language", "subtitle_language.not",
+    "writer", "writer.not",
     "decade", "resolution", "hdr", "unmatched", "duplicate", "unplayed", "progress", "trash",
     "last_played", "last_played.not", "last_played.before", "last_played.after",
     "added", "added.not", "added.before", "added.after",
@@ -102,7 +102,7 @@ searches = [
     "audience_rating.gt", "audience_rating.gte", "audience_rating.lt", "audience_rating.lte",
     "year", "year.not", "year.gt", "year.gte", "year.lt", "year.lte",
     "unplayed_episodes", "episode_unplayed", "episode_duplicate", "episode_progress", "episode_unmatched",
-    "episode_title", "episode_title.and", "episode_title.not", "episode_title.begins", "episode_title.ends",
+    "episode_title", "episode_title.not", "episode_title.begins", "episode_title.ends",
     "episode_added", "episode_added.not", "episode_added.before", "episode_added.after",
     "episode_air_date", "episode_air_date.not", "episode_air_date.before", "episode_air_date.after",
     "episode_last_played", "episode_last_played.not", "episode_last_played.before", "episode_last_played.after",
@@ -111,17 +111,17 @@ searches = [
     "episode_year", "episode_year.not", "episode_year.gt", "episode_year.gte", "episode_year.lt", "episode_year.lte"
 ]
 movie_only_searches = [
-    "country", "country.and", "country.not",
-    "director", "director.and", "director.not",
-    "producer", "producer.and", "producer.not",
-    "writer", "writer.and", "writer.not",
+    "country", "country.not",
+    "director", "director.not",
+    "producer", "producer.not",
+    "writer", "writer.not",
     "decade", "duplicate", "unplayed", "progress", "trash",
     "plays.gt", "plays.gte", "plays.lt", "plays.lte",
     "duration.gt", "duration.gte", "duration.lt", "duration.lte"
 ]
 show_only_searches = [
-    "network", "network.and", "network.not",
-    "episode_title", "episode_title.and", "episode_title.not", "episode_title.begins", "episode_title.ends",
+    "network", "network.not",
+    "episode_title", "episode_title.not", "episode_title.begins", "episode_title.ends",
     "episode_added", "episode_added.not", "episode_added.before", "episode_added.after",
     "episode_air_date", "episode_air_date.not",
     "episode_air_date.before", "episode_air_date.after",
@@ -155,7 +155,6 @@ sorts = {
     "added.asc": "addedAt:asc", "added.desc": "addedAt:desc"
 }
 modifiers = {
-    ".and": "&",
     ".not": "!",
     ".begins": "<",
     ".ends": ">",