The branch, eden has been updated
via 4387333b55880261d094879929341176accfeb7f (commit)
via 7435927ff3b3f76f49f0bdae9a458678badf4bfd (commit)
via e71f20ea67784edb5fe4668fd803cc4990468b87 (commit)
from 519b4b4ec72676092f9e69bfac7d53558e46d84c (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=4387333b55880261d094879929341176accfeb7f
commit 4387333b55880261d094879929341176accfeb7f
Author: beenje <[email protected]>
Date: Wed Mar 6 22:19:26 2013 +0100
[plugin.video.leafstv] marked as broken
diff --git a/plugin.video.leafstv/addon.xml b/plugin.video.leafstv/addon.xml
index db4ebd3..e662ea0 100644
--- a/plugin.video.leafstv/addon.xml
+++ b/plugin.video.leafstv/addon.xml
@@ -11,5 +11,6 @@
<description>Stream content from LeafsTV Interactive.</description>
<platform>all</platform>
<disclaimer></disclaimer>
+ <broken>service unavailable</broken>
</extension>
</addon>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=7435927ff3b3f76f49f0bdae9a458678badf4bfd
commit 7435927ff3b3f76f49f0bdae9a458678badf4bfd
Author: beenje <[email protected]>
Date: Wed Mar 6 22:02:00 2013 +0100
[plugin.video.bliptv] updated to version 0.8.2
diff --git a/plugin.video.bliptv/BlipTVNavigation.py
b/plugin.video.bliptv/BlipTVNavigation.py
index 247f056..a4ca263 100644
--- a/plugin.video.bliptv/BlipTVNavigation.py
+++ b/plugin.video.bliptv/BlipTVNavigation.py
@@ -38,7 +38,7 @@ class BlipTVNavigation:
self.xbmcplugin = sys.modules["__main__"].xbmcplugin
# This list contains the main menu structure the user first encounters
when running the plugin
- # label
, path
, thumbnail , scraper
/ action
+ # label , path
, thumbnail , scraper / action
self. categories = (
{'Title':self.language(30016) ,'path':"/root/explore"
, 'thumbnail':"explore" },
{'Title':self.language(30001) ,'path':"/root/explore/browse"
, 'thumbnail':"explore" , 'scraper': 'browse_shows'
},
diff --git a/plugin.video.bliptv/BlipTVScraper.py
b/plugin.video.bliptv/BlipTVScraper.py
index 8057b00..a752d18 100644
--- a/plugin.video.bliptv/BlipTVScraper.py
+++ b/plugin.video.bliptv/BlipTVScraper.py
@@ -40,7 +40,7 @@ class BlipTVScraper:
self.urls['category_recent_videos'] =
"http://blip.tv/pr/channel_get_recent_episodes?channels_id=%s&page=%s&no_wrap=1";
self.urls['category_trending_videos'] =
"http://blip.tv/pr/channel_get_trending_episodes?channels_id=%s&page=%s&no_wrap=1";
self.urls['category_popular_videos'] =
"http://blip.tv/pr/channel_get_popular_episodes?channels_id=%s&page=%s&no_wrap=1";
- self.urls['category_az_listing'] =
"http://blip.tv/pr/channel_get_directory_listing?channels_id=%s§ion=all&page=%s&no_wrap=1";
+ self.urls['category_az_listing'] =
"http://blip.tv/pr/channel_get_directory_listing?channels_id=%s&page=%s§ion=all&no_wrap=1";
self.urls['category_staff_picks'] =
"http://blip.tv/pr/channel_get_staff_picks?channels_id=%s&page=%s&no_wrap=1";
self.urls['category_audience_favs'] =
"http://blip.tv/pr/channel_get_audience_faves?channels_id=%s&page=%s&no_wrap=1";
self.urls['home_popular'] =
"http://blip.tv/pr/home_get_popular_shows?page=%s&no_wrap=1";
@@ -48,12 +48,19 @@ class BlipTVScraper:
self.urls['home_new'] =
"http://blip.tv/pr/home_get_new_shows?page=%s&no_wrap=1";
def extractAndResizeThumbnail(self, item):
- thumbnail = self.common.parseDOM(item, "div", attrs={"class":
"PosterCard"}, ret="style")[0]
- if thumbnail.find(":url("):
+ thumbnails = self.common.parseDOM(item, "div", attrs={"class":
"PosterCard"}, ret="style")
+
+ if not thumbnails:
+ thumbnails = self.common.parseDOM(item, "img", attrs={"class":
"Poster"}, ret="src")
+
+ thumbnail = thumbnails[0]
+ if thumbnail.find(":url(") > -1:
thumbnail = thumbnail[thumbnail.find(":url(") + 5:]
thumbnail = thumbnail[:thumbnail.find(");")]
- thumbnail = thumbnail.replace("&w=220", "&w=440")
- thumbnail = thumbnail.replace("&h=325", "&h=650")
+
+ thumbnail = thumbnail.replace("&w=220", "&w=440")
+ thumbnail = thumbnail.replace("&h=325", "&h=650")
+
return thumbnail
def searchShow(self, params={}):
@@ -87,9 +94,9 @@ class BlipTVScraper:
else:
title = title[0]
- name = self.common.parseDOM(title, "a")[0]
- link = self.common.parseDOM(title, "a", ret="href")[0]
- tmp.append({"path": get("path"), "show": link, "scraper":
"show", "Title": self.common.replaceHTMLCodes(name.strip()), "thumbnail":
thumbnail})
+ link = self.common.parseDOM(item, "div", attrs={"class":
"PosterCard"}, ret="data-show-page-url")[0]
+
+ tmp.append({"path": get("path"), "show": link, "scraper":
"show", "Title": self.common.replaceHTMLCodes(title.strip()), "thumbnail":
thumbnail})
if len(tmp) > 0 and page < 50:
items += tmp
@@ -214,6 +221,8 @@ class BlipTVScraper:
result = self.common.fetchPage({"link": url})
show_list = self.common.parseDOM(result["content"], "div",
attrs={"class": "PosterCardWrap"})
+ if not show_list:
+ show_list = self.common.parseDOM(result["content"], "div",
attrs={"class": "ChannelDirectoryItem"})
if not show_list:
tester = False
@@ -221,21 +230,26 @@ class BlipTVScraper:
for show in show_list:
thumbnail = self.extractAndResizeThumbnail(show)
- print "show: " + repr(show)
+
title = self.common.parseDOM(show, "h1", attrs={"class":
"ShowTitle"})
if not title:
- title = self.common.parseDOM(show, "div", attrs={"class":
"ShowTitle"})[0]
- else:
- title = title[0]
+ title = self.common.parseDOM(show, "div", attrs={"class":
"ShowTitle"})
+ if not title:
+ title = self.common.parseDOM(show, "h3")
+ title = self.common.parseDOM(title, "a")
+
+ title = title[0]
- name = self.common.parseDOM(title, "a")[0]
- link = self.common.parseDOM(title, "a", ret="href")[0]
+ link = self.common.parseDOM(show, "div", attrs={"class":
"PosterCard"}, ret="data-show-page-url")
+ if not link:
+ link = self.common.parseDOM(show, "h3")
+ link = self.common.parseDOM(link, "a", ret="href")
item = {}
- item["show"] = link
+ item["show"] = link[0]
item["scraper"] = "show"
item["thumbnail"] = thumbnail
- item["Title"] = self.common.replaceHTMLCodes(name)
+ item["Title"] = self.common.replaceHTMLCodes(title)
shows.append(item)
@@ -250,7 +264,7 @@ class BlipTVScraper:
self.common.log("")
url = self.createUrl(params)
result = self.common.fetchPage({"link": url})
- channel_id = self.common.parseDOM(result["content"], "div",
attrs={"id": "ChannelHeading"}, ret="data-id")
+ channel_id = self.common.parseDOM(result["content"], "div",
attrs={"id": "PageInfo"}, ret="data-channels-id")
if channel_id:
self.common.log(repr(channel_id))
params["channel_id"] = channel_id[0]
@@ -436,9 +450,7 @@ class BlipTVScraper:
if get("category"):
params["folder"] = "true"
- if get("scraper") in ['browse_shows']:
- function = self.scrapeCategoryShows
- if get("scraper") in ['staff_picks', 'favorites']:
+ if get("scraper") in ['staff_picks', 'favorites', 'browse_shows']:
function = self.scrapeCategoryFeaturedShows
if get("scraper") in ['popular_episodes', 'new_episodes',
'trending_episodes']:
del params["folder"]
diff --git a/plugin.video.bliptv/addon.xml b/plugin.video.bliptv/addon.xml
index b7040a3..6119b29 100644
--- a/plugin.video.bliptv/addon.xml
+++ b/plugin.video.bliptv/addon.xml
@@ -1,8 +1,8 @@
<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
-<addon id="plugin.video.bliptv" name="BlipTV" provider-name="TheCollective"
version="0.8.1">
+<addon id="plugin.video.bliptv" name="BlipTV" provider-name="TheCollective"
version="0.8.2">
<requires>
<import addon="xbmc.python" version="2.0" />
- <import addon="script.common.plugin.cache" version="1.5.0" />
+ <import addon="script.common.plugin.cache" version="1.5.1" />
<import addon="script.module.parsedom" version="1.5.1" />
<import addon="script.module.simple.downloader" version="0.9.4" />
</requires>
@@ -11,6 +11,7 @@
</extension>
<extension point="xbmc.addon.metadata">
<platform>all</platform>
+ <language />
<summary lang="en">Bliptv video plugin</summary>
<description lang="en">Plugin that let's you browse and play videos from
BlipTV!</description>
<summary lang="bg">Ðидео добавка за Bliptv</summary>
diff --git a/plugin.video.bliptv/changelog.txt
b/plugin.video.bliptv/changelog.txt
index 4004ac7..6b2c2fe 100644
--- a/plugin.video.bliptv/changelog.txt
+++ b/plugin.video.bliptv/changelog.txt
@@ -7,11 +7,14 @@
[B]Errata[/B]
+[B]Version 0.8.2[/B]
+- Fixed: site changes broke parts of the show scraper
+
[B]Version 0.8.0[/B]
-- Fixed site changes broke downloader
+- Fixed: site changes broke downloader
[B]Version 0.7.0[/B]
-- Fixed Show scraper
+- Fixed: Show scraper
[B]Version 0.6.0[/B]
- Blip.tv changed the layout of their main page and broke most of the scraper
diff --git a/plugin.video.bliptv/default.py b/plugin.video.bliptv/default.py
index 6890092..5f9939d 100644
--- a/plugin.video.bliptv/default.py
+++ b/plugin.video.bliptv/default.py
@@ -26,7 +26,7 @@ try: import xbmcvfs
except: import xbmcvfsdummy as xbmcvfs
# plugin constants
-version = "0.8.1"
+version = "0.8.2"
plugin = "BlipTV-" + version
author = "TheCollective"
url = "www.xbmc.com"
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=e71f20ea67784edb5fe4668fd803cc4990468b87
commit e71f20ea67784edb5fe4668fd803cc4990468b87
Author: beenje <[email protected]>
Date: Wed Mar 6 22:01:48 2013 +0100
[plugin.video.youtube] updated to version 3.4.3
diff --git a/plugin.video.youtube/YouTubeLogin.py
b/plugin.video.youtube/YouTubeLogin.py
index 2a8dd8f..485582d 100644
--- a/plugin.video.youtube/YouTubeLogin.py
+++ b/plugin.video.youtube/YouTubeLogin.py
@@ -209,7 +209,7 @@ class YouTubeLogin():
# Fill out login information and send.
newurl = self.common.parseDOM(ret["content"].replace("\n", " "),
"form", attrs={"id": "gaia_loginform"}, ret="action")
if len(newurl) > 0:
- (galx, url_data) = self._fillLoginInfo(ret["content"])
+ (galx, url_data) = self._fillLoginInfo(ret)
if len(galx) > 0 and len(url_data) > 0:
fetch_options = {"link": newurl[0], "no-language-cookie":
"true", "url_data": url_data, "hidden": "true", "referer": ret["location"]}
self.common.log("Part B")
@@ -256,12 +256,18 @@ class YouTubeLogin():
return (ret, status)
- def _fillLoginInfo(self, content):
+ def _fillLoginInfo(self, ret):
+ content = ret["content"]
rmShown = self.common.parseDOM(content, "input", attrs={"name":
"rmShown"}, ret="value")
cont = self.common.parseDOM(content, "input", attrs={"name":
"continue"}, ret="value")
- uilel = self.common.parseDOM(content, "input", attrs={"name":
"uilel"}, ret="value")
- if len(uilel) == 0:
+ uilel = self.common.parseDOM(content, "input", attrs={"name":
"uilel"}, ret="value") # Deprecated?
+ if len(uilel) == 0: # Deprecated?
uilel = self.common.parseDOM(content, "input", attrs=
{"id":"uilel"}, ret="value")
+ if len(uilel) == 0 and ret["new_url"].find("uilel=") > -1:
+ uilel = ret["new_url"][ret["new_url"].find("uilel=")+6]
+ if uilel.find("&") > -1:
+ uilel = uilel[:uilel.find("&")]
+ uilel = [uilel]
dsh = self.common.parseDOM(content, "input", attrs={"name": "dsh"},
ret="value")
if len(dsh) == 0:
dsh = self.common.parseDOM(content, "input", attrs={"id": "dsh"},
ret="value")
diff --git a/plugin.video.youtube/addon.xml b/plugin.video.youtube/addon.xml
index 0b26c3d..7327608 100644
--- a/plugin.video.youtube/addon.xml
+++ b/plugin.video.youtube/addon.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
-<addon id="plugin.video.youtube" name="YouTube" provider-name="TheCollective"
version="3.4.2">
+<addon id="plugin.video.youtube" name="YouTube" provider-name="TheCollective"
version="3.4.3">
<requires>
<import addon="xbmc.python" version="2.0" />
<import addon="script.module.simplejson" version="2.0.10" />
diff --git a/plugin.video.youtube/changelog.txt
b/plugin.video.youtube/changelog.txt
index f1ce7d3..45b6246 100644
--- a/plugin.video.youtube/changelog.txt
+++ b/plugin.video.youtube/changelog.txt
@@ -13,6 +13,9 @@
- [XBMC] Has Excessive Memory use after running the plugin for prolonged
periods of time
- [RTMPDUMP] Doesn't support handshake type 10 which is required by youtube.
+[B]Version 3.4.3[/B]
+- Fixed login
+
[B]Version 3.4.2[/B]
- Fixed playback bug cause by youtube site changes
- Fixed bug when using unicode characters in search
diff --git a/plugin.video.youtube/default.py b/plugin.video.youtube/default.py
index c7fde61..3bf7958 100644
--- a/plugin.video.youtube/default.py
+++ b/plugin.video.youtube/default.py
@@ -29,7 +29,7 @@ except ImportError:
import xbmcvfsdummy as xbmcvfs
# plugin constants
-version = "3.4.2"
+version = "3.4.3"
plugin = "YouTube-" + version
author = "TheCollective"
url = "www.xbmc.com"
-----------------------------------------------------------------------
Summary of changes:
plugin.video.bliptv/BlipTVNavigation.py | 2 +-
plugin.video.bliptv/BlipTVScraper.py | 52 +++++++++++++++++++------------
plugin.video.bliptv/addon.xml | 5 ++-
plugin.video.bliptv/changelog.txt | 7 +++-
plugin.video.bliptv/default.py | 2 +-
plugin.video.leafstv/addon.xml | 1 +
plugin.video.youtube/YouTubeLogin.py | 14 ++++++--
plugin.video.youtube/addon.xml | 2 +-
plugin.video.youtube/changelog.txt | 3 ++
plugin.video.youtube/default.py | 2 +-
10 files changed, 58 insertions(+), 32 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the
endpoint security space. For insight on selecting the right partner to
tackle endpoint security challenges, access the full report.
http://p.sf.net/sfu/symantec-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
