The branch, eden has been updated
via 0046d8f1cf2cc48bfd225eff741a365a32c2d02d (commit)
via 5b54f845fda03033421749b57ada5ad997e5cfb5 (commit)
from 4cb5349c24de822d418ed1210587f21de9d28d5c (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=0046d8f1cf2cc48bfd225eff741a365a32c2d02d
commit 0046d8f1cf2cc48bfd225eff741a365a32c2d02d
Author: spiff <[email protected]>
Date: Tue Oct 9 10:00:10 2012 +0200
[plugin.video.borsentv.dk] updated to version 1.0.3
diff --git a/.gitignore b/.gitignore
index ebe98a0..03ad345 100644
--- a/.gitignore
+++ b/.gitignore
@@ -101,3 +101,5 @@ plugin.video.filmarkivet/.gitignore
plugin.video.videovideo.dk/.git
plugin.video.videovideo.dk/.idea
plugin.video.nolife/.hg
+plugin.video.borsentv/.idea
+plugin.video.borsentv/.git
diff --git a/plugin.video.borsentv.dk/addon.py
b/plugin.video.borsentv.dk/addon.py
index 0d35f83..16617b9 100644
--- a/plugin.video.borsentv.dk/addon.py
+++ b/plugin.video.borsentv.dk/addon.py
@@ -1,98 +1,62 @@
+#
+# Copyright (C) 2012 Tommy Winther
+# http://tommy.winther.nu
+#
+# This Program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This Program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this Program; see the file LICENSE.txt. If not, write to
+# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# http://www.gnu.org/copyleft/gpl.html
+#
import os
import sys
import urlparse
import urllib2
import re
import datetime
-from elementtree import ElementTree
+
+import buggalo
import xbmcgui
import xbmcaddon
import xbmcplugin
-CATEGORIES = {
- 30100 : '',
- 30101 : 'investor.html',
- 30102 : 'privatoekonomi.html',
- 30103 : 'oekonomi.html',
- 30104 : 'politik.html',
- 30105 : 'it.html',
- 30106 : 'karriere.html',
- 30107 : 'weekend.html'
+BASE_URL = 'http://borsen.dk/tv/'
+FEEDS = {
+ 30100 : 'rss://borsen.dk/podcast/alle',
+ 30108 : 'rss://borsen.dk/podcast/investor1000',
+ 30101 : 'rss://borsen.dk/podcast/investor',
+ 30106 : 'rss://borsen.dk/podcast/karriere',
+ 30104 : 'rss://borsen.dk/podcast/politik',
+ 30103 : 'rss://borsen.dk/podcast/politik',
+ 30102 : 'rss://borsen.dk/podcast/politik'
}
-URL = 'http://borsentv.dk/%s'
-VIDEO_URL =
'http://borsentv.dk/services/frontend/borsentv/mFrontendT2_latestClips.php?%s'
-RTMP_URL = 'rtmp://stream.borsentv.dk/arkiv'
-RTMP_PATH = 'borsen_tv/mp4:%s.mp4'
-
class BorsenTVAddon(object):
def showCategories(self):
- for id, slug in CATEGORIES.items():
+ for id in FEEDS.keys():
item = xbmcgui.ListItem(ADDON.getLocalizedString(id), iconImage =
ICON)
- xbmcplugin.addDirectoryItem(HANDLE, PATH + '?category=%d' % id,
item, isFolder = True)
+ xbmcplugin.addDirectoryItem(HANDLE, FEEDS[id], item, isFolder =
True)
xbmcplugin.endOfDirectory(HANDLE)
- def showCategory(self, id):
- url = URL % CATEGORIES[int(id)]
- u = urllib2.urlopen(url)
- html = u.read()
- u.close()
-
- xml = ''
- m = re.search("'(perpage=[^']+)'", html)
- if m:
- url = VIDEO_URL % m.group(1).replace('%26', '&')
- u = urllib2.urlopen(url)
- xml = u.read()
- u.close()
-
-
- dom = ElementTree.fromstring(xml)
- for video in dom.find('videos/tab'):
- sThumb = video.findtext('sthumb').replace('_125.jpg', '.jpg')
- date = self._parseDate(video.findtext('hour'))
-
- item = xbmcgui.ListItem(video.findtext('title'), iconImage =
sThumb, thumbnailImage = sThumb)
- item.setProperty('Fanart_Image', sThumb)
- item.setInfo('video', infoLabels = {
- 'title' : video.findtext('title'),
- 'plot' : video.findtext('description').replace('<br />', ''),
- 'date' : date.strftime('%d.%m.%Y'),
- 'aired' : date.strftime('%d-%m-%Y'),
- 'studio' : ADDON.getAddonInfo('name'),
- 'year' : int(date.strftime('%Y'))
- })
-
- # Parse video id from file_url
- m = re.search('([0-9]+)$', video.findtext('file_url'))
- url = RTMP_PATH % m.group(1)
- xbmcplugin.addDirectoryItem(HANDLE, RTMP_URL + ' playpath=' + url,
item)
-
- xbmcplugin.addSortMethod(HANDLE, xbmcplugin.SORT_METHOD_DATE)
- xbmcplugin.endOfDirectory(HANDLE)
-
- def _parseDate(self, input):
- d = datetime.datetime.now()
- if input.find('/') > 0:
- m = re.search('([0-9]+)/([0-9]+)', input)
- d = datetime.datetime(year = d.year, month = int(m.group(2)), day
= int(m.group(1)))
-
- return d
-
if __name__ == '__main__':
- ADDON = xbmcaddon.Addon(id = 'plugin.video.borsentv.dk')
- PATH = sys.argv[0]
+ ADDON = xbmcaddon.Addon()
HANDLE = int(sys.argv[1])
- PARAMS = urlparse.parse_qs(sys.argv[2][1:])
-
ICON = os.path.join(ADDON.getAddonInfo('path'), 'icon.png')
- btv = BorsenTVAddon()
- if PARAMS.has_key('category'):
- btv.showCategory(PARAMS['category'][0])
- else:
+ buggalo.SUBMIT_URL = 'http://tommy.winther.nu/exception/submit.php'
+ try:
+ btv = BorsenTVAddon()
btv.showCategories()
-
-
+ except Exception:
+ buggalo.onExceptionRaised()
diff --git a/plugin.video.borsentv.dk/addon.xml
b/plugin.video.borsentv.dk/addon.xml
index dbbf5da..2400ebc 100644
--- a/plugin.video.borsentv.dk/addon.xml
+++ b/plugin.video.borsentv.dk/addon.xml
@@ -1,20 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.borsentv.dk" version="1.0.1" name="Børsen TV"
provider-name="twinther [[email protected]]">
+<addon id="plugin.video.borsentv.dk" version="1.0.3" name="Børsen TV"
provider-name="twinther [[email protected]]">
<requires>
<import addon="xbmc.python" version="2.0"/>
- <import addon="script.module.elementtree" version="1.2.7"/>
+ <import addon="script.module.buggalo" version="1.0.1"/>
</requires>
<extension point="xbmc.python.pluginsource" library="addon.py">
<provides>video</provides>
</extension>
<extension point="xbmc.addon.metadata">
<summary lang="en">Borsen TV</summary>
- <description lang="en">Borsen TV is Dagbladet Borsens TV station on
the internet, that focuses on business and finance, but also covers politics,
culture among other things.[CR][CR]If you have comments or suggestions for this
addon, please feel free to participate in the debate on my blog at
http://tommy.winther.nu</description>
- <disclaimer lang="en">Some parts of this addon may not be legal in
your country of residence - please check with your local laws.</disclaimer>
+ <description lang="en">Borsen TV is Dagbladet Borsens TV station on
the internet that focuses on business and finance, but also covers politics and
culture among other things.[CR][CR]If you have comments or suggestions for this
addon, please feel free to participate in the debate on my blog at
http://tommy.winther.nu</description>
<summary lang="da">Børsen TV</summary>
- <description lang="da">Børsen TV er Dagbladet Børsens TV kanal på
nettet, som har fokus på erhvervs- og finansstof, men som også dækker
politik, kultur og samfundsøkonomi.[CR][CR]Har du kommentarer, ris eller ros
til denne addon er du velkommen til at deltage i debatten på min blog på
http://tommy.winther.nu</description>
- <disclaimer lang="da">Nogle dele af denne addon er muligvis ikke
lovlig i dit land - kontroller venligst dine lokale love.</disclaimer>
+ <description lang="da">Børsen TV er Dagbladet Børsens TV kanal på
nettet som har fokus på erhvervs- og finansstof, men som også dækker
politik, kultur og samfundsøkonomi.[CR][CR]Har du kommentarer, ris eller ros
til denne addon er du velkommen til at deltage i debatten på min blog på
http://tommy.winther.nu</description>
<license>GPL 2.0</license>
<platform>all</platform>
+ <language>da</language>
</extension>
</addon>
diff --git a/plugin.video.borsentv.dk/changelog.txt
b/plugin.video.borsentv.dk/changelog.txt
index 382f77d..84acd80 100644
--- a/plugin.video.borsentv.dk/changelog.txt
+++ b/plugin.video.borsentv.dk/changelog.txt
@@ -1,3 +1,11 @@
+[B]Version 1.0.3 - 2012-10-03[/B]
+- Changed addon to use RSS feeds to greatly simplify the codebase
+
+[B]Version 1.0.2 - 2012-09-09[/B]
+- Updated to match site changes
+- Changed video streams to use M3U8 links
+- Now using script.module.buggalo
+
[B]Version 1.0.1 - 2011-12-18[/B]
- Fixed icon dimensions
diff --git a/plugin.video.borsentv.dk/resources/language/Danish/strings.xml
b/plugin.video.borsentv.dk/resources/language/Danish/strings.xml
index 0bb99cb..aec4ff9 100644
--- a/plugin.video.borsentv.dk/resources/language/Danish/strings.xml
+++ b/plugin.video.borsentv.dk/resources/language/Danish/strings.xml
@@ -8,4 +8,5 @@
<string id="30105">IT</string>
<string id="30106">Karriere</string>
<string id="30107">Weekend</string>
+ <string id="30108">Investor 1000</string>
</strings>
\ No newline at end of file
diff --git a/plugin.video.borsentv.dk/resources/language/English/strings.xml
b/plugin.video.borsentv.dk/resources/language/English/strings.xml
index a58f810..c12ef92 100644
--- a/plugin.video.borsentv.dk/resources/language/English/strings.xml
+++ b/plugin.video.borsentv.dk/resources/language/English/strings.xml
@@ -8,4 +8,5 @@
<string id="30105">IT</string>
<string id="30106">Career</string>
<string id="30107">Weekend</string>
+ <string id="30108">Investor 1000</string>
</strings>
\ No newline at end of file
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=5b54f845fda03033421749b57ada5ad997e5cfb5
commit 5b54f845fda03033421749b57ada5ad997e5cfb5
Author: spiff <[email protected]>
Date: Tue Oct 9 09:58:05 2012 +0200
[plugin.video.fox.news] updated to version 2.0.5
diff --git a/plugin.video.fox.news/addon.xml b/plugin.video.fox.news/addon.xml
index 7f86bc2..c23008f 100644
--- a/plugin.video.fox.news/addon.xml
+++ b/plugin.video.fox.news/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.fox.news"
name="Fox News"
- version="2.0.4"
+ version="2.0.5"
provider-name="divingmule">
<requires>
<import addon="xbmc.python" version="2.0"/>
diff --git a/plugin.video.fox.news/changelog.txt
b/plugin.video.fox.news/changelog.txt
index baf5101..a2c14a5 100644
--- a/plugin.video.fox.news/changelog.txt
+++ b/plugin.video.fox.news/changelog.txt
@@ -1,3 +1,6 @@
+Version 2.0.5
+fix for setting type change
+
Version 2.0.4
updated to reflect website changes
diff --git a/plugin.video.fox.news/default.py b/plugin.video.fox.news/default.py
index 4b7e13d..b227c51 100644
--- a/plugin.video.fox.news/default.py
+++ b/plugin.video.fox.news/default.py
@@ -17,7 +17,7 @@ __language__ = __settings__.getLocalizedString
home = __settings__.getAddonInfo('path')
icon = xbmc.translatePath( os.path.join( home, 'icon.png' ) )
cache = StorageServer.StorageServer("foxnews", 24)
-quality = __settings__.getSetting('video_quality')
+quality = __settings__.getSetting('quality')
def make_request(url, headers=None):
diff --git a/plugin.video.fox.news/resources/settings.xml
b/plugin.video.fox.news/resources/settings.xml
index a540172..a986c34 100644
--- a/plugin.video.fox.news/resources/settings.xml
+++ b/plugin.video.fox.news/resources/settings.xml
@@ -1,3 +1,3 @@
<settings>
- <setting id="video_quality" type="enum" lvalues="30002|30003|30004|30005"
values="0|1|2|3" label="30001" default="HIGH"/>
+ <setting id="quality" type="enum" lvalues="30002|30003|30004|30005"
values="0|1|2|3" label="30001" default="0"/>
</settings>
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 2 +
plugin.video.borsentv.dk/addon.py | 112 +++++++-------------
plugin.video.borsentv.dk/addon.xml | 11 +-
plugin.video.borsentv.dk/changelog.txt | 8 ++
.../resources/language/Danish/strings.xml | 1 +
.../resources/language/English/strings.xml | 1 +
plugin.video.fox.news/addon.xml | 2 +-
plugin.video.fox.news/changelog.txt | 3 +
plugin.video.fox.news/default.py | 2 +-
plugin.video.fox.news/resources/settings.xml | 2 +-
10 files changed, 61 insertions(+), 83 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Don't let slow site performance ruin your business. Deploy New Relic APM
Deploy New Relic app performance management and know exactly
what is happening inside your Ruby, Python, PHP, Java, and .NET app
Try New Relic at no cost today and get our sweet Data Nerd shirt too!
http://p.sf.net/sfu/newrelic-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
