From c16995f3579285dc75c67683a339d5bf6db47c9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Sun, 30 Oct 2022 23:28:19 +0200
Subject: [PATCH 1/3] Update pytrakt to 3.4.10

---
 Pipfile          |  2 +-
 Pipfile.lock     | 14 +++++++-------
 requirements.txt |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Pipfile b/Pipfile
index ce3e9d6b41..5a901b9d47 100644
--- a/Pipfile
+++ b/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.9"
+pytrakt = "==3.4.10"
 pyyaml = "==6.0"
 requests = ">=2.25.1"
 requests-cache = "==0.9.6"
diff --git a/Pipfile.lock b/Pipfile.lock
index 2dae5f8c98..0c396231aa 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "ccf79ef19a32cf801d80f49a58b28eee5af6439eede9c074ea476615a36f3da9"
+            "sha256": "9a063a05b5e63755e9da95b092cbdbcb4cd7e7a0230f03a6a7a5b28f4c2f59f8"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -81,11 +81,11 @@
         },
         "exceptiongroup": {
             "hashes": [
-                "sha256:2e3c3fc1538a094aab74fad52d6c33fc94de3dfee3ee01f187c0e0c72aec5337",
-                "sha256:9086a4a21ef9b31c72181c77c040a074ba0889ee56a7b289ff0afb0d97655f96"
+                "sha256:2ac84b496be68464a2da60da518af3785fff8b7ec0d090a581604bc870bdee41",
+                "sha256:affbabf13fb6e98988c38d9c5650e701569fe3c1de3233cfb61c5f33774690ad"
             ],
             "markers": "python_version < '3.11'",
-            "version": "==1.0.0rc9"
+            "version": "==1.0.0"
         },
         "idna": {
             "hashes": [
@@ -161,11 +161,11 @@
         },
         "pytrakt": {
             "hashes": [
-                "sha256:3887f3360b7f4c1aceb61ffb2ff55c6a189ea1da5a588cd75e637f94d656b2d4",
-                "sha256:c932750344203ad0e9221d4d6cc2e09e0cba2f3db2a96ec888dde9011645217d"
+                "sha256:880ca45ac98497ca3ed9d0fe61c55b773d21ca2ef0b8ba09d8eeeeb32b923f7a",
+                "sha256:f8bd8972ebc08c88522b4e3ed31d1a351b9f7bd59425a244b81adced60c8815a"
             ],
             "index": "pypi",
-            "version": "==3.4.9"
+            "version": "==3.4.10"
         },
         "pyyaml": {
             "hashes": [
diff --git a/requirements.txt b/requirements.txt
index 7f5f3ae290..5fc7a9ff13 100644
--- a/requirements.txt
+++ b/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.9
+pytrakt==3.4.10
 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'

From 0e21a3594231341fa7aba21dbfa1c1ba20d38424 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Mon, 24 Oct 2022 23:18:34 +0300
Subject: [PATCH 2/3] Use methods from scrobbler instance

---
 plextraktsync/trakt_api.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plextraktsync/trakt_api.py b/plextraktsync/trakt_api.py
index 32d479b53b..0916bc6319 100644
--- a/plextraktsync/trakt_api.py
+++ b/plextraktsync/trakt_api.py
@@ -38,19 +38,19 @@ def __init__(self, scrobbler: Scrobbler, threshold=80):
 
     def update(self, progress: float):
         self.logger.debug(f"update({self.scrobbler.media}): {progress}")
-        return self._post("start", progress)
+        return self.scrobbler.update(progress)
 
     def pause(self, progress: float):
         self.logger.debug(f"pause({self.scrobbler.media}): {progress}")
-        return self._post("pause", progress)
+        return self.scrobbler.pause(progress)
 
     def stop(self, progress: float):
         if progress >= self.threshold:
             self.logger.debug(f"stop({self.scrobbler.media}): {progress}")
-            return self._post("stop", progress)
+            return self.scrobbler.stop(progress)
         else:
             self.logger.debug(f"pause({self.scrobbler.media}): {progress}")
-            return self._post("pause", progress)
+            return self.scrobbler.pause(progress)
 
     # Copied method, until upstream is merged
     # https://github.com/moogar0880/PyTrakt/pull/196

From e7063732b5630df476b72de4b842929e88452e9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Mon, 24 Oct 2022 23:19:16 +0300
Subject: [PATCH 3/3] Remove unused scrobbler _post copy

---
 plextraktsync/trakt_api.py | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/plextraktsync/trakt_api.py b/plextraktsync/trakt_api.py
index 0916bc6319..5b9d818104 100644
--- a/plextraktsync/trakt_api.py
+++ b/plextraktsync/trakt_api.py
@@ -7,7 +7,6 @@
 import trakt.movies
 import trakt.sync
 import trakt.users
-from trakt import post
 from trakt.errors import ForbiddenException, OAuthException
 from trakt.movies import Movie
 from trakt.sync import Scrobbler
@@ -52,25 +51,6 @@ def stop(self, progress: float):
             self.logger.debug(f"pause({self.scrobbler.media}): {progress}")
             return self.scrobbler.pause(progress)
 
-    # Copied method, until upstream is merged
-    # https://github.com/moogar0880/PyTrakt/pull/196
-    @nocache
-    @rate_limit()
-    @time_limit()
-    @retry()
-    @post
-    def _post(self, method: str, progress: float):
-        self.scrobbler.progress = progress
-        uri = f"scrobble/{method}"
-        payload = dict(
-            progress=self.scrobbler.progress,
-            app_version=self.scrobbler.version,
-            date=self.scrobbler.date,
-        )
-        payload.update(self.scrobbler.media.to_json_singular())
-        response = yield uri, payload
-        yield response
-
 
 class TraktRatingCollection(dict):
     def __init__(self, trakt: TraktApi):