[Xbmc-addons] Plugins branch, frodo, updated. ce507898d177ccdbc6c43b4ef667ca863f434d17

Benjamin BERTRAND Fri, 28 Dec 2012 14:46:14 -0800

The branch, frodo has been updated
       via  ce507898d177ccdbc6c43b4ef667ca863f434d17 (commit)
       via  3d179c7b7179af309f65469495780bb960b8a4a8 (commit)
       via  b62381902180d5a5aac0eca5381554a09c8f3af6 (commit)
       via  0e2f7c84ae4bdf4fdb25134ef53d46c8bc01fae3 (commit)
      from  82c6a9a09361f6cc36a532688ec31a6c36756aec (commit)


- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=ce507898d177ccdbc6c43b4ef667ca863f434d17


http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=3d179c7b7179af309f65469495780bb960b8a4a8

commit 3d179c7b7179af309f65469495780bb960b8a4a8
Author: beenje <[email protected]>
Date:   Fri Dec 28 23:10:18 2012 +0100

    [plugin.video.itunes_podcasts] updated to version 1.1.2

diff --git a/plugin.video.itunes_podcasts/addon.py 
b/plugin.video.itunes_podcasts/addon.py
index 9d22a08..444a61b 100644
--- a/plugin.video.itunes_podcasts/addon.py
+++ b/plugin.video.itunes_podcasts/addon.py
@@ -18,7 +18,8 @@
 #

 

 from xbmcswift2 import Plugin, xbmc

-from resources.lib.api import ItunesPodcastApi, NetworkError

+from resources.lib.api import \

+    ItunesPodcastApi, NetworkError, NoEnclosureException

 

 plugin = Plugin()

 api = ItunesPodcastApi()

@@ -33,7 +34,8 @@ STRINGS = {
     'audio': 30006,

     'add_to_my_podcasts': 30010,

     'remove_from_my_podcasts': 30011,

-    'network_error': 30200

+    'network_error': 30200,

+    'no_media_found': 30007,

 }

 

 

@@ -101,9 +103,13 @@ def show_podcasts(content_type, genre_id):
 

 @plugin.route('/<content_type>/podcast/items/<podcast_id>/')

 def show_items(content_type, podcast_id):

-    podcast_items = api.get_podcast_items(

-        podcast_id=podcast_id

-    )

+    try:

+        podcast_items = api.get_podcast_items(

+            podcast_id=podcast_id

+        )

+    except NoEnclosureException:

+        plugin.notify(msg=_('no_media_found'))

+        return plugin.finish(succeeded=False)

     return __add_podcast_items(content_type, podcast_id, podcast_items)

 

 

@@ -245,12 +251,14 @@ def __get_country():
     if not plugin.get_setting('country_already_set'):

         lang_country_mapping = (

             ('chin', 'CN'),

+            ('denm', 'DK'),

             ('fin', 'FI'),

             ('fre', 'FR'),

             ('germa', 'DE'),

             ('greec', 'GR'),

             ('ital', 'IT'),

             ('japa', 'JP'),

+            ('kor', 'KR'),

             ('dutch', 'NL'),

             ('norw', 'NO'),

             ('pol', 'PL'),

diff --git a/plugin.video.itunes_podcasts/addon.xml 
b/plugin.video.itunes_podcasts/addon.xml
index 4285a9d..a6f5ea1 100644
--- a/plugin.video.itunes_podcasts/addon.xml
+++ b/plugin.video.itunes_podcasts/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.itunes_podcasts" name="Apple iTunes Podcasts" 
version="1.0.1" provider-name="Tristan Fischer ([email protected])">
+<addon id="plugin.video.itunes_podcasts" name="Apple iTunes Podcasts" 
version="1.1.2" provider-name="Tristan Fischer ([email protected])">
     <requires>
-        <import addon="xbmc.python" version="2.0"/>
+        <import addon="xbmc.python" version="2.1.0"/>
         <import addon="script.module.simplejson" version="2.0.10"/>
         <import addon="script.module.xbmcswift2" version="1.2.0"/>
         <import addon="script.module.feedparser" version="0.5.7"/>
@@ -12,9 +12,29 @@
     <extension point="xbmc.addon.metadata">
         <language></language>
         <platform>all</platform>
+        <summary lang="be">Apple iTunes Podcast Browser</summary>
+        <summary lang="da">Udforsk Podcasts fra Apple iTunes</summary>
         <summary lang="de">Apple iTunes Podcast Browser</summary>
+        <summary lang="el">Î ÎµÏÎ¹Î·Î³Î·ÏÎ®Ï Podcast ÏÎ¿Ï Apple 
iTunes</summary>
         <summary lang="en">Apple iTunes Podcast Browser</summary>
+        <summary lang="es">Explorador de Apple iTunes Podcasts</summary>
+        <summary lang="fr">Navigateur Apple iTunes Podcast</summary>
+        <summary lang="ko">ì í iTunes íìºì¤í¸ íìê¸°</summary>
+        <summary lang="lt">Apple iTunes [COLOR=red]Podcast[/COLOR] 
narÅ¡yklÄ</summary>
+        <summary lang="pl">PrzeglÄdarka podcastÃ³w Apple iTunes</summary>
+        <summary lang="pt_BR">Procurar Podcast Aplle Itunes</summary>
+        <summary lang="sv">Apple iTunes podcast-utforskare</summary>
+        <description lang="be">This add-on lets you browse and search for 
thousands of free Podcasts.[CR]It provides both, audio and video podcasts - 
each devided into over 60 genres. You can also search for specific podcasts by 
name.[CR]It is also possible to manage a "My Podcasts" list via 
context-menu.</description>
+        <description lang="da">Dette add-on lader dig udforske og sÃ¸ge efter 
tusinder af gratis Podcasts.[CR]Det tilbyder bÃ¥de lyd- og videopodcasts - hver 
isÃ¦r opdelt i over 60 genrer. Du kan ogsÃ¥ sÃ¸ge efter specifikke navne pÃ¥ 
podcasts.[CR]Det er ogsÃ¥ muligt at hÃ¥ndtere *Mine Podcasts" via 
kontekstmenuen.</description>
         <description lang="de">Dieses Add-on ermÃ¶glicht das durchsuchen von 
tausenden kostenlosen Podcasts.[CR]Es bieted Video- und Audio-Podcasts - je 
aufgeteilt auf Ã¼ber 60 Genre. Auch ist es mÃ¶glich nach Podcasts zu 
suchen.[CR]AuÃerdem ist es mÃ¶glich eine "Meine Podcasts"-Liste Ã¼ber das 
Kontext-Menu zu verwalten.</description>
+        <description lang="el">ÎÏÏÏ ÏÎ¿ ÏÏÏÏÎ¸ÎµÏÎ¿ ÏÎ±Ï 
ÎµÏÎ¹ÏÏÎÏÎµÎ¹ Î½Î± ÏÎµÏÎ¹Î·Î³Î·Î¸ÎµÎ¯ÏÎµ ÎºÎ±Î¹ Î½Î± 
Î±Î½Î±Î¶Î·ÏÎ®ÏÎµÏÎµ ÏÎ¹Î»Î¹Î¬Î´ÎµÏ Î´ÏÏÎµÎ¬Î½ Podcast.[CR]Î Î±ÏÎÏÎµÎ¹ 
podcast Î²Î¯Î½ÏÎµÎ¿ ÎºÎ±Î¹ Î®ÏÎ¿Ï - ÎºÎ±Î¹ ÏÎ± Î´ÏÎ¿ ÏÏÏÎ¹ÏÎ¼ÎÎ½Î± 
ÏÎµ 60 ÎµÎ¯Î´Î·. ÎÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± Î±Î½Î±Î¶Î·ÏÎ®ÏÎµÏÎµ ÏÏ
Î³ÎºÎµÎºÏÎ¹Î¼ÎÎ½Î± podcast Î¼Îµ ÏÎ¿ ÏÎ½Î¿Î¼Î±.[CR]ÎÎ¯Î½Î±Î¹, ÎµÏÎ¯ÏÎ·Ï, 
Î´ÏÎ½Î±ÏÏ Î½Î± Î´Î¹Î±ÏÎµÎ¹ÏÎ¹ÏÏÎµÎ¯ÏÎµ Î¼Î¯Î± Î»Î¯ÏÏÎ± "Podcast Î¼Î¿Ï
" Î¼ÎÏÏ ÏÎ¿Ï Î¼ÎµÎ½Î¿Ï ÎµÏÎ¹Î»Î¿Î³ÏÎ½.</description>
         <description lang="en">This add-on lets you browse and search for 
thousands of free Podcasts.[CR]It provides both, audio and video podcasts - 
each devided into over 60 genres. You can also search for specific podcasts by 
name.[CR]It is also possible to manage a "My Podcasts" list via 
context-menu.</description>
+        <description lang="es">Este complemento le permite explorar y buscar 
entre miles de Podcasts gratuitos.[CR]Proporciona acceso a podcasts de audio y 
video divididos en mÃ¡s de 60 gÃ©neros. Incluso puede buscar podcasts por su 
nombre.[CR]Incluso es posible manejar sus podcasts mediante la lista "Mis 
Podacsts" del menÃº contextual.</description>
+        <description lang="fr">Cette extension vous permet de naviguer et 
trouver des milliers de Podcasts gratuit.[CR]Il existe des podcasts audio et 
vidÃ©o, divisÃ© en 60 genres diffÃ©rents. Vous pouvez Ã©galement cherche un 
podcast par nom.[CR]Il est possible de gÃ©rer une liste de "Mes Podcasts" via 
le menu contextuel.</description>
+        <description lang="ko">ì´ ì ëì¨ì¼ë¡ ìì²ê°ì ë¬´ë£ 
íìºì¤í¸ë¥¼ íìíê³  ê²ìí  ì ììµëë¤.[CR]ê° 60ê° ì´ìì 
ì¥ë¥´ë¡ êµ¬ë¶ë ì¤ëì¤ì ë¹ëì¤ íìºì¤í¸ë¥¼ ì ê³µí©ëë¤. 
í¹ì í íìºì¤í¸ë¥¼ ì´ë¦ì¼ë¡ ê²ìí  ì ììµëë¤.[CR]ì»¨í
ì¤í¸ ë©ë´ë¥¼ ì´ì©í´ "ë´ íìºì¤í¸" ëª©ë¡ì ê´ë¦¬í  ì 
ììµëë¤.</description>
+        <description lang="lt">Å is priedas leidÅ¾ia jums narÅ¡yti ir ieÅ¡koti 
tÅ«kstanÄiÅ³ nemokamai Podcasts [COLOR=red](toliau verÄiama kaip - 
Transliacijos)[/COLOR].[CR]Jis suteikia prieigÄ prie garso ir vaizdo 
internetinÄs medijos failÅ³ - kur/katrie kiekvienas suskirstytas Ä¯ daugiau 
nei 60 Å¾anrÅ³.Taip pat jÅ«s galite ieÅ¡koti konkreÄiÅ³ prenumeruojamÅ³ 
transliacijÅ³ pagal pavadinimÄ.[CR]Taip pat galima valdyti "Mano 
Transliacijos" sÄraÅ¡Ä per kontekstinÄ¯ meniu.</description>
+        <description lang="pl">Wtyczka ta umoÅ¼liwia ci przeglÄdanie i 
szukanie w ÅrÃ³d tysiÄcy darmowych PodcastÃ³w.[CR]Posiada zarÃ³wno Podcasty 
audio i video, kaÅ¼de dostÄpne w ponad 60 gatunkach. MoÅ¼esz dodatkowo szukaÄ 
konkretnych PodcastÃ³w po nazwie.[CR]Dodatkowo moÅ¼esz zarzÄdzaÄ listÄ 
swoich ulubionych PodcastÃ³w poprzez menu kontekstowe.</description>
+        <description lang="pt_BR">Este add-on deixa navegar e procurar por 
milhares de Podcasts gratuitos.[CR]Ele fornece Ã¡udio e podcasts de vÃdeo - 
cada um dividido em mais de 60 gÃªneros. VocÃª tambÃ©m pode procurar podcasts 
especÃficos pelo nome. [CR] TambÃ©m Ã© possÃvel gerenciar  uma lista de "Meus 
Podcasts"  atravÃ©s do menu de contexto.</description>
+        <description lang="sv">Detta tillÃ¤gg lÃ¥ter dig blÃ¤ddra och sÃ¶ka 
efter tusentals podcasts.[CR]Det tillhandahÃ¥ller bÃ¥de ljud- och 
video-podcasts - Var och en indelad i Ã¶ver 60 genres. Du kan ocksÃ¥ sÃ¶ka 
efter specifika podcasts genom namn.[CR]Det Ã¤r ocksÃ¥ mÃ¶jligt att hantera 
"Mina podcasts"-listan via innehÃ¥llsmenyn.</description>
     </extension>
 </addon>
diff --git a/plugin.video.itunes_podcasts/changelog.txt 
b/plugin.video.itunes_podcasts/changelog.txt
index 9e0e7ad..79f2c0e 100644
--- a/plugin.video.itunes_podcasts/changelog.txt
+++ b/plugin.video.itunes_podcasts/changelog.txt
@@ -1,11 +1,20 @@
+1.1.2 (Frodo Version)

+ - show notification when podcast has no items

+ - added korea and dansk storefront

+ - fixed error on podcast items with invalid length

+ - added translations

+

 1.0.1

  - Autodetect content-type in Eden

+

 1.0.0

  - Initial release in the Eden-Repository

+

 0.9.1

  - changed add-on name to "Apple iTunes Podcasts"

  - fixed spaces in search term

  - fixed keyboard dialog after context action

+

 0.9.0

  - initial release

  Features:

diff --git 
a/plugin.video.itunes_podcasts/resources/language/English/strings.xml 
b/plugin.video.itunes_podcasts/resources/language/English/strings.xml
index 249e750..c4e5114 100644
--- a/plugin.video.itunes_podcasts/resources/language/English/strings.xml
+++ b/plugin.video.itunes_podcasts/resources/language/English/strings.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Translated using Transifex web application. For support, or if you would 
like to to help out, please visit your language team! -->
+<!-- English language-Team URL: 
http://www.transifex.com/projects/p/xbmc-addons/language/en/ -->
+<!-- Report language file syntax bugs at: [email protected] -->
+
 <strings>
     <!-- Root Menu -->
     <string id="30000">All genres</string>
@@ -7,9 +11,12 @@
     <string id="30004">Search</string>
     <string id="30005">Video Podcasts</string>
     <string id="30006">Audio Podcasts</string>
+    <string id="30007">No Video/Music found!</string>
+
     <!-- Context Menu -->
     <string id="30010">Add to "My Podcasts"</string>
     <string id="30011">Remove from "My Podcasts"</string>
+
     <!-- Settings -->
     <string id="30100">Podcasts: Force ViewMode to Thumbnail</string>
     <string id="30101">Podcast-Items: Force ViewMode to Thumbnail</string>
@@ -17,6 +24,7 @@
     <string id="30103">Podcasts to show in list (max 300)</string>
     <string id="30104">Podcasts to show in search (max 200)</string>
     <string id="30105">Show Subgenres</string>
+
     <!-- Messages -->
     <string id="30200">Network Error</string>
 </strings>
diff --git a/plugin.video.itunes_podcasts/resources/language/German/strings.xml 
b/plugin.video.itunes_podcasts/resources/language/German/strings.xml
index 98cc126..57c2d7d 100644
--- a/plugin.video.itunes_podcasts/resources/language/German/strings.xml
+++ b/plugin.video.itunes_podcasts/resources/language/German/strings.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Translated using Transifex web application. For support, or if you would 
like to to help out, please visit your language team! -->
+<!-- German language-Team URL: 
http://www.transifex.com/projects/p/xbmc-addons/language/de/ -->
+<!-- Report language file syntax bugs at: [email protected] -->
+
 <strings>
     <!-- Root Menu -->
     <string id="30000">Alle Genre</string>
@@ -7,9 +11,12 @@
     <string id="30004">Suche</string>
     <string id="30005">Video Podcasts</string>
     <string id="30006">Audio Podcasts</string>
+    <string id="30007">Kein Video/Musik gefunden!</string>
+
     <!-- Context Menu -->
     <string id="30010">Zu "Meine Podcasts" hinzufÃ¼gen</string>
     <string id="30011">Von "Meine Podcasts" entfernen</string>
+
     <!-- Settings -->
     <string id="30100">Podcasts: ViewMode Thumbnail erzwingen</string>
     <string id="30101">Podcast-Items: ViewMode Thumbnail erzwingen</string>
@@ -17,6 +24,7 @@
     <string id="30103">Anzahl Podcasts - Liste (max 300)</string>
     <string id="30104">Anzahl Podcasts - Suche (max 200)</string>
     <string id="30105">Untergenres anzeigen</string>
+
     <!-- Messages -->
     <string id="30200">Netzwerkfehler</string>
 </strings>
diff --git a/plugin.video.itunes_podcasts/resources/lib/api.py 
b/plugin.video.itunes_podcasts/resources/lib/api.py
index a4ae1a6..3223f39 100644
--- a/plugin.video.itunes_podcasts/resources/lib/api.py
+++ b/plugin.video.itunes_podcasts/resources/lib/api.py
@@ -49,9 +49,11 @@ STOREFRONT_IDS = {
     'FI': 143447,  # Finland

     'FR': 143442,  # France

     'DE': 143443,  # Germany

+    'DK': 143458,  # Denmark

     'GR': 143448,  # Greece

     'IT': 143450,  # Italy

     'JP': 143462,  # Japan

+    'KR': 143466,  # Korea

     'LU': 143451,  # Luxembourg

     'MX': 143468,  # Mexico

     'NL': 143452,  # Netherlands

@@ -197,14 +199,14 @@ class ItunesPodcastApi():
                 'summary': item.get('summary'),

                 'author': item.get('author'),

                 'item_url': link['url'],

-                'size': int(link.get('length', 0)),

+                'size': int(link.get('length', 0) or 0),

                 'thumb': item.get('image', {}).get('href') or fallback_thumb,

                 'duration': link.get('duration', '0:00'),

                 'pub_date': __format_date(item.get('published_parsed')),

                 'rights': content['feed'].get('copyright')

             })

         if not items:

-            raise NotImplementedError

+            raise NoEnclosureException

         return items

 

     def search_podcast(self, search_term, limit=50):

diff --git a/plugin.video.itunes_podcasts/resources/settings.xml 
b/plugin.video.itunes_podcasts/resources/settings.xml
index cb1e073..7ceabb8 100644
--- a/plugin.video.itunes_podcasts/resources/settings.xml
+++ b/plugin.video.itunes_podcasts/resources/settings.xml
@@ -5,5 +5,5 @@
        <setting id="show_subgenres" type="bool" label="30105" default="true"/>

        <setting id="num_podcasts_list" type="number" label="30103" 
default="100"/>

        <setting id="num_podcasts_search" type="number" label="30104" 
default="100"/>

-       <setting id="country" type="labelenum" label="30102" 
values="AU|BE|BG|BR|CA|CH|CL|CN|DE|ES|FI|FR|GB|GR|IT|JP|LU|MX|NL|NO|PL|PT|RO|RU|SE|TR|US"
 default="US" />

+       <setting id="country" type="labelenum" label="30102" 
values="AU|BE|BG|BR|CA|CH|CL|CN|DE|DK|ES|FI|FR|GB|GR|IT|JP|KR|LU|MX|NL|NO|PL|PT|RO|RU|SE|TR|US"
 default="US" />

 </settings>


http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=b62381902180d5a5aac0eca5381554a09c8f3af6

commit b62381902180d5a5aac0eca5381554a09c8f3af6
Author: beenje <[email protected]>
Date:   Fri Dec 28 22:53:18 2012 +0100

    [plugin.video.arretsurimages] updated to version 2.3.2

diff --git a/plugin.video.arretsurimages/addon.xml 
b/plugin.video.arretsurimages/addon.xml
index 02da4dc..a85ec7a 100644
--- a/plugin.video.arretsurimages/addon.xml
+++ b/plugin.video.arretsurimages/addon.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.video.arretsurimages"
        name="ArrÃªt Sur Images"
-       version="2.2.1"
+       version="2.3.2"
        provider-name="beenje">
   <requires>
-    <import addon="xbmc.python" version="2.0"/>
+    <import addon="xbmc.python" version="2.1.0"/>
     <import addon="script.module.beautifulsoup" version="3.0.8"/>
     <import addon="script.module.xbmcswift" version="0.2.0"/>
     <import addon="script.module.requests" version="0.13.2"/>
diff --git a/plugin.video.arretsurimages/changelog.txt 
b/plugin.video.arretsurimages/changelog.txt
index 950df8b..73b15de 100644
--- a/plugin.video.arretsurimages/changelog.txt
+++ b/plugin.video.arretsurimages/changelog.txt
@@ -1,3 +1,11 @@
+[B]Version 2.3.2[/B]
+
+- New branch for frodo
+
+[B]Version 2.2.2[/B]
+
+- Fixed UnicodeEncodeError
+
 [B]Version 2.2.1[/B]
 
 - Added new program "au Prochain Episode"
diff --git a/plugin.video.arretsurimages/resources/lib/scraper.py 
b/plugin.video.arretsurimages/resources/lib/scraper.py
index ae8b2da..3b70982 100644
--- a/plugin.video.arretsurimages/resources/lib/scraper.py
+++ b/plugin.video.arretsurimages/resources/lib/scraper.py
@@ -28,7 +28,7 @@ URLASI = 'http://www.arretsurimages.net'
 
 
 def log(msg, level=xbmc.LOGNOTICE):
-    xbmc.log('ASI scraper: %s' % msg, level)
+    xbmc.log('ASI scraper: %s' % msg.encode('utf-8'), level)
 
 
 def debug(msg):

http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=0e2f7c84ae4bdf4fdb25134ef53d46c8bc01fae3

commit 0e2f7c84ae4bdf4fdb25134ef53d46c8bc01fae3
Author: beenje <[email protected]>
Date:   Fri Dec 28 22:53:09 2012 +0100

    [plugin.video.m6groupe] updated to version 2.0.3

diff --git a/plugin.video.m6groupe/addon.py b/plugin.video.m6groupe/addon.py
index 95253ec..1669cd1 100644
--- a/plugin.video.m6groupe/addon.py
+++ b/plugin.video.m6groupe/addon.py
@@ -54,6 +54,7 @@ def show_channel(channel):
 def show_genres(channel):
     genres = catalog.get_genres(channel)
     items = [{'label': gnr['label'],
+              'thumbnail': gnr['thumb'],
               'path': plugin.url_for('show_programs', channel=channel, 
genre=gnr['id'])
              } for gnr in genres]
     return plugin.finish(items, sort_methods=[SortMethod.LABEL])
diff --git a/plugin.video.m6groupe/addon.xml b/plugin.video.m6groupe/addon.xml
index 9e35b1c..f2910ed 100644
--- a/plugin.video.m6groupe/addon.xml
+++ b/plugin.video.m6groupe/addon.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.m6groupe" name="M6 groupe" version="1.0.2" 
provider-name="beenje">
+<addon id="plugin.video.m6groupe" name="M6 groupe" version="2.0.3" 
provider-name="beenje">
   <requires>
-    <import addon="xbmc.python" version="2.0"/>
-    <import addon="script.module.xbmcswift2" version="1.3"/>
+    <import addon="xbmc.python" version="2.1.0"/>
+    <import addon="script.module.xbmcswift2" version="1.3.1"/>
     <import addon="script.module.requests" version="0.13.2"/>
   </requires>
   <extension point="xbmc.python.pluginsource" library="addon.py">
@@ -11,9 +11,9 @@
   <extension point="xbmc.addon.metadata">
     <platform>all</platform>
     <language>fr</language>
-    <summary lang="en">M6 and W9 Replay</summary>
-    <summary lang="fr">M6 et W9 Replay</summary>
-    <description lang="en">Watch videos from french channels M6 and 
W9</description>
-    <description lang="fr">AccÃ©der aux vidÃ©os des chaÃ®nes M6 et 
W9</description>
+    <summary lang="en">M6 group channels replay</summary>
+    <summary lang="fr">Replay des chaÃ®nes du groupe M6</summary>
+    <description lang="en">Watch videos from M6 group french channels (M6, W9 
and 6ter)</description>
+    <description lang="fr">AccÃ©der aux vidÃ©os des chaÃ®nes du groupe M6 (M6, 
W9 et 6ter)</description>
   </extension>
 </addon>
diff --git a/plugin.video.m6groupe/changelog.txt 
b/plugin.video.m6groupe/changelog.txt
index a818bc5..6c293ad 100644
--- a/plugin.video.m6groupe/changelog.txt
+++ b/plugin.video.m6groupe/changelog.txt
@@ -1,3 +1,13 @@
+[B]Version 2.0.3[/B]
+
+- New branch for frodo
+
+[B]Version 1.0.3[/B]
+
+- Added genre thumbnail thanks to JUL1EN094
+- Added swfVfy thanks to JUL1EN094
+- Try to get the mp4 url from the f4m url when it is not defined
+
 [B]Version 1.0.2[/B]
 
 - Added 6ter channel
diff --git a/plugin.video.m6groupe/resources/lib/catalog.py 
b/plugin.video.m6groupe/resources/lib/catalog.py
index f6ba892..b05fbb7 100644
--- a/plugin.video.m6groupe/resources/lib/catalog.py
+++ b/plugin.video.m6groupe/resources/lib/catalog.py
@@ -30,6 +30,8 @@ CATALOGUE_URL = 
'http://static.m6replay.fr/catalog/m6group_web/%s/catalogue.json
 CLIP_URL = 
'http://static.m6replay.fr/catalog/m6group_web/%s/clip/%s/clip_infos-%s.json'
 IMAGES_URL = 'http://static.m6replay.fr/images/'
 TTL = int(plugin.get_setting('cached_ttl'))
+# Bump the CATALOG_API to force a refresh of the catalog
+CATALOG_API = '1.0'
 
 
 def code(channel):
@@ -82,14 +84,17 @@ def get_date(clp):
 
 
 @plugin.cached(TTL)
-def get_catalog(channel):
+def get_catalog(channel, api):
     """Return a catalog with only the needed information
 
-    This catalog is cached"""
+    This catalog is cached
+    The api argument is used to force a refresh of the catalog
+    """
     full_catalog = get_json(CATALOGUE_URL % code(channel))
     # Only get main genres (no parent)
     genres = [{'id': id_gnr,
-               'label': gnr[u'name']
+               'label': gnr[u'name'],
+               'thumb': url_thumb(gnr),
               } for id_gnr, gnr in full_catalog[u'gnrList'].items() if 
gnr[u'idParent'] is None]
     # Get programs with visible clips
     programs = [{'id': id_pgm,
@@ -115,14 +120,14 @@ def get_catalog(channel):
 
 def get_genres(channel):
     """Return the list of main genres"""
-    catalog = get_catalog(channel)
+    catalog = get_catalog(channel, CATALOG_API)
     return catalog['genres']
 
 
 def get_programs(channel, id_gnr='all'):
     """Return the list of all programs or
     programs belonging to the specified genre"""
-    catalog = get_catalog(channel)
+    catalog = get_catalog(channel, CATALOG_API)
     all_programs = catalog['programs']
     if id_gnr == 'all':
         return all_programs
@@ -133,7 +138,7 @@ def get_programs(channel, id_gnr='all'):
 def get_clips(channel, id_pgm='all'):
     """Return the list of all clips or
     clips belonging to the specified program"""
-    catalog = get_catalog(channel)
+    catalog = get_catalog(channel, CATALOG_API)
     all_clips = catalog['clips']
     if id_pgm == 'all':
         return all_clips
@@ -145,9 +150,17 @@ def get_clip_url(channel, clip):
     """Return the playable url of the clip"""
     clip_key = '/'.join([clip[-2:], clip[-4:-2]])
     asset = get_json(CLIP_URL % (code(channel), clip_key, clip))[u'asset']
-    urls = [val[u'url'] for val in asset.values() if 
val[u'url'].startswith('mp4:')]
-    if urls:
-        return get_rtmp_url(urls[0])
+    urls = [val[u'url'] for val in asset.values()]
+    # Look for a mp4 url
+    for url in urls:
+        if url.startswith('mp4:'):
+            return get_rtmp_url(url)
+    # No mp4 url found, try to convert it from the f4m url
+    for url in urls:
+        if url.endswith('.f4m'):
+            link = 'mp4:production/regienum/' + 
url.split('/')[-1].replace('.f4m', '.mp4')
+            return get_rtmp_url(link)
+    # No url found
     return None
 
 
@@ -168,4 +181,4 @@ def get_rtmp_url(playpath):
     #filename = os.path.basename(playpath)
     token_url = encode_playpath(app, playpath, int(time.time()))
     rtmp_url = '/'.join([rtmp, app, token_url])
-    return rtmp_url + ' timeout=10'
+    return rtmp_url + ' 
swfUrl=http://www.m6replay.fr/rel-3/M6ReplayV3Application-3.swf swfVfy=1 
timeout=10'

-----------------------------------------------------------------------

Summary of changes:
 plugin.video.arretsurimages/addon.xml              |    4 +-
 plugin.video.arretsurimages/changelog.txt          |    8 +
 .../resources/lib/scraper.py                       |    2 +-
 .../LICENSE.txt                                    |    0
 plugin.video.hdtrailers_net/addon.py               |  214 ++++++++++++++++++++
 plugin.video.hdtrailers_net/addon.xml              |   19 ++
 plugin.video.hdtrailers_net/changelog.txt          |    9 +
 plugin.video.hdtrailers_net/icon.png               |  Bin 0 -> 48904 bytes
 .../resources/__init__.py                          |    0
 .../resources/language/English/strings.xml         |   24 +++
 .../resources/language/German/strings.xml          |   24 +++
 .../resources/lib}/__init__.py                     |    0
 .../resources/lib/scraper.py                       |  163 +++++++++++++++
 plugin.video.hdtrailers_net/resources/settings.xml |    9 +
 plugin.video.itunes_podcasts/addon.py              |   18 ++-
 plugin.video.itunes_podcasts/addon.xml             |   24 ++-
 plugin.video.itunes_podcasts/changelog.txt         |    9 +
 .../resources/language/Afrikaans/strings.xml       |    8 +
 .../resources/language/Amharic/strings.xml         |    8 +
 .../resources/language/Arabic/strings.xml          |    8 +
 .../resources/language/Basque/strings.xml          |    8 +
 .../resources/language/Belarusian/strings.xml      |   30 +++
 .../resources/language/Bulgarian/strings.xml       |    8 +
 .../resources/language/Catalan/strings.xml         |    8 +
 .../language/Chinese (Simple)/strings.xml          |    8 +
 .../language/Chinese (Traditional)/strings.xml     |    8 +
 .../resources/language/Croatian/strings.xml        |    8 +
 .../resources/language/Czech/strings.xml           |    8 +
 .../resources/language/Danish/strings.xml          |   30 +++
 .../resources/language/Dutch/strings.xml           |    8 +
 .../resources/language/English/strings.xml         |    8 +
 .../resources/language/Esperanto/strings.xml       |    8 +
 .../resources/language/Estonian/strings.xml        |    8 +
 .../resources/language/Finnish/strings.xml         |    8 +
 .../resources/language/French/strings.xml          |   30 +++
 .../resources/language/Galician/strings.xml        |    8 +
 .../resources/language/German/strings.xml          |    8 +
 .../resources/language/Greek/strings.xml           |   30 +++
 .../resources/language/Hebrew/strings.xml          |   11 +
 .../language/Hindi (Devanagiri)/strings.xml        |    8 +
 .../resources/language/Hungarian/strings.xml       |   12 +
 .../resources/language/Icelandic/strings.xml       |    8 +
 .../resources/language/Indonesian/strings.xml      |    8 +
 .../resources/language/Italian/strings.xml         |   11 +
 .../resources/language/Japanese/strings.xml        |    8 +
 .../resources/language/Korean/strings.xml          |   30 +++
 .../resources/language/Lithuanian/strings.xml      |   30 +++
 .../resources/language/Malayalam/strings.xml       |    8 +
 .../resources/language/Norwegian/strings.xml       |    8 +
 .../resources/language/Polish/strings.xml          |   30 +++
 .../language/Portuguese (Brazil)/strings.xml       |   30 +++
 .../resources/language/Portuguese/strings.xml      |   13 ++
 .../resources/language/Romanian/strings.xml        |    8 +
 .../resources/language/Russian/strings.xml         |    8 +
 .../language/Serbian (Cyrillic)/strings.xml        |    8 +
 .../resources/language/Serbian/strings.xml         |    8 +
 .../resources/language/Slovak/strings.xml          |    8 +
 .../resources/language/Slovenian/strings.xml       |    8 +
 .../language/Spanish (Argentina)/strings.xml       |    8 +
 .../language/Spanish (Mexico)/strings.xml          |   11 +
 .../resources/language/Spanish/strings.xml         |   30 +++
 .../resources/language/Swedish/strings.xml         |   30 +++
 .../resources/language/Thai/strings.xml            |    8 +
 .../resources/language/Turkish/strings.xml         |    8 +
 .../resources/language/Ukrainian/strings.xml       |    8 +
 plugin.video.itunes_podcasts/resources/lib/api.py  |    6 +-
 .../resources/settings.xml                         |    2 +-
 plugin.video.m6groupe/addon.py                     |    1 +
 plugin.video.m6groupe/addon.xml                    |   14 +-
 plugin.video.m6groupe/changelog.txt                |   10 +
 plugin.video.m6groupe/resources/lib/catalog.py     |   33 ++-
 71 files changed, 1185 insertions(+), 30 deletions(-)
 copy {plugin.program.advanced.launcher => 
plugin.video.hdtrailers_net}/LICENSE.txt (100%)
 create mode 100644 plugin.video.hdtrailers_net/addon.py
 create mode 100644 plugin.video.hdtrailers_net/addon.xml
 create mode 100644 plugin.video.hdtrailers_net/changelog.txt
 create mode 100644 plugin.video.hdtrailers_net/icon.png
 copy {plugin.audio.radio_de => 
plugin.video.hdtrailers_net}/resources/__init__.py (100%)
 create mode 100644 
plugin.video.hdtrailers_net/resources/language/English/strings.xml
 create mode 100644 
plugin.video.hdtrailers_net/resources/language/German/strings.xml
 copy {plugin.audio.radio_de/resources => 
plugin.video.hdtrailers_net/resources/lib}/__init__.py (100%)
 create mode 100644 plugin.video.hdtrailers_net/resources/lib/scraper.py
 create mode 100644 plugin.video.hdtrailers_net/resources/settings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Afrikaans/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Amharic/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Arabic/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Basque/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Belarusian/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Bulgarian/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Catalan/strings.xml
 create mode 100644 plugin.video.itunes_podcasts/resources/language/Chinese 
(Simple)/strings.xml
 create mode 100644 plugin.video.itunes_podcasts/resources/language/Chinese 
(Traditional)/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Croatian/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Czech/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Danish/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Dutch/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Esperanto/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Estonian/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Finnish/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/French/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Galician/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Greek/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Hebrew/strings.xml
 create mode 100644 plugin.video.itunes_podcasts/resources/language/Hindi 
(Devanagiri)/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Hungarian/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Icelandic/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Indonesian/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Italian/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Japanese/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Korean/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Lithuanian/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Malayalam/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Norwegian/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Polish/strings.xml
 create mode 100644 plugin.video.itunes_podcasts/resources/language/Portuguese 
(Brazil)/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Portuguese/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Romanian/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Russian/strings.xml
 create mode 100644 plugin.video.itunes_podcasts/resources/language/Serbian 
(Cyrillic)/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Serbian/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Slovak/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Slovenian/strings.xml
 create mode 100644 plugin.video.itunes_podcasts/resources/language/Spanish 
(Argentina)/strings.xml
 create mode 100644 plugin.video.itunes_podcasts/resources/language/Spanish 
(Mexico)/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Spanish/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Swedish/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Thai/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Turkish/strings.xml
 create mode 100644 
plugin.video.itunes_podcasts/resources/language/Ukrainian/strings.xml


hooks/post-receive
-- 
Plugins

------------------------------------------------------------------------------
Master HTML5, CSS3, ASP.NET, MVC, AJAX, Knockout.js, Web API and
much more. Get web development skills now with LearnDevNow -
350+ hours of step-by-step video tutorials by Microsoft MVPs and experts.
SALE $99.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122812

_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

[Xbmc-addons] Plugins branch, frodo, updated. ce507898d177ccdbc6c43b4ef667ca863f434d17

Reply via email to