The branch, frodo has been updated
via b1aaf47440f149b1f554534f8f0d14d73dcaf375 (commit)
via 39c06015c4ce63bb497dc47b2eff119384507a4f (commit)
from 26032c28a3f53f18ea75a839ddfcc4c20878f70f (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=b1aaf47440f149b1f554534f8f0d14d73dcaf375
commit b1aaf47440f149b1f554534f8f0d14d73dcaf375
Author: beenje <[email protected]>
Date: Fri May 31 22:48:48 2013 +0200
[plugin.video.itunes_trailers] updated to version 0.1.2
diff --git a/plugin.video.itunes_trailers/addon.xml
b/plugin.video.itunes_trailers/addon.xml
index 7098147..8687b84 100644
--- a/plugin.video.itunes_trailers/addon.xml
+++ b/plugin.video.itunes_trailers/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.itunes_trailers" name="Apple iTunes Trailers"
version="0.1.1" provider-name="Tristan Fischer ([email protected])">
+<addon id="plugin.video.itunes_trailers" name="Apple iTunes Trailers"
version="0.1.2" provider-name="Tristan Fischer ([email protected])">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.xbmcswift2" version="2.4.0"/>
diff --git a/plugin.video.itunes_trailers/changelog.txt
b/plugin.video.itunes_trailers/changelog.txt
index c1b99a5..9881114 100644
--- a/plugin.video.itunes_trailers/changelog.txt
+++ b/plugin.video.itunes_trailers/changelog.txt
@@ -1,3 +1,6 @@
+0.1.2 (31.05.2013)
+- fixed new trailers
+
0.1.1 (25.04.2013)
- fixed covers (apple switched to relative covers)
diff --git a/plugin.video.itunes_trailers/resources/lib/scraper.py
b/plugin.video.itunes_trailers/resources/lib/scraper.py
index e2ebbe2..07e9003 100644
--- a/plugin.video.itunes_trailers/resources/lib/scraper.py
+++ b/plugin.video.itunes_trailers/resources/lib/scraper.py
@@ -114,9 +114,10 @@ class TrailerScraper(object):
TRAILERS_URL = BASE_URL + '/%s/includes/playlists/web.inc'
BACKGROUND_URL = BASE_URL + '/%s/images/background.jpg'
+ OVERLAY_URL = BASE_URL + '/%s/includes/%s/extralarge.html'
def get_trailers(self, location):
- tree = self.__get_tree(location)
+ tree = self.__get_tree(self.TRAILERS_URL % location)
trailer_re = re.compile('trailer')
for li in tree.findAll('li', {'class': trailer_re}):
p_list = li.find('p').contents
@@ -125,10 +126,27 @@ class TrailerScraper(object):
section = li
else:
section = tree
- trailer_urls = [
- a['href'] for a in
- section.findAll('a', {'class': 'target-quicktimeplayer'})
- ]
+ trailer_url_section = section.findAll(
+ 'a', {'class': 'target-quicktimeplayer'}
+ )
+ if trailer_url_section:
+ trailer_urls = [
+ a['href'] for a in
+ trailer_url_section
+ ]
+ else:
+ # This is hacky but also done by js on website...
+ tname = li.find('h3').string.replace(' ', '').replace('-', '')
+ trailer_tree = self.__get_tree(
+ self.OVERLAY_URL % (location, tname.lower())
+ )
+ resolution_gen_url = trailer_tree.find(
+ 'a', {'class': 'movieLink'}
+ )['href'].split('?')[0]
+ trailer_urls = [
+ resolution_gen_url.replace('720p', res)
+ for res in ('h480p', 'h720p', 'h1080p')
+ ]
m, d, y = date_str.split()[1].split('/')
trailer = {
'title': li.find('h3').string,
@@ -140,10 +158,10 @@ class TrailerScraper(object):
}
yield trailer
- def __get_tree(self, location):
- url = self.TRAILERS_URL % location
+ def __get_tree(self, url):
headers = {'User-Agent': USER_AGENT}
req = urllib2.Request(url, None, headers)
+ print 'Opening URL: %s' % url
try:
return BeautifulSoup(urllib2.urlopen(req).read())
except urllib2.HTTPError, error:
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=39c06015c4ce63bb497dc47b2eff119384507a4f
commit 39c06015c4ce63bb497dc47b2eff119384507a4f
Author: beenje <[email protected]>
Date: Fri May 31 22:48:40 2013 +0200
[plugin.video.cinemassacre] updated to version 1.0.4
diff --git a/plugin.video.cinemassacre/addon.xml
b/plugin.video.cinemassacre/addon.xml
index 4ac1b28..fdfe8d6 100644
--- a/plugin.video.cinemassacre/addon.xml
+++ b/plugin.video.cinemassacre/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.cinemassacre" name="cinemassacre" version="1.0.3"
provider-name="dethfeet, Kr0nZ">
+<addon id="plugin.video.cinemassacre" name="cinemassacre" version="1.0.4"
provider-name="dethfeet, Kr0nZ">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="xbmc.gui" version="4.0.0"/>
@@ -15,6 +15,11 @@
<description lang="en">Home of the Angry Video Game Nerd, Monster Madness,
movie reviews, top 10's, and commentary, retro and classic videos</description>
<platform>all</platform>
<language>en</language>
+ <license>GNU GENERAL PUBLIC LICENSE. Version 2, June 1991</license>
+ <forum>http://forum.xbmc.org/showthread.php?tid=147672</forum>
+ <website>http://cinemassacre.com/</website>
+ <source>https://github.com/Kr0nZ/plugin.video.cinemassacre</source>
+ <email>[email protected]</email>
</extension>
</addon>
diff --git a/plugin.video.cinemassacre/changelog.txt
b/plugin.video.cinemassacre/changelog.txt
index 35d9003..32a7d78 100644
--- a/plugin.video.cinemassacre/changelog.txt
+++ b/plugin.video.cinemassacre/changelog.txt
@@ -1,3 +1,4 @@
+1.0.4 - Fix screenwave videos
1.0.3 - Fix springboard videos
1.0.2 - Fix recent videos
1.0.1 - Updated with website changes
diff --git a/plugin.video.cinemassacre/resources/defaults.xml
b/plugin.video.cinemassacre/resources/defaults.xml
index 359062d..76ac935 100644
--- a/plugin.video.cinemassacre/resources/defaults.xml
+++ b/plugin.video.cinemassacre/resources/defaults.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
- <defaults>
- <icons>
- <icon url="/category/avgn/" image="avgn.png"/>
- <icon url="/category/boardjames/" image="boardJ.png"/>
- <icon url="/category/ykwb/" image="ykwbs.png"/>
- </icons>
- <excludeUrls>
- <url>/fanstuff/</url>
- <url>/full-list-of-avgn-videos/</url>
- <url>/fan-art-page</url>
- <url>/2011/01/19/avgn-iphone-game-texting-of-the-bread/</url>
- <url>/2010/03/10/avgn-game-over-2-by-gavin-maclean/</url>
- <url>/2009/08/17/avgn-ko-boxing/</url>
- <url>/2009/01/19/11909-avgn-game-over-by-gavin-maclean/</url>
-
<url>/2008/08/03/the-avgn-in-pixel-land-blast-by-kevin-berryman/</url>
- <url>/2008/02/25/the-angry-video-game-by-eric-ruth/</url>
- <url>/fan-songs-page</url>
- <url>/category/avgn/avgn-collection/</url>
- <url>/2007/03/22/game-collection/</url>
- <url>http://www.screwattackstore.com/avgntshirts.html</url>
-
<url>http://cinemassacre.com/category/site-2/featuredarticles/</url>
- <url>http://cinemassacre.com/donate/</url>
- <url>http://cinemassacre.com/faq/</url>
- <url>http://cinemassacre.com/links/</url>
- <url>http://cinemassacre.com/partners/</url>
- <url>/terms-of-service/</url>
- <url>http://cinemassacre.com/contact/</url>
- </excludeUrls>
- </defaults>
+<?xml version="1.0" encoding="utf-8"?>
+ <defaults>
+ <icons>
+ <icon url="/category/avgn/" image="avgn.png"/>
+ <icon url="/category/boardjames/" image="boardJ.png"/>
+ <icon url="/category/ykwb/" image="ykwbs.png"/>
+ </icons>
+ <excludeUrls>
+ <url>/fanstuff/</url>
+ <url>/full-list-of-avgn-videos/</url>
+ <url>/fan-art-page</url>
+ <url>/2011/01/19/avgn-iphone-game-texting-of-the-bread/</url>
+ <url>/2010/03/10/avgn-game-over-2-by-gavin-maclean/</url>
+ <url>/2009/08/17/avgn-ko-boxing/</url>
+ <url>/2009/01/19/11909-avgn-game-over-by-gavin-maclean/</url>
+
<url>/2008/08/03/the-avgn-in-pixel-land-blast-by-kevin-berryman/</url>
+ <url>/2008/02/25/the-angry-video-game-by-eric-ruth/</url>
+ <url>/fan-songs-page</url>
+ <url>/category/avgn/avgn-collection/</url>
+ <url>/2007/03/22/game-collection/</url>
+ <url>http://www.screwattackstore.com/avgntshirts.html</url>
+
<url>http://cinemassacre.com/category/site-2/featuredarticles/</url>
+ <url>http://cinemassacre.com/donate/</url>
+ <url>http://cinemassacre.com/faq/</url>
+ <url>http://cinemassacre.com/links/</url>
+ <url>http://cinemassacre.com/partners/</url>
+ <url>/terms-of-service/</url>
+ <url>http://cinemassacre.com/contact/</url>
+ </excludeUrls>
+ </defaults>
diff --git a/plugin.video.cinemassacre/showEpisode.py
b/plugin.video.cinemassacre/showEpisode.py
index f4ffbc1..2a8e20b 100644
--- a/plugin.video.cinemassacre/showEpisode.py
+++ b/plugin.video.cinemassacre/showEpisode.py
@@ -43,15 +43,13 @@ def showEpisodeScreenwave(videoItem):
streamerVal = re.compile('streamer(?:[\'|\"]*):(?:[\s|\'|\"]*)([^\']*)',
re.DOTALL).findall(tmpContent)
flashplayerVal =
re.compile('flashplayer(?:[\'|\"]*):(?:[\s|\'|\"]*)([^\']*)',
re.DOTALL).findall(tmpContent)
- levelsVal = re.compile('levels(?:[\'|\"]*): \[(.*)\],',
re.DOTALL).findall(tmpContent)
- files = ""
- if len(levelsVal)>0:
- filesVal = re.compile('file(?:[\'|\"]*):(?:[\s|\'|\"]*)([^\'|\"]*)',
re.DOTALL).findall(levelsVal[0])
- for i in range(0,len(filesVal)):
- if "high" in filesVal[i]:
- files = filesVal[i]
- break
-
+ filesVal = re.compile('file(?:[\'|\"]*):(?:[\s|\'|\"]*)([^\'|\"]*)',
re.DOTALL).findall(tmpContent)
+
+ for i in range(0,len(filesVal)):
+ if "high" in filesVal[i]:
+ files = filesVal[i]
+ break
+
if len(streamerVal)>0 and len(flashplayerVal)>0 and len(files)>0:
rtmpurl = streamerVal[0]
swfVfy = flashplayerVal[0]
-----------------------------------------------------------------------
Summary of changes:
plugin.video.cinemassacre/addon.xml | 7 ++-
plugin.video.cinemassacre/changelog.txt | 1 +
plugin.video.cinemassacre/resources/defaults.xml | 60 ++++++++++----------
plugin.video.cinemassacre/showEpisode.py | 16 ++---
plugin.video.itunes_trailers/addon.xml | 2 +-
plugin.video.itunes_trailers/changelog.txt | 3 +
.../resources/lib/scraper.py | 32 ++++++++--
7 files changed, 73 insertions(+), 48 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite
It's a free troubleshooting tool designed for production
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap2
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
