Better sorting for SBS

diff --git a/common.py b/common.py
index 59519146ef2cb6a44765089d2b06cc2ae2faf577..544345d3e2ab609e437e96ba2b445c0c3db3a229 100644 (file)
--- a/common.py
+++ b/common.py
@@ -34,7 +34,6 @@ class Node(object):
                self.parent = parent
                self.children = []
                self.can_download = False
-               self.sort_children = False
 
        def get_children(self):
                if not self.children:

diff --git a/grabber.py b/grabber.py
index 165d5ea855eb20a06bd6d28e3503fc6625e281c7..9879043f0824c836f34d1ffea87b840e66e42641 100755 (executable)
--- a/grabber.py
+++ b/grabber.py
@@ -37,8 +37,7 @@ def main():
                        options.append((n.title, n))
                        if not n.can_download:
                                will_download = False
-               if node.sort_children:
-                       options = natural_sort(options, key=lambda x: x[0])
+               options = natural_sort(options, key=lambda x: x[0])
                result = choose(options, allow_multi=will_download)
                if result is None:
                        if node.parent is not None:

diff --git a/iview.py b/iview.py
index 20fddbb0bef9d70f85b4bfa58f1305b2cbaa0583..bccad956abcb5c98be4cb2327129f038c7fd957a 100644 (file)
--- a/iview.py
+++ b/iview.py
@@ -34,7 +34,6 @@ class IviewSeriesNode(Node):
                Node.__init__(self, title, parent)
                self.params = params
                self.series_id = series_id
-               self.sort_children = True
 
        def fill_children(self):
                series_doc = grab_json(self.params["api"] + "series=" + self.series_id, 3600)
@@ -52,7 +51,6 @@ class IviewSeriesNode(Node):
 class IviewRootNode(Node):
        def __init__(self, parent):
                Node.__init__(self, "ABC iView", parent)
-               self.sort_children = True
 
        def fill_children(self):
                config_doc = grab_xml(CONFIG_URL, 24*3600)
@@ -64,7 +62,6 @@ class IviewRootNode(Node):
                        cid = category.attrib["id"]
                        category_name = category.xpath("name/text()")[0]
                        category_node = Node(category_name, self)
-                       category_node.sort_children = True
                        categories_map[cid] = category_node
 
                # Create a duplicate of each series within each category that it appears

diff --git a/plus7.py b/plus7.py
index fa459d0d4cee2194c6ee05e6f5a3fe3dad311074..6a51b2f0406d70a8f858d30906796b95b39e53a1 100644 (file)
--- a/plus7.py
+++ b/plus7.py
@@ -45,7 +45,6 @@ class Plus7Series(Node):
        def __init__(self, title, parent, url):
                Node.__init__(self, title, parent)
                self.url = url
-               self.sort_children = True
 
        def fill_children(self):
                doc = grab_html(self.url, 3600)
@@ -60,7 +59,6 @@ class Plus7Series(Node):
 class Plus7Root(Node):
        def __init__(self, parent=None):
                Node.__init__(self, "Yahoo Plus7", parent)
-               self.sort_children = True
 
        def fill_children(self):
                doc = grab_html(BROWSE, 3600)

diff --git a/sbs.py b/sbs.py
index 4f39ff55ae8344db954c0dca978325e54ea41b27..fba0e13f2caf2c242b1a127e0a86236ed3722003 100644 (file)
--- a/sbs.py
+++ b/sbs.py
@@ -58,7 +58,6 @@ class SbsNavNode(Node):
        def __init__(self, title, parent, url):
                Node.__init__(self, title, parent)
                self.url = url
-               self.sort_children = True
 
        def fill_children(self):
                try:
@@ -100,9 +99,9 @@ class SbsRootNode(Node):
                        return
 
                node = Node(cat_data["name"], parent)
-               self.create_nav_node("Featured", node, cat_data, "furl")
-               self.create_nav_node("Latest", node, cat_data, "url")
-               self.create_nav_node("Most Popular", node, cat_data, "purl")
+               self.create_nav_node("-Featured", node, cat_data, "furl")
+               self.create_nav_node("-Latest", node, cat_data, "url")
+               self.create_nav_node("-Most Popular", node, cat_data, "purl")
 
                children = cat_data.get("children", [])
                if isinstance(children, dict):