Make CapCollection understandable and useable by humans

* Make the declaration of fct and it in the constructor Collection,
 instead of adding them from the outside
* Add a function to flatten a list containing collection (solves the
 radioob search crash)
* Better display of collections in the "ls" command (and display both id
 and title)
* The "cd" command goes to the root of the path (like the UNIX cd)
* Move the Video object of canalplus in a correct path
* Make Collection iterable
* Add comments to CapCollection
* Cache the result of fct in a Collection; it is only called once
* CollectionNotFound errors can be more explicit by providing a path
* Require utf-8 in collection paths
* Code cleanups

modules/canalplus/pages/__init__.py

@@ -18,7 +18,6 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 from .initpage import InitPage
-from .video import CanalplusVideo
 from .videopage import VideoPage
 
-__all__ = ['InitPage', 'VideoPage',  'CanalplusVideo']
+__all__ = ['InitPage', 'VideoPage']

modules/canalplus/pages/initpage.py

@@ -26,24 +26,24 @@ __all__ = ['InitPage']
 
 
 class InitPage(BasePage):
-    
     def on_loaded(self):
         self.collections = []
-        
-        def do(id):
-            self.browser.location("http://service.canal-plus.com/video/rest/getMEAs/cplus/" + id)
+
+        def do(_id):
+            self.browser.location("http://service.canal-plus.com/video/rest/getMEAs/cplus/%s" % _id)
             return self.browser.page.iter_channel()
 
-        ### Parse liste des channels
+        # Parse the list of channels
         for elem in self.document[2].getchildren():
-            coll = Collection()
+            children = []
             for e in elem.getchildren():
                 if e.tag == "NOM":
-                    coll.title = e.text.strip().encode('utf-8')
+                    _id = e.text.strip()
                 elif e.tag == "SELECTIONS":
                     for select in e:
-                        sub = Collection(title=select[1].text.strip().encode('utf-8'))
-                        sub.id = select[0].text
-                        sub.children = do
-                        coll.appendchild(sub)
+                        sub = Collection(_id=select[0].text,
+                                title=select[1].text.strip(),
+                                fct=do)
+                        children.append(sub)
+            coll = Collection(_id, children=children)
             self.collections.append(coll)

modules/canalplus/pages/video.py

@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright(C) 2010-2011 Nicolas Duhamel
-#
-# This file is part of weboob.
-#
-# weboob is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# weboob is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with weboob. If not, see <http://www.gnu.org/licenses/>.
-
-
-from weboob.capabilities.video import BaseVideo
-
-
-__all__ = ['CanalplusVideo']
-
-
-class CanalplusVideo(BaseVideo):
-    swf_player = False
-    @classmethod
-    def id2url(cls, _id):
-        return 'http://service.canal-plus.com/video/rest/getVideosLiees/cplus/%s' % _id

modules/canalplus/pages/videopage.py

@@ -23,7 +23,7 @@ from datetime import datetime
 from weboob.capabilities.base import NotAvailable
 from weboob.tools.capabilities.thumbnail import Thumbnail
 from weboob.tools.browser import BasePage
-from .video import CanalplusVideo
+from ..video import CanalplusVideo
 
 
 __all__ = ['VideoPage']
@@ -78,7 +78,7 @@ class VideoPage(BasePage):
 
     def iter_channel(self):
         for vid in self.document.getchildren():
-	        yield self.parse_video_channel(vid)
+            yield self.parse_video_channel(vid)
 
     def parse_video_channel(self,el):
         _id = el[0].text