The branch, eden has been updated
via 4e74acea65db18d3d9d034d4a83abadd7a794673 (commit)
from dfb0ca712238d2833dcbeea84b2d52dc74f3c755 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=4e74acea65db18d3d9d034d4a83abadd7a794673
commit 4e74acea65db18d3d9d034d4a83abadd7a794673
Author: amet <[email protected]>
Date: Mon May 21 14:03:23 2012 +0400
[plugin.video.pennyarcadetv] -v2.0.3
- Fixed breakage due to changes to website
diff --git a/plugin.video.pennyarcadetv/addon.xml
b/plugin.video.pennyarcadetv/addon.xml
index 1473530..9d62401 100644
--- a/plugin.video.pennyarcadetv/addon.xml
+++ b/plugin.video.pennyarcadetv/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.pennyarcadetv"
name="Penny Arcade TV"
- version="2.0.2"
+ version="2.0.3"
provider-name="jorsoban, ErwinJunge">
<requires>
<import addon="xbmc.python" version="2.0"/>
diff --git a/plugin.video.pennyarcadetv/changelog.txt
b/plugin.video.pennyarcadetv/changelog.txt
index 06c5d71..911aeb0 100644
--- a/plugin.video.pennyarcadetv/changelog.txt
+++ b/plugin.video.pennyarcadetv/changelog.txt
@@ -1,3 +1,7 @@
+[B]Version 2.0.3 - 2012-05-21[/B]
+
+- Fixed breakage due to changes to website
+
[B]Version 2.0.2 - 2012-05-12[/B]
- Version bump for eden
diff --git a/plugin.video.pennyarcadetv/default.py
b/plugin.video.pennyarcadetv/default.py
index 686bb42..528e1f3 100644
--- a/plugin.video.pennyarcadetv/default.py
+++ b/plugin.video.pennyarcadetv/default.py
@@ -78,8 +78,8 @@ def listShowsAndLatest(showOnlyLatest):
ep["title"] = links[2]["title"]
#Image and url
- ep["imgurl"] = __baseURL__ + div.parent.img["src"]
- ep["url"] = __baseURL__ + links[0]["href"]
+ ep["imgurl"] = div.parent.img["src"]
+ ep["url"] = links[0]["href"]
foundEps.append(ep)
else:
@@ -87,8 +87,8 @@ def listShowsAndLatest(showOnlyLatest):
#that shows the info without having other fields left empty..
show = {}
show["title"] = links[0]["title"]
- show["imgurl"] = __baseURL__ + div.parent.a.img["src"]
- show["url"] = __baseURL__ + links[0]["href"]
+ show["imgurl"] = div.parent.a.img["src"]
+ show["url"] = links[0]["href"]
foundShows.append(show)
except:
log("Issue with parsing show or ep div.")
@@ -139,7 +139,7 @@ def listShowEpisodes(url):
#TODO - not sure if using set content is worth the effort since there
isn"t much
#metadata available for these episodes other than title and image
#xbmcplugin.setContent(pluginHandle, "episodes")
- urlRegex = re.compile("/.*/.*/(.*?)/")
+ urlRegex = re.compile(".*/(.*?)/")
episodesPage = BeautifulSoup(getHTML(forURL=url),
convertEntities=BeautifulSoup.HTML_ENTITIES)
epLists = episodesPage.findAll(attrs={"class" : "episodes"})
@@ -151,8 +151,8 @@ def listShowEpisodes(url):
for epList in epLists:
for ep in epList.findAll("li"):
aTags = ep.findAll("a")
- img = __baseURL__ + ep.img["src"]
- url = __baseURL__ + aTags[0]["href"]
+ img = ep.img["src"]
+ url = aTags[0]["href"]
name = formatEpName(aTags[0]["href"], aTags[1].contents[2],
urlRegex, seasonCounter)
addEpisodeItem(name, url, img)
seasonCounter -= 1
@@ -185,12 +185,12 @@ def playVideo(url):
#Get the embed tag on the video page as the first step to get the final url
videoPage = BeautifulSoup(getHTML(forURL=url))
#Assuming a single embed tag works for now
- embedUrl = videoPage("embed")[0]["src"]
+ embedUrl = videoPage("iframe")[0]["src"]
#embedUrl redirects to another Url that has a QS param for a Url to the
rss file for this specific video
#4 is to get the query portion of the final url, not sure why the named
attribute doesn"t work..
redirectUrl = urlparse.urlparse(getRedirectURL(forURL=embedUrl))
- redirectQS = parse_qs(redirectUrl[4])
+ redirectQS = parse_qs(redirectUrl[5])
rssFileUrl = redirectQS["file"][0]
rssFile = BeautifulStoneSoup(getHTML(forURL=rssFileUrl))
@@ -232,4 +232,4 @@ elif action == "listlatestepisodes":
elif action == "listshowepisodes":
listShowEpisodes(params["url"][0])
elif action == "playvideo":
- playVideo(params["url"][0])
\ No newline at end of file
+ playVideo(params["url"][0])
-----------------------------------------------------------------------
Summary of changes:
plugin.video.pennyarcadetv/addon.xml | 2 +-
plugin.video.pennyarcadetv/changelog.txt | 4 ++++
plugin.video.pennyarcadetv/default.py | 20 ++++++++++----------
3 files changed, 15 insertions(+), 11 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons