Skip to content

Refactor: Use methods from scrobbler instance #1131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
glensc merged 3 commits into from
Oct 30, 2022
Merged

Refactor: Use methods from scrobbler instance #1131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c16995f
Update pytrakt to 3.4.10
glensc Oct 30, 2022
0e21a35
Use methods from scrobbler instance
glensc Oct 24, 2022
e706373
Remove unused scrobbler _post copy
glensc Oct 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
14 changes: 7 additions & 7 deletions Pipfile.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 4 additions & 24 deletions plextraktsync/trakt_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -38,38 +37,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)

# 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
return self.scrobbler.pause(progress)


class TraktRatingCollection(dict):
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down