Skip to content

Refactor and consolidate mixins #1564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JonnyWong16 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Refactor and consolidate mixins #1564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25909ae
Refactor mixins
JonnyWong16 Nov 23, 2025
a2cebef
Fix filtersDict type hint
JonnyWong16 Nov 23, 2025
2618257
Refactor all mixins into separate module and files
JonnyWong16 Nov 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 4 additions & 18 deletions plexapi/audio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down Expand Up @@ -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.

Expand Down Expand Up @@ -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.

Expand Down Expand Up @@ -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.

Expand Down
11 changes: 2 additions & 9 deletions plexapi/collection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
Loading
Loading