remove options in argument for exclude

lib/svtplay_dl/service/aftonbladet.py

@@ -16,7 +16,7 @@ class Aftonbladet(Service):
     def get(self):
         data = self.get_urldata()
 
-        if self.exclude(self.options):
+        if self.exclude():
             yield ServiceError("Excluding video")
             return
 

lib/svtplay_dl/service/bambuser.py

@@ -20,7 +20,7 @@ class Bambuser(Service, OpenGraphThumbMixin):
             yield ServiceError("Can't find video id in url")
             return
 
-        if self.exclude(self.options):
+        if self.exclude():
             yield ServiceError("Excluding video")
             return
 

lib/svtplay_dl/service/bigbrother.py

@@ -18,7 +18,7 @@ class Bigbrother(Service, OpenGraphThumbMixin):
     def get(self):
         data = self.get_urldata()
 
-        if self.exclude(self.options):
+        if self.exclude():
             yield ServiceError("Excluding video")
             return
 

lib/svtplay_dl/service/dbtv.py

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

lib/svtplay_dl/service/disney.py

@@ -78,7 +78,7 @@ class Disney(Service, OpenGraphThumbMixin):
                 else:
                     self.options.output = title
 
-            if self.exclude(self.options):
+            if self.exclude():
                 return
 
             url = "http://cdnapi.kaltura.com/html5/html5lib/v1.9.7.6/mwEmbedFrame.php?&wid=%s&uiconf_id=%s&entry_id=%s&playerId=%s&forceMobileHTML5=true&urid=1.9.7.6&callback=mwi" % \

lib/svtplay_dl/service/dplay.py

@@ -24,9 +24,6 @@ class Dplay(Service):
         premium = False
         parse = urlparse(self.url)
         domain = re.search(r"(dplay\.\w\w)", parse.netloc).group(1)
-        if self.exclude(self.options):
-            yield ServiceError("Excluding video")
-            return
 
         match = re.search(r"<link rel='shortlink' href='[^']+/\?p=(\d+)", data)
         if not match:
@@ -66,6 +63,11 @@ class Dplay(Service):
                 self.options.output = os.path.join(directory, title)
             else:
                 self.options.output = title
+
+        if self.exclude():
+            yield ServiceError("Excluding video")
+            return
+
         suburl = dataj["data"][0]["subtitles_sv_srt"]
         if len(suburl) > 0:
             yield subtitle(copy.copy(self.options), "raw", suburl)

lib/svtplay_dl/service/dr.py

@@ -19,7 +19,7 @@ class Dr(Service, OpenGraphThumbMixin):
     def get(self):
         data = self.get_urldata()
 
-        if self.exclude(self.options):
+        if self.exclude():
             yield ServiceError("Excluding video")
             return
 

lib/svtplay_dl/service/expressen.py

@@ -17,7 +17,7 @@ class Expressen(Service):
     def get(self):
         data = self.get_urldata()
 
-        if self.exclude(self.options):
+        if self.exclude():
             yield ServiceError("Excluding video")
             return
 

lib/svtplay_dl/service/hbo.py

@@ -24,7 +24,7 @@ class Hbo(Service):
             log.error("Something wrong with that url")
             return
 
-        if self.exclude(self.options):
+        if self.exclude():
             yield ServiceError("Excluding video")
             return
 

lib/svtplay_dl/service/lemonwhale.py

@@ -18,7 +18,7 @@ class Lemonwhale(Service):
         vid = None
         data = self.get_urldata()
 
-        if self.exclude(self.options):
+        if self.exclude():
             yield ServiceError("Excluding video")
             return
 

lib/svtplay_dl/service/mtvnn.py

@@ -34,7 +34,7 @@ class Mtvnn(Service, OpenGraphThumbMixin):
             else:
                 self.options.output = title
 
-        if self.exclude(self.options):
+        if self.exclude():
             yield ServiceError("Excluding video")
             return
 

lib/svtplay_dl/service/mtvservices.py

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

lib/svtplay_dl/service/nrk.py

@@ -19,7 +19,7 @@ class Nrk(Service, OpenGraphThumbMixin):
     def get(self):
         data = self.get_urldata()
 
-        if self.exclude(self.options):
+        if self.exclude():
             yield ServiceError("Excluding video")
             return
 

lib/svtplay_dl/service/picsearch.py

@@ -17,7 +17,7 @@ class Picsearch(Service, OpenGraphThumbMixin):
     supported_domains = ['dn.se', 'mobil.dn.se', 'di.se', 'csp.picsearch.com', 'csp.screen9.com']
 
     def get(self):
-        if self.exclude(self.options):
+        if self.exclude():
             yield ServiceError("Excluding video")
             return
 

lib/svtplay_dl/service/qbrick.py

@@ -17,7 +17,7 @@ class Qbrick(Service, OpenGraphThumbMixin):
     def get(self):
         data = self.get_urldata()
 
-        if self.exclude(self.options):
+        if self.exclude():
             yield ServiceError("Excluding video")
             return
 

lib/svtplay_dl/service/radioplay.py

@@ -19,7 +19,7 @@ class Radioplay(Service):
     def get(self):
         data = self.get_urldata()
 
-        if self.exclude(self.options):
+        if self.exclude():
             yield ServiceError("Excluding video")
             return
 

lib/svtplay_dl/service/raw.py

@@ -10,7 +10,7 @@ class Raw(Service):
     def get(self):
         data = self.get_urldata()
 
-        if self.exclude(self.options):
+        if self.exclude():
             return
 
         extention = False

lib/svtplay_dl/service/ruv.py

@@ -17,7 +17,7 @@ class Ruv(Service):
     def get(self):
         data = self.get_urldata()
 
-        if self.exclude(self.options):
+        if self.exclude():
             yield ServiceError("Excluding video")
             return
 

lib/svtplay_dl/service/solidtango.py

@@ -17,7 +17,7 @@ class Solidtango(Service):
     def get(self):
         data = self.get_urldata()
 
-        if self.exclude(self.options):
+        if self.exclude():
             yield ServiceError("Excluding video")
             return
         match = re.search('src="(http://mm-resource-service.herokuapp.com[^"]*)"', data)

lib/svtplay_dl/service/sr.py

@@ -21,7 +21,7 @@ class Sr(Service, OpenGraphThumbMixin):
     def get(self):
         data = self.get_urldata()
 
-        if self.exclude(self.options):
+        if self.exclude():
             yield ServiceError("Excluding video")
             return
 

lib/svtplay_dl/service/svtplay.py

@@ -60,7 +60,7 @@ class Svtplay(Service, OpenGraphThumbMixin):
             self.options.service = "svtplay"
             self.options.output = self.outputfilename(dataj, self.options.output, ensure_unicode(self.get_urldata()))
 
-        if self.exclude(self.options):
+        if self.exclude():
             yield ServiceError("Excluding video")
             return
 

lib/svtplay_dl/service/tv4play.py

@@ -81,7 +81,7 @@ class Tv4play(Service, OpenGraphThumbMixin):
             else:
                 self.options.output = title
 
-        if self.exclude(self.options):
+        if self.exclude():
             yield ServiceError("Excluding video")
             return
 

lib/svtplay_dl/service/twitch.py

@@ -47,7 +47,7 @@ class Twitch(Service):
     def get(self):
         urlp = urlparse(self.url)
 
-        if self.exclude(self.options):
+        if self.exclude():
             yield ServiceError("Excluding video")
             return
 

lib/svtplay_dl/service/urplay.py

@@ -25,7 +25,7 @@ class Urplay(Service, OpenGraphThumbMixin):
             yield ServiceError("Can't find json info")
             return
 
-        if self.exclude(self.options):
+        if self.exclude():
             yield ServiceError("Excluding video")
             return
 

lib/svtplay_dl/service/vg.py

@@ -38,7 +38,7 @@ class Vg(Service, OpenGraphThumbMixin):
             else:
                 self.options.output = title
 
-        if self.exclude(self.options):
+        if self.exclude():
             yield ServiceError("Excluding video")
             return
 

lib/svtplay_dl/service/viaplay.py

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

lib/svtplay_dl/service/vimeo.py

@@ -16,7 +16,7 @@ class Vimeo(Service, OpenGraphThumbMixin):
     def get(self):
         data = self.get_urldata()
 
-        if self.exclude(self.options):
+        if self.exclude():
             yield ServiceError("Excluding video")
             return
 

lib/svtplay_dl/service/youplay.py

@@ -17,7 +17,7 @@ class Youplay(Service, OpenGraphThumbMixin):
     def get(self):
         data = self.get_urldata()
 
-        if self.exclude(self.options):
+        if self.exclude():
             yield ServiceError("Excluding video")
             return