The branch, eden has been updated
via 15c8849cc900637a9b8b482d8d4969ba48c7d965 (commit)
via c99d449b46537d464b92abfc75a265478fb65eeb (commit)
via 157b4c9e11669084b546f9045d8674e0bbb40906 (commit)
from c989a7679d8bd81ed16d8f52f3dc3e5fa9454306 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=15c8849cc900637a9b8b482d8d4969ba48c7d965
commit 15c8849cc900637a9b8b482d8d4969ba48c7d965
Author: spiff <[email protected]>
Date: Tue Apr 17 09:21:33 2012 +0200
[plugin.video.visir] updated to version 1.2.0
diff --git a/plugin.video.visir/addon.xml b/plugin.video.visir/addon.xml
index 7968661..02861ed 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.1.0"
+ version="1.2.0"
provider-name="haukurhaf">
<requires>
<import addon="xbmc.python" version="2.0"/>
diff --git a/plugin.video.visir/changelog.txt b/plugin.video.visir/changelog.txt
index 2644aab..810620a 100644
--- a/plugin.video.visir/changelog.txt
+++ b/plugin.video.visir/changelog.txt
@@ -1,3 +1,7 @@
+Version 1.2.0:
+
+ Some flash based streams where not working (for example sports/EPL).
Needed to add special handling for those to work.
+
Version 1.1.0:
Support for live broadcasts (when airing)
diff --git a/plugin.video.visir/default.py b/plugin.video.visir/default.py
index 89bce1f..bd0b2f6 100644
--- a/plugin.video.visir/default.py
+++ b/plugin.video.visir/default.py
@@ -4,10 +4,6 @@
# VÃsir - VefTV
# Author: Haukur H. Ãórsson (haukurhaf.net)
# Play videos from the video section at Visir.is - a local media company in
Iceland.
-# Inspired by the Sarpur video plugin by Dagur.
-# 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.
import urllib, urllib2, re, xbmcaddon, xbmcplugin, xbmcgui, xbmc
from datetime import datetime, timedelta
@@ -56,16 +52,23 @@ def showVideos(category):
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)
+ data = getVideoData(file)
+
+ rtmpurl = data["rtmpurl"]
+ swfplayer = data["swfplayer"]
+ playpath = data["playpath"]
+
+ if (len(swfplayer) > 0):
+ item = xbmcgui.ListItem("Flash stream")
+ item.setProperty("PlayPath", playpath)
+ item.setProperty("SWFPlayer", swfplayer)
+ xbmc.Player(xbmc.PLAYER_CORE_DVDPLAYER).play(rtmpurl, item)
+ else:
+ xbmc.Player(xbmc.PLAYER_CORE_DVDPLAYER).play(rtmpurl)
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
-
def get_params():
param=[]
paramstring=sys.argv[2]
diff --git a/plugin.video.visir/scraper.py b/plugin.video.visir/scraper.py
index f56f46c..8afefdb 100644
--- a/plugin.video.visir/scraper.py
+++ b/plugin.video.visir/scraper.py
@@ -56,4 +56,18 @@ def getVideos(category):
fileid =
video["url"].split('=')[-1].replace('CLP','').replace('SRC','').replace('VTV','')
videos.append({"name":video["text"].encode('utf-8'),
"fileid":fileid, "thumbnail":video["image"]})
- return videos
\ No newline at end of file
+ return videos
+
+def getVideoData(fileid):
+ # In the case of EPL videos, those are .flv files which need special
handling :-(
+ if fileid.find("EPL") > -1:
+ html = fetchPage("http://www.visir.is/section/MEDIA99&fileid=";
+ fileid);
+ playpath = html[html.find('displayFlash(')+15:]
+ playpath = playpath[:playpath.find('\'')]
+ return { "rtmpurl":"rtmp://klippur.visir.is/vod/_definst_/",
"playpath":playpath, "swfplayer":"http://www.visir.is/jwplayer/player59.swf"; }
+ else:
+ # Other cases, simply fetch the video URL based on the file Id
+ path =
fetchPage("http://m3.visir.is/sjonvarp/myndband/bara-slod?itemid="; + fileid)
+ return { "rtmpurl":path, "playpath":"", "swfplayer":"" }
+
+
\ No newline at end of file
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=c99d449b46537d464b92abfc75a265478fb65eeb
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=157b4c9e11669084b546f9045d8674e0bbb40906
-----------------------------------------------------------------------
Summary of changes:
.../LICENSE.txt | 0
plugin.video.dmax/addon.xml | 17 +
plugin.video.dmax/changelog.txt | 3 +
plugin.video.dmax/default.py | 174 +++
plugin.video.dmax/icon.png | Bin 0 -> 4206 bytes
plugin.video.dmax/pyamf/LICENSE.txt | 29 +
plugin.video.dmax/pyamf/__init__.py | 848 +++++++++++
plugin.video.dmax/pyamf/_version.py | 4 +
plugin.video.dmax/pyamf/adapters/__init__.py | 91 ++
plugin.video.dmax/pyamf/adapters/_array.py | 20 +
plugin.video.dmax/pyamf/adapters/_collections.py | 20 +
plugin.video.dmax/pyamf/adapters/_decimal.py | 34 +
.../pyamf/adapters/_django_contrib_auth_models.py | 17 +
.../pyamf/adapters/_django_db_models_base.py | 281 ++++
.../pyamf/adapters/_django_db_models_fields.py | 23 +
.../pyamf/adapters/_django_db_models_query.py | 20 +
.../pyamf/adapters/_django_utils_translation.py | 26 +
plugin.video.dmax/pyamf/adapters/_elixir.py | 59 +
.../adapters/_google_appengine_ext_blobstore.py | 77 +
.../pyamf/adapters/_google_appengine_ext_db.py | 331 ++++
plugin.video.dmax/pyamf/adapters/_sets.py | 20 +
.../pyamf/adapters/_sqlalchemy_orm.py | 157 ++
.../pyamf/adapters/_sqlalchemy_orm_collections.py | 20 +
plugin.video.dmax/pyamf/adapters/util.py | 50 +
plugin.video.dmax/pyamf/alias.py | 546 +++++++
plugin.video.dmax/pyamf/amf0.py | 749 +++++++++
plugin.video.dmax/pyamf/amf3.py | 1595 ++++++++++++++++++++
plugin.video.dmax/pyamf/codec.py | 521 +++++++
plugin.video.dmax/pyamf/flex/__init__.py | 263 ++++
plugin.video.dmax/pyamf/flex/data.py | 124 ++
plugin.video.dmax/pyamf/flex/messaging.py | 539 +++++++
plugin.video.dmax/pyamf/python.py | 78 +
plugin.video.dmax/pyamf/remoting/__init__.py | 689 +++++++++
plugin.video.dmax/pyamf/remoting/amf0.py | 135 ++
plugin.video.dmax/pyamf/remoting/amf3.py | 191 +++
.../pyamf/remoting/client/__init__.py | 494 ++++++
.../pyamf/remoting/gateway/__init__.py | 598 ++++++++
plugin.video.dmax/pyamf/remoting/gateway/django.py | 183 +++
plugin.video.dmax/pyamf/remoting/gateway/google.py | 171 +++
.../pyamf/remoting/gateway/twisted.py | 417 +++++
plugin.video.dmax/pyamf/remoting/gateway/wsgi.py | 182 +++
plugin.video.dmax/pyamf/sol.py | 201 +++
plugin.video.dmax/pyamf/tests/__init__.py | 118 ++
plugin.video.dmax/pyamf/tests/adapters/__init__.py | 10 +
.../pyamf/tests/adapters/_google_models.py | 56 +
.../pyamf/tests/adapters/django_app}/__init__.py | 0
.../adapters/django_app/adapters}/__init__.py | 0
.../tests/adapters/django_app/adapters/models.py | 127 ++
.../pyamf/tests/adapters/django_app/settings.py | 6 +
.../pyamf/tests/adapters/test_array.py | 44 +
.../pyamf/tests/adapters/test_collections.py | 74 +
.../pyamf/tests/adapters/test_django.py | 733 +++++++++
.../pyamf/tests/adapters/test_elixir.py | 128 ++
.../pyamf/tests/adapters/test_google.py | 1153 ++++++++++++++
.../pyamf/tests/adapters/test_sqlalchemy.py | 415 +++++
plugin.video.dmax/pyamf/tests/gateway/__init__.py | 8 +
.../pyamf/tests/gateway/test_django.py | 221 +++
.../pyamf/tests/gateway/test_google.py | 138 ++
.../pyamf/tests/gateway/test_twisted.py | 805 ++++++++++
plugin.video.dmax/pyamf/tests/gateway/test_wsgi.py | 174 +++
.../pyamf/tests/imports/spam.py | 0
plugin.video.dmax/pyamf/tests/modules/__init__.py | 2 +
.../pyamf/tests/modules/test_decimal.py | 29 +
plugin.video.dmax/pyamf/tests/modules/test_sets.py | 38 +
plugin.video.dmax/pyamf/tests/remoting/__init__.py | 8 +
.../pyamf/tests/remoting/test_amf0.py | 76 +
.../pyamf/tests/remoting/test_client.py | 611 ++++++++
.../pyamf/tests/remoting/test_remoteobject.py | 247 +++
plugin.video.dmax/pyamf/tests/test_adapters.py | 66 +
.../pyamf/tests/test_adapters_util.py | 72 +
plugin.video.dmax/pyamf/tests/test_alias.py | 1142 ++++++++++++++
plugin.video.dmax/pyamf/tests/test_amf0.py | 1055 +++++++++++++
plugin.video.dmax/pyamf/tests/test_amf3.py | 1541 +++++++++++++++++++
plugin.video.dmax/pyamf/tests/test_basic.py | 604 ++++++++
plugin.video.dmax/pyamf/tests/test_codec.py | 270 ++++
plugin.video.dmax/pyamf/tests/test_flex.py | 232 +++
.../pyamf/tests/test_flex_messaging.py | 195 +++
plugin.video.dmax/pyamf/tests/test_gateway.py | 775 ++++++++++
plugin.video.dmax/pyamf/tests/test_imports.py | 105 ++
plugin.video.dmax/pyamf/tests/test_remoting.py | 390 +++++
plugin.video.dmax/pyamf/tests/test_sol.py | 225 +++
plugin.video.dmax/pyamf/tests/test_util.py | 1170 ++++++++++++++
plugin.video.dmax/pyamf/tests/test_versions.py | 41 +
plugin.video.dmax/pyamf/tests/test_xml.py | 84 +
plugin.video.dmax/pyamf/tests/util.py | 257 ++++
plugin.video.dmax/pyamf/util/__init__.py | 197 +++
plugin.video.dmax/pyamf/util/imports.py | 137 ++
plugin.video.dmax/pyamf/util/pure.py | 700 +++++++++
plugin.video.dmax/pyamf/versions.py | 40 +
plugin.video.dmax/pyamf/xml.py | 165 ++
.../LICENSE.txt | 0
plugin.video.eredivisie-live/README | 6 +
plugin.video.eredivisie-live/addon.xml | 22 +
plugin.video.eredivisie-live/changelog.txt | 5 +
plugin.video.eredivisie-live/default.py | 129 ++
plugin.video.eredivisie-live/icon.png | Bin 0 -> 2427 bytes
plugin.video.visir/addon.xml | 2 +-
plugin.video.visir/changelog.txt | 4 +
plugin.video.visir/default.py | 23 +-
plugin.video.visir/scraper.py | 16 +-
100 files changed, 24876 insertions(+), 12 deletions(-)
copy {plugin.video.cinemassacre => plugin.video.dmax}/LICENSE.txt (100%)
create mode 100644 plugin.video.dmax/addon.xml
create mode 100644 plugin.video.dmax/changelog.txt
create mode 100644 plugin.video.dmax/default.py
create mode 100644 plugin.video.dmax/icon.png
create mode 100644 plugin.video.dmax/pyamf/LICENSE.txt
create mode 100644 plugin.video.dmax/pyamf/__init__.py
create mode 100644 plugin.video.dmax/pyamf/_version.py
create mode 100644 plugin.video.dmax/pyamf/adapters/__init__.py
create mode 100644 plugin.video.dmax/pyamf/adapters/_array.py
create mode 100644 plugin.video.dmax/pyamf/adapters/_collections.py
create mode 100644 plugin.video.dmax/pyamf/adapters/_decimal.py
create mode 100644
plugin.video.dmax/pyamf/adapters/_django_contrib_auth_models.py
create mode 100644 plugin.video.dmax/pyamf/adapters/_django_db_models_base.py
create mode 100644 plugin.video.dmax/pyamf/adapters/_django_db_models_fields.py
create mode 100644 plugin.video.dmax/pyamf/adapters/_django_db_models_query.py
create mode 100644
plugin.video.dmax/pyamf/adapters/_django_utils_translation.py
create mode 100644 plugin.video.dmax/pyamf/adapters/_elixir.py
create mode 100644
plugin.video.dmax/pyamf/adapters/_google_appengine_ext_blobstore.py
create mode 100644 plugin.video.dmax/pyamf/adapters/_google_appengine_ext_db.py
create mode 100644 plugin.video.dmax/pyamf/adapters/_sets.py
create mode 100644 plugin.video.dmax/pyamf/adapters/_sqlalchemy_orm.py
create mode 100644
plugin.video.dmax/pyamf/adapters/_sqlalchemy_orm_collections.py
create mode 100644 plugin.video.dmax/pyamf/adapters/util.py
create mode 100644 plugin.video.dmax/pyamf/alias.py
create mode 100644 plugin.video.dmax/pyamf/amf0.py
create mode 100644 plugin.video.dmax/pyamf/amf3.py
create mode 100644 plugin.video.dmax/pyamf/codec.py
create mode 100644 plugin.video.dmax/pyamf/flex/__init__.py
create mode 100644 plugin.video.dmax/pyamf/flex/data.py
create mode 100644 plugin.video.dmax/pyamf/flex/messaging.py
create mode 100644 plugin.video.dmax/pyamf/python.py
create mode 100644 plugin.video.dmax/pyamf/remoting/__init__.py
create mode 100644 plugin.video.dmax/pyamf/remoting/amf0.py
create mode 100644 plugin.video.dmax/pyamf/remoting/amf3.py
create mode 100644 plugin.video.dmax/pyamf/remoting/client/__init__.py
create mode 100644 plugin.video.dmax/pyamf/remoting/gateway/__init__.py
create mode 100644 plugin.video.dmax/pyamf/remoting/gateway/django.py
create mode 100644 plugin.video.dmax/pyamf/remoting/gateway/google.py
create mode 100644 plugin.video.dmax/pyamf/remoting/gateway/twisted.py
create mode 100644 plugin.video.dmax/pyamf/remoting/gateway/wsgi.py
create mode 100644 plugin.video.dmax/pyamf/sol.py
create mode 100644 plugin.video.dmax/pyamf/tests/__init__.py
create mode 100644 plugin.video.dmax/pyamf/tests/adapters/__init__.py
create mode 100644 plugin.video.dmax/pyamf/tests/adapters/_google_models.py
copy {plugin.audio.radio_de/resources =>
plugin.video.dmax/pyamf/tests/adapters/django_app}/__init__.py (100%)
copy {plugin.audio.radio_de/resources =>
plugin.video.dmax/pyamf/tests/adapters/django_app/adapters}/__init__.py (100%)
create mode 100644
plugin.video.dmax/pyamf/tests/adapters/django_app/adapters/models.py
create mode 100644
plugin.video.dmax/pyamf/tests/adapters/django_app/settings.py
create mode 100644 plugin.video.dmax/pyamf/tests/adapters/test_array.py
create mode 100644 plugin.video.dmax/pyamf/tests/adapters/test_collections.py
create mode 100644 plugin.video.dmax/pyamf/tests/adapters/test_django.py
create mode 100644 plugin.video.dmax/pyamf/tests/adapters/test_elixir.py
create mode 100644 plugin.video.dmax/pyamf/tests/adapters/test_google.py
create mode 100644 plugin.video.dmax/pyamf/tests/adapters/test_sqlalchemy.py
create mode 100644 plugin.video.dmax/pyamf/tests/gateway/__init__.py
create mode 100644 plugin.video.dmax/pyamf/tests/gateway/test_django.py
create mode 100644 plugin.video.dmax/pyamf/tests/gateway/test_google.py
create mode 100644 plugin.video.dmax/pyamf/tests/gateway/test_twisted.py
create mode 100644 plugin.video.dmax/pyamf/tests/gateway/test_wsgi.py
copy plugin.audio.radio_de/resources/__init__.py =>
plugin.video.dmax/pyamf/tests/imports/spam.py (100%)
create mode 100644 plugin.video.dmax/pyamf/tests/modules/__init__.py
create mode 100644 plugin.video.dmax/pyamf/tests/modules/test_decimal.py
create mode 100644 plugin.video.dmax/pyamf/tests/modules/test_sets.py
create mode 100644 plugin.video.dmax/pyamf/tests/remoting/__init__.py
create mode 100644 plugin.video.dmax/pyamf/tests/remoting/test_amf0.py
create mode 100644 plugin.video.dmax/pyamf/tests/remoting/test_client.py
create mode 100644 plugin.video.dmax/pyamf/tests/remoting/test_remoteobject.py
create mode 100644 plugin.video.dmax/pyamf/tests/test_adapters.py
create mode 100644 plugin.video.dmax/pyamf/tests/test_adapters_util.py
create mode 100644 plugin.video.dmax/pyamf/tests/test_alias.py
create mode 100644 plugin.video.dmax/pyamf/tests/test_amf0.py
create mode 100644 plugin.video.dmax/pyamf/tests/test_amf3.py
create mode 100644 plugin.video.dmax/pyamf/tests/test_basic.py
create mode 100644 plugin.video.dmax/pyamf/tests/test_codec.py
create mode 100644 plugin.video.dmax/pyamf/tests/test_flex.py
create mode 100644 plugin.video.dmax/pyamf/tests/test_flex_messaging.py
create mode 100644 plugin.video.dmax/pyamf/tests/test_gateway.py
create mode 100644 plugin.video.dmax/pyamf/tests/test_imports.py
create mode 100644 plugin.video.dmax/pyamf/tests/test_remoting.py
create mode 100644 plugin.video.dmax/pyamf/tests/test_sol.py
create mode 100644 plugin.video.dmax/pyamf/tests/test_util.py
create mode 100644 plugin.video.dmax/pyamf/tests/test_versions.py
create mode 100644 plugin.video.dmax/pyamf/tests/test_xml.py
create mode 100644 plugin.video.dmax/pyamf/tests/util.py
create mode 100644 plugin.video.dmax/pyamf/util/__init__.py
create mode 100644 plugin.video.dmax/pyamf/util/imports.py
create mode 100644 plugin.video.dmax/pyamf/util/pure.py
create mode 100644 plugin.video.dmax/pyamf/versions.py
create mode 100644 plugin.video.dmax/pyamf/xml.py
copy {plugin.audio.abradio.cz => plugin.video.eredivisie-live}/LICENSE.txt
(100%)
create mode 100644 plugin.video.eredivisie-live/README
create mode 100644 plugin.video.eredivisie-live/addon.xml
create mode 100644 plugin.video.eredivisie-live/changelog.txt
create mode 100644 plugin.video.eredivisie-live/default.py
create mode 100644 plugin.video.eredivisie-live/icon.png
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
