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
This commit is contained in:
Laurent Bachelier 2012-02-02 19:16:31 +01:00
commit 682e14c86a
14 changed files with 125 additions and 63 deletions

View file

@ -25,7 +25,8 @@ import lxml.etree
from weboob.tools.browser import BaseBrowser
from weboob.tools.browser.decorators import id2url
from .pages import InitPage, CanalplusVideo, VideoPage
from .pages import InitPage, VideoPage
from .video import CanalplusVideo
from weboob.capabilities.collection import Collection, CollectionNotFound
@ -85,9 +86,12 @@ class CanalplusBrowser(BaseBrowser):
if len(path) == 0 or not isinstance(collections, (list, Collection)):
return collections
i = path[0]
if i not in [collection.title for collection in collections]:
raise CollectionNotFound()
matches = [collection
for collection in collections
if collection.id == i or collection.title == i]
if not len(matches):
raise CollectionNotFound(path)
return walk_res(path[1:], [collection.children for collection in collections if collection.title == i][0])
return walk_res(path[1:], matches[0])
return walk_res(split_path, collections)