Refactor and consolidate mixins

plexapi/audio.py

@@ -10,12 +10,7 @@
 from plexapi import media, utils
 from plexapi.base import Playable, PlexPartialObject, PlexHistory, PlexSession, cached_data_property
 from plexapi.exceptions import BadRequest
-from plexapi.mixins import (
-    AdvancedSettingsMixin, SplitMergeMixin, UnmatchMatchMixin, ExtrasMixin, HubsMixin, PlayedUnplayedMixin, RatingMixin,
-    ArtUrlMixin, ArtMixin, LogoMixin, LogoUrlMixin, PosterUrlMixin, PosterMixin, SquareArtMixin, SquareArtUrlMixin,
-    ThemeMixin, ThemeUrlMixin,
-    ArtistEditMixins, AlbumEditMixins, TrackEditMixins
-)
+from plexapi.mixins import ArtistMixins, AlbumMixins, TrackMixins, PlayedUnplayedMixin
 from plexapi.playlist import Playlist
 
 
@@ -180,10 +175,7 @@ def sonicallySimilar(
 
 @utils.registerPlexObject
 class Artist(
-    Audio,
-    AdvancedSettingsMixin, SplitMergeMixin, UnmatchMatchMixin, ExtrasMixin, HubsMixin, RatingMixin,
-    ArtMixin, LogoMixin, PosterMixin, SquareArtMixin, ThemeMixin,
-    ArtistEditMixins
+    Audio, ArtistMixins
 ):
     """ Represents a single Artist.
 
@@ -350,10 +342,7 @@ def metadataDirectory(self):
 
 @utils.registerPlexObject
 class Album(
-    Audio,
-    SplitMergeMixin, UnmatchMatchMixin, RatingMixin,
-    ArtMixin, LogoMixin, PosterMixin, SquareArtMixin, ThemeUrlMixin,
-    AlbumEditMixins
+    Audio, AlbumMixins
 ):
     """ Represents a single Album.
 
@@ -503,10 +492,7 @@ def metadataDirectory(self):
 
 @utils.registerPlexObject
 class Track(
-    Audio, Playable,
-    ExtrasMixin, RatingMixin,
-    ArtUrlMixin, LogoUrlMixin, PosterUrlMixin, SquareArtUrlMixin, ThemeUrlMixin,
-    TrackEditMixins
+    Audio, Playable, TrackMixins
 ):
     """ Represents a single Track.
 

plexapi/collection.py

@@ -6,20 +6,13 @@
 from plexapi.base import PlexPartialObject, cached_data_property
 from plexapi.exceptions import BadRequest, NotFound, Unsupported
 from plexapi.library import LibrarySection, ManagedHub
-from plexapi.mixins import (
-    AdvancedSettingsMixin, SmartFilterMixin, HubsMixin, RatingMixin,
-    ArtMixin, LogoMixin, PosterMixin, SquareArtMixin, ThemeMixin,
-    CollectionEditMixins
-)
+from plexapi.mixins import CollectionMixins
 from plexapi.utils import deprecated
 
 
 @utils.registerPlexObject
 class Collection(
-    PlexPartialObject,
-    AdvancedSettingsMixin, SmartFilterMixin, HubsMixin, RatingMixin,
-    ArtMixin, LogoMixin, PosterMixin, SquareArtMixin, ThemeMixin,
-    CollectionEditMixins
+    PlexPartialObject, CollectionMixins
 ):
     """ Represents a single Collection.
 

plexapi/mixins.py

@@ -111,7 +111,7 @@ def _parseFilterGroups(self, feed: Deque[Tuple[str, str]], returnOn: Union[Set[s
 
     def _parseQueryFeed(self, feed: "deque[Tuple[str, str]]") -> dict:
         """ Parse the query string into a dict. """
-        filtersDict = {}
+        filtersDict: dict[str, Union[str, int, list, dict]] = {}
         special_keys = {"type", "sort"}
         integer_keys = {"includeGuids", "limit"}
         as_is_keys = {"group", "having"}
@@ -1414,3 +1414,99 @@ class PlaylistEditMixins(
     SortTitleMixin, SummaryMixin, TitleMixin
 ):
     pass
+
+
+class MovieMixins(
+    AdvancedSettingsMixin, SplitMergeMixin, UnmatchMatchMixin, ExtrasMixin, HubsMixin, RatingMixin,
+    ArtMixin, LogoMixin, PosterMixin, SquareArtMixin, ThemeMixin,
+    MovieEditMixins,
+    WatchlistMixin
+):
+    pass
+
+
+class ShowMixins(
+    AdvancedSettingsMixin, SplitMergeMixin, UnmatchMatchMixin, ExtrasMixin, HubsMixin, RatingMixin,
+    ArtMixin, LogoMixin, PosterMixin, SquareArtMixin, ThemeMixin,
+    ShowEditMixins,
+    WatchlistMixin
+):
+    pass
+
+
+class SeasonMixins(
+    AdvancedSettingsMixin, ExtrasMixin, RatingMixin,
+    ArtMixin, LogoMixin, PosterMixin, SquareArtMixin, ThemeUrlMixin,
+    SeasonEditMixins
+):
+    pass
+
+
+class EpisodeMixins(
+    ExtrasMixin, RatingMixin,
+    ArtMixin, LogoMixin, PosterMixin, SquareArtMixin, ThemeUrlMixin,
+    EpisodeEditMixins
+):
+    pass
+
+
+class ClipMixins(
+    ArtUrlMixin, LogoUrlMixin, PosterUrlMixin, SquareArtUrlMixin
+):
+    pass
+
+
+class ArtistMixins(
+    AdvancedSettingsMixin, SplitMergeMixin, UnmatchMatchMixin, ExtrasMixin, HubsMixin, RatingMixin,
+    ArtMixin, LogoMixin, PosterMixin, SquareArtMixin, ThemeMixin,
+    ArtistEditMixins
+):
+    pass
+
+
+class AlbumMixins(
+    SplitMergeMixin, UnmatchMatchMixin, RatingMixin,
+    ArtMixin, LogoMixin, PosterMixin, SquareArtMixin, ThemeUrlMixin,
+    AlbumEditMixins
+):
+    pass
+
+
+class TrackMixins(
+    ExtrasMixin, RatingMixin,
+    ArtUrlMixin, LogoUrlMixin, PosterUrlMixin, SquareArtUrlMixin, ThemeUrlMixin,
+    TrackEditMixins
+):
+    pass
+
+
+class PhotoalbumMixins(
+    RatingMixin,
+    ArtMixin, LogoMixin, PosterMixin, SquareArtMixin,
+    PhotoalbumEditMixins
+):
+    pass
+
+
+class PhotoMixins(
+    RatingMixin,
+    ArtUrlMixin, LogoUrlMixin, PosterUrlMixin, SquareArtUrlMixin,
+    PhotoEditMixins
+):
+    pass
+
+
+class CollectionMixins(
+    AdvancedSettingsMixin, SmartFilterMixin, HubsMixin, RatingMixin,
+    ArtMixin, LogoMixin, PosterMixin, SquareArtMixin, ThemeMixin,
+    CollectionEditMixins
+):
+    pass
+
+
+class PlaylistMixins(
+    SmartFilterMixin,
+    ArtMixin, LogoMixin, PosterMixin, SquareArtMixin,
+    PlaylistEditMixins
+):
+    pass

plexapi/photo.py

@@ -6,19 +6,12 @@
 from plexapi import media, utils, video
 from plexapi.base import Playable, PlexPartialObject, PlexSession, cached_data_property
 from plexapi.exceptions import BadRequest
-from plexapi.mixins import (
-    RatingMixin,
-    ArtUrlMixin, ArtMixin, LogoMixin, LogoUrlMixin, PosterUrlMixin, PosterMixin, SquareArtMixin, SquareArtUrlMixin,
-    PhotoalbumEditMixins, PhotoEditMixins
-)
+from plexapi.mixins import PhotoalbumMixins, PhotoMixins
 
 
 @utils.registerPlexObject
 class Photoalbum(
-    PlexPartialObject,
-    RatingMixin,
-    ArtMixin, LogoMixin, PosterMixin, SquareArtMixin,
-    PhotoalbumEditMixins
+    PlexPartialObject, PhotoalbumMixins
 ):
     """ Represents a single Photoalbum (collection of photos).
 
@@ -157,10 +150,7 @@ def metadataDirectory(self):
 
 @utils.registerPlexObject
 class Photo(
-    PlexPartialObject, Playable,
-    RatingMixin,
-    ArtUrlMixin, LogoUrlMixin, PosterUrlMixin, SquareArtUrlMixin,
-    PhotoEditMixins
+    PlexPartialObject, Playable, PhotoMixins
 ):
     """ Represents a single Photo.
 

plexapi/playlist.py

@@ -8,16 +8,13 @@
 from plexapi.base import Playable, PlexPartialObject, cached_data_property
 from plexapi.exceptions import BadRequest, NotFound, Unsupported
 from plexapi.library import LibrarySection, MusicSection
-from plexapi.mixins import SmartFilterMixin, ArtMixin, LogoMixin, PosterMixin, SquareArtMixin, PlaylistEditMixins
+from plexapi.mixins import PlaylistMixins
 from plexapi.utils import deprecated
 
 
 @utils.registerPlexObject
 class Playlist(
-    PlexPartialObject, Playable,
-    SmartFilterMixin,
-    ArtMixin, LogoMixin, PosterMixin, SquareArtMixin,
-    PlaylistEditMixins
+    PlexPartialObject, Playable, PlaylistMixins
 ):
     """ Represents a single Playlist.
 

plexapi/video.py

@@ -6,13 +6,7 @@
 from plexapi import media, utils
 from plexapi.base import Playable, PlexPartialObject, PlexHistory, PlexSession, cached_data_property
 from plexapi.exceptions import BadRequest
-from plexapi.mixins import (
-    AdvancedSettingsMixin, SplitMergeMixin, UnmatchMatchMixin, ExtrasMixin, HubsMixin, PlayedUnplayedMixin, RatingMixin,
-    ArtUrlMixin, ArtMixin, LogoMixin, LogoUrlMixin, PosterUrlMixin, PosterMixin, SquareArtMixin, SquareArtUrlMixin,
-    ThemeUrlMixin, ThemeMixin,
-    MovieEditMixins, ShowEditMixins, SeasonEditMixins, EpisodeEditMixins,
-    WatchlistMixin
-)
+from plexapi.mixins import MovieMixins, ShowMixins, SeasonMixins, EpisodeMixins, ClipMixins, PlayedUnplayedMixin
 
 
 class Video(PlexPartialObject, PlayedUnplayedMixin):
@@ -337,11 +331,7 @@ def sync(self, videoQuality, client=None, clientId=None, limit=None, unwatched=F
 
 @utils.registerPlexObject
 class Movie(
-    Video, Playable,
-    AdvancedSettingsMixin, SplitMergeMixin, UnmatchMatchMixin, ExtrasMixin, HubsMixin, RatingMixin,
-    ArtMixin, LogoMixin, PosterMixin, SquareArtMixin, ThemeMixin,
-    MovieEditMixins,
-    WatchlistMixin
+    Video, Playable, MovieMixins
 ):
     """ Represents a single Movie.
 
@@ -549,11 +539,7 @@ def metadataDirectory(self):
 
 @utils.registerPlexObject
 class Show(
-    Video,
-    AdvancedSettingsMixin, SplitMergeMixin, UnmatchMatchMixin, ExtrasMixin, HubsMixin, RatingMixin,
-    ArtMixin, LogoMixin, PosterMixin, SquareArtMixin, ThemeMixin,
-    ShowEditMixins,
-    WatchlistMixin
+    Video, ShowMixins
 ):
     """ Represents a single Show (including all seasons and episodes).
 
@@ -801,10 +787,7 @@ def metadataDirectory(self):
 
 @utils.registerPlexObject
 class Season(
-    Video,
-    AdvancedSettingsMixin, ExtrasMixin, RatingMixin,
-    ArtMixin, LogoMixin, PosterMixin, SquareArtMixin, ThemeUrlMixin,
-    SeasonEditMixins
+    Video, SeasonMixins
 ):
     """ Represents a single Season.
 
@@ -983,10 +966,7 @@ def metadataDirectory(self):
 
 @utils.registerPlexObject
 class Episode(
-    Video, Playable,
-    ExtrasMixin, RatingMixin,
-    ArtMixin, LogoMixin, PosterMixin, SquareArtMixin, ThemeUrlMixin,
-    EpisodeEditMixins
+    Video, Playable, EpisodeMixins
 ):
     """ Represents a single Episode.
 
@@ -1260,8 +1240,7 @@ def metadataDirectory(self):
 
 @utils.registerPlexObject
 class Clip(
-    Video, Playable,
-    ArtUrlMixin, LogoUrlMixin, PosterUrlMixin, SquareArtUrlMixin
+    Video, Playable, ClipMixins
 ):
     """ Represents a single Clip.