The branch, frodo has been updated
via 8af753e0599f881f0852cbba061de29be028dadc (commit)
via 45b4b267402d8b3b71396a46f3580d2efbd3ac84 (commit)
from 26d063f548519d0a52898fe3254e1c2c51f579b0 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=8af753e0599f881f0852cbba061de29be028dadc
commit 8af753e0599f881f0852cbba061de29be028dadc
Author: beenje <[email protected]>
Date: Wed Apr 24 22:28:40 2013 +0200
[plugin.audio.shoutcast] updated to version 2.2.0
diff --git a/plugin.audio.shoutcast/addon.py b/plugin.audio.shoutcast/addon.py
index a8265aa..91b489e 100644
--- a/plugin.audio.shoutcast/addon.py
+++ b/plugin.audio.shoutcast/addon.py
@@ -166,7 +166,14 @@ def __add_stations(stations):
items = []
show_bitrate = plugin.get_setting('show_bitrate_in_title', bool)
choose_random = plugin.get_setting('choose_random_server', bool)
+ if plugin.get_setting('bitrate_filter_enabled', bool):
+ bitrates = (96, 128, 160, 192)
+ min_bitrate = plugin.get_setting('bitrate_filter', choices=bitrates)
+ else:
+ min_bitrate = None
for i, station in enumerate(stations):
+ if min_bitrate and int(station.get('bitrate', 0)) < min_bitrate:
+ continue
station_id = str(station['id'])
if not station_id in my_stations_ids:
context_menu = [(
@@ -174,7 +181,7 @@ def __add_stations(stations):
'XBMC.RunPlugin(%s)' % plugin.url_for(
endpoint='add_to_my_stations',
station_id=station_id,
- station_name=station['name']
+ station_name=station['name'].encode('utf-8')
)
)]
else:
diff --git a/plugin.audio.shoutcast/addon.xml b/plugin.audio.shoutcast/addon.xml
index 7b5699a..c132de4 100644
--- a/plugin.audio.shoutcast/addon.xml
+++ b/plugin.audio.shoutcast/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.audio.shoutcast" name="SHOUTcast 2" version="2.1.1"
provider-name="Tristan Fischer ([email protected])">
+<addon id="plugin.audio.shoutcast" name="SHOUTcast 2" version="2.2.0"
provider-name="Tristan Fischer ([email protected])">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.simplejson" version="2.0.10"/>
@@ -12,6 +12,11 @@
<extension point="xbmc.addon.metadata">
<language></language>
<platform>all</platform>
+ <website>http://www.shoutcast.com/</website>
+ <source>https://github.com/dersphere/plugin.audio.shoutcast</source>
+ <forum>http://forum.xbmc.org/showthread.php?tid=143678</forum>
+ <email>[email protected]</email>
+ <license>GNU GENERAL PUBLIC LICENSE. Version 2, June 1991</license>
<summary lang="be">more than 50.000 free internet radio
stations</summary>
<summary lang="da">mere end 50.000 gratis netradiostationer</summary>
<summary lang="de">mehr als 50.000 kostenlose Internet Radio
Sender</summary>
diff --git a/plugin.audio.shoutcast/changelog.txt
b/plugin.audio.shoutcast/changelog.txt
index 4758a99..2f8dbe5 100644
--- a/plugin.audio.shoutcast/changelog.txt
+++ b/plugin.audio.shoutcast/changelog.txt
@@ -1,17 +1,22 @@
-2.1.1
+2.2.0 (23.04.2013)
+ - fixed unicode related error (Top 500 was broken)
+ - added bitrate filter
+ - updated translations
+
+2.1.1 (09.03.2013)
- updated translations
- migrated to xbmcswift2 v2.4.0
-2.1.0
+2.1.0 (30.01.2013)
- Rename Add-on to "SHOUTcast" to match guidelines
- Changed to xbmcswift2 v1.3
- Fix Sorting
- updated translations
-2.0.1
+2.0.1 (02.11.2012)
- added method and setting for auto choose server (don't ask for playlist
entries)
-2.0.0
+2.0.0 (unreleased)
- Initial Release
- Features:
Top 500 Stations
diff --git a/plugin.audio.shoutcast/resources/language/English/strings.xml
b/plugin.audio.shoutcast/resources/language/English/strings.xml
index 42e669d..9fa82aa 100644
--- a/plugin.audio.shoutcast/resources/language/English/strings.xml
+++ b/plugin.audio.shoutcast/resources/language/English/strings.xml
@@ -21,6 +21,12 @@
<string id="30101">Num stations in list</string>
<string id="30102">Show Bitrate in Title</string>
<string id="30103">Choose a random server (Don't ask)</string>
+ <string id="30104">Filter stations by minium Bitrate</string>
+ <string id="30110">Minimum Bitrate</string>
+ <string id="30111">96 kbit/s</string>
+ <string id="30112">128 kbit/s</string>
+ <string id="30113">160 kbit/s</string>
+ <string id="30114">192 kbit/s</string>
<!-- Messages -->
<string id="30200">Network Error</string>
diff --git a/plugin.audio.shoutcast/resources/settings.xml
b/plugin.audio.shoutcast/resources/settings.xml
index 6e9c337..0117754 100644
--- a/plugin.audio.shoutcast/resources/settings.xml
+++ b/plugin.audio.shoutcast/resources/settings.xml
@@ -3,5 +3,7 @@
<setting id="choose_random_server" type="bool" label="30103"
default="true"/>
<setting id="show_subgenres" type="bool" label="30100" default="false"/>
<setting id="show_bitrate_in_title" type="bool" label="30102"
default="false"/>
+ <setting id="bitrate_filter_enabled" type="bool" label="30104"
default="false"/>
+ <setting id="bitrate_filter" type="enum" label="30110" default="1"
lvalues="30111|30112|30113|30114" enable="eq(-1,true)"/>
<setting id="limit" type="number" label="30101" default="500"/>
</settings>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=45b4b267402d8b3b71396a46f3580d2efbd3ac84
commit 45b4b267402d8b3b71396a46f3580d2efbd3ac84
Author: beenje <[email protected]>
Date: Wed Apr 24 22:25:55 2013 +0200
[plugin.video.nascar] updated to version 2.0.1
diff --git a/plugin.video.nascar/addon.xml b/plugin.video.nascar/addon.xml
index 89cc8b9..191ba45 100644
--- a/plugin.video.nascar/addon.xml
+++ b/plugin.video.nascar/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.nascar"
name="Nascar.com"
- version="2.0.0"
+ version="2.0.1"
provider-name="divingmule">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
diff --git a/plugin.video.nascar/changelog.txt
b/plugin.video.nascar/changelog.txt
index 70ed883..94d3b77 100644
--- a/plugin.video.nascar/changelog.txt
+++ b/plugin.video.nascar/changelog.txt
@@ -1,3 +1,6 @@
+Version 2.0.1
+fix website changes
+
Version 2.0.0
major version bump for frodo
major update, the old video feed isn't updated anymore, now scrapping the
website
diff --git a/plugin.video.nascar/default.py b/plugin.video.nascar/default.py
index 287618e..0c0f334 100644
--- a/plugin.video.nascar/default.py
+++ b/plugin.video.nascar/default.py
@@ -8,6 +8,7 @@ import xbmcgui
import xbmcaddon
from BeautifulSoup import BeautifulSoup
from pyamf import remoting
+from traceback import print_exc
addon = xbmcaddon.Addon(id='plugin.video.nascar')
home = xbmc.translatePath(addon.getAddonInfo('path'))
@@ -55,7 +56,15 @@ def get_video_items(url, featured=False):
items = soup.find('div', attrs={'class':
"articlesList"})('article')
for i in items:
if featured:
- title = re.findall('"linkText":"(.+?)"', str(i))[0]
+ try:
+ a_dict =
eval(i.img['data-tracking-params'].replace('\r\n', ''))
+ title = a_dict['eVar1']
+ except:
+ try:
+ title = re.findall('"eVar1":"(.+?)\n",',
str(i.img))[0].strip()
+ except:
+ print_exc
+ pass
item_id =
i.img['data-ajax-post-data'].split('=')[1].split('&')[0]
thumb = i.img['data-resp-url']
else:
@@ -158,7 +167,7 @@ if mode==None:
'sort': ['recent', 'popular']
}
videos_url = (
-
'http://www.nascar.com/en_us/%snews-media.all.0.videos.all.all.%s.%s.html'
+
'http://www.nascar.com/en_us/%snews-media.all.0.videos.all.all.%s.%s.all.html'
%(sort['series'][int(addon.getSetting('series'))],
sort['time'][int(addon.getSetting('time'))],
sort['sort'][int(addon.getSetting('sort'))])
-----------------------------------------------------------------------
Summary of changes:
plugin.audio.shoutcast/addon.py | 9 ++++++++-
plugin.audio.shoutcast/addon.xml | 7 ++++++-
plugin.audio.shoutcast/changelog.txt | 13 +++++++++----
.../resources/language/Bulgarian/strings.xml | 2 --
.../resources/language/English/strings.xml | 6 ++++++
.../resources/language/Hebrew/strings.xml | 2 --
plugin.audio.shoutcast/resources/settings.xml | 2 ++
plugin.video.nascar/addon.xml | 2 +-
plugin.video.nascar/changelog.txt | 3 +++
plugin.video.nascar/default.py | 13 +++++++++++--
10 files changed, 46 insertions(+), 13 deletions(-)
copy {plugin.video.itunes_podcasts =>
plugin.audio.shoutcast}/resources/language/Bulgarian/strings.xml (91%)
copy {plugin.video.itunes_podcasts =>
plugin.audio.shoutcast}/resources/language/Hebrew/strings.xml (91%)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_apr
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
