Small cleanup

diff --git a/common.py b/common.py
index 1ce0008aa4c1d2ca3808d8dc883fb5b696e94614..70f9726162cae78c8f890d64163f181211f2f283 100644 (file)
--- a/common.py
+++ b/common.py
@@ -31,8 +31,13 @@ class Node(object):
                self.can_download = False
 
        def get_children(self):
+               if not self.children:
+                       self.fill_children()
                return self.children
 
+       def fill_children(self):
+               pass
+
        def download(self):
                raise NotImplemented
 

diff --git a/iview.py b/iview.py
index f86116086b5d19eced0ce03a3d05c39307d2c61e..f5d4737de36af6e79e4b5a3dcd4aef7374cf4fe2 100644 (file)
--- a/iview.py
+++ b/iview.py
@@ -34,10 +34,7 @@ class IviewSeries(Node):
                self.series_title = series_title
                self.series_id = series_id
 
-       def get_children(self):
-               if self.children:
-                       return self.children
-               print "DOWNLOADING SERIES"
+       def fill_children(self):
                series_doc = grab_json(PARAMS["api"] + "series=" + self.series_id, 3600)[0]
                for episode in series_doc["f"]:
                        vpath = episode["n"]
@@ -45,7 +42,6 @@ class IviewSeries(Node):
                        if self.series_title != episode_title:
                                episode_title = self.series_title + " " + episode_title
                        IviewNode(episode_title, self, vpath)
-               return self.children
 
 
 

diff --git a/sbs.py b/sbs.py
index d4570cac155166b0037e7aae27cec4ccec135e73..d622e4046d6799b205ee39c6df0ab268aae5e47d 100644 (file)
--- a/sbs.py
+++ b/sbs.py
@@ -85,8 +85,8 @@ def fill_section(get_catnode, section):
                index += doc["itemsPerPage"]
 
 class SbsRoot(Node):
-       def __init__(self, title, parent=None):
-               Node.__init__(self, title, parent)
+       def __init__(self, parent=None):
+               Node.__init__(self, "SBS", parent)
                self.catnodes = {}
 
        def get_catnode(self, name):
@@ -97,13 +97,10 @@ class SbsRoot(Node):
                        self.catnodes[name] = n
                        return n
 
-       def get_children(self):
-               if self.children:
-                       return self.children
+       def fill_children(self):
                for section in SECTIONS:
                        fill_section(self.get_catnode, section)
-               return self.children
 
 def fill_nodes(root_node):
-       SbsRoot("SBS", root_node)
+       SbsRoot(root_node)