really need to sanity check on this one..

Author: Hellowlol

plexapi/base.py

@@ -182,7 +182,12 @@ def listAttrs(self, data, attr, **kwargs):
 
     def reload(self, key=None):
         """ Reload the data for this object from self.key. """
-        key = key or self.key
+        if key is None:
+            if hasattr(self, '_details_key'):
+                key = self._details_key
+            else:
+                key = self.key
+
         if not key:
             raise Unsupported('Cannot reload an object not built from a URL.')
         self._initpath = key
@@ -275,7 +280,7 @@ def __getattribute__(self, attr):
         if attr == 'key' or attr.startswith('_'): return value
         if value not in (None, []): return value
         if self.isFullObject(): return value
-        # Log warning that were reloading the object
+        # Log the reload.
         clsname = self.__class__.__name__
         title = self.__dict__.get('title', self.__dict__.get('name'))
         objname = "%s '%s'" % (clsname, title) if title else clsname
@@ -310,6 +315,8 @@ def isFullObject(self):
             search result for a movie often only contain a portion of the attributes a full
             object (main url) for that movie contain.
         """
+        #print(self._details_key == self._initpath)
+        #return self._details_key == self._initpath or not self.key or self.key == self._initpath
         return not self.key or self.key == self._initpath
 
     def isPartialObject(self):
@@ -448,6 +455,14 @@ def _loadData(self, data):
         self.viewedAt = utils.toDatetime(data.attrib.get('viewedAt'))               # history
         self.playlistItemID = utils.cast(int, data.attrib.get('playlistItemID'))    # playlist
 
+    def isFullObject(self):
+        """ Retruns True if this is already a full object. A full object means all attributes
+            were populated from the api path representing only this item. For example, the
+            search result for a movie often only contain a portion of the attributes a full
+            object (main url) for that movie contain.
+        """
+        return self._details_key == self._initpath or not self.key
+
     def getStreamURL(self, **params):
         """ Returns a stream url that may be used by external applications such as VLC.
 

plexapi/video.py

@@ -79,7 +79,7 @@ def markUnwatched(self):
 
 
 @utils.registerPlexObject
-class Movie(Video, Playable):
+class Movie(Playable, Video):
     """ Represents a single Movie.
 
         Attributes:
@@ -115,14 +115,18 @@ class Movie(Video, Playable):
     """
     TAG = 'Video'
     TYPE = 'movie'
-    _include = '?checkFiles=1&includeExtras=1&includeRelated=1&includeRelatedCount=5&includeOnDeck=1&includeChapters=1&includePopularLeaves=1&includeConcerts=1&includePreferences=1'
+    _include = ('?checkFiles=1&includeExtras=1&includeRelated=1'
+                '&includeOnDeck=1&includeChapters=1&includePopularLeaves=1'
+                '&includeConcerts=1&includePreferences=1')
+
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
         Video._loadData(self, data)
         Playable._loadData(self, data)
 
-        self.key = data.attrib.get('key') + self._include
+        self.key = data.attrib.get('key')
+        self._details_key = self.key + self._include
         self.art = data.attrib.get('art')
         self.audienceRating = utils.cast(float, data.attrib.get('audienceRating'))
         self.audienceRatingImage = data.attrib.get('audienceRatingImage')
@@ -442,7 +446,7 @@ def download(self, savepath=None, keep_orginal_name=False, **kwargs):
 
 
 @utils.registerPlexObject
-class Episode(Video, Playable):
+class Episode(Playable, Video):
     """ Represents a single Shows Episode.
 
         Attributes:
@@ -476,11 +480,15 @@ class Episode(Video, Playable):
     """
     TAG = 'Video'
     TYPE = 'episode'
+    _include = ('?checkFiles=1&includeExtras=1&includeRelated=1'
+                '&includeOnDeck=1&includeChapters=1&includePopularLeaves=1'
+                '&includeConcerts=1&includePreferences=1')
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
         Video._loadData(self, data)
         Playable._loadData(self, data)
+        self._details_key = self.key + self._include
         self._seasonNumber = None  # cached season number
         self.art = data.attrib.get('art')
         self.chapterSource = data.attrib.get('chapterSource')
@@ -509,6 +517,7 @@ def _loadData(self, data):
         self.writers = self.findItems(data, media.Writer)
         self.labels = self.findItems(data, media.Label)
         self.collections = self.findItems(data, media.Collection)
+        self.chapters = self.findItems(data, media.Chapter)
 
     def __repr__(self):
         return '<%s>' % ':'.join([p for p in [