Better excluding message

fixing #198

lib/svtplay_dl/service/aftonbladet.py

@@ -17,6 +17,7 @@ class Aftonbladet(Service):
         data = self.get_urldata()
 
         if self.exclude(options):
+            yield ServiceError("Excluding video")
             return
 
         match = re.search('data-aptomaId="([-0-9a-z]+)"', data)

lib/svtplay_dl/service/bambuser.py

@@ -20,6 +20,7 @@ class Bambuser(Service, OpenGraphThumbMixin):
             return
 
         if self.exclude(options):
+            yield ServiceError("Excluding video")
             return
 
         json_url = "http://player-c.api.bambuser.com/getVideo.json?api_key=005f64509e19a868399060af746a00aa&vid=%s" % match.group(1)

lib/svtplay_dl/service/bigbrother.py

@@ -17,6 +17,7 @@ class Bigbrother(Service, OpenGraphThumbMixin):
         data = self.get_urldata()
 
         if self.exclude(options):
+            yield ServiceError("Excluding video")
             return
 
         match = re.search(r'id="(bcPl[^"]+)"', data)

lib/svtplay_dl/service/dbtv.py

@@ -16,6 +16,7 @@ class Dbtv(Service, OpenGraphThumbMixin):
         data = self.get_urldata()
 
         if self.exclude(options):
+            yield ServiceError("Excluding video")
             return
 
         parse = urlparse(self.url)

lib/svtplay_dl/service/disney.py

@@ -23,6 +23,7 @@ class Disney(Service, OpenGraphThumbMixin):
             data = self.get_urldata()
 
             if self.exclude(options):
+                yield ServiceError("Excluding video")
                 return
 
             match = re.search(r"Grill.burger=({.*}):", data)

lib/svtplay_dl/service/dr.py

@@ -19,6 +19,7 @@ class Dr(Service, OpenGraphThumbMixin):
         data = self.get_urldata()
 
         if self.exclude(options):
+            yield ServiceError("Excluding video")
             return
 
         match = re.search(r'resource:[ ]*"([^"]*)",', data)

lib/svtplay_dl/service/expressen.py

@@ -20,6 +20,7 @@ class Expressen(Service):
         data = self.get_urldata()
 
         if self.exclude(options):
+            yield ServiceError("Excluding video")
             return
 
         match = re.search("xmlUrl=([^ ]+)\" ", data)

lib/svtplay_dl/service/hbo.py

@@ -23,6 +23,7 @@ class Hbo(Service):
             return
 
         if self.exclude(options):
+            yield ServiceError("Excluding video")
             return
 
         match = re.search("^/(.*).html", other)

lib/svtplay_dl/service/kanal5.py

@@ -63,6 +63,7 @@ class Kanal5(Service):
                 options.output = title
 
         if self.exclude(options):
+            yield ServiceError("Excluding video")
             return
 
         if data["hasSubtitle"]:

lib/svtplay_dl/service/lemonwhale.py

@@ -18,6 +18,7 @@ class Lemonwhale(Service):
         data = self.get_urldata()
 
         if self.exclude(options):
+            yield ServiceError("Excluding video")
             return
 
         match = re.search(r'video url-([^"]+)', data)

lib/svtplay_dl/service/mtvnn.py

@@ -32,6 +32,7 @@ class Mtvnn(Service, OpenGraphThumbMixin):
                 options.output = title
 
         if self.exclude(options):
+            yield ServiceError("Excluding video")
             return
 
         swfurl = mediagen.find("{http://search.yahoo.com/mrss/}player").attrib["url"]

lib/svtplay_dl/service/mtvservices.py

@@ -32,6 +32,7 @@ class Mtvservices(Service):
             sa = list(ss.iter("rendition"))
 
         if self.exclude(options):
+            yield ServiceError("Excluding video")
             return
 
         for i in sa:

lib/svtplay_dl/service/nrk.py

@@ -19,6 +19,7 @@ class Nrk(Service, OpenGraphThumbMixin):
         data = self.get_urldata()
 
         if self.exclude(options):
+            yield ServiceError("Excluding video")
             return
 
         match = re.search("data-subtitlesurl = \"(/.*)\"", data)

lib/svtplay_dl/service/picsearch.py

@@ -17,6 +17,7 @@ class Picsearch(Service, OpenGraphThumbMixin):
         data = self.get_urldata()
 
         if self.exclude(options):
+            yield ServiceError("Excluding video")
             return
 
         ajax_auth = re.search(r"picsearch_ajax_auth = '(\w+)'", data)

lib/svtplay_dl/service/qbrick.py

@@ -17,6 +17,7 @@ class Qbrick(Service, OpenGraphThumbMixin):
         data = self.get_urldata()
 
         if self.exclude(options):
+            yield ServiceError("Excluding video")
             return
 
         if re.findall(r"di.se", self.url):

lib/svtplay_dl/service/radioplay.py

@@ -19,6 +19,7 @@ class Radioplay(Service):
         data = self.get_urldata()
 
         if self.exclude(options):
+            yield ServiceError("Excluding video")
             return
 
         match = re.search(r"RP.vcdData = ({.*});</script>", data)

lib/svtplay_dl/service/ruv.py

@@ -17,6 +17,7 @@ class Ruv(Service):
         data = self.get_urldata()
 
         if self.exclude(options):
+            yield ServiceError("Excluding video")
             return
 
         match = re.search(r'"([^"]+geo.php)"', data)

lib/svtplay_dl/service/sr.py

@@ -21,6 +21,7 @@ class Sr(Service, OpenGraphThumbMixin):
         data = self.get_urldata()
 
         if self.exclude(options):
+            yield ServiceError("Excluding video")
             return
 
         match = re.search(r'href="(/sida/[\.\/=a-z0-9&;\?]+playaudio=\d+)"', data)

lib/svtplay_dl/service/svtplay.py

@@ -60,6 +60,7 @@ class Svtplay(Service, OpenGraphThumbMixin):
             options.output = outputfilename(data, options.output, ensure_unicode(self.get_urldata()))
 
         if self.exclude(options):
+            yield ServiceError("Excluding video")
             return
 
         if data["video"]["subtitleReferences"]:

lib/svtplay_dl/service/tv4play.py

@@ -87,6 +87,7 @@ class Tv4play(Service, OpenGraphThumbMixin):
                 options.output = title
 
         if self.exclude(options):
+            yield ServiceError("Excluding video")
             return
 
         for i in sa:

lib/svtplay_dl/service/twitch.py

@@ -48,6 +48,7 @@ class Twitch(Service):
         urlp = urlparse(self.url)
 
         if self.exclude(options):
+            yield ServiceError("Excluding video")
             return
 
         match = re.match(r'/(\w+)/([bcv])/(\d+)', urlp.path)

lib/svtplay_dl/service/urplay.py

@@ -29,6 +29,7 @@ class Urplay(Service, OpenGraphThumbMixin):
             return
 
         if self.exclude(options):
+            yield ServiceError("Excluding video")
             return
 
         data = match.group(1)

lib/svtplay_dl/service/vg.py

@@ -38,6 +38,7 @@ class Vg(Service, OpenGraphThumbMixin):
                 options.output = title
 
         if self.exclude(options):
+            yield ServiceError("Excluding video")
             return
 
         if "hds" in jsondata["streamUrls"]:

lib/svtplay_dl/service/viaplay.py

@@ -70,6 +70,7 @@ class Viaplay(Service, OpenGraphThumbMixin):
             options.live = True
 
         if self.exclude(options):
+            yield ServiceError("Excluding video")
             return
 
         if dataj["sami_path"]:

lib/svtplay_dl/service/vimeo.py

@@ -16,6 +16,7 @@ class Vimeo(Service, OpenGraphThumbMixin):
         data = self.get_urldata()
 
         if self.exclude(options):
+            yield ServiceError("Excluding video")
             return
 
         match = re.search('data-config-url="([^"]+)" data-fallback-url', data)

lib/svtplay_dl/service/youplay.py

@@ -17,6 +17,7 @@ class Youplay(Service, OpenGraphThumbMixin):
         data = self.get_urldata()
 
         if self.exclude(options):
+            yield ServiceError("Excluding video")
             return
 
         match = re.search(r'script async defer src="(//content.youplay.se[^"]+)"', data)