3
0
Fork 0
forked from mirrors/nixpkgs

miro: Fix parsing of youtube feeds.

Youtube feeds now don't append a "sig" query string argument anymore, so
all those feeds would fail without this patch. For the latter, a pull
request already exists on upstream at pculture/miro#428, so I guess we
can drop our patch upon release of the next new upstream bugfix release.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2014-04-21 10:11:48 +02:00
parent 28229d8ef1
commit 65fcb8d503
No known key found for this signature in database
GPG key ID: D0EBD0EC8C2DC961
2 changed files with 17 additions and 0 deletions

View file

@ -22,6 +22,8 @@ buildPythonPackage rec {
patches = [ ./gconf.patch ];
postPatch = ''
patch -p1 -d .. < "${./youtube-feeds.patch}"
sed -i -e 's/\$(shell which python)/python/' Makefile
sed -i -e 's|/usr/bin/||' -e 's|/usr||' \
-e 's/BUILD_TIME[^,]*/BUILD_TIME=0/' setup.py

View file

@ -0,0 +1,15 @@
diff --git a/lib/flashscraper.py b/lib/flashscraper.py
index 323dbe4..d203b78 100644
--- a/lib/flashscraper.py
+++ b/lib/flashscraper.py
@@ -134,9 +134,7 @@ def _youtube_callback_step2(info, video_id, callback):
# strip url= from url=xxxxxx, strip trailer. Strip duplicate params.
for fmt, stream_map_data in zip(fmt_list, stream_map):
stream_map = cgi.parse_qs(stream_map_data)
- url_base = stream_map['url'][0]
- sig_part = '&signature=' + stream_map['sig'][0]
- fmt_url_map[fmt] = url_base + sig_part
+ fmt_url_map[fmt] = stream_map['url'][0]
title = params.get("title", ["No title"])[0]
try: