The branch, eden has been updated
via e3ecabf0cf20df9b6c86892c4e962876e910d7ad (commit)
via b96729b0648bdabb86bd2902656e75e3107a81ba (commit)
via c7f0678deeea6aaf879dfd5de608d36226fda99a (commit)
via e137e898f14b1d29e8277236a188a44ad5e191e4 (commit)
via df4f88ea80917ee8e72f9d35df520c7d659c6d9e (commit)
from 556b1612f021649f97e21550d326f050d6accf09 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=e3ecabf0cf20df9b6c86892c4e962876e910d7ad
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=b96729b0648bdabb86bd2902656e75e3107a81ba
commit b96729b0648bdabb86bd2902656e75e3107a81ba
Author: beenje <[email protected]>
Date: Fri Dec 28 23:11:45 2012 +0100
[plugin.audio.di.fm] updated to version 2.1.1
diff --git a/plugin.audio.di.fm/addon.xml b/plugin.audio.di.fm/addon.xml
index dd09d3a..9d110d1 100644
--- a/plugin.audio.di.fm/addon.xml
+++ b/plugin.audio.di.fm/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.audio.di.fm"
name="Digitally Imported"
- version="2.1.0"
+ version="2.1.1"
provider-name="qualisoft.dk - Tim C. Steinmetz">
<requires>
<import addon="xbmc.python" version="2.0"/>
diff --git a/plugin.audio.di.fm/changelog.txt b/plugin.audio.di.fm/changelog.txt
index d03dec7..c62f519 100644
--- a/plugin.audio.di.fm/changelog.txt
+++ b/plugin.audio.di.fm/changelog.txt
@@ -3,6 +3,11 @@
- Removed feature
+22 December 2012 v2.1.1
+* Made 256k quality selectable from config (duh!)
+* 256k is now default quality for Premium members
+
+
8 December 2012 v2.1.0
+ Added a 4th stream quality option for Premium members: 256k/sec MP3
+ Now using the config.ini file to hopefully streamline the process of
updating the di.fm/sky.fm/jazzradio.com plugins
diff --git a/plugin.audio.di.fm/resources/language/English/strings.xml
b/plugin.audio.di.fm/resources/language/English/strings.xml
index a7c3637..e007bd0 100644
--- a/plugin.audio.di.fm/resources/language/English/strings.xml
+++ b/plugin.audio.di.fm/resources/language/English/strings.xml
@@ -18,7 +18,7 @@
<string id="30014">General</string>
<string id="30015">Get HQ streams with DI Premium at
http://www.di.fm</string>
- <string id="30016">Version: 2.0.0</string>
+ <string id="30016">Version: 2.1.1</string>
<string id="30017">Author: Tim C. 'Bitcrusher' Steinmetz</string>
<string id="30018">Homepage: http://qualisoft.dk</string>
<string id="30019">E-mail: [email protected]</string>
diff --git a/plugin.audio.di.fm/resources/settings.xml
b/plugin.audio.di.fm/resources/settings.xml
index 1dcc53b..a298cd5 100644
--- a/plugin.audio.di.fm/resources/settings.xml
+++ b/plugin.audio.di.fm/resources/settings.xml
@@ -13,7 +13,8 @@
<category label="30002">
<setting id="username" type="text" label="30003" />
<setting id="password" type="text" option="hidden"
label="30004" />
- <setting id="bitrate" type="enum" label="30013"
values="40|64|128" default="2" />
+ <setting id="bitrate" type="enum" label="30013"
+ values="40|64|128|256" default="3" />
<setting id="usefavorites" type="bool" label="30005"
default="false" />
<setting id="forceupdate" type="bool" label="30010"
default="false" />
<setting type="lsep" label="30017" />
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=c7f0678deeea6aaf879dfd5de608d36226fda99a
commit c7f0678deeea6aaf879dfd5de608d36226fda99a
Author: beenje <[email protected]>
Date: Fri Dec 28 23:11:40 2012 +0100
[plugin.audio.jazzradio.com] updated to version 1.1.1
diff --git a/plugin.audio.jazzradio.com/addon.xml
b/plugin.audio.jazzradio.com/addon.xml
index 3f61a57..cfe859f 100644
--- a/plugin.audio.jazzradio.com/addon.xml
+++ b/plugin.audio.jazzradio.com/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.audio.jazzradio.com"
name="JazzRadio.com"
- version="1.1.0"
+ version="1.1.1"
provider-name="qualisoft.dk - Tim C. Steinmetz">
<requires>
<import addon="xbmc.python" version="2.0"/>
diff --git a/plugin.audio.jazzradio.com/changelog.txt
b/plugin.audio.jazzradio.com/changelog.txt
index d7fd42d..9509362 100644
--- a/plugin.audio.jazzradio.com/changelog.txt
+++ b/plugin.audio.jazzradio.com/changelog.txt
@@ -3,6 +3,11 @@
- Removed feature
+22 December 2012 v1.1.1
+* Made 256k quality selectable from config (duh!)
+* 256k is now default quality for Premium members
+
+
8 December 2012 v1.1.0
+ Added a 4th stream quality option for Premium members: 256k/sec MP3
+ Now using the config.ini file to hopefully streamline the process of
updating the di.fm/sky.fm/jazzradio.com plugins
diff --git a/plugin.audio.jazzradio.com/resources/language/English/strings.xml
b/plugin.audio.jazzradio.com/resources/language/English/strings.xml
index 7b705dd..2b874be 100644
--- a/plugin.audio.jazzradio.com/resources/language/English/strings.xml
+++ b/plugin.audio.jazzradio.com/resources/language/English/strings.xml
@@ -18,7 +18,7 @@
<string id="30014">General</string>
<string id="30015">Get HQ streams with Jazz Radio Premium at
http://www.jazzradio.com</string>
- <string id="30016">Version: 1.0.0</string>
+ <string id="30016">Version: 1.1.1</string>
<string id="30017">Author: Tim C. 'Bitcrusher' Steinmetz</string>
<string id="30018">Homepage: http://qualisoft.dk</string>
<string id="30019">E-mail: [email protected]</string>
diff --git a/plugin.audio.jazzradio.com/resources/settings.xml
b/plugin.audio.jazzradio.com/resources/settings.xml
index 1dcc53b..bc91e57 100644
--- a/plugin.audio.jazzradio.com/resources/settings.xml
+++ b/plugin.audio.jazzradio.com/resources/settings.xml
@@ -13,7 +13,7 @@
<category label="30002">
<setting id="username" type="text" label="30003" />
<setting id="password" type="text" option="hidden"
label="30004" />
- <setting id="bitrate" type="enum" label="30013"
values="40|64|128" default="2" />
+ <setting id="bitrate" type="enum" label="30013"
values="40|64|128|256" default="3" />
<setting id="usefavorites" type="bool" label="30005"
default="false" />
<setting id="forceupdate" type="bool" label="30010"
default="false" />
<setting type="lsep" label="30017" />
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=e137e898f14b1d29e8277236a188a44ad5e191e4
commit e137e898f14b1d29e8277236a188a44ad5e191e4
Author: beenje <[email protected]>
Date: Fri Dec 28 22:53:01 2012 +0100
[plugin.video.m6groupe] updated to version 1.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..59e0adf 100644
--- a/plugin.video.m6groupe/addon.xml
+++ b/plugin.video.m6groupe/addon.xml
@@ -1,5 +1,5 @@
<?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="1.0.3"
provider-name="beenje">
<requires>
<import addon="xbmc.python" version="2.0"/>
<import addon="script.module.xbmcswift2" version="1.3"/>
@@ -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..919b31d 100644
--- a/plugin.video.m6groupe/changelog.txt
+++ b/plugin.video.m6groupe/changelog.txt
@@ -1,3 +1,9 @@
+[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'
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=df4f88ea80917ee8e72f9d35df520c7d659c6d9e
commit df4f88ea80917ee8e72f9d35df520c7d659c6d9e
Author: beenje <[email protected]>
Date: Fri Dec 28 22:51:41 2012 +0100
[plugin.video.arretsurimages] updated to version 2.2.2
diff --git a/plugin.video.arretsurimages/addon.xml
b/plugin.video.arretsurimages/addon.xml
index 02da4dc..406355a 100644
--- a/plugin.video.arretsurimages/addon.xml
+++ b/plugin.video.arretsurimages/addon.xml
@@ -1,7 +1,7 @@
<?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.2.2"
provider-name="beenje">
<requires>
<import addon="xbmc.python" version="2.0"/>
diff --git a/plugin.video.arretsurimages/changelog.txt
b/plugin.video.arretsurimages/changelog.txt
index 950df8b..ed02304 100644
--- a/plugin.video.arretsurimages/changelog.txt
+++ b/plugin.video.arretsurimages/changelog.txt
@@ -1,3 +1,7 @@
+[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):
-----------------------------------------------------------------------
Summary of changes:
plugin.audio.di.fm/addon.xml | 2 +-
plugin.audio.di.fm/changelog.txt | 5 +
.../resources/language/English/strings.xml | 2 +-
plugin.audio.di.fm/resources/settings.xml | 3 +-
plugin.audio.jazzradio.com/addon.xml | 2 +-
plugin.audio.jazzradio.com/changelog.txt | 5 +
.../resources/language/English/strings.xml | 2 +-
plugin.audio.jazzradio.com/resources/settings.xml | 2 +-
plugin.video.arretsurimages/addon.xml | 2 +-
plugin.video.arretsurimages/changelog.txt | 4 +
.../resources/lib/scraper.py | 2 +-
plugin.video.m6groupe/addon.py | 1 +
plugin.video.m6groupe/addon.xml | 10 +-
plugin.video.m6groupe/changelog.txt | 6 +
plugin.video.m6groupe/resources/lib/catalog.py | 33 +++--
.../LICENSE.txt | 0
plugin.video.medi1tv/Medi1TVScraper.py | 145 ++++++++++++++++++++
plugin.video.medi1tv/Medi1Utils.py | 92 +++++++++++++
plugin.video.medi1tv/README.md | 12 ++
plugin.video.medi1tv/addon.py | 90 ++++++++++++
plugin.video.medi1tv/addon.xml | 60 ++++++++
plugin.video.medi1tv/icon.png | Bin 0 -> 16372 bytes
.../resources/__init__.py | 0
.../resources/lib}/__init__.py | 0
24 files changed, 457 insertions(+), 23 deletions(-)
copy {plugin.audio.dradio => plugin.video.medi1tv}/LICENSE.txt (100%)
create mode 100644 plugin.video.medi1tv/Medi1TVScraper.py
create mode 100644 plugin.video.medi1tv/Medi1Utils.py
create mode 100644 plugin.video.medi1tv/README.md
create mode 100644 plugin.video.medi1tv/addon.py
create mode 100644 plugin.video.medi1tv/addon.xml
create mode 100644 plugin.video.medi1tv/icon.png
copy {plugin.audio.radio_de => plugin.video.medi1tv}/resources/__init__.py
(100%)
copy {plugin.audio.radio_de/resources =>
plugin.video.medi1tv/resources/lib}/__init__.py (100%)
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
