The branch, eden has been updated
via a35b7efb39cb7a0642b86f9829ba56624ad4980d (commit)
via 216272be187b82c79a6d87b835dbce5957476f44 (commit)
from 441ba1d737f4405b14b369e2c0898f38ea812792 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=a35b7efb39cb7a0642b86f9829ba56624ad4980d
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=216272be187b82c79a6d87b835dbce5957476f44
commit 216272be187b82c79a6d87b835dbce5957476f44
Author: spiff <[email protected]>
Date: Wed Apr 4 15:01:01 2012 +0200
[plugin.video.visir] updated to version 1.1.0
diff --git a/plugin.video.visir/addon.xml b/plugin.video.visir/addon.xml
index dddf9c0..7968661 100644
--- a/plugin.video.visir/addon.xml
+++ b/plugin.video.visir/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.visir"
name="VÃsir - VefTV"
- version="1.0.0"
+ version="1.1.0"
provider-name="haukurhaf">
<requires>
<import addon="xbmc.python" version="2.0"/>
@@ -14,7 +14,7 @@
</extension>
<extension point="xbmc.addon.metadata">
<summary lang="en">Play videos from the video section at Visir.is - a
local media company in Iceland.</summary>
- <description lang="en">Author: Haukur H. Ãórsson (haukurhaf.net).
Limitations in this version: Live broadcasts from Stod2 are not supported yet.
The plugin does not support paging - it only loads the first 18 videos in each
category.</description>
+ <description lang="en">Author: Haukur H. Ãórsson
(haukurhaf.net)</description>
<platform>all</platform>
</extension>
</addon>
diff --git a/plugin.video.visir/changelog.txt b/plugin.video.visir/changelog.txt
index 63d8e23..2644aab 100644
--- a/plugin.video.visir/changelog.txt
+++ b/plugin.video.visir/changelog.txt
@@ -1,3 +1,8 @@
+Version 1.1.0:
+
+ Support for live broadcasts (when airing)
+ Support for paging in video lists
+
Version 1.0.0:
Inital release.
diff --git a/plugin.video.visir/default.py b/plugin.video.visir/default.py
index 8177d9f..89bce1f 100644
--- a/plugin.video.visir/default.py
+++ b/plugin.video.visir/default.py
@@ -25,16 +25,20 @@ name = None
def showCategories():
categories = getRootCategories()
+
+ if isLiveStreamPlaying():
+ addMenuItem(__language__(32200).encode('utf8'), 'livestream',
'')
+
for category in categories:
addMenuItem(category["name"], 'category', category["id"])
def showCategory(category):
categories = getSubCategories(category)
if not categories:
- showVideos(category+',,')
+ showVideos(category+',,,1')
for category in categories:
- addMenuItem(category["name"], 'videos', category["id"] + ',' +
category["subid"] + ',' + category["type"])
+ addMenuItem(category["name"], 'videos', category["id"] + ',' +
category["subid"] + ',' + category["type"] + ',1')
def showVideos(category):
videos = getVideos(category)
@@ -43,11 +47,21 @@ def showVideos(category):
for video in videos:
addMenuItem(video["name"], 'play', video["fileid"],
video["thumbnail"])
+
+ cat = category.split(',')[0]
+ subcat = category.split(',')[1]
+ type = category.split(',')[2]
+ pageno = category.split(',')[3]
+
+ addMenuItem(__language__(32300).encode('utf8'), 'videos', cat + ',' +
subcat + ',' + type + ',' + str(int(pageno)+1))
def play(file):
file = getVideoUrl(file)
xbmc.Player(xbmc.PLAYER_CORE_DVDPLAYER).play(file)
+def playLiveStream():
+
xbmc.Player(xbmc.PLAYER_CORE_DVDPLAYER).play('http://utsending.visir.is:1935/live/vlc.sdp/playlist.m3u8')
+
def getVideoUrl(fileid):
html =
fetchPage("http://m3.visir.is/sjonvarp/myndband/bara-slod?itemid="; + fileid)
return html
@@ -72,7 +86,7 @@ def get_params():
def addMenuItem(name, action_key, action_value, iconimage='DefaultFolder.png'):
is_folder = True
- if action_key == 'play':
+ if action_key == 'play' or action_key == 'livestream':
is_folder = False
u=sys.argv[0]+"?action_key="+urllib.quote_plus(action_key)+"&action_value="+str(action_value)+"&name="+urllib.quote_plus(name)
liz=xbmcgui.ListItem(name, iconImage=iconimage, thumbnailImage='')
@@ -99,5 +113,7 @@ elif action_key == 'videos':
showVideos(action_value)
elif action_key == 'play':
play(action_value)
+elif action_key == 'livestream':
+ playLiveStream()
xbmcplugin.endOfDirectory(int(sys.argv[1]))
\ No newline at end of file
diff --git a/plugin.video.visir/resources/language/English/strings.xml
b/plugin.video.visir/resources/language/English/strings.xml
index bb38397..c88d450 100644
--- a/plugin.video.visir/resources/language/English/strings.xml
+++ b/plugin.video.visir/resources/language/English/strings.xml
@@ -2,4 +2,6 @@
<strings>
<!-- error -->
<string id="32100">No videos found in the selected category!</string>
+ <string id="32200">Live broadcast</string>
+ <string id="32300">Next page</string>
</strings>
\ No newline at end of file
diff --git a/plugin.video.visir/resources/language/Icelandic/strings.xml
b/plugin.video.visir/resources/language/Icelandic/strings.xml
index 29f4ffb..c11c7b9 100644
--- a/plugin.video.visir/resources/language/Icelandic/strings.xml
+++ b/plugin.video.visir/resources/language/Icelandic/strings.xml
@@ -2,4 +2,6 @@
<strings>
<!-- error -->
<string id="32100">Engin myndbönd fundust í völdum flokki!</string>
+ <string id="32200">Bein útsending</string>
+ <string id="32300">Næsta síða</string>
</strings>
\ No newline at end of file
diff --git a/plugin.video.visir/scraper.py b/plugin.video.visir/scraper.py
index 55bbfc8..f56f46c 100644
--- a/plugin.video.visir/scraper.py
+++ b/plugin.video.visir/scraper.py
@@ -15,6 +15,10 @@ def fetchPage(url):
response.close()
return html
+def isLiveStreamPlaying():
+ html = fetchPage("http://www.visir.is/section/MEDIA";)
+ return html.find("vlc.sdp") > -1
+
def getRootCategories():
categories = []
html = fetchPage("http://www.visir.is/section/MEDIA";)
@@ -44,8 +48,9 @@ def getVideos(category):
cat = category.split(',')[0]
subcat = category.split(',')[1]
type = category.split(',')[2]
+ pageno = category.split(',')[3]
- html =
fetchPage("http://www.visir.is/section/MEDIA01&template=mlist&pageNo=1&kat="; +
cat +"&subkat=" + subcat + "&type=" + type)
+ html =
fetchPage("http://www.visir.is/section/MEDIA01&template=mlist&pageNo="; + pageno
+ "&kat=" + cat +"&subkat=" + subcat + "&type=" + type)
jsonData = json.JSONDecoder('latin1').decode(html)
for video in jsonData['items']:
fileid =
video["url"].split('=')[-1].replace('CLP','').replace('SRC','').replace('VTV','')
-----------------------------------------------------------------------
Summary of changes:
.../LICENSE.txt | 0
plugin.video.myvideo_de/addon.py | 196 +++++++
plugin.video.myvideo_de/addon.xml | 18 +
plugin.video.myvideo_de/changelog.txt | 17 +
plugin.video.myvideo_de/icon.png | Bin 0 -> 23669 bytes
.../resources/__init__.py | 0
.../resources/language/English/strings.xml | 9 +
.../resources/language/German/strings.xml | 9 +
.../resources/lib}/__init__.py | 0
plugin.video.myvideo_de/resources/lib/scraper.py | 618 ++++++++++++++++++++
plugin.video.myvideo_de/resources/settings.xml | 5 +
plugin.video.visir/addon.xml | 4 +-
plugin.video.visir/changelog.txt | 5 +
plugin.video.visir/default.py | 22 +-
.../resources/language/English/strings.xml | 2 +
.../resources/language/Icelandic/strings.xml | 2 +
plugin.video.visir/scraper.py | 7 +-
17 files changed, 908 insertions(+), 6 deletions(-)
copy {plugin.audio.radio_de => plugin.video.myvideo_de}/LICENSE.txt (100%)
create mode 100644 plugin.video.myvideo_de/addon.py
create mode 100644 plugin.video.myvideo_de/addon.xml
create mode 100644 plugin.video.myvideo_de/changelog.txt
create mode 100644 plugin.video.myvideo_de/icon.png
copy {plugin.audio.radio_de => plugin.video.myvideo_de}/resources/__init__.py
(100%)
create mode 100644
plugin.video.myvideo_de/resources/language/English/strings.xml
create mode 100644
plugin.video.myvideo_de/resources/language/German/strings.xml
copy {plugin.audio.radio_de/resources =>
plugin.video.myvideo_de/resources/lib}/__init__.py (100%)
create mode 100644 plugin.video.myvideo_de/resources/lib/scraper.py
create mode 100644 plugin.video.myvideo_de/resources/settings.xml
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Better than sec? Nothing is better than sec when it comes to
monitoring Big Data applications. Try Boundary one-second
resolution app monitoring today. Free.
http://p.sf.net/sfu/Boundary-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
