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

fix style

Browse source
This commit is contained in:
Romain Bignon 2014-03-20 07:48:41 +01:00
commit 991723549e
2 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/senscritique/browser.py
View file

@ -18,13 +18,10 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>. # along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.tools.browser2 import PagesBrowser, URL, Profile, Firefox from weboob.tools.browser2 import PagesBrowser, URL, Profile, Firefox
from weboob.tools.json import json as simplejson
from .calendar import SensCritiquenCalendarEvent from .calendar import SensCritiquenCalendarEvent
from .pages import AjaxPage, EventPage, JsonResumePage from .pages import AjaxPage, EventPage, JsonResumePage
import urllib
import urllib2
import re import re
__all__ = ['SenscritiqueBrowser'] __all__ = ['SenscritiqueBrowser']
@ -85,8 +82,9 @@ class SenscritiqueBrowser(PagesBrowser):
def set_package_settings(self, package, channels): def set_package_settings(self, package, channels):
url = 'http://www.senscritique.com/sc/tv_guides/saveSettings.json' url = 'http://www.senscritique.com/sc/tv_guides/saveSettings.json'
params = "network=%s" % package params = {'network': package}
params += ''.join(["&channels%%5B%%5D=%d" % (channel) for channel in channels]) for channel in channels:
params['channels[]'] = channel
self.open(url, data=params) self.open(url, data=params)
def list_events(self, date_from, date_to=None, package=None, channels=None): def list_events(self, date_from, date_to=None, package=None, channels=None):
@ -99,7 +97,7 @@ class SenscritiqueBrowser(PagesBrowser):
self._setup_session(SensCritiqueAjaxProfile()) self._setup_session(SensCritiqueAjaxProfile())
while True: while True:
self.DATA['page'] = '%d' % page_nb self.DATA['page'] = '%d' % page_nb
page = self.ajax_page.open(data=urllib.urlencode(self.DATA)) page = self.ajax_page.open(data=self.DATA)
nb_events = page.count_events() nb_events = page.count_events()
events = page.list_events(date_from=date_from, date_to=date_to) events = page.list_events(date_from=date_from, date_to=date_to)
@ -119,7 +117,7 @@ class SenscritiqueBrowser(PagesBrowser):
self._setup_session(SensCritiqueAjaxProfile()) self._setup_session(SensCritiqueAjaxProfile())
while True: while True:
self.DATA['page'] = '%d' % page_nb self.DATA['page'] = '%d' % page_nb
page = self.ajax_page.open(data=urllib.urlencode(self.DATA)) page = self.ajax_page.open(data=self.DATA)
event = page.list_events(_id=_id) event = page.list_events(_id=_id)
nb_events = page.count_events() nb_events = page.count_events()
if event or nb_events < self.LIMIT or page >= self.LIMIT_NB_PAGES: if event or nb_events < self.LIMIT or page >= self.LIMIT_NB_PAGES:
@ -140,9 +138,8 @@ class SenscritiqueBrowser(PagesBrowser):
def get_resume(self, _id): def get_resume(self, _id):
self._setup_session(SensCritiqueJsonProfile()) self._setup_session(SensCritiqueJsonProfile())
re_id = re.compile('/(.*)/(.*?).json', re.DOTALL) re_id = re.compile('^/?(.*)/.*', re.DOTALL)
a_id = re_id.search(_id).group(1) a_id = re_id.search(_id).group(1)
print a_id
return self.json_page.go(_id=a_id).get_resume() return self.json_page.go(_id=a_id).get_resume()
# return "get resume" # return "get resume"

6
modules/senscritique/pages.py
View file

@ -18,13 +18,12 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>. # along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.tools.misc import html2text from weboob.tools.misc import html2text
from weboob.tools.browser import BasePage
from .calendar import SensCritiquenCalendarEvent from .calendar import SensCritiquenCalendarEvent
from datetime import date, datetime, time from datetime import date, datetime, time
from weboob.tools.browser2.page import HTMLPage, method, ItemElement, SkipItem, ListElement, JsonPage from weboob.tools.browser2.page import HTMLPage, method, ItemElement, ListElement, JsonPage
from weboob.tools.browser2.filters import Filter, Link, CleanText, Env, Attr, Regexp from weboob.tools.browser2.filters import Filter, Link, CleanText, Regexp
__all__ = ['AjaxPage', 'EventPage', 'JsonResumePage'] __all__ = ['AjaxPage', 'EventPage', 'JsonResumePage']
@ -178,6 +177,5 @@ class EventPage(HTMLPage):
class JsonResumePage(JsonPage): class JsonResumePage(JsonPage):
def get_resume(self): def get_resume(self):
print self.doc
if self.doc['json']['success']: if self.doc['json']['success']:
return self.doc['json']['data'] return self.doc['json']['data']