Merge branch 'master' into patch-8

Author: blacktwin

.gitignore

@@ -24,3 +24,4 @@ include/
 lib/
 pip-selfcheck.json
 pyvenv.cfg
+MANIFEST

plexapi/base.py

@@ -6,6 +6,7 @@
 from plexapi.exceptions import BadRequest, NotFound, UnknownType, Unsupported
 from plexapi.utils import tag_helper
 
+DONT_RELOAD_FOR_KEYS = ['key', 'session']
 OPERATORS = {
     'exact': lambda v, q: v == q,
     'iexact': lambda v, q: v.lower() == q.lower(),
@@ -278,7 +279,8 @@ def __getattribute__(self, attr):
         # Dragons inside.. :-/
         value = super(PlexPartialObject, self).__getattribute__(attr)
         # Check a few cases where we dont want to reload
-        if attr == 'key' or attr.startswith('_'): return value
+        if attr in DONT_RELOAD_FOR_KEYS: return value
+        if attr.startswith('_'): return value
         if value not in (None, []): return value
         if self.isFullObject(): return value
         # Log the reload.

plexapi/client.py

@@ -187,24 +187,30 @@ def sendCommand(self, command, proxy=None, **params):
             log.debug('Client %s doesnt support %s controller.'
                       'What your trying might not work' % (self.title, controller))
 
+        proxy = self._proxyThroughServer if proxy is None else proxy
+        query = self._server.query if proxy else self.query
+
         # Workaround for ptp. See https://github.com/pkkid/python-plexapi/issues/244
         t = time.time()
         if t - self._last_call >= 80 and self.product in ('ptp', 'Plex Media Player'):
             url = '/player/timeline/poll?wait=0&commandID=%s' % self._nextCommandId()
-            if proxy:
-                self._server.query(url, headers=headers)
-            else:
-                self.query(url, headers=headers)
+            query(url, headers=headers)
             self._last_call = t
 
         params['commandID'] = self._nextCommandId()
         key = '/player/%s%s' % (command, utils.joinArgs(params))
 
-        proxy = self._proxyThroughServer if proxy is None else proxy
-
-        if proxy:
-            return self._server.query(key, headers=headers)
-        return self.query(key, headers=headers)
+        try:
+            return query(key, headers=headers)
+        except ElementTree.ParseError:
+            # Workaround for players which don't return valid XML on successful commands
+            #   - Plexamp: `b'OK'`
+            if self.product in (
+                'Plexamp',
+                'Plex for Android (TV)',
+            ):
+                return
+            raise
 
     def url(self, key, includeToken=False):
         """ Build a URL string with proper token argument. Token will be appended to the URL

plexapi/media.py

@@ -85,6 +85,8 @@ class MediaPart(PlexObject):
             key (str): Key used to access this media part (ex: /library/parts/46618/1389985872/file.avi).
             size (int): Size of this file in bytes (ex: 733884416).
             streams (list<:class:`~plexapi.media.MediaPartStream`>): List of streams in this media part.
+            exists (bool): Determine if file exists
+            accessible (bool): Determine if file is accessible
     """
     TAG = 'Part'
 
@@ -104,6 +106,8 @@ def _loadData(self, data):
         self.syncState = data.attrib.get('syncState')
         self.videoProfile = data.attrib.get('videoProfile')
         self.streams = self._buildStreams(data)
+        self.exists = cast(bool, data.attrib.get('exists'))
+        self.accessible = cast(bool, data.attrib.get('accessible'))
 
     def _buildStreams(self, data):
         streams = []
@@ -463,6 +467,23 @@ class Mood(MediaTag):
     FILTER = 'mood'
 
 
+@utils.registerPlexObject
+class Poster(PlexObject):
+    """ Represents a Poster.
+
+        Attributes:
+            TAG (str): 'Photo'
+    """
+    TAG = 'Photo'
+
+    def _loadData(self, data):
+        self._data = data
+        self.key = data.attrib.get('key')
+        self.ratingKey = data.attrib.get('ratingKey')
+        self.selected = data.attrib.get('selected')
+        self.thumb = data.attrib.get('thumb')
+
+
 @utils.registerPlexObject
 class Producer(MediaTag):
     """ Represents a single Producer media tag.

plexapi/video.py

@@ -123,6 +123,11 @@ def removeSubtitles(self, streamID=None, streamTitle=None):
                 self._server.query(stream.key, self._server._session.delete)
         self.reload()
 
+    def posters(self):
+        """ Returns list of available poster objects. :class:`~plexapi.media.Poster`:"""
+
+        return self.fetchItems('%s/posters' % self.key, cls=media.Poster)
+
     def sync(self, videoQuality, client=None, clientId=None, limit=None, unwatched=False, title=None):
         """ Add current video (movie, tv-show, season or episode) as sync item for specified device.
             See :func:`plexapi.myplex.MyPlexAccount.sync()` for possible exceptions.

tests/test_audio.py

@@ -7,7 +7,7 @@ def test_audio_Artist_attr(artist):
     artist.reload()
     assert utils.is_datetime(artist.addedAt)
     assert artist.countries == []
-    assert [i.tag for i in artist.genres] == ['Electronic']
+    assert [i.tag for i in artist.genres] in [[], ['Electronic']]
     assert utils.is_string(artist.guid, gte=5)
     assert artist.index == '1'
     assert utils.is_metadata(artist._initpath)
@@ -79,6 +79,7 @@ def test_audio_Album_attrs(album):
     assert album.year == 2016
     assert album.artUrl is None
 
+
 def test_audio_Album_tracks(album):
     tracks = album.tracks()
     track = tracks[0]
@@ -96,7 +97,7 @@ def test_audio_Album_tracks(album):
     assert utils.is_int(track.parentRatingKey)
     assert utils.is_metadata(track.parentThumb, contains='/thumb/')
     assert track.parentTitle == 'Unmastered Impulses'
-    #assert track.ratingCount == 9 # Flaky
+    # assert track.ratingCount == 9 # Flaky
     assert utils.is_int(track.ratingKey)
     assert track._server._baseurl == utils.SERVER_BASEURL
     assert track.summary == ""
@@ -114,7 +115,7 @@ def test_audio_Album_track(album, track=None):
     # this is not reloaded. its not that much info missing.
     track = track or album.track('Holy Moment')
     assert utils.is_datetime(track.addedAt)
-    assert track.duration == 298606
+    assert track.duration in [298605, 298606]
     assert utils.is_metadata(track.grandparentKey)
     assert utils.is_int(track.grandparentRatingKey)
     assert track.grandparentTitle == 'Infinite State'
@@ -147,7 +148,7 @@ def test_audio_Album_track(album, track=None):
     assert media.audioCodec == 'mp3'
     assert media.bitrate == 385
     assert media.container == 'mp3'
-    assert media.duration == 298606
+    assert media.duration in [298605, 298606]
     assert media.height is None
     assert utils.is_int(media.id, gte=1)
     assert utils.is_metadata(media._initpath)
@@ -160,7 +161,7 @@ def test_audio_Album_track(album, track=None):
     assert media.videoResolution is None
     assert media.width is None
     assert part.container == 'mp3'
-    assert part.duration == 298606
+    assert part.duration in [298605, 298606]
     assert part.file.endswith('.mp3')
     assert utils.is_int(part.id)
     assert utils.is_metadata(part._initpath)
@@ -186,7 +187,7 @@ def test_audio_Track_attrs(album):
     assert utils.is_datetime(track.addedAt)
     assert track.art is None
     assert track.chapterSource is None
-    assert track.duration == 298606
+    assert track.duration in [298605, 298606]
     assert track.grandparentArt is None
     assert utils.is_metadata(track.grandparentKey)
     assert utils.is_int(track.grandparentRatingKey)
@@ -232,7 +233,7 @@ def test_audio_Track_attrs(album):
     assert media.audioCodec == 'mp3'
     assert media.bitrate == 385
     assert media.container == 'mp3'
-    assert media.duration == 298606
+    assert media.duration in [298605, 298606]
     assert media.height is None
     assert utils.is_int(media.id, gte=1)
     assert utils.is_metadata(media._initpath)
@@ -245,12 +246,12 @@ def test_audio_Track_attrs(album):
     assert media.videoResolution is None
     assert media.width is None
     assert part.container == 'mp3'
-    assert part.duration == 298606
+    assert part.duration in [298605, 298606]
     assert part.file.endswith('.mp3')
     assert utils.is_int(part.id)
     assert utils.is_metadata(part._initpath)
     assert utils.is_part(part.key)
-    #assert part.media == <Media:Holy.Moment>
+    # assert part.media == <Media:Holy.Moment>
     assert part._server._baseurl == utils.SERVER_BASEURL
     assert part.size == 14360402
     # Assign 0 part.streams
@@ -269,7 +270,7 @@ def test_audio_Track_attrs(album):
     assert utils.is_metadata(stream._initpath)
     assert stream.language is None
     assert stream.languageCode is None
-    #assert stream.part == <MediaPart:22>
+    # assert stream.part == <MediaPart:22>
     assert stream.samplingRate == 44100
     assert stream.selected is True
     assert stream._server._baseurl == utils.SERVER_BASEURL

tests/test_video.py

@@ -125,6 +125,7 @@ def test_video_Movie_attrs(movies):
     assert [i.tag for i in movie.directors] == ['Nina Paley']
     assert movie.duration >= 160000
     assert movie.fields == []
+    assert movie.posters()
     assert sorted([i.tag for i in movie.genres]) == ['Animation', 'Comedy', 'Fantasy', 'Musical', 'Romance']
     assert movie.guid == 'com.plexapp.agents.imdb://tt1172203?lang=en'
     assert utils.is_metadata(movie._initpath)
@@ -239,6 +240,8 @@ def test_video_Movie_attrs(movies):
     assert len(part.key) >= 10
     assert part._server._baseurl == utils.SERVER_BASEURL
     assert utils.is_int(part.size, gte=1000000)
+    assert part.exists
+    assert part.accessible
     # Stream 1
     stream1 = part.streams[0]
     assert stream1.bitDepth in (8, None)
@@ -530,6 +533,8 @@ def test_video_Episode_attrs(episode):
     assert len(part.key) >= 10
     assert part._server._baseurl == utils.SERVER_BASEURL
     assert utils.is_int(part.size, gte=18184197)
+    assert part.exists
+    assert part.accessible
 
 
 def test_video_Season(show):
@@ -638,3 +643,17 @@ def test_that_reload_return_the_same_object(plex):
     episode_section_get_key = episode_section_get.key
     assert episode_library_search_key == episode_library_search.reload().key == episode_search_key == episode_search.reload().key == episode_section_get_key == episode_section_get.reload().key  # noqa
 
+
+def test_video_exists_accessible(movie, episode):
+    assert movie.media[0].parts[0].exists is None
+    assert movie.media[0].parts[0].accessible is None
+    movie.reload()
+    assert movie.media[0].parts[0].exists is True
+    assert movie.media[0].parts[0].accessible is True
+
+    assert episode.media[0].parts[0].exists is None
+    assert episode.media[0].parts[0].accessible is None
+    episode.reload()
+    assert episode.media[0].parts[0].exists is True
+    assert episode.media[0].parts[0].accessible is True
+