The branch, eden has been updated
via a4bb2095355917ba2971d20e9b3cf04e8427ecbd (commit)
from d16c2e29a251075f9e981113082db37ad743dd79 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=a4bb2095355917ba2971d20e9b3cf04e8427ecbd
commit a4bb2095355917ba2971d20e9b3cf04e8427ecbd
Author: beenje <[email protected]>
Date: Tue Feb 19 21:35:33 2013 +0100
[plugin.video.youtube] updated to version 3.4.2
diff --git a/plugin.video.youtube/YouTubePlayer.py
b/plugin.video.youtube/YouTubePlayer.py
index 316cf2b..736d598 100644
--- a/plugin.video.youtube/YouTubePlayer.py
+++ b/plugin.video.youtube/YouTubePlayer.py
@@ -22,7 +22,6 @@ import cgi
try: import simplejson as json
except ImportError: import json
-
class YouTubePlayer():
fmt_value = {
5: "240p h263 flv container",
@@ -296,7 +295,7 @@ class YouTubePlayer():
found = False
for line in data.split("\n"):
- if line.strip().startswith("var swf = \""):
+ if line.strip().startswith("yt.playerConfig = "):
found = True
p1 = line.find("=")
p2 = line.rfind(";")
@@ -307,12 +306,8 @@ class YouTubePlayer():
if found:
data = json.loads(data)
- data = data[data.find("flashvars"):]
- data = data[data.find("\""):]
- data = data[:1 + data[1:].find("\"")]
+ flashvars = data["args"]
- for k, v in cgi.parse_qs(data).items():
- flashvars[k] = v[0]
self.common.log(u"flashvars: " + repr(flashvars), 2)
return flashvars
diff --git a/plugin.video.youtube/YouTubeStorage.py
b/plugin.video.youtube/YouTubeStorage.py
index 274ce28..21e71ed 100644
--- a/plugin.video.youtube/YouTubeStorage.py
+++ b/plugin.video.youtube/YouTubeStorage.py
@@ -65,30 +65,6 @@ class YouTubeStorage():
except:
return io.open(filepath, alternate)
- def getStoredArtists(self, params={}):
- self.common.log(repr(params), 5)
- get = params.get
-
- artists = self.retrieve(params)
-
- result = []
- for title, artist in artists:
- item = {}
- item["path"] = get("path")
- item["Title"] = urllib.unquote_plus(title)
- item["artist"] = artist
- item["scraper"] = "music_artist"
- item["icon"] = "music"
- item["thumbnail"] = "music"
- thumbnail = self.retrieve(params, "thumbnail", item)
-
- if thumbnail:
- item["thumbnail"] = thumbnail
-
- result.append(item)
-
- return (result, 200)
-
def getStoredSearches(self, params={}):
self.common.log(repr(params), 5)
get = params.get
@@ -269,15 +245,6 @@ class YouTubeStorage():
if iget("search"):
key += urllib.unquote_plus(iget("search", ""))
- if get("artist") or iget("artist"):
- key = "artist_"
-
- if get("artist"):
- key += get("artist")
-
- if iget("artist"):
- key += iget("artist")
-
if get("user_feed"):
key = get("user_feed")
@@ -296,7 +263,7 @@ class YouTubeStorage():
if key:
key += "_thumb"
- return key.encode("utf-8","ignore")
+ return key
def _getValueStorageKey(self, params={}, item={}):
self.common.log(repr(params), 5)
@@ -344,18 +311,12 @@ class YouTubeStorage():
if get("scraper"):
key = "s_" + get("scraper")
- if get("scraper") == "music_artist" and get("artist"):
- key += "_" + get("artist")
-
if get("scraper") == "disco_search":
key = "store_disco_searches"
if get("category"):
key += "_category_" + get("category")
- if get("show"):
- key += "_" + get("show")
- key += "_season_" + get("season", "0")
if get("user_feed"):
key = "result_" + get("user_feed")
@@ -374,7 +335,6 @@ class YouTubeStorage():
if get("store"):
key = "store_" + get("store")
- self.common.log("Done : %s" % key, 5)
return key
#============================= Storage Functions
=================================
@@ -412,9 +372,7 @@ class YouTubeStorage():
existing.append(results)
self.cache.set(key, repr(existing))
else:
- self.common.log("hit else", 5)
value = repr(results)
- self.common.log(repr(key) + " - " + repr(value), 5)
self.cache.set(key, value)
self.common.log("done", 5)
@@ -432,7 +390,6 @@ class YouTubeStorage():
if results:
value = repr(results)
- self.common.log(repr(key) + " - " + repr(value), 5)
self.settings.setSetting(key, value)
self.common.log("done", 5)
@@ -442,8 +399,6 @@ class YouTubeStorage():
self.common.log(repr(params), 5)
key = self.getStorageKey(params, type, item)
- self.common.log("Got key " + repr(key))
-
if type == "thumbnail" or type == "viewmode" or type == "value":
return self.retrieveValue(key)
else:
diff --git a/plugin.video.youtube/addon.xml b/plugin.video.youtube/addon.xml
index db58bc8..0b26c3d 100644
--- a/plugin.video.youtube/addon.xml
+++ b/plugin.video.youtube/addon.xml
@@ -1,9 +1,9 @@
<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
-<addon id="plugin.video.youtube" name="YouTube" provider-name="TheCollective"
version="3.4.1">
+<addon id="plugin.video.youtube" name="YouTube" provider-name="TheCollective"
version="3.4.2">
<requires>
<import addon="xbmc.python" version="2.0" />
<import addon="script.module.simplejson" version="2.0.10" />
- <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>
@@ -118,5 +118,6 @@ Raadpleeg de lokale wetgeving voordat u deze plugin
installeert.</disclaimer>
<disclaimer
lang="th">à¸à¸²à¸à¸ªà¹à¸§à¸à¸à¸²à¸à¸ªà¹à¸§à¸à¸à¸¢à¸²à¸¢à¸à¸µà¹à¸à¸²à¸à¹à¸¡à¹à¸à¸¹à¸à¸à¹à¸à¸à¸à¸²à¸¡à¸à¸à¸«à¸¡à¸²à¸¢à¹à¸à¸à¸£à¸°à¹à¸à¸¨à¸à¸à¸à¸à¸¸à¸
à¸à¸£à¸¸à¸à¸²à¸à¸£à¸§à¸à¸ªà¸à¸à¸à¸à¸«à¸¡à¸²à¸¢à¹à¸à¸à¸£à¸°à¹à¸à¸¨à¸à¸à¸à¸à¸¸à¸à¸à¹à¸à¸à¸à¸³à¸à¸²à¸£à¸à¸´à¸à¸à¸±à¹à¸</disclaimer>
<disclaimer lang="zh">è¿ä¸ªæ件çæäºå
容å¯è½ä¸ç¬¦åä½
æå¨å½å®¶çæ³å¾è§å® - 请å¨å¨å®è£
å确认符åå½å°æ³å¾ã</disclaimer>
<platform>all</platform>
+ <language />
</extension>
</addon>
\ No newline at end of file
diff --git a/plugin.video.youtube/changelog.txt
b/plugin.video.youtube/changelog.txt
index 6f77495..f1ce7d3 100644
--- a/plugin.video.youtube/changelog.txt
+++ b/plugin.video.youtube/changelog.txt
@@ -13,6 +13,14 @@
- [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.2[/B]
+- Fixed playback bug cause by youtube site changes
+- Fixed bug when using unicode characters in search
+- Fixed bug in spanish translations
+
+[B]Version 3.4.1[/B]
+- Changed plugin release now controlled by release script
+
[B]Version 3.4.0[/B]
- Fixed Login was broken after youtube changed look
- Fixed Playback of over 18 videos was broken with the new youtube look
diff --git a/plugin.video.youtube/default.py b/plugin.video.youtube/default.py
index 2fe1f3b..c7fde61 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.1"
+version = "3.4.2"
plugin = "YouTube-" + version
author = "TheCollective"
url = "www.xbmc.com"
diff --git a/plugin.video.youtube/resources/language/Spanish
(Argentina)/strings.xml b/plugin.video.youtube/resources/language/Spanish
(Argentina)/strings.xml
index acb7f12..9ac18be 100644
--- a/plugin.video.youtube/resources/language/Spanish (Argentina)/strings.xml
+++ b/plugin.video.youtube/resources/language/Spanish (Argentina)/strings.xml
@@ -166,8 +166,8 @@
<string id="30509">Mas resultados</string>
<string id="30510">Ver favoritos</string>
<string id="30511">Ver videos subidos</string>
- <string id="30512">Subscribirse a %s%</string>
- <string id="30513">Dar de baja de %s%</string>
+ <string id="30512">Subscribirse a %s</string>
+ <string id="30513">Dar de baja de %s</string>
<string id="30514">Buscar similares</string>
<string id="30515">Editar búsqueda</string>
<string id="30516">Mas videos de %s</string>
diff --git a/plugin.video.youtube/resources/language/Spanish/strings.xml
b/plugin.video.youtube/resources/language/Spanish/strings.xml
index 1f2bbc1..8d5a41a 100644
--- a/plugin.video.youtube/resources/language/Spanish/strings.xml
+++ b/plugin.video.youtube/resources/language/Spanish/strings.xml
@@ -166,8 +166,8 @@
<string id="30509">Mas resultados</string>
<string id="30510">Ver favoritos</string>
<string id="30511">Ver vÃdeos subidos</string>
- <string id="30512">Subscribirse a %s%</string>
- <string id="30513">Dar de baja de %s%</string>
+ <string id="30512">Subscribirse a %s</string>
+ <string id="30513">Dar de baja de %s</string>
<string id="30514">Buscar similares</string>
<string id="30515">Editar búsqueda</string>
<string id="30516">Mas vÃdeos de %s</string>
-----------------------------------------------------------------------
Summary of changes:
plugin.video.youtube/YouTubePlayer.py | 9 +-
plugin.video.youtube/YouTubeStorage.py | 47 +----
plugin.video.youtube/addon.xml | 5 +-
plugin.video.youtube/changelog.txt | 8 +
plugin.video.youtube/default.py | 2 +-
plugin.video.youtube/eden-addon.xml | 22 --
.../language/Spanish (Argentina)/strings.xml | 4 +-
.../resources/language/Spanish/strings.xml | 4 +-
.../language/language/Bulgarian/strings.xml | 218 -------------------
.../language/language/English/strings.xml | 220 --------------------
.../language/language/Russian/strings.xml | 184 ----------------
11 files changed, 19 insertions(+), 704 deletions(-)
delete mode 100644 plugin.video.youtube/eden-addon.xml
delete mode 100644
plugin.video.youtube/resources/language/language/Bulgarian/strings.xml
delete mode 100644
plugin.video.youtube/resources/language/language/English/strings.xml
delete mode 100644
plugin.video.youtube/resources/language/language/Russian/strings.xml
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_feb
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
