v0.5.0 : Switch to new API (+code refactoring) & strings update

known-as-bmf · known-as-bmf · commit e3ab15ca7eee · 2015-10-29T19:01:05.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# Version 0.5.0
+
+* Switched to a new API
+* Strings updated to match the new ARTE categories
+
 # Version 0.4.0
 
 * Fixed download procedure (got rid of simpledownloader for a more shitty solution)
diff --git a/addon.py b/addon.py
@@ -24,6 +24,7 @@
 import requests
 import os
 import urllib2
+# import datetime
 
 
 plugin = Plugin()
@@ -40,43 +41,74 @@
 # lang : F | D
 live_json = base_url + '/papi/tvguide/videos/livestream/{lang}/'
 
-# http://www.arte.tv/guide/{lang}/plus7/par_dates.json?value={date}
-# lang : fr | de
-# date : date sous la forme yyyy-mm-jj
-
-# http://www.arte.tv/guide/{lang}/plus7/par_themes.json?value={genre}
-# lang  : fr | de
-# genre : trigramme du genre (ACT DOC DEC EUR GEO SOC JUN AUT CIN ART CUL ENV)
-
-# http://www.arte.tv/guide/{lang}/plus7/par_emissions.json?value={emission}
-# lang     : fr | de
-# emission : trigramme de l'emission (VMI TSG AJT JTE COU FUM KAR DCA MTR PNB PHI SUA TRA VOX XEN YOU
-
-categories = [('new',         30001),
-              ('selection',   30002),
-              ('most_viewed', 30003),
-              ('last_chance', 30004),
-              ('themes',      30005)]
-
-themes = [('ACT', 3000501),
-          ('DOC', 3000502),
-          ('DEC', 3000503),
-          ('EUR', 3000504),
-          ('GEO', 3000505),
-          ('SOC', 3000506),
-          ('JUN', 3000507),
-          ('AUT', 3000508),
-          ('CIN', 3000509),
-          ('ART', 3000510),
-          ('CUL', 3000511),
-          ('ENV', 3000512)]
+# http://www.arte.tv/papi/tvguide/videos/plus7/program/{lang}/{detailLevel}/{category}/{cluster}/{recommended}/{sort}/{limit}/{offset}/DE_FR.json
+# lang : F | D
+# detailLevel : L2 | L3 (the higher the most verbose)
+# category : categorie (HIS... see below)
+# cluster : emission (VMI... see below)
+# recommended : 1 | -1
+# sort : AIRDATE_DESC | AIRDATE_ASC | ALPHA | VIEWS | LAST_CHANCE
+# limit : n of results
+# offset : starts at 1
+#
+# cluster : emission
+# 28 Minutes                        VMI
+# 360° GEO                          TSG
+# ARTE Journal                      AJT
+# ARTE Junior                       JUN
+# ARTE Reportage                    JTE
+# Au cœur de la nuit                ACN
+# Cinéma sur ARTE                   FIL
+# Court-circuit                     COU
+# Cuisines des terroirs             CUI
+# Futuremag                         FUM
+# Karambolage                       KAR
+# Le Dessous des cartes             DCA
+# Maestro                           MAE
+# Metropolis                        MTR
+# Personne ne bouge !               PNB
+# Philosophie                       PHI
+# Square                            SUA
+# Tracks                            TRA
+# Vox Pop                           VOX
+# X:enius                           XEN
+# Yourope                           YOU
+#
+# category : categories
+# Actu & société                    ACT
+# Séries & fiction                  FIC
+# Cinéma                            CIN
+# Arts & spectacles classiques      ART
+# Culture pop                       CUL
+# Découverte                        DEC
+# Histoire                          HIS
+# Junior                            JUN
+listing_json = base_url + '/papi/tvguide/videos/plus7/program/{lang}/L2/{category}/{cluster}/{highlight}/{sort}/{limit}/{offset}/DE_FR.json'
+
+def get_menu_items():
+    return [(plugin.url_for('listing'),                                   30001), # new http://www.arte.tv/papi/tvguide/videos/plus7/program/F/L2/ALL/ALL/-1/AIRDATE_DESC/0/0/DE_FR.json
+            (plugin.url_for('listing', highlight='1', limit='6'),         30002), # selection http://www.arte.tv/papi/tvguide/videos/plus7/program/F/L2/ALL/ALL/1/AIRDATE_DESC/6/0/DE_FR.json
+            (plugin.url_for('listing', sort='VIEWS', limit='20'),         30003), # most_viewed http://www.arte.tv/papi/tvguide/videos/plus7/program/F/L2/ALL/ALL/-1/VIEWS/0/0/DE_FR.json
+            (plugin.url_for('listing', sort='LAST_CHANCE', limit='20'),   30004), # last chance http://www.arte.tv/papi/tvguide/videos/plus7/program/F/L2/ALL/ALL/-1/LAST_CHANCE/0/0/DE_FR.json
+            (plugin.url_for('categories'),                                30005)] # categories http://www.arte.tv/papi/tvguide/videos/plus7/program/F/L2/XXX/ALL/-1/AIRDATE_DESC/0/0/DE_FR.json
+
+
+def get_categories():
+    return [('ACT', 3000501),
+            ('FIC', 3000502),
+            ('CIN', 3000503),
+            ('ART', 3000504),
+            ('CUL', 3000505),
+            ('DEC', 3000506),
+            ('HIS', 3000507),
+            ('JUN', 3000508)]
 
 headers = {'user-agent': plugin.name + '/' + plugin.addon.getAddonInfo('version')}
 
 quality_map = {0: 'SQ', 1: 'EQ', 2: 'HQ', 3: 'MQ'}
 
 # Settings
-language = 'fr' if plugin.get_setting('lang', int) == 0 else 'de'
+language = 'FR' if plugin.get_setting('lang', int) == 0 else 'DE'
 prefer_vost = plugin.get_setting('prefer_vost', bool)
 quality = plugin.get_setting('quality', int)
 protocol = 'HBBTV' if plugin.get_setting('protocol', int) == 0 else 'RMP4'
@@ -87,9 +119,9 @@
 @plugin.route('/')
 def index():
     items = [{
-        'label': plugin.get_string(value),
-        'path': plugin.url_for('show_' + key)
-    } for key, value in categories]
+        'label': plugin.get_string(sid),
+        'path': path
+    } for path, sid in get_menu_items()]
     items.append({
         'label': plugin.get_string(30006),
         'path': plugin.url_for('play_live'),
@@ -98,58 +130,61 @@ def index():
     return items
 
 
-@plugin.route('/new', name='show_new',
-              options={'json_url': base_url + '/guide/{lang}/plus7.json'})
-@plugin.route('/selection', name='show_selection',
-              options={'json_url': base_url + '/guide/{lang}/plus7/selection.json'})
-@plugin.route('/most_viewed', name='show_most_viewed',
-              options={'json_url': base_url + '/guide/{lang}/plus7/plus_vues.json'})
-@plugin.route('/last_chance', name='show_last_chance',
-              options={'json_url': base_url + '/guide/{lang}/plus7/derniere_chance.json'})
-@plugin.route('/themes/<theme>', name='show_theme',
-              options={'json_url': base_url + '/guide/{lang}/plus7/par_themes.json'})
-def list_items(json_url, theme=None):
+@plugin.route('/listing', name='listing')
+def show_listing():
     plugin.set_content('tvshows')
 
-    payload = {}
-    if theme:
-        payload['value'] = theme
+    # very ugly workaround ahead (plugin.request.args.XXX returns an array for unknown reason)
+    url = listing_json.format(lang=language[0],
+                              category=plugin.request.args.get('category', ['ALL'])[0],
+                              cluster=plugin.request.args.get('cluster', ['ALL'])[0],
+                              highlight=plugin.request.args.get('highlight', ['-1'])[0],
+                              sort=plugin.request.args.get('sort', ['AIRDATE_DESC'])[0],
+                              limit=plugin.request.args.get('limit', ['0'])[0],
+                              offset=plugin.request.args.get('offset', ['0'])[0])
+
+    data = load_json(url)
 
-    data = load_json(json_url.format(lang=language), payload)
+    listing_key = 'program{lang}List'.format(lang=language)
 
     items = []
-    for video in data['videos']:
+    for video in data[listing_key]:
+        vdo = video['VDO']
         item = {
-            'label': video['title'],
-            'path': plugin.url_for('play', vid=str(video['em'])),
-            'thumbnail': video['image_url'],
+            'label': vdo.get('VTI'),
+            'path': plugin.url_for('play', vid=str(vdo.get('VPI'))),
+            'thumbnail': vdo.get('VTU').get('IUR'),
             'is_playable': True,
             'info_type': 'video',
             'info': {
-                'label': video['title'],
-                'title': video['title'],
-                'duration': str(video['duration']),
-                'genre': video['video_channels'] if video['video_channels'] else '',
-                'plot': video['desc'] if video['desc'] else '',
+                'label': vdo.get('VTI'),
+                'title': vdo.get('VTI'),
+                'duration': str(vdo.get('VDU')),
+                'genre': vdo.get('VCG'),
+                'plot': vdo.get('VDE'),
+                'plotoutline': vdo.get('V7T'),
+                'year': vdo.get('productionYear'),
+                'director': vdo.get('PPD'),
+                #'aired': datetime.datetime.strptime(vdo.get('VDA')[:-6], '%d/%m/%Y %H:%M:%S').strftime('%Y-%m-%d') if vdo.get('VDA') else None
             },
             'properties': {
-                'fanart_image': video['image_url'],
+                'fanart_image': vdo.get('VTU').get('IUR'),
             },
             'context_menu': [
-                (plugin.get_string(30021), actions.background(plugin.url_for('download', vid=str(video['em'])))),
+                (plugin.get_string(30021), actions.background(plugin.url_for('download', vid=str(vdo.get('VPI'))))),
             ],
         }
         # item['context_menu'].append((plugin.get_string(30020), plugin.url_for('enqueue', item=item)))
         items.append(item)
     return plugin.finish(items)
 
 
-@plugin.route('/show_themes', name='show_themes')
-def show_themes():
+@plugin.route('/categories', name='categories')
+def show_categories():
     items = [{
         'label': plugin.get_string(value),
-        'path': plugin.url_for('show_theme', theme=key)
-    } for key, value in themes]
+        'path': plugin.url_for('listing', sort='AIRDATE_DESC', category=key)
+    } for key, value in get_categories()]
     return plugin.finish(items)
 
 
diff --git a/addon.xml b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.arteplussept" name="Arte +7" version="0.4.0" provider-name="bmf">
+<addon id="plugin.video.arteplussept" name="Arte +7" version="0.5.0" provider-name="bmf">
     <requires>
         <import addon="xbmc.python" version="2.1.0"/>
         <import addon="script.module.xbmcswift2" version="2.4.0"/>
diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,8 @@
-v0.4.0
+v0.5.0
+- Switched to a new API
+- Strings updated to match the new ARTE categories
 
+v0.4.0
 - Fixed download procedure (got rid of simpledownloader for a more shitty solution)
 - Added download quality setting
 - Added very low quality setting (may not be available for every video - fallbacks on highest)
diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
@@ -7,7 +7,7 @@
     <string id="30002">Selection</string>
     <string id="30003">Most viewed</string>
     <string id="30004">Last chance</string>
-    <string id="30005">Themes</string>
+    <string id="30005">Categories</string>
     <string id="30006">Live</string>
 
     <string id="30007">Downloading</string>
@@ -27,17 +27,13 @@
     <string id="30054">Download directory</string>
     <string id="30055">Download video quality</string>
 
-    <!-- themes -->
-    <string id="3000501">News</string>
-    <string id="3000502">Documentary</string>
-    <string id="3000503">Discovery</string>
-    <string id="3000504">Europe</string>
-    <string id="3000505">Geopolitics &amp; History</string>
-    <string id="3000506">Society</string>
-    <string id="3000507">Junior</string>
-    <string id="3000508">Other</string>
-    <string id="3000509">Movie &amp; Fiction</string>
-    <string id="3000510">Art, Culture &amp; Spectacle</string>
-    <string id="3000511">Pop Culture &amp; Alternative</string>
-    <string id="3000512">Environment &amp; Science</string>
+    <!-- categories -->
+    <string id="3000501">News &amp; society</string>
+    <string id="3000502">Shows &amp; fiction</string>
+    <string id="3000503">Cinema</string>
+    <string id="3000504">Arts &amp; classical performances</string>
+    <string id="3000505">Pop culture</string>
+    <string id="3000506">Discovery</string>
+    <string id="3000507">History</string>
+    <string id="3000508">Junior</string>
 </strings>
diff --git a/resources/language/French/strings.xml b/resources/language/French/strings.xml
@@ -7,7 +7,7 @@
     <string id="30002">Sélection</string>
     <string id="30003">Les plus vues</string>
     <string id="30004">Dernière chance</string>
-    <string id="30005">Thèmes</string>
+    <string id="30005">Catégories</string>
     <string id="30006">Direct</string>
 
     <string id="30007">Téléchargement</string>
@@ -27,17 +27,13 @@
     <string id="30054">Répertoire de téléchargement</string>
     <string id="30055">Qualité des vidéos téléchargées</string>
 
-    <!-- themes -->
-    <string id="3000501">Actualités</string>
-    <string id="3000502">Documentaire</string>
-    <string id="3000503">Découverte</string>
-    <string id="3000504">Europe</string>
-    <string id="3000505">Géopolitique &amp; Histoire</string>
-    <string id="3000506">Société</string>
-    <string id="3000507">Junior</string>
-    <string id="3000508">Autre</string>
-    <string id="3000509">Cinéma &amp; Fiction</string>
-    <string id="3000510">Art, Culture &amp; Spectacle</string>
-    <string id="3000511">Culture Pop &amp; Alternative</string>
-    <string id="3000512">Environnement &amp; Science</string>
+    <!-- categories -->
+    <string id="3000501">Actu &amp; société</string>
+    <string id="3000502">Séries &amp; fiction</string>
+    <string id="3000503">Cinéma</string>
+    <string id="3000504">Arts &amp; spectacles classiques</string>
+    <string id="3000505">Culture pop</string>
+    <string id="3000506">Découverte</string>
+    <string id="3000507">Histoire</string>
+    <string id="3000508">Junior</string>
 </strings>
diff --git a/resources/language/German/strings.xml b/resources/language/German/strings.xml
@@ -27,17 +27,13 @@
     <string id="30054">Downloadverzeichnis</string>
     <string id="30055">Videoqualität der Downloads</string>
 
-    <!-- themes -->
-    <string id="3000501">Aktuelles</string>
-    <string id="3000502">Dokumentationen</string>
-    <string id="3000503">Entdeckung</string>
-    <string id="3000504">Europa</string>
-    <string id="3000505">Geopolitik &amp; Geschichte</string>
-    <string id="3000506">Gesellschaft</string>
-    <string id="3000507">Junior</string>
-    <string id="3000508">Andere</string>
-    <string id="3000509">Kino &amp; Serien</string>
-    <string id="3000510">Kunst &amp; Kultur</string>
-    <string id="3000511">Popkultur &amp; Musik</string>
-    <string id="3000512">Umwelt &amp; Wissenschaft</string>
+    <!-- categories -->
+    <string id="3000501">Aktuelles &amp; Gesellschaft</string>
+    <string id="3000502">Fernsehfilme &amp; Serien</string>
+    <string id="3000503">Kino</string>
+    <string id="3000504">Kunst &amp; Kultur</string>
+    <string id="3000505">Popkultur &amp; Alternativ</string>
+    <string id="3000506">Entdeckung</string>
+    <string id="3000507">Geschichte</string>
+    <string id="3000508">Junior</string>
 </strings>
