The branch, frodo has been updated
via dff232cb5e3341394394233c4d878ae0ac64dd4a (commit)
from 404f3b6fe0d968a30abb1510c65921a210c07a24 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=dff232cb5e3341394394233c4d878ae0ac64dd4a
commit dff232cb5e3341394394233c4d878ae0ac64dd4a
Author: Martijn Kaijser <[email protected]>
Date: Sun Jul 27 11:52:57 2014 +0200
[plugin.video.youtube] 4.4.9
diff --git a/plugin.video.youtube/YouTubeCore.py
b/plugin.video.youtube/YouTubeCore.py
index 2bb7e09..a3a340d 100644
--- a/plugin.video.youtube/YouTubeCore.py
+++ b/plugin.video.youtube/YouTubeCore.py
@@ -780,7 +780,7 @@ class YouTubeCore():
for tmp in self.common.parseDOM(node, "yt:duration", ret="seconds"):
if tmp:
- result = tmp
+ result = str(int(tmp) / 60)
return result
diff --git a/plugin.video.youtube/YouTubeLogin.py
b/plugin.video.youtube/YouTubeLogin.py
index f4212f5..4977d2f 100644
--- a/plugin.video.youtube/YouTubeLogin.py
+++ b/plugin.video.youtube/YouTubeLogin.py
@@ -188,9 +188,13 @@ class YouTubeLogin():
fetch_options = False
# Check if we are logged in.
-# nick = self.common.parseDOM(ret["content"], "p", attrs={"class":
"masthead-expanded-acct-sw-id2"})
- nick = self.common.parseDOM(ret["content"], "span", attrs={"id":
"yt-masthead-user-displayname"})
+ nick = self.common.parseDOM(ret["content"], "div", attrs={"class":
"yt-masthead-picker-name"})
+ if len(nick) > 0 and nick[0] != "Sign In":
+ self.common.log("Logged in. Parsing data: " + repr(nick))
+ sys.modules["__main__"].cookiejar.save()
+ self.settings.setSetting("cookies_saved", "true")
+ return(ret, 200)
# Check if there are any errors to report
errors = self.core._findErrors(ret, silent=True)
@@ -199,12 +203,6 @@ class YouTubeLogin():
self.common.log("Returning error: " + repr(errors))
return (errors, 303)
- if len(nick) > 0 and nick[0] != "Sign In":
- self.common.log("Logged in. Parsing data: " + repr(nick))
- sys.modules["__main__"].cookiejar.save()
- self.settings.setSetting("cookies_saved", "true")
- return(ret, 200)
-
# Click login link on youtube.com
newurl = self.common.parseDOM(ret["content"], "button",
attrs={"href": ".*?ServiceLogin.*?"}, ret="href")
if len(newurl) > 0:
diff --git a/plugin.video.youtube/YouTubePlayer.py
b/plugin.video.youtube/YouTubePlayer.py
index 539aa67..1cea249 100644
--- a/plugin.video.youtube/YouTubePlayer.py
+++ b/plugin.video.youtube/YouTubePlayer.py
@@ -445,6 +445,7 @@ class YouTubePlayer():
# get main function name
match = re.search("signature=(\w+?)\([^)]\)", playerData)
+ #match = re.search("signature=([$a-zA-Z]+)", playerData)
if match:
mainFunName = match.group(1)
self.common.log('Main signature function name = "%s"' %
mainFunName)
diff --git a/plugin.video.youtube/addon.xml b/plugin.video.youtube/addon.xml
index 1e8ea4f..8eab002 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="4.4.8">
+<addon id="plugin.video.youtube" name="YouTube" provider-name="TheCollective"
version="4.4.9">
<requires>
<import addon="xbmc.python" version="2.1.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 c59d967..e7e7fc5 100644
--- a/plugin.video.youtube/changelog.txt
+++ b/plugin.video.youtube/changelog.txt
@@ -10,6 +10,9 @@
- [RTMPDUMP] Doesn't support handshake type 10 which is required by youtube.
- [YOUTUBE] Requesting suggestions/recommendations from youtube sometimes
stalls.
+[B]Version 4.4.9[/B]
+- Fixed login issues for all five login methods.
+
[B]Version 3.4.8[/B]
- Fixed login issues for all five login methods.
- Refactored VEVO video playback code.
diff --git a/plugin.video.youtube/default.py b/plugin.video.youtube/default.py
index f38ea0f..53adb2b 100644
--- a/plugin.video.youtube/default.py
+++ b/plugin.video.youtube/default.py
@@ -30,7 +30,7 @@ except ImportError:
import xbmcvfsdummy as xbmcvfs
# plugin constants
-version = "4.4.8"
+version = "4.4.9"
plugin = "YouTube-" + version
author = "TheCollective"
url = "www.xbmc.com"
-----------------------------------------------------------------------
Summary of changes:
plugin.video.youtube/YouTubeCore.py | 2 +-
plugin.video.youtube/YouTubeLogin.py | 14 ++++++--------
plugin.video.youtube/YouTubePlayer.py | 1 +
plugin.video.youtube/addon.xml | 2 +-
plugin.video.youtube/changelog.txt | 3 +++
plugin.video.youtube/default.py | 2 +-
6 files changed, 13 insertions(+), 11 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Want fast and easy access to all the code in your enterprise? Index and
search up to 200,000 lines of code with a free copy of Black Duck
Code Sight - the same software that powers the world's largest code
search on Ohloh, the Black Duck Open Hub! Try it now.
http://p.sf.net/sfu/bds
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
