From 77115279e18e6376c4be9becf093f6dd2864d90f Mon Sep 17 00:00:00 2001
From: Johan Andersson <j@i19.se>
Date: Tue, 8 May 2018 22:51:27 +0200
Subject: [PATCH] remove some old naming methods that we dont need now

---
 lib/svtplay_dl/service/barnkanalen.py | 4 +---
 lib/svtplay_dl/service/raw.py         | 7 +------
 lib/svtplay_dl/service/tv4play.py     | 1 -
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/lib/svtplay_dl/service/barnkanalen.py b/lib/svtplay_dl/service/barnkanalen.py
index ac67fe7..60d602a 100644
--- a/lib/svtplay_dl/service/barnkanalen.py
+++ b/lib/svtplay_dl/service/barnkanalen.py
@@ -52,9 +52,7 @@ class Barnkanalen(Svtplay):
         if "live" in janson["video"]:
             self.config.set("live", janson["video"]["live"])
 
-        if self.options.output_auto:
-            self.options.service = "svtplay"
-            self.options.output = self.outputfilename(janson["video"])
+        self.outputfilename(janson["video"])
 
         if "programVersionId" in janson["video"]:
             vid = janson["video"]["programVersionId"]
diff --git a/lib/svtplay_dl/service/raw.py b/lib/svtplay_dl/service/raw.py
index b5c2260..4ec60a9 100644
--- a/lib/svtplay_dl/service/raw.py
+++ b/lib/svtplay_dl/service/raw.py
@@ -11,12 +11,7 @@ from svtplay_dl.fetcher.dash import dashparse
 class Raw(Service):
     def get(self):
         filename = os.path.basename(self.url[:self.url.rfind("/")])
-        if self.options.output and os.path.isdir(self.options.output):
-            self.options.output = os.path.join(os.path.dirname(self.options.output), filename)
-            extention = True
-        elif self.options.output is None:
-            self.options.output = filename
-            extention = True
+        self.output["title"] = filename
 
         streams = []
         if re.search(".f4m", self.url):
diff --git a/lib/svtplay_dl/service/tv4play.py b/lib/svtplay_dl/service/tv4play.py
index 8c632b0..4716167 100644
--- a/lib/svtplay_dl/service/tv4play.py
+++ b/lib/svtplay_dl/service/tv4play.py
@@ -73,7 +73,6 @@ class Tv4play(Service, OpenGraphThumbMixin):
             return
 
         if self.options.get("output_auto"):
-            self.options.service = "tv4play"
             basename = self._autoname(vid)
             if not basename:
                 yield ServiceError("Cant find vid id for autonaming.")