Lazy loading plus support for SBS HTTP videos

[webdl] / grabber.py

diff --git a/grabber.py b/grabber.py
index b4b8310ae4827298020e96de013dd3a11d3fe7e1..9fa546fdf35d299e238627b0191df7dcaef0e6b1 100755 (executable)
--- a/grabber.py
+++ b/grabber.py
@@ -22,19 +22,17 @@ def choose(options, allow_multi):
                        else:
                                if len(values) == 1:
                                        return values[0]
-               except ValueError, IndexError:
+               except (ValueError, IndexError):
                        print >>sys.stderr, "Invalid input, please try again"
                        pass
 
 def main():
-       print "Loading episode data...",
-       sys.stdout.flush()
        node = load_root_node()
-       print "done"
+
        while True:
                options = {}
                will_download = True
-               for n in node.children:
+               for n in node.get_children():
                        options[n.title] = n
                        if not n.can_download:
                                will_download = False