diff --git a/addon.xml b/addon.xml index f51374e..268ed53 100644 --- a/addon.xml +++ b/addon.xml @@ -1,7 +1,7 @@ diff --git a/resources/lib/movistar.py b/resources/lib/movistar.py index 452f372..32a4e59 100644 --- a/resources/lib/movistar.py +++ b/resources/lib/movistar.py @@ -460,7 +460,7 @@ class Movistar(object): today = datetime.today() date = today.strftime('%Y-%m-%dT00:00:00') ch_data = self.load_epg_data(date, duration, channels) - if not ch_data: return [] + if not ch_data or 'error' in ch_data: return {} data = [] data.append(ch_data) else: @@ -1025,9 +1025,9 @@ class Movistar(object): except: return None - def epg_to_movies(self, channel_id, date=None): + def epg_to_movies(self, channel_id, date=None, duration=2): LOG('epg_to_movies: {} {}'.format(channel_id, date)) - epg = self.get_epg(channels=channel_id, date=date) + epg = self.get_epg(channels=channel_id, date=date, duration=duration) res = [] if not channel_id in epg: return res for p in epg[channel_id]: diff --git a/resources/lib/plugin.py b/resources/lib/plugin.py index 36976d1..fd72ce1 100644 --- a/resources/lib/plugin.py +++ b/resources/lib/plugin.py @@ -421,15 +421,16 @@ def list_profiles(params): def list_epg(params): LOG('list_epg: {}'.format(params)) from datetime import datetime, timedelta + from .timeconv import my_strftime if 'id' in params: if not 'date' in params: today = datetime.today() - for i in range(7, 1, -1): + for i in range(6, 0, -1): past_date = today - timedelta(days=i) date = past_date.strftime('%Y-%m-%dT00:00:00') - display_str = past_date.strftime('%a %d/%m').capitalize() + display_str = my_strftime(past_date, '%a %d') add_menu_option(display_str, get_url(action='epg', id=params['id'], name=params['name'], date=date)) - add_videos(params['name'], 'movies', m.epg_to_movies(params['id'], params.get('date'))) + add_videos(params['name'], 'movies', m.epg_to_movies(params['id'], params.get('date'), duration=1)) else: channels = m.get_channels() open_folder(addon.getLocalizedString(30107)) # EPG diff --git a/resources/lib/timeconv.py b/resources/lib/timeconv.py index e1e9704..a56220d 100644 --- a/resources/lib/timeconv.py +++ b/resources/lib/timeconv.py @@ -9,14 +9,16 @@ from datetime import datetime import pytz from dateutil import parser -weekdays = ['Dom', 'Lun', 'Mar', 'Mie', 'Jue', 'Vie', 'Sab'] - -def timestamp2str(timestamp, format='%H:%M'): - time = datetime.fromtimestamp(timestamp / 1000) +def my_strftime(time, format): + weekdays = ['Dom', 'Lun', 'Mar', 'Mie', 'Jue', 'Vie', 'Sab'] if '%a' in format: w = int(time.strftime('%w')) format = format.replace('%a', weekdays[w]) - return time.strftime(format).capitalize() + return time.strftime(format) + +def timestamp2str(timestamp, format='%H:%M'): + time = datetime.fromtimestamp(timestamp / 1000) + return my_strftime(time, format) def isodate2date(date_string): date_object = parser.parse(date_string)