From c88083aef2fc7666ddd89a703d4f376c6e3450f1 Mon Sep 17 00:00:00 2001 From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com> Date: Sat, 3 Apr 2021 16:11:44 -0700 Subject: [PATCH] Rename PlexServer attribute --- plexpy/exporter.py | 4 ++-- plexpy/libraries.py | 2 +- plexpy/plex.py | 8 ++++---- plexpy/plextv.py | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plexpy/exporter.py b/plexpy/exporter.py index 90fbb0a0..9f22686d 100644 --- a/plexpy/exporter.py +++ b/plexpy/exporter.py @@ -1654,7 +1654,7 @@ class Export(object): self.user_id, self.metadata_level, self.media_info_level, self.thumb_level, self.art_level, self.export_type, self.file_format) - self.obj = plex.plex + self.obj = plex.PlexServer self.media_type = self.export_type self.obj_title = user_info['username'] @@ -1667,7 +1667,7 @@ class Export(object): self.section_id, self.metadata_level, self.media_info_level, self.thumb_level, self.art_level, self.export_type, self.file_format) - self.obj = plex.get_library(str(self.section_id)) + self.obj = plex.get_library(self.section_id) if self.export_type == 'all': self.media_type = self.obj.type else: diff --git a/plexpy/libraries.py b/plexpy/libraries.py index e5a3df96..8dabfccc 100644 --- a/plexpy/libraries.py +++ b/plexpy/libraries.py @@ -249,7 +249,7 @@ def get_playlists(section_id=None, user_id=None): plex = Plex(token=plex_token) if user_id: - playlists = plex.plex.playlists() + playlists = plex.PlexServer.playlists() else: library = plex.get_library(section_id) playlists = library.playlists() diff --git a/plexpy/plex.py b/plexpy/plex.py index a581c060..29379053 100644 --- a/plexpy/plex.py +++ b/plexpy/plex.py @@ -56,13 +56,13 @@ class Plex(object): def __init__(self, url=None, token=None): url = url or plexpy.CONFIG.PMS_URL token = token or plexpy.CONFIG.PMS_TOKEN - self.plex = PlexObject(url, token) + self.PlexServer = PlexObject(url, token) def get_library(self, section_id): - return self.plex.library.sectionByID(str(section_id)) + return self.PlexServer.library.sectionByID(int(section_id)) def get_library_items(self, section_id): - return self.get_library(str(section_id)).all() + return self.get_library(section_id).all() def get_item(self, rating_key): - return self.plex.fetchItem(rating_key) + return self.PlexServer.fetchItem(rating_key) diff --git a/plexpy/plextv.py b/plexpy/plextv.py index 8bbcaa0d..5e487a55 100644 --- a/plexpy/plextv.py +++ b/plexpy/plextv.py @@ -503,7 +503,7 @@ class PlexTV(object): tokens = users.Users().get_tokens(user_id=device_user_id) if tokens['server_token']: plex = Plex(token=tokens['server_token']) - for playlist in plex.plex.playlists(): + for playlist in plex.PlexServer.playlists(): if location_uri.endswith(playlist.guid): rating_key = str(playlist.ratingKey) # String for backwards consistency