Skip to content

Fix season watched/unwatched #678

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
merged 2 commits into from
Mar 2, 2021
Merged

Fix season watched/unwatched #678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1049580
Fix season watched and unwatched
JonnyWong16 Mar 2, 2021
bdec69e
Update show/season watched/unwatched tests
JonnyWong16 Mar 2, 2021
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
4 changes: 2 additions & 2 deletions plexapi/video.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,11 +678,11 @@ def show(self):

def watched(self):
""" Returns list of watched :class:`~plexapi.video.Episode` objects. """
return self.episodes(watched=True)
return self.episodes(viewCount__gt=0)

def unwatched(self):
""" Returns list of unwatched :class:`~plexapi.video.Episode` objects. """
return self.episodes(watched=False)
return self.episodes(viewCount=0)

def download(self, savepath=None, keep_original_name=False, **kwargs):
""" Download video files to specified directory.
Expand Down
27 changes: 25 additions & 2 deletions tests/test_video.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,17 +611,21 @@ def test_video_Show_history(show):

def test_video_Show_watched(tvshows):
show = tvshows.get("The 100")
show.episodes()[0].markWatched()
episode = show.episodes()[0]
episode.markWatched()
watched = show.watched()
assert len(watched) == 1 and watched[0].title == "Pilot"
episode.markUnwatched()


def test_video_Show_unwatched(tvshows):
show = tvshows.get("The 100")
episodes = show.episodes()
episodes[0].markWatched()
episode = episodes[0]
episode.markWatched()
unwatched = show.unwatched()
assert len(unwatched) == len(episodes) - 1
episode.markUnwatched()


def test_video_Show_settings(show):
Expand Down Expand Up @@ -885,6 +889,25 @@ def test_video_Season_history(show):
season.markUnwatched()


def test_video_Season_watched(tvshows):
season = tvshows.get("The 100").season(1)
episode = season.episode(1)
episode.markWatched()
watched = season.watched()
assert len(watched) == 1 and watched[0].title == "Pilot"
episode.markUnwatched()


def test_video_Season_unwatched(tvshows):
season = tvshows.get("The 100").season(1)
episodes = season.episodes()
episode = episodes[0]
episode.markWatched()
unwatched = season.unwatched()
assert len(unwatched) == len(episodes) - 1
episode.markUnwatched()


def test_video_Season_attrs(show):
season = show.season("Season 1")
assert utils.is_datetime(season.addedAt)
Expand Down