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:
parent
10215d1e4c
commit
682e14c86a
14 changed files with 125 additions and 63 deletions
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue