plugins.filmon: use /tv/ url and raise PluginError for invalid channels

back-to · gravyboat · commit fe7228e804d3 · 2020-05-10T12:04:17.000-07:00
diff --git a/src/streamlink/plugins/filmon.py b/src/streamlink/plugins/filmon.py
@@ -2,8 +2,8 @@
 import logging
 import time
 
-from streamlink import StreamError
-from streamlink.compat import urlparse
+from streamlink.exceptions import PluginError, StreamError
+from streamlink.compat import urlparse, urlunparse
 from streamlink.plugin import Plugin
 from streamlink.plugin.api import validate
 from streamlink.stream import HLSStream, hls_playlist
@@ -158,6 +158,8 @@ def channel(self, channel):
             except Exception:
                 log.debug("channel sleep {0}".format(_))
                 time.sleep(0.75)
+        else:
+            raise PluginError("Unable to find 'self.api.channel' for {0}".format(channel))
         return self.session.http.json(res, schema=self.api_schema)
 
     def vod(self, vod_id):
@@ -197,6 +199,9 @@ class Filmon(Plugin):
 
     def __init__(self, url):
         super(Filmon, self).__init__(url)
+        parsed = urlparse(self.url)
+        if parsed.path.startswith("/channel/"):
+            self.url = urlunparse(parsed._replace(path=parsed.path.replace("/channel/", "/tv/")))
         self.api = FilmOnAPI(self.session)
 
     @classmethod
@@ -241,6 +246,9 @@ def _get_streams(self):
             else:
                 _id = channel
 
+            if _id is None:
+                raise PluginError("Unable to find channel ID: {0}".format(channel))
+
             try:
                 data = self.api.channel(_id)
                 for stream in data["streams"]:
