Make get_streams always return a dict.

1 files changed, 27 insertions, 30 deletions

diff --git a/src/livestreamer/plugins/ownedtv.py b/src/livestreamer/plugins/ownedtv.py
index e2ccf94..6461c15 100644
--- a/src/livestreamer/plugins/ownedtv.py
+++ b/src/livestreamer/plugins/ownedtv.py
@@ -48,38 +48,35 @@ class OwnedTV(Plugin):
 
     def _get_streams(self):
         channelid = self._get_channel_id(self.url)
-
-        if not channelid:
-            return False
-
-        fd = urllib.urlopen(self.ConfigURL.format(channelid))
-        data = fd.read()
-        fd.close()
-
         streams = {}
-        dom = xml.dom.minidom.parseString(data)
-        channels = dom.getElementsByTagName("channels")[0]
-        clip = channels.getElementsByTagName("clip")[0]
 
-        streams = {}
-        for item in clip.getElementsByTagName("item"):
-            base = item.getAttribute("base")
-            if not base:
-                continue
-
-            if base[0] == "$":
-                ref = re.match("\${(.+)}", base).group(1)
-                base = self.CDN[ref]
-
-            for streamel in item.getElementsByTagName("stream"):
-                name = streamel.getAttribute("label").lower().replace(" ", "_")
-                playpath = streamel.getAttribute("name")
-
-                if not name in streams:
-                    streams[name] = RTMPStream({
-                        "rtmp": ("{0}/{1}").format(base, playpath),
-                        "live": 1
-                    })
+        if channelid:
+            fd = urllib.urlopen(self.ConfigURL.format(channelid))
+            data = fd.read()
+            fd.close()
+
+            dom = xml.dom.minidom.parseString(data)
+            channels = dom.getElementsByTagName("channels")[0]
+            clip = channels.getElementsByTagName("clip")[0]
+
+            for item in clip.getElementsByTagName("item"):
+                base = item.getAttribute("base")
+                if not base:
+                    continue
+
+                if base[0] == "$":
+                    ref = re.match("\${(.+)}", base).group(1)
+                    base = self.CDN[ref]
+
+                for streamel in item.getElementsByTagName("stream"):
+                    name = streamel.getAttribute("label").lower().replace(" ", "_")
+                    playpath = streamel.getAttribute("name")
+
+                    if not name in streams:
+                        streams[name] = RTMPStream({
+                            "rtmp": ("{0}/{1}").format(base, playpath),
+                            "live": 1
+                        })
 
         return streams