The branch, frodo has been updated
via bcecfc1665a4f0579aa3eb9e5044fb47c5c1064f (commit)
via ecbebf3d8fd363fce63b83a9d47c7b7b84f66a01 (commit)
via fbe1bf7bfc0425d3a01674d7c2ce2b80a7f970c7 (commit)
via bb3520e12a2cf240e96359532bed4c584214350c (commit)
via 6b670805e18d527d0f5b0a8240517cf200a2051e (commit)
via 4680a48c7ada9c547100397e31c692ff02a79152 (commit)
from 465362151401fd3d0ba20c320f8794a5b8358602 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=bcecfc1665a4f0579aa3eb9e5044fb47c5c1064f
commit bcecfc1665a4f0579aa3eb9e5044fb47c5c1064f
Author: sphere <[email protected]>
Date: Thu Jul 3 11:01:15 2014 +0200
[plugin.video.tagesschauvideoblog] updated to version 0.1.3
diff --git a/plugin.video.tagesschauvideoblog/addon.py
b/plugin.video.tagesschauvideoblog/addon.py
index 720cc01..0f1574f 100644
--- a/plugin.video.tagesschauvideoblog/addon.py
+++ b/plugin.video.tagesschauvideoblog/addon.py
@@ -31,7 +31,7 @@ videoregexp =
re.compile(re.escape(tagesschauURL)+'ausland\/videoblog\/[^"]+')
blogsregexp = re.compile('Startseite Videoblog(.*)subressort',
re.MULTILINE|re.DOTALL)
blogurlregexp = re.compile('a href="(\/videoblog\/[^"]+)"')
blogtitleregexp = re.compile('">([^<]+)<\/a><\/li>')
-entriesregexp =
re.compile('<h4[^>]*><a[^>]+href="\/([^"]*)"[^>]*>([^<]+)<\/a>')
+entriesregexp = re.compile('a\thref="(\/videoblog\/[^"]+)">\n[^\n]*\n<h4
class="headline">([^<]*)<\/h4>', re.MULTILINE|re.DOTALL)
teaserregexp =
re.compile('img[^>]+src="(\/multimedia\/bilder\/[^"]+teaser+[^"]+)')
def removeNonAscii(s):
diff --git a/plugin.video.tagesschauvideoblog/addon.xml
b/plugin.video.tagesschauvideoblog/addon.xml
index 659ac59..fcb29c3 100644
--- a/plugin.video.tagesschauvideoblog/addon.xml
+++ b/plugin.video.tagesschauvideoblog/addon.xml
@@ -15,7 +15,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
-<addon id="plugin.video.tagesschauvideoblog" name="Tagesschau Videoblog"
version="0.1.2" provider-name="Fiona Schmidtke, Niclas Hoyer">
+<addon id="plugin.video.tagesschauvideoblog" name="Tagesschau Videoblog"
version="0.1.3" provider-name="Fiona Schmidtke, Niclas Hoyer">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.xbmcswift2" version="2.4.0"/>
diff --git a/plugin.video.tagesschauvideoblog/changelog.txt
b/plugin.video.tagesschauvideoblog/changelog.txt
index 3b6b20d..f5823e2 100644
--- a/plugin.video.tagesschauvideoblog/changelog.txt
+++ b/plugin.video.tagesschauvideoblog/changelog.txt
@@ -8,3 +8,7 @@ version 0.1.1:
version 0.1.2:
* fixed errors after changes on tagesschau.de
+
+
+ version 0.1.3:
+ * fixed errors after changes on tagesschau.de
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=ecbebf3d8fd363fce63b83a9d47c7b7b84f66a01
commit ecbebf3d8fd363fce63b83a9d47c7b7b84f66a01
Author: sphere <[email protected]>
Date: Thu Jul 3 10:57:04 2014 +0200
[plugin.video.realtimetvitalia] updated to version 1.0.2
diff --git a/plugin.video.realtimetvitalia/addon.xml
b/plugin.video.realtimetvitalia/addon.xml
index dfe07e4..5734e0d 100644
--- a/plugin.video.realtimetvitalia/addon.xml
+++ b/plugin.video.realtimetvitalia/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.realtimetvitalia" name="Real Time TV Italia"
version="1.0.1" provider-name="Goph">
+<addon id="plugin.video.realtimetvitalia" name="Real Time TV Italia"
version="1.0.2" provider-name="Goph">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="xbmc.addon" version="12.0.0"/>
@@ -21,7 +21,7 @@
<forum>http://forum.xbmc.org/showthread.php?tid=196642</forum>
<website>https://github.com/xbmc-goph/plugin.video.realtimetvitalia</website>
<email></email>
- <source></source>
+ <source>https://github.com/xbmc-goph/plugin.video.realtimetvitalia</source>
<license>GNU GENERAL PUBLIC LICENSE. Version 2, June 1991</license>
</extension>
</addon>
diff --git a/plugin.video.realtimetvitalia/changelog.txt
b/plugin.video.realtimetvitalia/changelog.txt
index 9ca4b98..941565d 100644
--- a/plugin.video.realtimetvitalia/changelog.txt
+++ b/plugin.video.realtimetvitalia/changelog.txt
@@ -1,3 +1,6 @@
+1.0.2 (2014-07-02)
+Fixed errors in parsing video information
+
1.0.1 (2014-06-03)
Added autoplay function
diff --git a/plugin.video.realtimetvitalia/default.py
b/plugin.video.realtimetvitalia/default.py
index c9f1537..ff3821d 100644
--- a/plugin.video.realtimetvitalia/default.py
+++ b/plugin.video.realtimetvitalia/default.py
@@ -12,7 +12,6 @@ addon = xbmcaddon.Addon()
addonID = addon.getAddonInfo('id')
thisPlugin = int(sys.argv[1])
urlSearchParameters = "http://www.realtimetv.it/video/";
-urlThumbnails = "http://www.realtimetv.it/web/";
baseUrl = "http://www.realtimetv.it";
height = 1080;#268|356|360|400|572|576
@@ -22,8 +21,6 @@ const_publisherID = 1265527910001;
const_playerKey = "AQ~~,AAABJqdXbnE~,swSdm6mQzrHdUAncp0a9cwAjGy8zF2fs"
maxBitRate = 5120000
-thumbnailsCache = StorageServer.StorageServer("plugin.video.realtimetvitalia",
24*7)
-
def loadPage(url):
print "Load: " + url
req = urllib2.Request(url)
@@ -70,7 +67,6 @@ def getShows(link):
for item in search_list:
item_title = item.find('a').string
item_link = item.find('a')['href']
- #item_thumbnail =
thumbnailsCache.cacheFunction(getShowThumbnail, item_link.rsplit('/',2)[1])
addDirectoryItem(item_title, item_link, "category", "")
xbmcplugin.addSortMethod(thisPlugin, xbmcplugin.SORT_METHOD_LABEL)
xbmcplugin.endOfDirectory(thisPlugin)
@@ -81,19 +77,6 @@ def getCategories(link):
xbmcplugin.addSortMethod(thisPlugin, xbmcplugin.SORT_METHOD_LABEL)
xbmcplugin.endOfDirectory(thisPlugin)
-def getShowThumbnail(link):
- try:
- page = loadPage(urlThumbnails + link)
- soup = BeautifulSoup(page)
- except:
- show_thumbnail = "None"
- try:
- show_banner = soup.find('img', {'class':
'article-banner'})['src']
- show_thumbnail = baseUrl + show_banner
- except:
- show_thumbnail = "None"
- return show_thumbnail
-
def getEpisodes(link):
global thisPlugin
page = loadPage(baseUrl + link + "?sort=date")
@@ -107,8 +90,11 @@ def getEpisodes(link):
episodes_containers_list = soup.findAll('dl', {'class': re.compile('
item item-')})
for episode_container in episodes_containers_list:
episode_title = episode_container.find('dd',{'class':
'thumbnail'}).find('a')['title']
+ xbmc.log(msg=episode_title)
try:
episode_number = episode_container.find('dd',{'class':
'description'}).string
+ if episode_number is None:
+ episode_number = ""
except:
episode_number = ""
try:
@@ -118,7 +104,7 @@ def getEpisodes(link):
episode_link = episode_container.find('dd',{'class':
'thumbnail'}).find('a')['href']
episode_thumbnail = episode_container.find('dd',{'class':
'thumbnail'}).find('a').find('img')['src']
try:
- episode_description =
episode_container.find('dd',{'class':
'extended-info'}).find('dl').find('dd',{'class': 'summary'}).string
+ episode_description =
episode_container.find('dd',{'class':
'extended-info'}).find('dl').find('dd',{'class':
'summary'}).string.encode('utf-8')
except:
episode_description = "None"
try:
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=fbe1bf7bfc0425d3a01674d7c2ce2b80a7f970c7
commit fbe1bf7bfc0425d3a01674d7c2ce2b80a7f970c7
Author: sphere <[email protected]>
Date: Thu Jul 3 10:56:26 2014 +0200
[plugin.video.npr] updated to version 1.0.3
diff --git a/plugin.video.npr/README.txt b/plugin.video.npr/README.txt
index ef1a138..bb1ee9d 100644
--- a/plugin.video.npr/README.txt
+++ b/plugin.video.npr/README.txt
@@ -8,3 +8,5 @@ version 1.0.1 initial release
version 1.0.2 clean-up of genre
+Version 1.0.3 - website changes
+
diff --git a/plugin.video.npr/addon.xml b/plugin.video.npr/addon.xml
index c460c12..4957167 100644
--- a/plugin.video.npr/addon.xml
+++ b/plugin.video.npr/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.npr"
name="NPR Music Videos"
- version="1.0.2"
+ version="1.0.3"
provider-name="t1m">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
diff --git a/plugin.video.npr/changelog.txt b/plugin.video.npr/changelog.txt
index 2193525..d8cd55f 100644
--- a/plugin.video.npr/changelog.txt
+++ b/plugin.video.npr/changelog.txt
@@ -1,5 +1,6 @@
-Version 1.0.2 - cleanup of genre
+Version 1.0.3 - website changes
+Version 1.0.2 - cleanup of genre
Version 1.0.1 Initial release
diff --git a/plugin.video.npr/default.py b/plugin.video.npr/default.py
index e34c311..67a1221 100644
--- a/plugin.video.npr/default.py
+++ b/plugin.video.npr/default.py
@@ -73,22 +73,32 @@ def getSources(fanart):
pg = getRequest(urlbase)
catname = __language__(30000)
addDir(catname,urlbase.encode(UTF8),'GC',icon,addonfanart,catname,GENRE,'',False)
- cats = re.compile('<p class="more"><a
href="/templates/story/story\.php\?storyId=(.+?)">(.+?)<').findall(pg)
+ blob = re.compile('<div
class="subtopics">(.+?)</ul>').findall(pg)[0]
+ cats = re.compile('<a href="(.+?)">(.+?)<').findall(blob)
for caturl, catname in cats:
- caturl =
'http://www.npr.org/templates/archives/archive.php?thingId=%s' % (caturl)
+ caturl = NPRBASE % (caturl)
+# caturl =
'http://www.npr.org/templates/archives/archive.php?thingId=%s' % (caturl)
addDir(catname,caturl.encode(UTF8),'GC',icon,addonfanart,catname,GENRE,'',False)
def getCats(cat_url):
pg = getRequest(cat_url)
if cat_url == NPRBASE % ('/sections/music-videos/'):
- blob = re.compile('<div
id="genreselector">(.+?)</div>').findall(pg)[0]
+ blob = re.compile('data-metrics-action="Click Music
Genres"(.+?)</ul>').findall(pg)[0]
cats = re.compile('href="(.+?)">(.+?)<').findall(blob)
for caturl, catname in cats:
caturl = NPRBASE % (caturl)
+ catname = deuni(catname)
addDir(catname,caturl.encode(UTF8),'GC',icon,addonfanart,catname,GENRE,'',False)
else:
- shows = re.compile('<div class="bucket clearfix">.+?<a
href="(.+?)".+?src="(.+?)".+?<h4>.+?">(.+?)<.+?<p>(.+?)</p>').findall(pg)
- for showurl, showimg, showname, showdesc in shows:
+ if not ('thingId' in cat_url):
+ sid = re.compile('"storyId":"(.+?)"').findall(pg)[0]
+ cat_url =
'http://www.npr.org/templates/archives/archive.php?thingId=%s' % (sid)
+ pg = getRequest(cat_url)
+ blobs = re.compile('<div class="bucket clearfix">(.+?)END
CLASS="BUCKET CLEARFIX"').findall(pg)
+ for blob in blobs:
+ print "blob = "+str(blob)
+ shows = re.compile('<a href="(.+?)".+?src="(.+?)".+?<p
class="watch">.+?<h4>.+?">(.+?)<.+?<p>(.+?)</p>').findall(blob)
+ for showurl, showimg, showname, showdesc in shows:
try:
(showdate, showdesc) = showdesc.split('</span>',1)
showdate = re.compile('.+?>(.+?)&').findall(showdate)[0]
@@ -97,12 +107,12 @@ def getCats(cat_url):
pass
showurl = "%s?url=%s&name=%s&mode=GS" %(sys.argv[0],
urllib.quote_plus(showurl), urllib.quote_plus(showname))
addLink(showurl.encode(UTF8),deuni(showname),showimg,addonfanart,deuni(showdesc),GENRE,'')
- try:
- nextlink = re.compile('<a class="prev"
href="(.+?)"').findall(pg)[0]
+ try:
+ nextlink = re.compile('<a class="next"
href="(.+?)"').findall(pg)[0]
caturl = NPRBASE % (nextlink)
catname = '[COLOR red]%s[/COLOR]' % (__language__(30001))
addDir(catname,caturl.encode(UTF8),'GC','',addonfanart,catname,GENRE,'',False)
- except:
+ except:
pass
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=bb3520e12a2cf240e96359532bed4c584214350c
commit bb3520e12a2cf240e96359532bed4c584214350c
Author: sphere <[email protected]>
Date: Thu Jul 3 10:53:22 2014 +0200
[plugin.video.i24News] updated to version 1.0.3
diff --git a/plugin.video.i24News/README.txt b/plugin.video.i24News/README.txt
index 606786b..423656f 100644
--- a/plugin.video.i24News/README.txt
+++ b/plugin.video.i24News/README.txt
@@ -4,6 +4,8 @@ plugin.video.i24News
XBMC Addon for i24News
+Version 1.0.3 Updated for website changes, added next page for shows
+
version 1.0.2 updated for website changes
version 1.0.1 initial release
diff --git a/plugin.video.i24News/addon.xml b/plugin.video.i24News/addon.xml
index 6931b4a..9b7dfb8 100644
--- a/plugin.video.i24News/addon.xml
+++ b/plugin.video.i24News/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.i24News"
name="i24 News"
- version="1.0.2"
+ version="1.0.3"
provider-name="t1m">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
diff --git a/plugin.video.i24News/changelog.txt
b/plugin.video.i24News/changelog.txt
index 0aff1bb..d271ffa 100644
--- a/plugin.video.i24News/changelog.txt
+++ b/plugin.video.i24News/changelog.txt
@@ -4,3 +4,4 @@ Version 1.0.1 Initial release
Version 1.0.2 Updated for website changes
+Version 1.0.3 Updated for website changes, added next page for shows
diff --git a/plugin.video.i24News/default.py b/plugin.video.i24News/default.py
index 3a223df..4b2809c 100644
--- a/plugin.video.i24News/default.py
+++ b/plugin.video.i24News/default.py
@@ -83,6 +83,7 @@ def getSources(replay_url):
link=getRequest(BASE_URL+replay_url)
match = re.compile('<li id=.+?<a
href="(.+?)">(.+?)</a>').findall(link)
for pchoice, pname in match:
+ if not ('</a>' in pname):
addDir(deuni(pname),pchoice,'GC',icon,fanart,deuni(pname),GENRE_NEWS,"",False)
@@ -90,7 +91,7 @@ def getCats(Category_url):
log("main page")
link = getRequest(BASE_URL+Category_url)
- match = re.compile('<li
class="results-item">.+?href="(.+?)".+?<img
src="(.+?)".+?video">(.+?)<.+?<span>(.+?)<.+?description">(.+?)<.+?</li>').findall(link)
+ match = re.compile('<li
class="results-item">.+?href="(.+?)".+?<img
src="(.+?)".+?mosaic-view">(.+?)<.+?<span>(.+?)<.+?description">(.+?)<.+?</p>').findall(link)
for pid, pimage, pname, pdate, pdesc in match:
pname = pname.strip()
pdesc = pdate.strip()+'\n'+pdesc.strip()
@@ -101,6 +102,11 @@ def getCats(Category_url):
addLink(caturl.encode(UTF8),deuni(pname),pimage,fanart,deuni(pdesc),GENRE_NEWS,"")
except:
log("Problem adding directory")
+ try:
+ url = re.compile('title="next page"
href="(.+?)"').findall(link)[0]
+ addDir('[COLOR blue]%s[/COLOR]' % (__language__(30004)),
url, 'GC', icon, fanart,(__language__(30004)), GENRE_NEWS,"",False)
+ except:
+ return
def play_playlist(name, list):
diff --git a/plugin.video.i24News/resources/language/English/strings.xml
b/plugin.video.i24News/resources/language/English/strings.xml
index 3e8d0d1..a633cf4 100644
--- a/plugin.video.i24News/resources/language/English/strings.xml
+++ b/plugin.video.i24News/resources/language/English/strings.xml
@@ -4,5 +4,5 @@
<string id="30001">English</string>
<string id="30002">French</string>
<string id="30003">Arabic</string>
-
+ <string id="30004">Next Page</string>
</strings>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=6b670805e18d527d0f5b0a8240517cf200a2051e
commit 6b670805e18d527d0f5b0a8240517cf200a2051e
Author: sphere <[email protected]>
Date: Thu Jul 3 10:52:14 2014 +0200
[plugin.video.jupiterbroadcasting] updated to version 3.1.1
diff --git a/plugin.video.jupiterbroadcasting/README.md
b/plugin.video.jupiterbroadcasting/README.md
index df6b63d..bdfcbcd 100644
--- a/plugin.video.jupiterbroadcasting/README.md
+++ b/plugin.video.jupiterbroadcasting/README.md
@@ -5,7 +5,7 @@ Watch shows from the [Jupiter
Broadcasting](http://jupiterbroadcasting.com) netw
## Shows
-* [Live Show](http://jblive.tv)
+* [JBLive.TV](http://jblive.tv)
* [Linux Action Show](http://www.jupiterbroadcasting.com/show/linuxactionshow/)
* [BSD Now](http://www.jupiterbroadcasting.com/show/bsdnow/)
* [Coder Radio](http://www.jupiterbroadcasting.com/show/coderradio/)
diff --git a/plugin.video.jupiterbroadcasting/addon.xml
b/plugin.video.jupiterbroadcasting/addon.xml
index f196173..0ec45dc 100644
--- a/plugin.video.jupiterbroadcasting/addon.xml
+++ b/plugin.video.jupiterbroadcasting/addon.xml
@@ -2,7 +2,7 @@
<addon
id="plugin.video.jupiterbroadcasting"
name="Jupiter Broadcasting"
- version="3.1.0"
+ version="3.1.1"
provider-name="Rob Loach">
<requires>
<import addon="xbmc.python" version="2.1.0" />
diff --git a/plugin.video.jupiterbroadcasting/changelog.txt
b/plugin.video.jupiterbroadcasting/changelog.txt
index 209d7ad..f3a7529 100644
--- a/plugin.video.jupiterbroadcasting/changelog.txt
+++ b/plugin.video.jupiterbroadcasting/changelog.txt
@@ -1,3 +1,11 @@
+[B]Version 3.1.1 June 24th, 2014[/B]
+- Updated artwork for active shows: Linux Action Show and Linux Unplugged
+- Updated artwork work archived shows: Torked and In Depth Look
+- Updated artwork for addon main icon with new color logo
+- Improved the assets filename structure
+- Renamed Live Show item JBLive.TV
+- Added new artwork for JBLive.TV and Most Recent items
+
[B]Version 3.1.0 June 5th, 2014[/B]
- New Show: Tech Talk Today
- New Show: HowTo Linux
diff --git a/plugin.video.jupiterbroadcasting/default.py
b/plugin.video.jupiterbroadcasting/default.py
index 065f530..dc1d006 100644
--- a/plugin.video.jupiterbroadcasting/default.py
+++ b/plugin.video.jupiterbroadcasting/default.py
@@ -23,7 +23,7 @@ def get_shows():
'feed': feedburner + 'AllJupiterVideos?format=xml',
'feed-low': feedburner + 'AllJupiterVideos?format=xml',
'feed-audio': feedburner +
'/AllJupiterBroadcastingShowsOgg?format=xml',
- 'image': 'jupiterbroadcasting.jpg',
+ 'image': 'most-recent.jpg',
'plot': __language__(30206),
'genre': 'Technology',
'count': 0
@@ -34,7 +34,7 @@ def get_shows():
'feed': feedburner + 'linuxashd?format=xml',
'feed-low': feedburner + 'linuxactionshowipodvid?format=xml',
'feed-audio': feedburner + 'TheLinuxActionShowOGG?format=xml',
- 'image': 'LAS_Colored.jpg',
+ 'image': 'linux-action-show.jpg',
'plot': __language__(30200),
'genre': 'Technology'
}
@@ -74,7 +74,7 @@ def get_shows():
'feed': jupiter + 'feeds/indepthlookihd.xml',
'feed-low': jupiter + 'feeds/indepthlookmob.xml',
'feed-audio': jupiter + 'feeds/indepthlookmp3.xml?format=xml',
- 'image': 'indepthlook.jpg',
+ 'image': 'in-depth-look.jpg',
'plot': __language__(30214),
'genre': 'Technology'
}
@@ -94,7 +94,7 @@ def get_shows():
'feed': jupiter + 'feeds/FauxShowHD.xml',
'feed-low': jupiter + 'feeds/FauxShowMobile.xml',
'feed-audio': jupiter + 'feeds/FauxShowMP3.xml',
- 'image': 'fauxshow.jpg',
+ 'image': 'faux-show.jpg',
'plot': __language__(30211),
'genre': 'Comedy'
}
@@ -104,7 +104,7 @@ def get_shows():
'feed': feedburner + 'jupiternitehd?format=xml',
'feed-low': feedburner + 'jupiternitelargevid?format=xml',
'feed-audio': feedburner + 'jupiternitemp3?format=xml',
- 'image': 'jupiteratnite.jpg',
+ 'image': 'jupiter-at-nite.jpg',
'plot': __language__(30204),
'genre': 'Technology'
}
@@ -134,7 +134,7 @@ def get_shows():
'feed': feedburner + 'jupiterbeeristasty-hd?format=xml',
'feed-low': feedburner + 'BeerIsTasty?format=xml',
'feed-audio': feedburner + 'BeerIsTasty?format=xml',
- 'image': 'beeristasty.png',
+ 'image': 'beer-is-tasty.png',
'plot': __language__(30201),
'genre': 'Technology'
}
@@ -144,7 +144,7 @@ def get_shows():
'feed': feedburner + 'ldf-video?format=xml',
'feed-low': feedburner + 'ldf-video?format=xml',
'feed-audio': feedburner + 'ldf-mp3?format=xml',
- 'image': 'jupiterfiles.jpg',
+ 'image': 'jupiter-files.jpg',
'plot': __language__(30205),
'genre': 'Technology'
}
@@ -164,7 +164,7 @@ def get_shows():
'feed': feedburner + 'coderradiovideo?format=xml',
'feed-low': jupiter + 'feeds/coderradioogg.xml?format=xml',
'feed-audio': jupiter + 'feeds/coderradioogg.xml',
- 'image': 'coderradio.jpg',
+ 'image': 'coder-radio.jpg',
'plot': __language__(30217),
'genre': 'Technology'
}
@@ -184,7 +184,7 @@ def get_shows():
'feed': feedburner + 'linuxunvid?format=xml',
'feed-low': feedburner + 'linuxunogg?format=xml',
'feed-audio': feedburner + 'linuxunogg?format=xml',
- 'image': 'Linux_Unplugged.jpg',
+ 'image': 'linux-unplugged.jpg',
'plot': __language__(30219),
'genre': 'Technology'
}
@@ -194,7 +194,7 @@ def get_shows():
'feed': feedburner + 'BsdNowHd?format=xml',
'feed-low': feedburner + 'BsdNowMobile?format=xml',
'feed-audio': feedburner + 'BsdNowOgg?format=xml',
- 'image': 'bsdnow.jpg',
+ 'image': 'bsd-now.jpg',
'plot': __language__(30220),
'genre': 'Technology'
}
@@ -203,7 +203,7 @@ def get_shows():
'feed': feedburner + 'HowtoLinuxHd?format=xml',
'feed-low': feedburner + 'HowtoLinuxMobile?format=xml',
'feed-audio': feedburner + 'HowtoLinuxOgg?format=xml',
- 'image': 'howtolinux.jpg',
+ 'image': 'howto-linux.jpg',
'plot': __language__(30221),
'genre': 'Technology'
}
@@ -213,7 +213,7 @@ def get_shows():
'feed': 'http://feedpress.me/t3mob',
'feed-low': 'http://feedpress.me/t3ogg',
'feed-audio': 'http://feedpress.me/t3ogg',
- 'image': 'techtalktoday.png',
+ 'image': 'tech-talk-today.png',
'plot': __language__(30222),
'genre': 'Technology'
}
@@ -244,7 +244,7 @@ def categories():
__settings__.getAddonInfo('path'),
'resources',
'media',
- 'jupiterbroadcasting.jpg'),
+ 'jblive-tv.jpg'),
info={
'title': __language__(30010),
'plot': __language__(30210),
diff --git a/plugin.video.jupiterbroadcasting/fanart.jpg
b/plugin.video.jupiterbroadcasting/fanart.jpg
index 5361dc3..37db6df 100644
Binary files a/plugin.video.jupiterbroadcasting/fanart.jpg and
b/plugin.video.jupiterbroadcasting/fanart.jpg differ
diff --git a/plugin.video.jupiterbroadcasting/icon.png
b/plugin.video.jupiterbroadcasting/icon.png
index 20dabc3..f9017ae 100644
Binary files a/plugin.video.jupiterbroadcasting/icon.png and
b/plugin.video.jupiterbroadcasting/icon.png differ
diff --git
a/plugin.video.jupiterbroadcasting/resources/language/English/strings.xml
b/plugin.video.jupiterbroadcasting/resources/language/English/strings.xml
index cdbe28a..1834d7a 100644
--- a/plugin.video.jupiterbroadcasting/resources/language/English/strings.xml
+++ b/plugin.video.jupiterbroadcasting/resources/language/English/strings.xml
@@ -31,7 +31,7 @@
<string id="30009">SciByte</string>
<string id="30209">SciByte is a show about science topics presented by
Heather and Jeremy.</string>
- <string id="30010">[ Live Show ]</string>
+ <string id="30010">[ JBLive.TV ]</string>
<string id="30210">Watch the Jupiter Broadcasting live feed.</string>
<string id="30011">FauxShow</string>
diff --git a/plugin.video.jupiterbroadcasting/resources/media/torked.jpg
b/plugin.video.jupiterbroadcasting/resources/media/torked.jpg
index 55789be..180f894 100644
Binary files a/plugin.video.jupiterbroadcasting/resources/media/torked.jpg and
b/plugin.video.jupiterbroadcasting/resources/media/torked.jpg differ
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=4680a48c7ada9c547100397e31c692ff02a79152
commit 4680a48c7ada9c547100397e31c692ff02a79152
Author: sphere <[email protected]>
Date: Thu Jul 3 10:50:45 2014 +0200
[plugin.video.sarpur] updated to version 3.1.1
diff --git a/plugin.video.sarpur/addon.xml b/plugin.video.sarpur/addon.xml
index c87abd2..41df4a8 100644
--- a/plugin.video.sarpur/addon.xml
+++ b/plugin.video.sarpur/addon.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.sarpur"
name="Sarpur"
- version="3.1.0"
+ version="3.1.1"
provider-name="Dagur Páll Ammendrup">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
- <!--import addon="script.module.beautifulsoup" version="3.0.8"/-->
+ <import addon="script.module.html5lib" version="0.999"/>
<import addon="script.module.simplejson" version="2.0.10"/>
</requires>
<extension point="xbmc.python.pluginsource"
diff --git a/plugin.video.sarpur/changelog.txt
b/plugin.video.sarpur/changelog.txt
index 02f0eef..3f4636f 100644
--- a/plugin.video.sarpur/changelog.txt
+++ b/plugin.video.sarpur/changelog.txt
@@ -1,3 +1,9 @@
+[B]Version 3.1.1[/B]
+- Added missing required library
+
+[B]Version 3.1.0[/B]
+- Complete rewrite. Plenty of bugfixes and better performance
+
[B]Version 3.0.3[/B]
- Live URL is now fetched instead of being hard coded
diff --git a/plugin.video.sarpur/default.py b/plugin.video.sarpur/default.py
index e48d57c..c55cc53 100644
--- a/plugin.video.sarpur/default.py
+++ b/plugin.video.sarpur/default.py
@@ -5,7 +5,7 @@
import sarpur
import urlparse
import xbmcplugin
-from sarpur import actions
+from sarpur import actions, logger
xbmcplugin.setContent(sarpur.ADDON_HANDLE, 'episodes')
@@ -40,7 +40,7 @@ try:
actions.play_live_stream(action_value)
else:
- print "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/__init__.py
b/plugin.video.sarpur/sarpur/__init__.py
index e867645..e7e50d6 100644
--- a/plugin.video.sarpur/sarpur/__init__.py
+++ b/plugin.video.sarpur/sarpur/__init__.py
@@ -5,6 +5,7 @@ import sys
import xbmcaddon
ALWAYS_REFRESH = False
+LOGGING_ENABLED = True
BASE_URL = sys.argv[0]
ADDON_HANDLE = int(sys.argv[1])
diff --git a/plugin.video.sarpur/sarpur/actions.py
b/plugin.video.sarpur/sarpur/actions.py
index 3ecb94c..8482e58 100644
--- a/plugin.video.sarpur/sarpur/actions.py
+++ b/plugin.video.sarpur/sarpur/actions.py
@@ -67,7 +67,7 @@ def play_live_stream(name):
def tab_index(url):
pageurl = 'http://www.ruv.is{0}'.format(url)
- print pageurl
+
episodes = scraper.get_tab_items(pageurl)
if not episodes:
gui.infobox("Engar upptökur", "Engin upptaka fannst")
diff --git a/plugin.video.sarpur/sarpur/scraper.py
b/plugin.video.sarpur/sarpur/scraper.py
index 8317943..2f8b65f 100644
--- a/plugin.video.sarpur/sarpur/scraper.py
+++ b/plugin.video.sarpur/sarpur/scraper.py
@@ -6,7 +6,6 @@ import html5lib
import re
def get_document(url):
- print "Slód: '{0}'".format(url)
r = requests.get(url)
source = r.content
doc = html5lib.parse(source, treebuilder='lxml',
namespaceHTMLElements=False)
@@ -51,11 +50,6 @@ def get_showtree():
channel_name = channel.find("h1").text
showtree.append({"name": channel_name, "categories": []})
- try:
- print channel_name.encode('utf-8')
- except AttributeError:
- print "nochan"
-
for group in channel.find("div").iterchildren():
if group.tag == 'h2':
showtree[i]["categories"].append({"name":group.text,
"shows":[]})
@@ -152,7 +146,3 @@ def get_live_url(channel='ruv'):
doc = get_document(page_urls.get(channel))
return doc.xpath("//div[@id='spilarinn']/video/source")[0].attrib['src']
-
-if __name__ == '__main__':
- None
- #print get_episodes('')
-----------------------------------------------------------------------
Summary of changes:
plugin.video.i24News/README.txt | 2 +
plugin.video.i24News/addon.xml | 2 +-
plugin.video.i24News/changelog.txt | 1 +
plugin.video.i24News/default.py | 8 +++++-
.../resources/language/English/strings.xml | 2 +-
plugin.video.jupiterbroadcasting/.editorconfig | 9 +++++++
plugin.video.jupiterbroadcasting/README.md | 2 +-
plugin.video.jupiterbroadcasting/addon.xml | 2 +-
plugin.video.jupiterbroadcasting/changelog.txt | 8 ++++++
plugin.video.jupiterbroadcasting/default.py | 26 ++++++++++----------
plugin.video.jupiterbroadcasting/fanart.jpg | Bin 37338 -> 61588 bytes
plugin.video.jupiterbroadcasting/icon.png | Bin 11496 -> 21643 bytes
.../resources/language/English/strings.xml | 2 +-
.../resources/media/LAS_Colored.jpg | Bin 83656 -> 0 bytes
.../resources/media/Linux_Unplugged.jpg | Bin 43157 -> 0 bytes
.../media/{beeristasty.png => beer-is-tasty.png} | Bin 108138 -> 108138
bytes
.../resources/media/{bsdnow.jpg => bsd-now.jpg} | Bin 334190 -> 334190
bytes
.../media/{coderradio.jpg => coder-radio.jpg} | Bin 638313 -> 638313
bytes
.../media/{fauxshow.jpg => faux-show.jpg} | Bin 120818 -> 120818
bytes
.../media/{howtolinux.jpg => howto-linux.jpg} | Bin 118714 -> 118714
bytes
.../resources/media/in-depth-look.jpg | Bin 0 -> 172040 bytes
.../resources/media/indepthlook.jpg | Bin 26485 -> 0 bytes
.../resources/media/jblive-tv.jpg | Bin 0 -> 48906 bytes
.../{jupiteratnite.jpg => jupiter-at-nite.jpg} | Bin 50587 -> 50587 bytes
.../media/{jupiterfiles.jpg => jupiter-files.jpg} | Bin 12908 -> 12908 bytes
.../resources/media/jupiterbroadcasting.jpg | Bin 33783 -> 0 bytes
.../resources/media/linux-action-show.jpg | Bin 0 -> 231317 bytes
.../resources/media/linux-unplugged.jpg | Bin 0 -> 218812 bytes
.../resources/media/most-recent.jpg | Bin 0 -> 49162 bytes
.../{techtalktoday.png => tech-talk-today.png} | Bin 212461 -> 212461
bytes
.../resources/media/torked.jpg | Bin 11436 -> 163865 bytes
plugin.video.npr/README.txt | 2 +
plugin.video.npr/addon.xml | 2 +-
plugin.video.npr/changelog.txt | 3 +-
plugin.video.npr/default.py | 26 +++++++++++++------
plugin.video.realtimetvitalia/addon.xml | 4 +-
plugin.video.realtimetvitalia/changelog.txt | 3 ++
plugin.video.realtimetvitalia/default.py | 22 +++-------------
plugin.video.sarpur/addon.xml | 4 +-
plugin.video.sarpur/changelog.txt | 6 ++++
plugin.video.sarpur/default.py | 4 +-
plugin.video.sarpur/resources/data/showtree.dat | 1 -
plugin.video.sarpur/resources/data/tabs.dat | 1 -
plugin.video.sarpur/sarpur/__init__.py | 1 +
plugin.video.sarpur/sarpur/actions.py | 2 +-
plugin.video.sarpur/sarpur/logger.py | 9 +++++++
plugin.video.sarpur/sarpur/scraper.py | 10 -------
plugin.video.tagesschauvideoblog/addon.py | 2 +-
plugin.video.tagesschauvideoblog/addon.xml | 2 +-
plugin.video.tagesschauvideoblog/changelog.txt | 4 +++
50 files changed, 104 insertions(+), 68 deletions(-)
create mode 100644 plugin.video.jupiterbroadcasting/.editorconfig
delete mode 100644
plugin.video.jupiterbroadcasting/resources/media/LAS_Colored.jpg
delete mode 100644
plugin.video.jupiterbroadcasting/resources/media/Linux_Unplugged.jpg
rename plugin.video.jupiterbroadcasting/resources/media/{beeristasty.png =>
beer-is-tasty.png} (100%)
rename plugin.video.jupiterbroadcasting/resources/media/{bsdnow.jpg =>
bsd-now.jpg} (100%)
rename plugin.video.jupiterbroadcasting/resources/media/{coderradio.jpg =>
coder-radio.jpg} (100%)
rename plugin.video.jupiterbroadcasting/resources/media/{fauxshow.jpg =>
faux-show.jpg} (100%)
rename plugin.video.jupiterbroadcasting/resources/media/{howtolinux.jpg =>
howto-linux.jpg} (100%)
create mode 100644
plugin.video.jupiterbroadcasting/resources/media/in-depth-look.jpg
delete mode 100644
plugin.video.jupiterbroadcasting/resources/media/indepthlook.jpg
create mode 100644
plugin.video.jupiterbroadcasting/resources/media/jblive-tv.jpg
rename plugin.video.jupiterbroadcasting/resources/media/{jupiteratnite.jpg =>
jupiter-at-nite.jpg} (100%)
rename plugin.video.jupiterbroadcasting/resources/media/{jupiterfiles.jpg =>
jupiter-files.jpg} (100%)
delete mode 100644
plugin.video.jupiterbroadcasting/resources/media/jupiterbroadcasting.jpg
create mode 100644
plugin.video.jupiterbroadcasting/resources/media/linux-action-show.jpg
create mode 100644
plugin.video.jupiterbroadcasting/resources/media/linux-unplugged.jpg
create mode 100644
plugin.video.jupiterbroadcasting/resources/media/most-recent.jpg
rename plugin.video.jupiterbroadcasting/resources/media/{techtalktoday.png =>
tech-talk-today.png} (100%)
delete mode 100644 plugin.video.sarpur/resources/data/showtree.dat
delete mode 100644 plugin.video.sarpur/resources/data/tabs.dat
create mode 100644 plugin.video.sarpur/sarpur/logger.py
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Open source business process management suite built on Java and Eclipse
Turn processes into business applications with Bonita BPM Community Edition
Quickly connect people, data, and systems into organized workflows
Winner of BOSSIE, CODIE, OW2 and Gartner awards
http://p.sf.net/sfu/Bonitasoft
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
