From 4db275df0d68bd3153d091e6eba44cdfd189b5a3 Mon Sep 17 00:00:00 2001
From: blacktwin <blacktwin@users.noreply.github.com>
Date: Sat, 12 Oct 2019 14:40:43 -0400
Subject: [PATCH] Corrections from comments

Moved all subtitle functions to parent Video class.
Add to removeSubtitles docstring how subtitle files are handled when removed.
---
 plexapi/video.py | 89 ++++++++++++++++++------------------------------
 1 file changed, 33 insertions(+), 56 deletions(-)

diff --git a/plexapi/video.py b/plexapi/video.py
index 127685e0..8dc55742 100644
--- a/plexapi/video.py
+++ b/plexapi/video.py
@@ -90,6 +90,39 @@ class Video(PlexPartialObject):
         """ Returns str, default title for a new syncItem. """
         return self.title
 
+    def subtitleStreams(self):
+        """ Returns a list of :class:`~plexapi.media.SubtitleStream` objects for all MediaParts. """
+        streams = []
+
+        parts = self.iterParts()
+        for part in parts:
+            streams += part.subtitleStreams()
+        return streams
+
+    def uploadSubtitles(self, filepath):
+        """ Upload Subtitle file for video. """
+        url = '%s/subtitles' % self.key
+        filename = os.path.basename(filepath)
+        subFormat = os.path.splitext(filepath)[1][1:]
+        with open(filepath, 'rb') as subfile:
+            params = {'title': filename,
+                      'format': subFormat
+                      }
+            headers = {'Accept': 'text/plain, */*'}
+            self._server.query(url, self._server._session.post, data=subfile, params=params, headers=headers)
+        self.reload()
+
+    def removeSubtitles(self, streamID=None, streamTitle=None):
+        """ Remove Subtitle from movie's subtitles listing.
+
+            Note: If subtitle file is located inside video directory it will bbe deleted.
+            Files outside of video directory are not effected.
+        """
+        for stream in self.subtitleStreams():
+            if streamID == stream.id or streamTitle == stream.title:
+                self._server.query(stream.key, self._server._session.delete)
+        self.reload()
+
     def sync(self, videoQuality, client=None, clientId=None, limit=None, unwatched=False, title=None):
         """ Add current video (movie, tv-show, season or episode) as sync item for specified device.
             See :func:`plexapi.myplex.MyPlexAccount.sync()` for possible exceptions.
@@ -220,34 +253,6 @@ class Movie(Playable, Video):
         """
         return [part.file for part in self.iterParts() if part]
 
-    def subtitleStreams(self):
-        """ Returns a list of :class:`~plexapi.media.SubtitleStream` objects for all MediaParts. """
-        streams = []
-        for elem in self.media:
-            for part in elem.parts:
-                streams += part.subtitleStreams()
-        return streams
-
-    def uploadSubtitles(self, filepath):
-        """ Upload Subtitle file for video. """
-        url = '%s/subtitles' % self.key
-        filename = os.path.basename(filepath)
-        subFormat = os.path.splitext(filepath)[1][1:]
-        with open(filepath, 'rb') as subfile:
-            params = {'title': filename,
-                      'format': subFormat
-                      }
-            headers = {'Accept': 'text/plain, */*'}
-            self._server.query(url, self._server._session.post, data=subfile, params=params, headers=headers)
-        self.reload()
-
-    def removeSubtitles(self, streamID=int, streamTitle=str):
-        """ Remove Subtitle from movie's subtitles listing. """
-        for stream in self.subtitleStreams():
-            if streamID == stream.id or streamTitle == stream.title:
-                self._server.query(stream.key, self._server._session.delete)
-        self.reload()
-
     def _prettyfilename(self):
         # This is just for compat.
         return self.title
@@ -643,31 +648,3 @@ class Episode(Playable, Video):
     def _defaultSyncTitle(self):
         """ Returns str, default title for a new syncItem. """
         return '%s - %s - (%s) %s' % (self.grandparentTitle, self.parentTitle, self.seasonEpisode, self.title)
-
-    def subtitleStreams(self):
-        """ Returns a list of :class:`~plexapi.media.SubtitleStream` objects for all MediaParts. """
-        streams = []
-        for elem in self.media:
-            for part in elem.parts:
-                streams += part.subtitleStreams()
-        return streams
-
-    def uploadSubtitles(self, filepath):
-        """ Upload Subtitle file for video. """
-        url = '%s/subtitles' % self.key
-        filename = os.path.basename(filepath)
-        subFormat = os.path.splitext(filepath)[1][1:]
-        with open(filepath, 'rb') as subfile:
-            params = {'title': filename,
-                      'format': subFormat
-                      }
-            headers = {'Accept': 'text/plain, */*'}
-            self._server.query(url, self._server._session.post, data=subfile, params=params, headers=headers)
-        self.reload()
-
-    def removeSubtitles(self, streamID=int, streamTitle=str):
-        """ Remove Subtitle from movie's subtitles listing. """
-        for stream in self.subtitleStreams():
-            if streamID == stream.id or streamTitle == stream.title:
-                self._server.query(stream.key, self._server._session.delete)
-        self.reload()