The branch, dharma has been updated
via 98b68466c068eb5a9c36c58676b4d8c001213af2 (commit)
via c4d6a20c3287c46ae6b29c9cd3f3f5f109e4fb0a (commit)
via f5bc06c94cc2f042b35a9e95f6c36b1e5a4d9896 (commit)
from 7ce71243dbac3c969164659bb0df1e688e28e770 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=98b68466c068eb5a9c36c58676b4d8c001213af2
commit 98b68466c068eb5a9c36c58676b4d8c001213af2
Author: spiff <[email protected]>
Date: Sat Aug 13 12:01:39 2011 +0200
[plugin.video.sc2casts] updated to version 0.4.4
diff --git a/plugin.video.sc2casts/addon.xml b/plugin.video.sc2casts/addon.xml
index bff5536..1e27776 100644
--- a/plugin.video.sc2casts/addon.xml
+++ b/plugin.video.sc2casts/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.sc2casts"
name="SC2Casts"
- version="0.4.3"
+ version="0.4.4"
provider-name="Krill">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/plugin.video.sc2casts/changelog.txt
b/plugin.video.sc2casts/changelog.txt
index 7f3e7c1..94bb6da 100644
--- a/plugin.video.sc2casts/changelog.txt
+++ b/plugin.video.sc2casts/changelog.txt
@@ -1,3 +1,7 @@
+v0.4.4
+----------------------
+- Updated some code due to changes on Youtube
+
v0.4.3
----------------------
- Updated the code
diff --git a/plugin.video.sc2casts/default.py b/plugin.video.sc2casts/default.py
index 42fb45e..d769f27 100644
--- a/plugin.video.sc2casts/default.py
+++ b/plugin.video.sc2casts/default.py
@@ -1,6 +1,6 @@
import sys, xbmc, xbmcplugin, xbmcaddon, sc2casts
-__version__ = "0.4.2"
+__version__ = "0.4.4"
__plugin__ = "SC2Casts-" + __version__
__author__ = "Kristoffer Petersson"
__settings__ = xbmcaddon.Addon(id='plugin.video.sc2casts')
diff --git a/plugin.video.sc2casts/sc2casts.py
b/plugin.video.sc2casts/sc2casts.py
index 342cadb..7277280 100644
--- a/plugin.video.sc2casts/sc2casts.py
+++ b/plugin.video.sc2casts/sc2casts.py
@@ -199,30 +199,20 @@ class SC2Casts:
return link
def getVideoUrl(self, url):
+ print url
link =
self.getRequest('http://www.youtube.com/watch?v='+url+'&safeSearch=none&hl=en_us')
- fmtSource = re.findall('"fmt_url_map": "([^"]+)"', link)
- fmt_url_map = urllib.unquote_plus(fmtSource[0]).split('|')
+ fmtSource = re.findall('"url_encoded_fmt_stream_map":
"([^"]+)"', link)
+ fmt_url_map = urllib.unquote_plus(fmtSource[0]).split(',url=')
links = {}
for fmt_url in fmt_url_map:
- if (len(fmt_url) > 7):
- if (fmt_url.rfind(',') > fmt_url.rfind('&id=')):
- final_url = fmt_url[:fmt_url.rfind(',')]
- final_url =
final_url.replace('\u0026','&')
- if (final_url.rfind('itag=') > 0):
- quality =
final_url[final_url.rfind('itag=') + 5:]
- quality =
quality[:quality.find('&')]
- else:
- quality = "5"
- links[int(quality)] =
final_url.replace('\/','/')
- else :
- final_url = fmt_url
- if (final_url.rfind('itag=') > 0):
- quality =
final_url[final_url.rfind('itag=') + 5:]
- quality =
quality[:quality.find('&')]
- else :
- quality = "5"
- links[int(quality)] =
final_url.replace('\/','/')
+ url = fmt_url.replace('\u0026','&')
+ quality = url[url.rfind('&itag=')+6:]
+ if(url.find('&itag=')!=url.rfind('&itag=')):
+ url = url[:url.rfind('&itag=')]
+ if (url.rfind('; codecs')>0):
+ url = url[:url.rfind(';
codecs')]
+ links[int(quality)] = url
hd_quality = int(self.__settings__.getSetting( "hd_videos" ))
get = links.get
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=c4d6a20c3287c46ae6b29c9cd3f3f5f109e4fb0a
commit c4d6a20c3287c46ae6b29c9cd3f3f5f109e4fb0a
Author: spiff <[email protected]>
Date: Sat Aug 13 12:00:37 2011 +0200
[plugin.video.dr.dk.live] updated to version 1.3.0
diff --git a/.gitignore b/.gitignore
index 13e27d2..1981bce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,5 @@ plugin.video.aljazeera/.gitignore
plugin.video.dr.dk.podcast/.git
plugin.video.dr.dk.podcast/.idea
plugin.audio.dr.dk.netradio/.git
+plugin.video.dr.dk.live/.git
+plugin.video.dr.dk.live/.idea
diff --git a/plugin.video.dr.dk.live/addon.py b/plugin.video.dr.dk.live/addon.py
index 2c4db72..53a3d3b 100644
--- a/plugin.video.dr.dk.live/addon.py
+++ b/plugin.video.dr.dk.live/addon.py
@@ -1,11 +1,11 @@
import sys
+import cgi as urlparse
import xbmc
+import xbmcaddon
import xbmcgui
import xbmcplugin
-import danishaddons
-
# High : 1000 kb/s
# Medium : 500 kb/s
# Low : 300 kb/s
@@ -48,31 +48,24 @@ CHANNELS = [
'high' : 'mms://stream.nordjyske.dk/24nordjyske - Full Broadcast
Quality',
'medium' : 'mms://stream.nordjyske.dk/24nordjyske'
}
- },
- # From:
http://ft.arkena.tv/xml/core_player_clip_data_v2.php?wtve=187&wtvl=2&wtvk=012536940751284
- {'name' : 'Folketinget', 'urls' : {
- 'high' : 'rtmp://chip.arkena.com/webtvftfl/hi1'
- }
- }
-]
+ }]
def showChannels():
-
for idx, c in enumerate(CHANNELS):
- icon = danishaddons.ADDON_PATH + "/resources/logos/" +
c['name'].replace(" ", "_") + ".png"
+ icon = ADDON.getAddonInfo('path') + "/resources/logos/" +
c['name'].replace(" ", "_") + ".png"
if c['urls'].has_key(getQuality()):
item = xbmcgui.ListItem(c['name'], iconImage = icon)
- url = danishaddons.ADDON_PATH + '?idx=' + str(idx)
- xbmcplugin.addDirectoryItem(danishaddons.ADDON_HANDLE, url, item,
True)
+ url = PATH + '?idx=' + str(idx)
+ xbmcplugin.addDirectoryItem(HANDLE, url, item, True)
- xbmcplugin.endOfDirectory(danishaddons.ADDON_HANDLE)
+ xbmcplugin.endOfDirectory(HANDLE)
def playChannel(idx):
c = CHANNELS[int(idx)]
q = getQuality()
- icon = danishaddons.ADDON_PATH + "/resources/logos/" + c['name'].replace("
", "_") + ".png"
+ icon = ADDON.getAddonInfo('path') + "/resources/logos/" +
c['name'].replace(" ", "_") + ".png"
if c['urls'].has_key(q):
item = xbmcgui.ListItem(c['name'], thumbnailImage = icon)
@@ -80,17 +73,20 @@ def playChannel(idx):
xbmc.Player().play(c['urls'][q], item)
else:
d = xbmcgui.Dialog()
- d.ok(c['name'], danishaddons.msg(30001) % q.capitalize(),
danishaddons.msg(30002))
+ d.ok(c['name'], ADDON.getLocalizedString(30001) % q.capitalize(),
ADDON.getLocalizedString(30002))
def getQuality():
- return danishaddons.ADDON.getSetting('quality').lower()
+ return ADDON.getSetting('quality').lower()
if __name__ == '__main__':
- danishaddons.init(sys.argv)
+ ADDON = xbmcaddon.Addon(id = 'plugin.video.dr.dk.live')
+ PATH = sys.argv[0]
+ HANDLE = int(sys.argv[1])
+ PARAMS = urlparse.parse_qs(sys.argv[2][1:])
- if danishaddons.ADDON_PARAMS.has_key('idx'):
- playChannel(danishaddons.ADDON_PARAMS['idx'])
+ if PARAMS.has_key('idx'):
+ playChannel(PARAMS['idx'][0])
else:
showChannels()
diff --git a/plugin.video.dr.dk.live/addon.xml
b/plugin.video.dr.dk.live/addon.xml
index f385167..3fac195 100644
--- a/plugin.video.dr.dk.live/addon.xml
+++ b/plugin.video.dr.dk.live/addon.xml
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="plugin.video.dr.dk.live"
- version="1.2.3"
+ version="1.3.0"
name="Danish Live TV"
provider-name="twinther [[email protected]]">
<requires>
<import addon="xbmc.python" version="1.0"/>
- <import addon="script.module.danishaddons" version="1.1.0"/>
</requires>
<extension point="xbmc.python.pluginsource" library="addon.py">
<provides>video</provides>
@@ -14,8 +13,8 @@
<extension point="xbmc.addon.metadata">
<summary lang="en">Watch Danish Live TV</summary>
<summary lang="da">Se dansk Live TV</summary>
- <description lang="en">Live steams for[CR]DR1[CR]DR2[CR]DR
Update[CR]DR K[CR]DR Ramasjang[CR]24 Nordjyske[CR]Folketinget</description>
- <description lang="da">Live steams for[CR]DR1[CR]DR2[CR]DR
Update[CR]DR K[CR]DR Ramasjang[CR]24 Nordjyske[CR]Folketinget</description>
+ <description lang="en">Live steams for[CR]DR1[CR]DR2[CR]DR
Update[CR]DR K[CR]DR Ramasjang[CR]24 Nordjyske</description>
+ <description lang="da">Live steams for[CR]DR1[CR]DR2[CR]DR
Update[CR]DR K[CR]DR Ramasjang[CR]24 Nordjyske</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>
<disclaimer lang="da">Nogle dele af denne addon er muligvis ikke
lovlig i dit land - kontroller venligst dine lokale love.</disclaimer>
<license>GPL 2.0</license>
diff --git a/plugin.video.dr.dk.live/changelog.txt
b/plugin.video.dr.dk.live/changelog.txt
index b7c73ea..efea0ac 100644
--- a/plugin.video.dr.dk.live/changelog.txt
+++ b/plugin.video.dr.dk.live/changelog.txt
@@ -1,3 +1,7 @@
+[B]Version 1.3.0 - 2011-08-12[/B]
+- Removed dependency on script.module.danishaddons
+- Removed Folketinget as stream was broken
+
[B]Version 1.2.3[/B]
- Removed all usages of os.getcwd()
diff --git a/plugin.video.dr.dk.live/resources/language/English/strings.xml
b/plugin.video.dr.dk.live/resources/language/English/strings.xml
index 8e88b0b..8ff73c4 100644
--- a/plugin.video.dr.dk.live/resources/language/English/strings.xml
+++ b/plugin.video.dr.dk.live/resources/language/English/strings.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
- <string id="30001">This channel is not available in %s quality.</string>
- <string id="30002">Change the quality setting and try again.</string>
- <string id="30100">General</string>
- <string id="30101">Quality</string>
+ <string id="30001">This channel is not available in %s quality.</string>
+ <string id="30002">Change the quality setting and try again.</string>
+ <string id="30100">General</string>
+ <string id="30101">Quality</string>
</strings>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=f5bc06c94cc2f042b35a9e95f6c36b1e5a4d9896
commit f5bc06c94cc2f042b35a9e95f6c36b1e5a4d9896
Author: spiff <[email protected]>
Date: Sat Aug 13 11:57:08 2011 +0200
[plugin.video.musicvideojukebox] updated to version 1.0.2
diff --git a/plugin.video.musicvideojukebox/Default.py
b/plugin.video.musicvideojukebox/Default.py
index f67975f..4a4b8f3 100644
--- a/plugin.video.musicvideojukebox/Default.py
+++ b/plugin.video.musicvideojukebox/Default.py
@@ -121,21 +121,36 @@ def playVideo(params):
response =
getHttpResponse("http://www.youtube.com/watch?v=%s&safeSearch=none&hl=en_us"; %
videoId)
''' get urls from response '''
- fmturlmaps = re.findall('"fmt_url_map": "([^"]+)"', response);
+ ''' fmturlmaps = re.findall('"fmt_url_map": "([^"]+)"', response); '''
+ fmturlmaps = re.findall('"url_encoded_fmt_stream_map": "([^"]+)"',
response);
+
''' we only need the first fmturlmaps '''
fmturlmaps = fmturlmaps[0].split(',')
urls = {}
for fmturlmap in fmturlmaps:
+ fmturlmap = fmturlmap.replace("url=", "");
+
+ ''' itag= '''
+ itag = fmturlmap[fmturlmap.rfind("itag=") + 5:];
+
''' split by | '''
- fmtinfo = fmturlmap.split( '|' )
- urls[int(fmtinfo[0])] = fmtinfo[1].replace('\/', '/')
+ ''' fmtinfo = fmturlmap.split( '|' ) '''
+ ''' urls[int(fmtinfo[0])] = fmtinfo[1].replace('\/', '/') '''
+
+ ''' cut last part '''
+ urlparts = fmturlmap.split('\u0026');
+
+ urls[int(itag)] = urllib.unquote_plus(urlparts[0]);
+
+
''' get highest available format:
SD videos: 35, 34, 18, 5
HD videos: 22 (720p), 37 (1080p)
- '''
+ '''
+
''' get preferred format from settings '''
quality = int(__settings__.getSetting("quality"))
@@ -152,7 +167,7 @@ def playVideo(params):
elif urls.get(5):
url = urls.get(5)
- url = url.replace('\u0026', '&');
+ ''' url = url.replace('\u0026', '&'); '''
listitem=xbmcgui.ListItem(label=params.get('title'),
iconImage=params.get('thumbnail'), thumbnailImage=params.get('thumbnail'),
path=url);
''' listitem.setInfo(type='Video', infoLabels=labels) '''
diff --git a/plugin.video.musicvideojukebox/addon.xml
b/plugin.video.musicvideojukebox/addon.xml
index 4a6d11c..84af91c 100644
--- a/plugin.video.musicvideojukebox/addon.xml
+++ b/plugin.video.musicvideojukebox/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.musicvideojukebox"
name="Music Video Jukebox"
- version="1.0.1"
+ version="1.0.2"
provider-name="iZE">
<requires>
<import addon="xbmc.python" version="1.0"/>
@@ -15,5 +15,4 @@
<summary lang="en">Search for an artist and it will play up to 150 music
videos of that artist.</summary>
<description lang="en">This plugin uses Google Suggest API, Last.fm and
YouTube to search for music videos of an artist, and plays up to 150 music
videos of that artist.</description>
</extension>
- <broken>Reported broken by several forum users</broken>
</addon>
diff --git a/plugin.video.musicvideojukebox/changelog.txt
b/plugin.video.musicvideojukebox/changelog.txt
index 123b41e..bbe788a 100644
--- a/plugin.video.musicvideojukebox/changelog.txt
+++ b/plugin.video.musicvideojukebox/changelog.txt
@@ -1,3 +1,7 @@
+Version 1.0.2
+-------------
+- fixed problem with the plugin not being able to play the videos due to
changes on the Youtube website
+
Version 1.0.1
-------------
- youtube changed something in the format of the response that provides the
urls to the video's, the plugin now takes care of that new response.
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 2 +
plugin.video.dr.dk.live/addon.py | 36 +++++++++-----------
plugin.video.dr.dk.live/addon.xml | 7 ++--
plugin.video.dr.dk.live/changelog.txt | 4 ++
.../resources/language/English/strings.xml | 8 ++--
.../resources/logos/Folketinget.png | Bin 3710 -> 0 bytes
plugin.video.dr.dk.live/test.py | 30 ----------------
plugin.video.musicvideojukebox/Default.py | 25 +++++++++++---
plugin.video.musicvideojukebox/addon.xml | 3 +-
plugin.video.musicvideojukebox/changelog.txt | 4 ++
plugin.video.sc2casts/addon.xml | 2 +-
plugin.video.sc2casts/changelog.txt | 4 ++
plugin.video.sc2casts/default.py | 2 +-
plugin.video.sc2casts/sc2casts.py | 30 +++++-----------
14 files changed, 70 insertions(+), 87 deletions(-)
delete mode 100644 plugin.video.dr.dk.live/resources/logos/Folketinget.png
delete mode 100644 plugin.video.dr.dk.live/test.py
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
FREE DOWNLOAD - uberSVN with Social Coding for Subversion.
Subversion made easy with a complete admin console. Easy
to use, easy to manage, easy to install, easy to extend.
Get a Free download of the new open ALM Subversion platform now.
http://p.sf.net/sfu/wandisco-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
