Allow disabling auto-reloading when accessing missing attributes (#935)

* Rename _autoReload to _overwriteNone

* Allow disabling auto reloading

* Update test for disabling auto reloading

* Change autoReload to private attribute

Author: JonnyWong16

plexapi/base.py

@@ -53,8 +53,9 @@ def __init__(self, server, data, initpath=None, parent=None):
         if data is not None:
             self._loadData(data)
         self._details_key = self._buildDetailsKey()
-        self._autoReload = False
+        self._overwriteNone = True
         self._edits = None  # Save batch edits for a single API call
+        self._autoReload = True  # Automatically reload the object when accessing a missing attribute
 
     def __repr__(self):
         uid = self._clean(self.firstAttr('_baseurl', 'key', 'id', 'playQueueID', 'uri'))
@@ -66,9 +67,9 @@ def __setattr__(self, attr, value):
         if attr in _DONT_OVERWRITE_SESSION_KEYS and value == []:
             value = getattr(self, attr, [])
 
-        autoReload = self.__dict__.get('_autoReload')
-        # Don't overwrite an attr with None unless it's a private variable or not auto reload
-        if value is not None or attr.startswith('_') or attr not in self.__dict__ or not autoReload:
+        overwriteNone = self.__dict__.get('_overwriteNone')
+        # Don't overwrite an attr with None unless it's a private variable or overwrite None is True
+        if value is not None or attr.startswith('_') or attr not in self.__dict__ or overwriteNone:
             self.__dict__[attr] = value
 
     def _clean(self, value):
@@ -346,17 +347,17 @@ def reload(self, key=None, **kwargs):
         """
         return self._reload(key=key, **kwargs)
 
-    def _reload(self, key=None, _autoReload=False, **kwargs):
+    def _reload(self, key=None, _overwriteNone=True, **kwargs):
         """ Perform the actual reload. """
         details_key = self._buildDetailsKey(**kwargs) if kwargs else self._details_key
         key = key or details_key or self.key
         if not key:
             raise Unsupported('Cannot reload an object not built from a URL.')
         self._initpath = key
         data = self._server.query(key)
-        self._autoReload = _autoReload
+        self._overwriteNone = _overwriteNone
         self._loadData(data[0])
-        self._autoReload = False
+        self._overwriteNone = True
         return self
 
     def _checkAttrs(self, elem, **kwargs):
@@ -472,13 +473,14 @@ def __getattribute__(self, attr):
         if attr.startswith('_'): return value
         if value not in (None, []): return value
         if self.isFullObject(): return value
+        if self._autoReload is False: return value
         # 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
         log.debug("Reloading %s for attr '%s'", objname, attr)
         # Reload and return the value
-        self._reload(_autoReload=True)
+        self._reload()
         return super(PlexPartialObject, self).__getattribute__(attr)
 
     def analyze(self):
@@ -791,7 +793,7 @@ def updateProgress(self, time, state='stopped'):
         key = '/:/progress?key=%s&identifier=com.plexapp.plugins.library&time=%d&state=%s' % (self.ratingKey,
                                                                                               time, state)
         self._server.query(key)
-        self._reload(_autoReload=True)
+        self._reload(_overwriteNone=False)
 
     def updateTimeline(self, time, state='stopped', duration=None):
         """ Set the timeline progress for this video.
@@ -809,7 +811,7 @@ def updateTimeline(self, time, state='stopped', duration=None):
         key = '/:/timeline?ratingKey=%s&key=%s&identifier=com.plexapp.plugins.library&time=%d&state=%s%s'
         key %= (self.ratingKey, self.key, time, state, durationStr)
         self._server.query(key)
-        self._reload(_autoReload=True)
+        self._reload(_overwriteNone=False)
 
 
 class MediaContainer(PlexObject):

tests/test_video.py

@@ -339,6 +339,10 @@ def test_video_Movie_isFullObject_and_reload(plex):
 
 def test_video_Movie_isPartialObject(movie):
     assert movie.isPartialObject()
+    movie._autoReload = False
+    assert movie.originalTitle is None
+    assert movie.isPartialObject()
+    movie._autoReload = True
 
 
 def test_video_Movie_media_delete(movie, patched_http_call):