nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

simplify and factorize code, remove dead code, follow conventions, use new-style classes

Browse source
This commit is contained in:
Christophe Benz 2010-12-09 15:27:06 +01:00 • committed by Romain Bignon
commit f1b3264a67
28 changed files with 202 additions and 251 deletions
Download patch file Download diff file Expand all files Collapse all files

34
weboob/backends/canalplus/browser.py
View file

@ -15,16 +15,21 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
import urllib
import lxml.etree
from weboob.tools.browser import BaseBrowser
from weboob.tools.browser.decorators import id2url
from .pages import InitPage, CanalplusVideo, VideoPage
import lxml.etree
class XMLParser:
__all__ = ['CanalplusBrowser']
class XMLParser(object):
def parse(self, data, encoding=None):
if encoding is None:
parser = None
@ -33,22 +38,21 @@ class XMLParser:
return lxml.etree.XML(data.get_data(), parser)
__all__ = ['CanalplusBrowser']
class CanalplusBrowser(BaseBrowser):
DOMAIN = u'service.canal-plus.com'
ENCODING = 'utf-8'
PAGES = {r"http://service.canal-plus.com/video/rest/initPlayer/cplus/": InitPage,
r"http://service.canal-plus.com/video/rest/search/cplus/.*": VideoPage,
r"http://service.canal-plus.com/video/rest/getVideosLiees/cplus/(?P<id>.+)": VideoPage,
}
PAGES = {
r'http://service.canal-plus.com/video/rest/initPlayer/cplus/': InitPage,
r'http://service.canal-plus.com/video/rest/search/cplus/.*': VideoPage,
r'http://service.canal-plus.com/video/rest/getVideosLiees/cplus/(?P<id>.+)': VideoPage,
}
#We need lxml.etree.XMLParser for read CDATA
PARSER = XMLParser()
FORMATS = { 'sd': 'BAS_DEBIT',
'hd': 'HD'
}
FORMATS = {
'sd': 'BAS_DEBIT',
'hd': 'HD',
}
def __init__(self, quality, *args, **kwargs):
BaseBrowser.__init__(self, parser= self.PARSER, *args, **kwargs)
@ -58,15 +62,13 @@ class CanalplusBrowser(BaseBrowser):
self.quality = 'HD'
def home(self):
self.location("http://service.canal-plus.com/video/rest/initPlayer/cplus/")
self.location('http://service.canal-plus.com/video/rest/initPlayer/cplus/')
def iter_search_results(self, pattern):
self.location("http://service.canal-plus.com/video/rest/search/cplus/" + urllib.quote_plus(pattern))
self.location('http://service.canal-plus.com/video/rest/search/cplus/' + urllib.quote_plus(pattern))
return self.page.iter_results()
@id2url(CanalplusVideo.id2url)
def get_video(self, url, video=None):
self.location(url)
return self.page.get_video(video, self.quality)