Merge master

Author: pkkid

docs/configuration.rst

@@ -21,7 +21,7 @@ are optional. An example config.ini file may look like the following with all po
     client_baseurl = http://127.0.0.1:32433
     client_token = BDFSLCNSNL789FH7
 
-    [headers]
+    [header]
     identifier = 0x485b314307f3L
     platorm = Linux
     platform_version = 4.4.0-62-generic

plexapi/myplex.py

@@ -516,6 +516,7 @@ class MyPlexUser(PlexObject):
             thumb (str): Link to the users avatar.
             title (str): Seems to be an aliad for username.
             username (str): User's username.
+            servers: Servers shared between user and friend
     """
     TAG = 'User'
     key = 'https://plex.tv/api/users/'

plexapi/server.py

@@ -182,7 +182,12 @@ def account(self):
         """ Returns the :class:`~plexapi.server.Account` object this server belongs to. """
         data = self.query(Account.key)
         return Account(self, data)
-    
+
+    def createToken(self, type='delegation', scope='all'):
+        """Create a temp access token for the server."""
+        q = self.query('/security/token?type=%s&scope=%s' % (type, scope))
+        return q.attrib.get('token')
+
     def systemAccounts(self):
         """ Returns the :class:`~plexapi.server.SystemAccounts` objects this server contains. """
         accounts = []
@@ -325,7 +330,7 @@ def history(self, maxresults=9999999, mindate=None):
 
             Parameters:
                 maxresults (int): Only return the specified number of results (optional).
-                mindate (datetime): Min datetime to return results from. This really helps speed 
+                mindate (datetime): Min datetime to return results from. This really helps speed
                     up the result listing. For example: datetime.now() - timedelta(days=7)
         """
         results, subresults = [], '_init'

tools/plex-markwatched.py

@@ -18,14 +18,40 @@
 from plexapi.server import PlexServer
 
 
+def _has_markwatched_tag(item):
+    collections = item.show().collections if item.type == 'episode' else item.collections
+    tags = [c.tag.lower() for c in collections]
+    return 'markwatched' in tags
+
+
+def _get_title(item):
+    if item.type == 'episode':
+        return f'{item.grandparentTitle} {item.seasonEpisode}'
+    return item.title
+
+
+def _iter_items(search):
+    for item in search:
+        if item.type in ['show']:
+            for episode in item.episodes():
+                yield episode
+            break
+        yield item
+
+
 if __name__ == '__main__':
-    datestr = lambda: datetime.now().strftime('%Y-%m-%d %H:%M:%S')
-    print('%s Starting plex-markwatched script..' % datestr())
+    datestr = lambda: datetime.now().strftime('%Y-%m-%d %H:%M:%S')  # noqa
+    print(f'{datestr()} Starting plex-markwatched script..')
     plex = PlexServer()
     for section in plex.library.sections():
-        if section.type in ('show',):  # ('movie', 'artist', 'show'):
-            for item in section.search(collection='markwatched'):
-                for episode in item.episodes():
-                    if not episode.isWatched:
-                        print('%s Marking %s watched.' % (datestr(), episode.title))
-                        episode.markWatched()
+        print(f'{datestr()} Checking {section.title} for unwatched items..')
+        for item in _iter_items(section.search(collection='markwatched')):
+            if not item.isWatched:
+                print(f'{datestr()}  Marking {_get_title(item)} watched.')
+                item.markWatched()
+    # Check all OnDeck items
+    print(f'{datestr()} Checking OnDeck for unwatched items..')
+    for item in plex.library.onDeck():
+        if not item.isWatched and _has_markwatched_tag(item):
+            print(f'{datestr()}  Marking {_get_title(item)} watched.')
+            item.markWatched()