The branch, frodo has been updated
via 2f504e7d1d7aeccb658bdc2968e17a1a19c61e5b (commit)
via fbd2c754c957f87d7086c13464d3fecf153a52e0 (commit)
via 915a67fa1515c632a0b94c46106f3205cead3371 (commit)
via cdd97b2c872c4b67e87f981cdd2b1756cf6d9b15 (commit)
via 1ea3d619d739336457b6b263e98c105be770b7b3 (commit)
from 4402e16e2644def7f47bfb000082289019e76b73 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=2f504e7d1d7aeccb658bdc2968e17a1a19c61e5b
commit 2f504e7d1d7aeccb658bdc2968e17a1a19c61e5b
Author: Martijn Kaijser <[email protected]>
Date: Fri Oct 3 21:05:12 2014 +0200
[plugin.video.sarpur] 3.1.3
diff --git a/plugin.video.sarpur/addon.xml b/plugin.video.sarpur/addon.xml
index 6b8b4ea..2f5e52f 100644
--- a/plugin.video.sarpur/addon.xml
+++ b/plugin.video.sarpur/addon.xml
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.sarpur"
name="Sarpur"
- version="3.1.2"
+ version="3.1.3"
provider-name="Dagur Páll Ammendrup">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.html5lib" version="0.999"/>
<import addon="script.module.simplejson" version="2.0.10"/>
+ <import addon="script.module.requests" version="2.3.0"/>
</requires>
<extension point="xbmc.python.pluginsource"
library="default.py">
diff --git a/plugin.video.sarpur/changelog.txt
b/plugin.video.sarpur/changelog.txt
index f4a0019..c8823dc 100644
--- a/plugin.video.sarpur/changelog.txt
+++ b/plugin.video.sarpur/changelog.txt
@@ -1,3 +1,6 @@
+[B]Version 3.1.3[/B]
+- Added requests to imports
+
[B]Version 3.1.2[/B]
- Switched from lxml to plain etree
diff --git a/plugin.video.sarpur/default.py b/plugin.video.sarpur/default.py
index c55cc53..e937394 100644
--- a/plugin.video.sarpur/default.py
+++ b/plugin.video.sarpur/default.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# encoding: UTF-8
-
+import sys
import sarpur
import urlparse
import xbmcplugin
@@ -32,7 +32,7 @@ try:
actions.tab_index(action_value)
elif action_key == 'view_podcast_index':
actions.podcast_index()
- elif action_key =='view_podcast_show':
+ elif action_key == 'view_podcast_show':
actions.podcast_show(action_value, name)
elif action_key == 'play_podcast':
actions.play_podcast(action_value)
@@ -40,7 +40,8 @@ try:
actions.play_live_stream(action_value)
else:
- logger.log("Action: {0}, Value: {1}, Name: {2}".format(action_key,
action_value, name))
+ logger.log("Action: {0}, Value: {1}, Name: {2}".format(
+ action_key, action_value, name))
finally:
xbmcplugin.endOfDirectory(sarpur.ADDON_HANDLE)
diff --git a/plugin.video.sarpur/sarpur/actions.py
b/plugin.video.sarpur/sarpur/actions.py
index 8482e58..993a443 100644
--- a/plugin.video.sarpur/sarpur/actions.py
+++ b/plugin.video.sarpur/sarpur/actions.py
@@ -3,55 +3,59 @@
import sarpur
-import scraper
+import sarpur.scraper as scraper
import util.player as player
from sarpur.cached import Categories
from util.gui import GUI
-gui = GUI(sarpur.ADDON_HANDLE, sarpur.BASE_URL)
-cats = Categories()
+INTERFACE = GUI(sarpur.ADDON_HANDLE, sarpur.BASE_URL)
+CATS = Categories()
def index():
- """ The front page (i.e. the first one the user sees when opening the
plugin) """
+ """
+ The front page (i.e. the first one the user sees when opening the plugin)
+ """
- for tab in cats.tabs:
+ for tab in CATS.tabs:
title = tab[0].encode('utf-8')
url = tab[1].encode('utf-8')
- gui.addDir(title, 'view_tab', url)
+ INTERFACE.addDir(title, 'view_tab', url)
- for i, channel in enumerate(cats.showtree):
+ for i, channel in enumerate(CATS.showtree):
title = '{0} Ãættir'.format(channel['name'].encode('utf-8'))
- gui.addDir(title, 'view_channel_index', i)
+ INTERFACE.addDir(title, 'view_channel_index', i)
- gui.addDir('Hlaðvarp', 'view_podcast_index', '')
- gui.addItem('Bein úttsending: RÃV', 'play_live', 'ruv')
- gui.addItem('Bein úttsending: RÃS 1', 'play_live', 'ras1')
- gui.addItem('Bein úttsending: RÃS 2', 'play_live', 'ras2')
- gui.addItem('Bein úttsending: RONDÃ', 'play_live', 'rondo')
+ INTERFACE.addDir('Hlaðvarp', 'view_podcast_index', '')
+ INTERFACE.addItem('Bein úttsending: RÃV', 'play_live', 'ruv')
+ INTERFACE.addItem('Bein úttsending: RÃS 1', 'play_live', 'ras1')
+ INTERFACE.addItem('Bein úttsending: RÃS 2', 'play_live', 'ras2')
+ INTERFACE.addItem('Bein úttsending: RONDÃ', 'play_live', 'rondo')
def channel_index(channel):
- for i, category in enumerate(cats.showtree[channel].get('categories')):
- gui.addDir(category['name'].encode('utf-8'),
+ for i, category in enumerate(CATS.showtree[channel].get('categories')):
+ INTERFACE.addDir(category['name'].encode('utf-8'),
'view_channel_category',
- "{0};{1}".format(channel,i))
+ "{0};{1}".format(channel, i))
def channel_category(channel, category):
- for show in cats.showtree[channel]['categories'][category]['shows']:
+ for show in CATS.showtree[channel]['categories'][category]['shows']:
name, url = show
if url[0] == '/':
url = 'http://dagskra.ruv.is%s' % url
- gui.addDir(name.encode('utf-8'), 'view_channel_category_show',
url.encode('utf-8'))
+ INTERFACE.addDir(name.encode('utf-8'),
+ 'view_channel_category_show',
+ url.encode('utf-8'))
def channel_category_show(url, show_name):
episodes = scraper.get_episodes(url)
if not episodes:
- gui.infobox("Engar upptökur", "Engin upptaka fannst")
+ INTERFACE.infobox("Engar upptökur", "Engin upptaka fannst")
else:
for episode in episodes:
episode_name, url = episode
name = "{0} - {1}".format(show_name, episode_name.encode('utf-8'))
- gui.addItem(name, 'play', url)
+ INTERFACE.addItem(name, 'play', url)
def play_video(url, name):
(playpath, rtmp_url, swfplayer) = scraper.get_stream_info(url)
@@ -70,19 +74,21 @@ def tab_index(url):
episodes = scraper.get_tab_items(pageurl)
if not episodes:
- gui.infobox("Engar upptökur", "Engin upptaka fannst")
+ INTERFACE.infobox("Engar upptökur", "Engin upptaka fannst")
else:
for episode in episodes:
episode_name, url = episode
- gui.addItem(episode_name.encode('utf-8'), 'play',
url.encode('utf-8'))
+ INTERFACE.addItem(episode_name.encode('utf-8'),
+ 'play',
+ url.encode('utf-8'))
def podcast_index():
for show in scraper.get_podcast_shows():
name, url = show
- gui.addDir(name.encode('utf-8'), 'view_podcast_show', url)
+ INTERFACE.addDir(name.encode('utf-8'), 'view_podcast_show', url)
def podcast_show(url, name):
for recording in scraper.get_podcast_episodes(url):
date, url = recording
title = "{0} - {1}".format(name, date.encode('utf-8'))
- gui.addItem(title, 'play_podcast', url.encode('utf-8'))
+ INTERFACE.addItem(title, 'play_podcast', url.encode('utf-8'))
diff --git a/plugin.video.sarpur/sarpur/cached.py
b/plugin.video.sarpur/sarpur/cached.py
index d422be5..81cb4a5 100644
--- a/plugin.video.sarpur/sarpur/cached.py
+++ b/plugin.video.sarpur/sarpur/cached.py
@@ -4,15 +4,15 @@
import os
import json
import sarpur
-import scraper
+import sarpur.scraper as scraper
from datetime import datetime
-DATA_PATH = os.path.join(sarpur.ADDON.getAddonInfo('path'), 'resources','data')
-SHOWTREEFILE_LOCATION = os.path.join(DATA_PATH,'showtree.dat')
-TABFILE_LOCATION = os.path.join(DATA_PATH,'tabs.dat')
+DATA_PATH = os.path.join(sarpur.ADDON.getAddonInfo('path'), 'resources',
'data')
+SHOWTREEFILE_LOCATION = os.path.join(DATA_PATH, 'showtree.dat')
+TABFILE_LOCATION = os.path.join(DATA_PATH, 'tabs.dat')
-class Categories():
+class Categories(object):
def __init__(self):
try:
@@ -23,8 +23,8 @@ class Categories():
showtree = self.update_showtree()
tabs = self.update_tabs()
else:
- tabs = json.load(file(TABFILE_LOCATION,'rb'))
- showtree = json.load(file(SHOWTREEFILE_LOCATION,'rb'))
+ tabs = json.load(file(TABFILE_LOCATION, 'rb'))
+ showtree = json.load(file(SHOWTREEFILE_LOCATION, 'rb'))
except OSError:
if not os.path.exists(DATA_PATH):
@@ -48,8 +48,8 @@ class Categories():
tabs = scraper.get_tabs()
- json.dump(tabs, file(TABFILE_LOCATION,'wb'))
- return tabs
+ json.dump(tabs, file(TABFILE_LOCATION, 'wb'))
+ self.tabs = tabs
def update_showtree(self):
@@ -80,5 +80,5 @@ class Categories():
"""
showtree = scraper.get_showtree()
- json.dump(showtree, file(SHOWTREEFILE_LOCATION,'wb'))
- return showtree
+ json.dump(showtree, file(SHOWTREEFILE_LOCATION, 'wb'))
+ self.showtree = showtree
diff --git a/plugin.video.sarpur/sarpur/scraper.py
b/plugin.video.sarpur/sarpur/scraper.py
index 31578a0..5c426c3 100644
--- a/plugin.video.sarpur/sarpur/scraper.py
+++ b/plugin.video.sarpur/sarpur/scraper.py
@@ -3,16 +3,16 @@
import requests, re
from html5lib import treebuilders
-from xml.etree import cElementTree
+from xml.etree import ElementTree
def get_document(url):
- r = requests.get(url)
- source = r.content
+ req = requests.get(url)
+ source = req.content
- tb = treebuilders.getTreeBuilder("etree", cElementTree)
+ builder = treebuilders.getTreeBuilder("etree", ElementTree)
doc = html5lib.parse(source,
- treebuilder=tb,
+ treebuilder=builder,
namespaceHTMLElements=False)
return doc
@@ -23,16 +23,16 @@ def get_episodes(url):
doc = get_document(url)
#Generic look
- for ep in doc.xpath("//a[contains(@title, 'Spila')]"):
- episodes.append((ep.text, ep.get('href')))
+ for episode in doc.xpath("//a[contains(@title, 'Spila')]"):
+ episodes.append((episode.text, episode.get('href')))
if episodes:
return episodes
#"Special" page
- for ep in doc.xpath("//div[contains(@class,'mm-mynd')]"):
- episode_date = ep.getparent().find('span').text
- url = u'http://www.ruv.is{0}'.format(ep.find('a').attrib.get('href'))
+ for episode in doc.xpath("//div[contains(@class,'mm-mynd')]"):
+ episode_date = episode.getparent().find('span').text
+ url =
u'http://www.ruv.is{0}'.format(episode.find('a').attrib.get('href'))
episodes.append((episode_date, url))
return episodes
@@ -42,8 +42,8 @@ def get_tabs():
xpathstring = "//div[@class='menu-block-ctools-menu-sarpsmynd-1
menu-name-menu-sarpsmynd parent-mlid-_active:0 menu-level-2']/ul/li/a"
tabs = []
- for a in doc.xpath(xpathstring):
- tabs.append((a.text, a.get('href')))
+ for hyperlink in doc.xpath(xpathstring):
+ tabs.append((hyperlink.text, hyperlink.get('href')))
return tabs
@@ -57,7 +57,8 @@ def get_showtree():
for group in channel.find("div").iterchildren():
if group.tag == 'h2':
- showtree[i]["categories"].append({"name":group.text,
"shows":[]})
+ showtree[i]["categories"].append(
+ {"name":group.text, "shows":[]})
elif group.tag == 'div':
for show in group.findall("div"):
hyperlink = show.find("a")
@@ -82,12 +83,12 @@ def get_stream_info(page_url):
else: #RÃS 1 & 2
# The ip address of the stream server is returned in another page
cache_url = doc.xpath("//script[contains(@src,
'load.cache.is')]")[0].get('src')
- cache_content = res = requests.get(cache_url)
+ res = requests.get(cache_url)
cache_ip = re.search('"([^"]+)"', res.content).group(1)
# Now that we have the ip address we can insert it into the URL
source_js = doc.xpath("//script[contains(., 'tengipunktur')]")[0].text
- source_url = re.search("'file': '(http://' \+ tengipunktur \+
'[^']+)", source_js).group(1)
+ source_url = re.search(r"'file': '(http://' \+ tengipunktur \+
'[^']+)", source_js).group(1)
rtmp_url = source_url.replace("' + tengipunktur + '", cache_ip)
@@ -133,13 +134,13 @@ def get_podcast_episodes(url):
for item in doc.findall("//guid"):
url = item.text
- for el in item.itersiblings():
- if el.tag == 'pubdate':
- date = el.text
+ for element in item.itersiblings():
+ if element.tag == 'pubdate':
+ date = element.text
#date = item.xpath('pubdate')[0].text
#url = item.xpath('guid')[0].text
- episodes.append((date,url))
+ episodes.append((date, url))
return episodes
diff --git a/plugin.video.sarpur/util/gui.py b/plugin.video.sarpur/util/gui.py
index 079ba28..e2df3f6 100644
--- a/plugin.video.sarpur/util/gui.py
+++ b/plugin.video.sarpur/util/gui.py
@@ -19,20 +19,32 @@ class GUI(object):
url =
"{base_url}?action_key={key}&action_value={value}&name={name}".format(**formatparams)
- listitem = xbmcgui.ListItem(name, iconImage=iconimage,
thumbnailImage='')
- listitem.setInfo(type="Video", infoLabels={ "Title": name } )
+ listitem = xbmcgui.ListItem(name,
+ iconImage=iconimage,
+ thumbnailImage='')
+ listitem.setInfo(type="Video", infoLabels={"Title": name})
xbmcplugin.addDirectoryItem(
- handle = self.addon_handle,
- url = url,
- listitem = listitem,
- isFolder = is_folder)
-
- def addDir(self, name, action_key, action_value,
iconimage='DefaultFolder.png'):
- self._addDir(name, action_key, action_value, iconimage, is_folder=True)
-
- def addItem(self, name, action_key, action_value,
iconimage='DefaultMovies.png'):
- self._addDir(name, action_key, action_value, iconimage,
is_folder=False)
+ handle=self.addon_handle,
+ url=url,
+ listitem=listitem,
+ isFolder=is_folder)
+
+ def addDir(self, name, action_key, action_value,
+ iconimage='DefaultFolder.png'):
+ self._addDir(name,
+ action_key,
+ action_value,
+ iconimage,
+ is_folder=True)
+
+ def addItem(self, name, action_key, action_value,
+ iconimage='DefaultMovies.png'):
+ self._addDir(name,
+ action_key,
+ action_value,
+ iconimage,
+ is_folder=False)
def infobox(self, title, message):
xbmcgui.Dialog().ok(title, message)
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=fbd2c754c957f87d7086c13464d3fecf153a52e0
commit fbd2c754c957f87d7086c13464d3fecf153a52e0
Author: Martijn Kaijser <[email protected]>
Date: Fri Oct 3 21:03:33 2014 +0200
[plugin.video.corbettreport] 0.0.6
diff --git a/plugin.video.corbettreport/addon.xml
b/plugin.video.corbettreport/addon.xml
index e3169ad..0eefbc3 100644
--- a/plugin.video.corbettreport/addon.xml
+++ b/plugin.video.corbettreport/addon.xml
@@ -3,7 +3,7 @@
id="plugin.video.corbettreport"
name="CorbettReport.com Video Podcasts"
provider-name="celadoor"
- version="0.0.5">
+ version="0.0.6">
<requires>
<import addon="xbmc.python" version="2.1.0" />
<import addon="script.common.plugin.cache" version="1.5.1" />
diff --git a/plugin.video.corbettreport/changelog.txt
b/plugin.video.corbettreport/changelog.txt
index c70312a..d37f62c 100644
--- a/plugin.video.corbettreport/changelog.txt
+++ b/plugin.video.corbettreport/changelog.txt
@@ -1,5 +1,6 @@
created by celadoor.
+Version 0.0.6 -re-enabled some of the audio options, updated icon.
Version 0.0.5 -Update due to website url changes.
diff --git a/plugin.video.corbettreport/default.py
b/plugin.video.corbettreport/default.py
index a770e3a..bf17394 100644
--- a/plugin.video.corbettreport/default.py
+++ b/plugin.video.corbettreport/default.py
@@ -21,7 +21,7 @@ def CATEGORIES():
addDir(__language__(30013),'http://www.corbettreport.com/category/videos/page/3/',1,__icon__,__language__(30018))
addDir(__language__(30014),'http://www.corbettreport.com/category/videos/page/4/',1,__icon__,__language__(30018))
addDir(__language__(30015),'http://www.corbettreport.com/category/videos/page/5/',1,__icon__,__language__(30018))
-
addDir(__language__(30016),'http://www.corbettreport.com/category/episodes/',3,'',__language__(30018))
+
addDir(__language__(30016),'http://www.corbettreport.com/category/podcasts/',3,'',__language__(30018))
addDir(__language__(30017),'http://www.corbettreport.com/category/interviews/',3,'',__language__(30018))
@@ -48,11 +48,13 @@ def INDEX2(url):
link=response.read()
response.close()
#interviews and podcasts
- match=re.compile('post-title"><a href="(.+?)" rel="bookmark"
title="Permanent Link to (.+?)">(.+?)</a></h2>\r\n\r\n\t\t\t\t\t\t<div
class="meta">\r\n\r\n\t<span class="meta-author"><a
href="http://www.corbettreport.com/author/admin/"; title="Posts by Corbett"
rel="author">Corbett</a></span> • <span class="meta-date">(.+?)</span>
\r\n\r\n</div>\r\n\t\t\t\t\t\t\t\t\t\t\t\t\t<p><a href=(.+?)<img
class="alignright" src="(.+?)" alt').findall(link)#corbett
+
+ #match=re.compile('<option value="(.+?)">Interview
(.+?)</option').findall(link)
+ match=re.compile('<option value="(.+?)">(.+?)</option').findall(link)
if len(match) > 0:
- for url,name,name2,date,name3,image in match:
+ for url,name in match:
name = name.replace('"', '"').replace('’', '
').replace('&', '&').replace('–', "'") # Cleanup the title.
- addDir(name,url,2,image,date+"
"+name+__language__(30019)+__language__(30020))
+ addDir(name,url,2,__icon__,name+"
"+name+__language__(30019)+__language__(30020))
else:
xbmc.log(__language__(30021), xbmc.LOGERROR )
xbmcgui.Dialog().ok(__language__(30022), __language__(30021))
diff --git a/plugin.video.corbettreport/icon.png
b/plugin.video.corbettreport/icon.png
index cc4119a..2d923bd 100644
Binary files a/plugin.video.corbettreport/icon.png and
b/plugin.video.corbettreport/icon.png differ
diff --git a/plugin.video.corbettreport/resources/language/English/strings.xml
b/plugin.video.corbettreport/resources/language/English/strings.xml
index 32e23cf..8317493 100644
--- a/plugin.video.corbettreport/resources/language/English/strings.xml
+++ b/plugin.video.corbettreport/resources/language/English/strings.xml
@@ -5,7 +5,7 @@
<string id="30013">CorbettReport.com Videos 3rd page</string>
<string id="30014">CorbettReport.com Videos 4th page</string>
<string id="30015">CorbettReport.com Videos 5th page</string>
-<string id="30016">CorbettReport.com Audio Episodes</string>
+<string id="30016">CorbettReport.com Audio Podcasts</string>
<string id="30017">CorbettReport.com Audio Interviews</string>
<string id="30018">[The Corbett Report is an independent, listener-supported
alternative news source. It operates on the principle of open source
intelligence and provides podcasts, interviews, articles and videos about
breaking news and important issues from 9/11 Truth and false flag terror to the
Big Brother police state, eugenics, geopolitics, the central banking fraud and
more..</string>
<string id="30019">[COLOR yellow][CR][CR]Please Donate, and support the video
content provider![/COLOR]</string>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=915a67fa1515c632a0b94c46106f3205cead3371
commit 915a67fa1515c632a0b94c46106f3205cead3371
Author: Martijn Kaijser <[email protected]>
Date: Fri Oct 3 21:02:34 2014 +0200
[plugin.video.popcornflix] 1.0.7
diff --git a/plugin.video.popcornflix/README.txt
b/plugin.video.popcornflix/README.txt
index 7bff300..552bb79 100644
--- a/plugin.video.popcornflix/README.txt
+++ b/plugin.video.popcornflix/README.txt
@@ -3,6 +3,8 @@ plugin.video.popcornflix================
XBMC Addon for popcornflix website
+Version 1.0.7 Fix for change in bitrate range
+Version 1.0.6 Added bitrate setting
Version 1.0.5 Website change
Version 1.0.4 Fix stupid shortcut for US site so videos play on International
sites
version 1.0.2 initial release
diff --git a/plugin.video.popcornflix/addon.xml
b/plugin.video.popcornflix/addon.xml
index 5ccc195..67ffbf6 100644
--- a/plugin.video.popcornflix/addon.xml
+++ b/plugin.video.popcornflix/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.popcornflix"
name="Popcornflix"
- version="1.0.5"
+ version="1.0.7"
provider-name="t1m">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
diff --git a/plugin.video.popcornflix/changelog.txt
b/plugin.video.popcornflix/changelog.txt
index fb0fb16..29c8e14 100644
--- a/plugin.video.popcornflix/changelog.txt
+++ b/plugin.video.popcornflix/changelog.txt
@@ -1,3 +1,7 @@
+Version 1.0.7 Fix for bitrate range change
+
+Version 1.0.6 Added bitrate setting
+
Version 1.0.5 Website change
Version 1.0.4 Fix stupid shortcut for US site so videos play on International
sites
diff --git a/plugin.video.popcornflix/default.py
b/plugin.video.popcornflix/default.py
index 8e5cd81..c006a78 100644
--- a/plugin.video.popcornflix/default.py
+++ b/plugin.video.popcornflix/default.py
@@ -75,22 +75,39 @@ def getCats(c_url):
for sid,simg,sname,sgenre,sdesc in shows:
if (not sid.startswith('/series')) and (not sid.startswith('/tv-shows')):
surl = "%s?url=%s&mode=GS" %(sys.argv[0], urllib.quote_plus(sid))
-
addLink(surl.encode(UTF8),sname,simg.encode(UTF8),addonfanart,sdesc,sgenre,'',False)
+
addLink(surl.encode(UTF8),sname,simg.encode(UTF8),addonfanart,sdesc.strip(),sgenre,'',False)
else:
sname = '[COLOR blue]'+sname+'[/COLOR]'
- addDir(sname, sid, 'GC', simg, addonfanart, sdesc, sgenre, '')
+ addDir(sname, sid, 'GC', simg, addonfanart, sdesc.strip(), sgenre, '')
def getShow(sid):
html = getRequest('http://www.popcornflix.com%s' % (sid))
- url = re.compile('data-videodata="(.+?)"').findall(html)[0]
+ url = re.compile('data-videodata="(.+?)"').search(html).group(1)
html = getRequest(url)
- url = re.compile('Player":"(.+?)"').findall(html)[0]
+ url = re.compile('Player":"(.+?)"').search(html).group(1)
url = urllib.unquote_plus(url.replace('\\',''))
html = getRequest(url)
- url = re.compile('RESOLUTION=864x480(.+?)#').findall(html)[0]
- url = url.strip()
- xbmcplugin.setResolvedUrl(int(sys.argv[1]), True,
xbmcgui.ListItem(path=url))
+ playlist =
re.compile('BANDWIDTH=(.+?),.+?http:(.+?)protocolversion=3').findall(html)
+ try:
+ bitrates = [150000, 240000, 340000, 440000, 552000, 640000, 840000,
1240000]
+ try:
+ urate = bitrates[int(addon.getSetting('bitrate'))]
+ except:
+ urate = 150000
+ current = 0
+ for bitrate,pp in playlist:
+ if (int(bitrate) <= int(urate)) and (current < int(bitrate)):
+ current = int(bitrate)
+ playpath = pp
+ if current == 0: (current, playpath) = playlist[0]
+ url = 'http:'+playpath+'protocolversion=3'
+ url = url.strip()
+ xbmcplugin.setResolvedUrl(int(sys.argv[1]), True,
xbmcgui.ListItem(path=url))
+ except:
+ dialog = xbmcgui.Dialog()
+ dialog.ok(__language__(30000), '',__language__(30001))
+
def play_playlist(name, list):
@@ -140,7 +157,7 @@ def
addLink(url,name,iconimage,fanart,description,genre,date,showcontext=True,pl
# MAIN EVENT PROCESSING STARTS HERE
-xbmcplugin.setContent(int(sys.argv[1]), 'movies')
+xbmcplugin.setContent(int(sys.argv[1]), 'tvshows')
parms = {}
try:
diff --git a/plugin.video.popcornflix/resources/language/English/strings.xml
b/plugin.video.popcornflix/resources/language/English/strings.xml
index 79c1e3b..21f2144 100644
--- a/plugin.video.popcornflix/resources/language/English/strings.xml
+++ b/plugin.video.popcornflix/resources/language/English/strings.xml
@@ -1,3 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<strings>
+ <string id="30000">Popcornflix</string>
+ <string id="30001">No Playable Video Found</string>
+ <string id="30002">Movies</string>
+ <string id="30003">Shows</string>
+ <string id="30004">Maximum Bitrate</string>
+ <string id="30005">150 Kbps</string>
+ <string id="30006">240 Kbps</string>
+ <string id="30007">340 Kbps</string>
+ <string id="30008">440 Kbps</string>
+ <string id="30009">553 Kbps</string>
+ <string id="30010">660 Kbps</string>
+ <string id="30011">880 Kbps</string>
+ <string id="30012">1200 Kbps</string>
+
</strings>
diff --git a/plugin.video.popcornflix/resources/settings.xml
b/plugin.video.popcornflix/resources/settings.xml
index f8056a3..9dc052e 100644
--- a/plugin.video.popcornflix/resources/settings.xml
+++ b/plugin.video.popcornflix/resources/settings.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<settings>
<category label="Settings">
+ <setting type="sep" />
+ <setting id="bitrate" type="enum"
lvalues="30005|30006|30007|30008|30009|30010|30011|30012" label="30004"
default="7"/>
+
</category>
</settings>
\ No newline at end of file
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=cdd97b2c872c4b67e87f981cdd2b1756cf6d9b15
commit cdd97b2c872c4b67e87f981cdd2b1756cf6d9b15
Author: Martijn Kaijser <[email protected]>
Date: Fri Oct 3 21:01:28 2014 +0200
[plugin.audio.jazzradio.com] 3.0.1
diff --git a/plugin.audio.jazzradio.com/addon.xml
b/plugin.audio.jazzradio.com/addon.xml
index 98112ab..f40ef0f 100644
--- a/plugin.audio.jazzradio.com/addon.xml
+++ b/plugin.audio.jazzradio.com/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.audio.jazzradio.com"
name="JazzRadio.com"
- 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.jazzradio.com/changelog.txt
b/plugin.audio.jazzradio.com/changelog.txt
index cace184..d688a6e 100644
--- a/plugin.audio.jazzradio.com/changelog.txt
+++ b/plugin.audio.jazzradio.com/changelog.txt
@@ -3,6 +3,10 @@
- Removed feature
+24. August 2014 v3.0.1
+* Fixed url for channel asset/graphics
+
+
29. June 2014 v3.0.0
+ Rebased on same code as the DI.fm and Sky.fm plugins - thus the severe
version bump
+ Threading of playlists parsing to speed up first run and refreshing of
playlists - 8 threads
diff --git a/plugin.audio.jazzradio.com/config.ini
b/plugin.audio.jazzradio.com/config.ini
index ebb3af3..5076612 100644
--- a/plugin.audio.jazzradio.com/config.ini
+++ b/plugin.audio.jazzradio.com/config.ini
@@ -1,7 +1,7 @@
# JazzRadio.com XBMC config
[plugin]
id = plugin.audio.jazzradio.com
-date = 29. June 2014
+date = 24. August 2014
checkinkey = a57ab7ceada3fefeaa70a7136ab05f9af5ebac82
[cache]
diff --git a/plugin.audio.jazzradio.com/default.py
b/plugin.audio.jazzradio.com/default.py
index 203af81..01ec9ee 100644
--- a/plugin.audio.jazzradio.com/default.py
+++ b/plugin.audio.jazzradio.com/default.py
@@ -272,7 +272,7 @@ class musicAddonXbmc:
self.newChannels += 1
for c in channelMeta:
if c['channel']['type'] == 'channel' and c['channel']['id'] ==
channel['id']:
- asset = c['channel']['asset_url']
+ asset = "http:" + c['channel']['asset_url']
self.getChannelAsset(str(channel['id']), asset)
if ADDON.getSetting('randomstream') == "true":
diff --git a/plugin.audio.jazzradio.com/resources/language/English/strings.xml
b/plugin.audio.jazzradio.com/resources/language/English/strings.xml
index ea65c68..6793ef0 100644
--- a/plugin.audio.jazzradio.com/resources/language/English/strings.xml
+++ b/plugin.audio.jazzradio.com/resources/language/English/strings.xml
@@ -24,7 +24,7 @@
<string id="30009">Homepage</string>
<string id="30015">Get HQ 256kb/sec streams with Jazzradio Premium at
http://www.jazzradio.com</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>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=1ea3d619d739336457b6b263e98c105be770b7b3
commit 1ea3d619d739336457b6b263e98c105be770b7b3
Author: Martijn Kaijser <[email protected]>
Date: Fri Oct 3 20:59:16 2014 +0200
[plugin.video.viewster] 1.0.4
diff --git a/plugin.video.viewster/README.txt b/plugin.video.viewster/README.txt
index 7dd7a7a..b65be75 100644
--- a/plugin.video.viewster/README.txt
+++ b/plugin.video.viewster/README.txt
@@ -3,5 +3,8 @@ plugin.video.viewster================
XBMC Addon for viewster website
+Version 1.0.4 added "all languages" support
+Version 1.0.3 added language support
+version 1.0.2 added higher res video support
version 1.0.1 initial release
diff --git a/plugin.video.viewster/addon.xml b/plugin.video.viewster/addon.xml
index d3ed186..0565a47 100644
--- a/plugin.video.viewster/addon.xml
+++ b/plugin.video.viewster/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.viewster"
name="Viewster"
- version="1.0.1"
+ version="1.0.4"
provider-name="t1m">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
@@ -17,7 +17,7 @@
<platform>all</platform>
<language>en</language>
<license>GNU GENERAL PUBLIC LICENSE. Version 2, June 1991</license>
- <forum></forum>
+ <forum>http://forum.xbmc.org/showthread.php?tid=200604</forum>
<website>http://www.viewster.com</website>
<email></email>
<source>https://github.com/learningit/plugin.video.viewster</source>
diff --git a/plugin.video.viewster/changelog.txt
b/plugin.video.viewster/changelog.txt
index d7e7154..0b32426 100644
--- a/plugin.video.viewster/changelog.txt
+++ b/plugin.video.viewster/changelog.txt
@@ -1 +1,7 @@
-Version 1.0.1 Initial release
\ No newline at end of file
+Version 1.0.1 Initial release
+
+Version 1.0.2 added higher res video support
+
+Version 1.0.3 added language support
+
+Version 1.0.4 added "all languages" support
\ No newline at end of file
diff --git a/plugin.video.viewster/default.py b/plugin.video.viewster/default.py
index 42218bc..41be4f3 100644
--- a/plugin.video.viewster/default.py
+++ b/plugin.video.viewster/default.py
@@ -110,10 +110,12 @@ def getCats(url):
addDir(sname, '%s#%s' % (sid,sname), 'GS', img, addonfanart, xname,
'', '')
-def getShow(osid, start='0', end=str(MAX_PER_PAGE-1), order='1', lang='1',
query='undefined'):
+def getShow(osid, start='0', end=str(MAX_PER_PAGE-1), order='1',
lang=str(int(addon.getSetting('lang'))), query='undefined'):
(sid, sxname) = osid.split('#',1)
if '#' in sxname:
(sxname,start,end,order,lang,query) = sxname.split('#',5)
+ if 'Trailers' in sid:
+ lang = '1' # force to English for trailers - until f4m available
qurl =
'http://api.live.viewster.com/api/v1%s?from=%s&to=%s&q=%s&order=%s&lang=%s' %
(sid, start, end, query, order, lang)
html = getRequest(qurl, headers = {'Accept': 'application/json,
text/javascript, */*; q=0.01', 'Origin': 'http://www.viewster.com',
'User-Agent': 'Mozilla/5.0 (Windows NT 6.3; WOW64)
AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.125 Safari/537.36',
@@ -198,20 +200,31 @@ def getVideo(sid, name):
'User-Agent': 'Mozilla/5.0 (iPad; CPU OS 7_0_4 like Mac
OS X) AppleWebKit/537.51.1 (KHTML, like Gecko) CriOS/34.0.1847.18
#Mobile/11B554a Safari/9537.53',
'Referer' : 'http://www.viewster.com/movie/%s/%s' %
(sid, name), 'Accept-Encoding': 'gzip,deflate,sdch',
'Accept-Language' : 'en-US,en;q=0.8'})
-
- a = json.loads(html)
- url =
'http://production-ps.lvp.llnw.net/r/PlaylistService/media/%s/getMobilePlaylistByMediaId?platform=MobileH264&;'
% (a['media_id'])
- html = getRequest('%s' % (url),
- headers = {'Accept': '*/*', 'Origin': 'http://www.viewster.com',
- 'User-Agent': 'Mozilla/5.0 (iPad; CPU OS 7_0_4 like Mac
OS X) AppleWebKit/537.51.1 (KHTML, like Gecko) CriOS/34.0.1847.18
#Mobile/11B554a Safari/9537.53',
- 'Referer' : 'http://www.viewster.com/movie/%s/%s' %
(sid, name), 'Accept-Encoding': 'gzip,deflate,sdch',
- 'Accept-Language' : 'en-US,en;q=0.8'})
-
a = json.loads(html)
- url = a['mediaList'][0]['mobileUrls'][0]['mobileUrl']
- xbmcplugin.setResolvedUrl(int(sys.argv[1]), True,
xbmcgui.ListItem(path=url))
+ in0 = '<tns:in0>%s</tns:in0>' % a['media_id']
+ in1 = '<tns:in1 xsi:nil="true" />'
+ SoapMessage = """<SOAP-ENV:Envelope
xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><SOAP-ENV:Body><tns:getPlaylistByMediaId
xmlns:tns="http://service.data.media.pluggd.com";>"""+in0+in1+"""</tns:getPlaylistByMediaId></SOAP-ENV:Body></SOAP-ENV:Envelope>"""
+ html = getRequest("http://ps2.delvenetworks.com/PlaylistService";,
+ user_data = SoapMessage,
+ headers={ "Host": "ps2.delvenetworks.com",
+ "User-Agent":"Mozilla/5.0 (Macintosh; U; Intel
Mac OS X 10.6; en-US; rv:1.9.2.10) Gecko/20100914 Firefox/3.6.10",
+ "Content-type": "text/xml; charset=\"UTF-8\"",
"Content-length": "%d" % len(SoapMessage),
+ "Referer":
"http://static.delvenetworks.com/deployments/player/player-3.27.1.0.swf?playerForm=Chromeless";,
+ "X-Page-URL": "http://www.viewster.com/movie/";,
"SOAPAction": "\"\""})
+ streams = re.compile('<Stream>(.+?)</Stream>').findall(html)
+ show_url=''
+ highbitrate = float(0)
+ for stream in streams:
+ (url, bitrate) =
re.compile('<url>(.+?)</u.+?<videoBitRate>(.+?)</v').findall(stream)[0]
+ if (float(bitrate)) > highbitrate:
+ show_url = url
+ highbitrate = float(bitrate)
+ if not ('divaag-webmobile' in show_url):
+ finalurl = '%s swfUrl=http://video.limelight.com/player/loader.swf
pageUrl=http://www.viewster.com/movie/' % show_url
+ else:
+ finalurl =
show_url.replace('rtmp://divaag-webmobile.csl.delvenetworks.com/a5112/l2/mp4:','http://divaag-webmobile.cpl.delvenetworks.com/')
+ xbmcplugin.setResolvedUrl(int(sys.argv[1]), True, xbmcgui.ListItem(path
= finalurl))
-
def play_playlist(name, list):
playlist = xbmc.PlayList(1)
playlist.clear()
diff --git a/plugin.video.viewster/resources/language/English/strings.xml
b/plugin.video.viewster/resources/language/English/strings.xml
index d7c4b75..c04114e 100644
--- a/plugin.video.viewster/resources/language/English/strings.xml
+++ b/plugin.video.viewster/resources/language/English/strings.xml
@@ -3,4 +3,11 @@
<string id="30000">Next Page</string>
<string id="30001">Search Movies</string>
<string id="30002">Search TV Shows</string>
+ <string id="30003">English</string>
+ <string id="30004">French</string>
+ <string id="30005">German</string>
+ <string id="30006">Spanish</string>
+ <string id="30007">Language</string>
+ <string id="30008">Settings</string>
+ <string id="30009">All Languages</string>
</strings>
diff --git a/plugin.video.viewster/resources/settings.xml
b/plugin.video.viewster/resources/settings.xml
index f8056a3..009bda1 100644
--- a/plugin.video.viewster/resources/settings.xml
+++ b/plugin.video.viewster/resources/settings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<settings>
- <category label="Settings">
+ <category label="30008">
+ <setting id="lang" type="enum" label="30007"
lvalues="30009|30003|30004|30005|30006" default="0" />
</category>
-</settings>
\ No newline at end of file
+</settings>
-----------------------------------------------------------------------
Summary of changes:
plugin.audio.jazzradio.com/addon.xml | 2 +-
plugin.audio.jazzradio.com/changelog.txt | 4 ++
plugin.audio.jazzradio.com/config.ini | 2 +-
plugin.audio.jazzradio.com/default.py | 2 +-
.../resources/language/English/strings.xml | 2 +-
plugin.video.corbettreport/addon.xml | 2 +-
plugin.video.corbettreport/changelog.txt | 1 +
plugin.video.corbettreport/default.py | 10 ++--
plugin.video.corbettreport/icon.png | Bin 73060 -> 75648 bytes
.../resources/language/English/strings.xml | 2 +-
plugin.video.popcornflix/README.txt | 2 +
plugin.video.popcornflix/addon.xml | 2 +-
plugin.video.popcornflix/changelog.txt | 4 ++
plugin.video.popcornflix/default.py | 33 +++++++++---
.../resources/language/English/strings.xml | 14 +++++
plugin.video.popcornflix/resources/settings.xml | 3 +
plugin.video.sarpur/addon.xml | 3 +-
plugin.video.sarpur/changelog.txt | 3 +
plugin.video.sarpur/default.py | 7 ++-
plugin.video.sarpur/sarpur/actions.py | 54 +++++++++++---------
plugin.video.sarpur/sarpur/cached.py | 22 ++++----
plugin.video.sarpur/sarpur/scraper.py | 39 +++++++-------
plugin.video.sarpur/util/gui.py | 36 +++++++++----
plugin.video.viewster/README.txt | 3 +
plugin.video.viewster/addon.xml | 4 +-
plugin.video.viewster/changelog.txt | 8 +++-
plugin.video.viewster/default.py | 39 +++++++++-----
.../resources/language/English/strings.xml | 7 +++
plugin.video.viewster/resources/settings.xml | 5 +-
29 files changed, 208 insertions(+), 107 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer
Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports
Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper
Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer
http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
