The branch, frodo has been updated
via 87c10567554e3c3aed7ab8fface7a342ddb5dab4 (commit)
from da3544a2b3ffd6dc20aba536499597a84ebb6d5f (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=87c10567554e3c3aed7ab8fface7a342ddb5dab4
commit 87c10567554e3c3aed7ab8fface7a342ddb5dab4
Author: beenje <[email protected]>
Date: Thu Jan 2 22:51:18 2014 +0100
[plugin.audio.di.fm] updated to version 3.0.1
diff --git a/plugin.audio.di.fm/addon.xml b/plugin.audio.di.fm/addon.xml
index 49aadba..1eb28b5 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="3.0.0"
+ version="3.0.1"
provider-name="qualisoft.dk - Tim C. Steinmetz">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
diff --git a/plugin.audio.di.fm/changelog.txt b/plugin.audio.di.fm/changelog.txt
index ee33635..356c241 100644
--- a/plugin.audio.di.fm/changelog.txt
+++ b/plugin.audio.di.fm/changelog.txt
@@ -3,24 +3,28 @@
- Removed feature
-31 December 2013 v3.0.0
+1. January 2014 v3.0.1
+* Cache file pathing on OSes not using *UNIX syntax (Windows)
+
+
+31. December 2013 v3.0.0
+ Rewrote whole plugin
+ Threading of playlists parsing to speed up first run and refreshing of
playlists - 8 threads
* Now fully support the new di.fm design
- Check-in with stats are gone for now
-20 May 2013 v2.1.2
+20. May 2013 v2.1.2
* Fixed problems related to new Digitally Imported webpage
Thanks to Vidar Waagbø for the regex patch
-22 December 2012 v2.1.1
+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
+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
* Fixed it so UTF8 chars is handled correctly in channelnames
@@ -28,7 +32,7 @@
was actually the one belonging to the next channelname, etc.
-2 Oct 2012 v2.0.0
+2. Oct 2012 v2.0.0
+ Using JSON to get streams addresses instead of parsing the HTML for them
+ Added an indication of what quality the stream is, shown as i.e: 64 kb
* Complete rewrite of the codebase, making it more modular and generally
awesomer
@@ -40,13 +44,13 @@
Thanks to DexN for making me aware of the JSON data and for being my willing
guinea pig ;)
-25 Apr 2012 v1.1.1
+25. Apr 2012 v1.1.1
* Changed cache path from using xbmc.getaddoninfo('path') to
xbmc.getaddoninfo('profile')
* Renamed resource/language/english to resource/language/English
* Localized on-screen strings (used in dialogboxes)
-22 Apr 2012 v1.1.0
+22. Apr 2012 v1.1.0
+ The addon is now GPL2
+ Added AAC+ streams - 1/2 bandwidth for the same quali
+ Channelart will automatically be downloaded - for when new channels are added
@@ -59,7 +63,7 @@ Thanks to DexN for making me aware of the JSON data and for
being my willing gui
- Removed MP3 stream support
-4 Jan 2012 v1.0
+4. Jan 2012 v1.0
+ Added channelgraphics for 3 new channels
+ Now supports DI Premium - highquality 256k streams
+ DI Premium members can choose between 256k and 128k streams
@@ -69,11 +73,11 @@ Thanks to DexN for making me aware of the JSON data and for
being my willing gui
* Removed the "Digitally Imported - " substring that had been added to
streamnames
-25 Jul 2011 v0.71
+25. Jul 2011 v0.71
* Fixed a bug when setting "Stream cache expiration" to 0 - it actually works
now
-23 Jul 2011 v0.7
+23. Jul 2011 v0.7
+ Initial stable release
+ Only supports public streams
+ Sort channels by A-Z or list them in the order they are shown on di.fm
diff --git a/plugin.audio.di.fm/config.ini b/plugin.audio.di.fm/config.ini
index f75518e..660e51e 100644
--- a/plugin.audio.di.fm/config.ini
+++ b/plugin.audio.di.fm/config.ini
@@ -1,7 +1,7 @@
# DI.fm XBMC config
[plugin]
id = plugin.audio.di.fm
-date = 31. December 2013
+date = 1. January 2014
checkinkey = a57ab7ceada3fefeaa70a7136ab05f9af5ebac82
[cache]
diff --git a/plugin.audio.di.fm/default.py b/plugin.audio.di.fm/default.py
index 90ed3af..d4215c4 100644
--- a/plugin.audio.di.fm/default.py
+++ b/plugin.audio.di.fm/default.py
@@ -195,7 +195,7 @@ class musicAddonXbmc:
# if we could not reach di.fm at all
if not html:
- xbmc.log('di.fm could not be reached', xbmc.LOGWARNING)
+ xbmc.log(u'di.fm could not be reached', xbmc.LOGWARNING)
xbmcgui.Dialog().ok(ADDON.getLocalizedString(30100),
ADDON.getLocalizedString(30101),
ADDON.getLocalizedString(30102),
@@ -228,12 +228,12 @@ class musicAddonXbmc:
# Saves channels to cache and reset the "force update" flag
if len(channels) > 0:
- pickle.dump(self.channelsList, open("%s/%s" %
(self.addonProfilePath, pluginConfig.get('cache', 'cacheChannels')), "w"),
protocol=0)
+ pickle.dump(self.channelsList,
open(os.path.join(self.addonProfilePath, pluginConfig.get('cache',
'cacheChannels')), "w"), protocol=0)
ADDON.setSetting(id="forceupdate", value="false")
# else load channels from cache file
else:
- self.channelsList = pickle.load(open(("%s/%s" %
(self.addonProfilePath, pluginConfig.get('cache', 'cacheChannels'))), "r"))
+ self.channelsList =
pickle.load(open(os.path.join(self.addonProfilePath, pluginConfig.get('cache',
'cacheChannels')), "r"))
for channel in self.channelsList:
self.addItem(channel['name'],
@@ -312,7 +312,7 @@ class musicAddonXbmc:
# tart it up a bit if it's a new channel
if isNewChannel:
li = xbmcgui.ListItem(label="[COLOR FF007EFF]" + channelTitle +
"[/COLOR]", thumbnailImage=icon)
- xbmc.log("New channel found: " + channelTitle, xbmc.LOGERROR)
+ xbmc.log(u"New channel found: %s" % channelTitle.encode('ascii',
'xmlcharrefreplace'), xbmc.LOGERROR)
else:
li = xbmcgui.ListItem(label=channelTitle, thumbnailImage=icon)
@@ -384,10 +384,10 @@ class musicAddonXbmc:
try:
if ADDON.getSetting("forceupdate") == "true":
re_config =
re.compile("NS\('AudioAddict.API'\).Config\s*=\s*([^;]+);", re.M | re.I)
- pickle.dump(re_config.findall(html)[0], open("%s/%s" %
(self.addonProfilePath, pluginConfig.get('cache', 'cachePremiumConfig')), "w"),
protocol=0)
+ pickle.dump(re_config.findall(html)[0],
open(os.path.join(self.addonProfilePath, pluginConfig.get('cache',
'cachePremiumConfig')), "w"), protocol=0)
premiumConfig = json.loads(re_config.findall(html)[0])
else:
- premiumConfig = json.loads(pickle.load(open(("%s/%s" %
(self.addonProfilePath, pluginConfig.get('cache', 'cachePremiumConfig'))),
"r")))
+ premiumConfig =
json.loads(pickle.load(open(os.path.join(self.addonProfilePath,
pluginConfig.get('cache', 'cachePremiumConfig')), "r")))
return premiumConfig
except Exception:
sys.exc_clear() # Clears all exceptions so the script will
continue to run
@@ -400,23 +400,23 @@ class musicAddonXbmc:
def checkFileTime(self, filename, days):
if not os.path.exists(self.addonProfilePath):
os.makedirs(self.addonProfilePath)
- return False
+ return True
daysInSecs = int(days)*60*60*24
- file = "%s%s" % (self.addonProfilePath, filename)
+ file = os.path.join(self.addonProfilePath, filename)
# If file exists, check timestamp
if os.path.exists(file):
if os.path.getmtime(file) > (time.time() - daysInSecs):
- xbmc.log('It has not been %s days since %s was last updated' %
(days, file), xbmc.LOGNOTICE)
+ xbmc.log(u'It has not been %s days since %s was last updated'
% (days, file), xbmc.LOGNOTICE)
return False
else:
- xbmc.log('The cache file %s + has expired' % file,
xbmc.LOGNOTICE)
+ xbmc.log(u'The cache file %s + has expired' % file,
xbmc.LOGNOTICE)
return True
# If file does not exist, return true so the file will be created by
scraping the page
else:
- xbmc.log('The cache file %s does not exist' % file, xbmc.LOGNOTICE)
+ xbmc.log(u'The cache file %s does not exist' % file,
xbmc.LOGNOTICE)
return True
diff --git a/plugin.audio.di.fm/resources/language/English/strings.xml
b/plugin.audio.di.fm/resources/language/English/strings.xml
index d24aff2..5b3fe05 100644
--- a/plugin.audio.di.fm/resources/language/English/strings.xml
+++ b/plugin.audio.di.fm/resources/language/English/strings.xml
@@ -24,7 +24,7 @@
<string id="30009">Homepage</string>
<string id="30015">Get HQ 256kb/sec streams with DI Premium at
http://www.di.fm</string>
- <string id="30016">Version: 3.0.0</string>
+ <string id="30016">Version: 3.0.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>
-----------------------------------------------------------------------
Summary of changes:
plugin.audio.di.fm/addon.xml | 2 +-
plugin.audio.di.fm/changelog.txt | 24 +++++++++++--------
plugin.audio.di.fm/config.ini | 2 +-
plugin.audio.di.fm/default.py | 22 +++++++++---------
.../resources/language/English/strings.xml | 2 +-
5 files changed, 28 insertions(+), 24 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
