Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 24 additions & 0 deletions plexapi/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -771,6 +771,30 @@ def iterParts(self):
for part in item.parts:
yield part

def videoStreams(self):
""" Returns a list of :class:`~plexapi.media.videoStream` objects for all MediaParts. """
if self.isPartialObject():
self.reload()
return sum((part.videoStreams() for part in self.iterParts()), [])

def audioStreams(self):
""" Returns a list of :class:`~plexapi.media.AudioStream` objects for all MediaParts. """
if self.isPartialObject():
self.reload()
return sum((part.audioStreams() for part in self.iterParts()), [])

def subtitleStreams(self):
""" Returns a list of :class:`~plexapi.media.SubtitleStream` objects for all MediaParts. """
if self.isPartialObject():
self.reload()
return sum((part.subtitleStreams() for part in self.iterParts()), [])

def lyricStreams(self):
""" Returns a list of :class:`~plexapi.media.LyricStream` objects for all MediaParts. """
if self.isPartialObject():
self.reload()
return sum((part.lyricStreams() for part in self.iterParts()), [])

def play(self, client):
""" Start playback on the specified client.

Expand Down
36 changes: 0 additions & 36 deletions plexapi/video.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,42 +97,6 @@ def _defaultSyncTitle(self):
""" Returns str, default title for a new syncItem. """
return self.title

def videoStreams(self):
""" Returns a list of :class:`~plexapi.media.videoStream` objects for all MediaParts. """
streams = []

if self.isPartialObject():
self.reload()

parts = self.iterParts()
for part in parts:
streams += part.videoStreams()
return streams

def audioStreams(self):
""" Returns a list of :class:`~plexapi.media.AudioStream` objects for all MediaParts. """
streams = []

if self.isPartialObject():
self.reload()

parts = self.iterParts()
for part in parts:
streams += part.audioStreams()
return streams

def subtitleStreams(self):
""" Returns a list of :class:`~plexapi.media.SubtitleStream` objects for all MediaParts. """
streams = []

if self.isPartialObject():
self.reload()

parts = self.iterParts()
for part in parts:
streams += part.subtitleStreams()
return streams

def uploadSubtitles(self, filepath):
""" Upload Subtitle file for video. """
url = f'{self.key}/subtitles'
Expand Down
4 changes: 4 additions & 0 deletions tests/test_audio.py
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,10 @@ def test_audio_Track_artist(album, artist):
assert tracks[0].artist() == artist


def test_audio_Track_lyricStreams(track):
assert not track.lyricStreams()


def test_audio_Track_mixins_images(track):
test_mixins.attr_artUrl(track)
test_mixins.attr_posterUrl(track)
Expand Down