Merge pull request #711 from glensc/pytrakt/shows/progress

Pipfile

@@ -15,7 +15,7 @@ oauthlib = "==3.2.2"
 plexapi = "==4.13.0"
 python-dotenv = "==0.21.0"
 python-git-info = "==0.8.0"
-pytrakt = "==3.4.5"
+pytrakt = "==3.4.7"
 pyyaml = "==6.0"
 requests = ">=2.25.1"
 requests-cache = "==0.9.6"

plextraktsync/pytrakt_extensions.py

@@ -49,20 +49,6 @@ def allcollected():
     yield AllShowsProgress(data)
 
 
-@get
-def watched(show_id):
-    # returns a ShowProgress object containing the watched states of the passed show
-    data = yield "shows/{}/progress/watched?specials=true".format(show_id)
-    yield ShowProgress(**data)
-
-
-@get
-def collected(show_id):
-    # returns a ShowProgress object containing the collected states of the passed show
-    data = yield "shows/{}/progress/collection?specials=true".format(show_id)
-    yield ShowProgress(**data)
-
-
 class EpisodeProgress:
     def __init__(
         self,

plextraktsync/trakt_api.py

@@ -23,6 +23,7 @@
 from plextraktsync.factory import factory, logger, logging
 from plextraktsync.path import pytrakt_file
 from plextraktsync.plex_api import PlexGuid, PlexLibraryItem
+from plextraktsync.pytrakt_extensions import ShowProgress
 
 
 class ScrobblerProxy:
@@ -311,7 +312,8 @@ def remove_from_watchlist(self, m, batch=False):
     @rate_limit()
     @retry()
     def collected(self, tm: TVShow):
-        return pytrakt_extensions.collected(tm.trakt)
+        data = tm.collection_progress(specials=True)
+        return ShowProgress(**data)
 
     def find_by_guid(self, guid: PlexGuid):
         if guid.type == "episode" and guid.is_episode:

requirements.txt

@@ -24,7 +24,7 @@ prompt-toolkit==3.0.31; python_full_version >= '3.6.2'
 pygments==2.13.0; python_version >= '3.6'
 python-dotenv==0.21.0
 python-git-info==0.8.0
-pytrakt==3.4.5
+pytrakt==3.4.7
 pyyaml==6.0
 requests-cache==0.9.6
 requests-oauthlib==1.3.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'

tests/test_trakt_progress.py

@@ -0,0 +1,31 @@
+#!/usr/bin/env python3 -m pytest
+from trakt.tv import TVShow
+
+from plextraktsync.pytrakt_extensions import ShowProgress
+from plextraktsync.trakt_api import TraktApi
+from tests.conftest import factory
+
+trakt: TraktApi = factory.trakt_api()
+
+
+def test_trakt_collection_progress():
+    show = TVShow('Game of Thrones')
+    collected = trakt.collected(show)
+    assert isinstance(collected, ShowProgress)
+    s01e01 = collected.get_completed(1, 1)
+    assert isinstance(s01e01, bool)
+
+
+def test_trakt_watched_progress():
+    show = TVShow('Game of Thrones')
+    data = show.watched_progress()
+    watched = ShowProgress(**data)
+
+    assert isinstance(watched, ShowProgress)
+    s01e01 = watched.get_completed(1, 1)
+    assert isinstance(s01e01, bool)
+
+
+if __name__ == '__main__':
+    test_trakt_collection_progress()
+    test_trakt_watched_progress()