Merge branch 'master' of github.com:pkkid/python-plexapi

Author: pkkid

plexapi/myplex.py

@@ -172,7 +172,6 @@ def query(self, url, method=None, headers=None, timeout=None, **kwargs):
         if response.status_code not in (200, 201, 204):  # pragma: no cover
             codename = codes.get(response.status_code)[0]
             errtext = response.text.replace('\n', ' ')
-            log.warning('BadRequest (%s) %s %s; %s' % (response.status_code, codename, response.url, errtext))
             raise BadRequest('(%s) %s %s; %s' % (response.status_code, codename, response.url, errtext))
         data = response.text.encode('utf8')
         return ElementTree.fromstring(data) if data.strip() else None
@@ -487,7 +486,6 @@ def claimToken(self):
         if response.status_code not in (200, 201, 204):  # pragma: no cover
             codename = codes.get(response.status_code)[0]
             errtext = response.text.replace('\n', ' ')
-            log.warning('BadRequest (%s) %s %s; %s' % (response.status_code, codename, response.url, errtext))
             raise BadRequest('(%s) %s %s; %s' % (response.status_code, codename, response.url, errtext))
         return response.json()['token']
 

plexapi/utils.py

@@ -181,7 +181,7 @@ def toDatetime(value, format=None):
             # https://bugs.python.org/issue30684
             # And platform support for before epoch seems to be flaky.
             # TODO check for others errors too.
-            if int(value) == 0:
+            if int(value) <= 0:
                 value = 86400
             value = datetime.fromtimestamp(int(value))
     return value

plexapi/video.py

@@ -262,6 +262,7 @@ class Show(Video):
             banner (str): Key to banner artwork (/library/metadata/<ratingkey>/art/<artid>)
             childCount (int): Unknown.
             contentRating (str) Content rating (PG-13; NR; TV-G).
+            collections (List<:class:`~plexapi.media.Collection`>): List of collections this media belongs.
             duration (int): Duration of show in milliseconds.
             guid (str): Plex GUID (com.plexapp.agents.imdb://tt4302938?lang=en).
             index (int): Plex index (?)
@@ -294,6 +295,7 @@ def _loadData(self, data):
         self.banner = data.attrib.get('banner')
         self.childCount = utils.cast(int, data.attrib.get('childCount'))
         self.contentRating = data.attrib.get('contentRating')
+        self.collections = self.findItems(data, media.Collection)
         self.duration = utils.cast(int, data.attrib.get('duration'))
         self.guid = data.attrib.get('guid')
         self.index = data.attrib.get('index')