Fix embedded image urls #1687

Merged
merged 6 commits into from Oct 27, 2012

Projects

None yet

2 participants

@jmarshallnz
Member

We previously constructed image:// urls without the use of CURL. This led to inconsistent URLs - i.e. pass the constructed image:// url through CURL and it will end up no longer matching.

This fixes them to be constructed using CURL. We need to update the databases to suit, but this is relatively simple.

It fixes #13431.

Jonathan Mar... added some commits Oct 22, 2012
Jonathan Marshall adds CTextureCache::CanCacheImageURL for testing whether an image:// …
…URL may be cached on demand
8589cd8
Jonathan Marshall adds unit test for CTextureCache::GetWrappedImageURL a5d8039
Jonathan Marshall use CURL for creating wrapped URLs to make sure they are consistent. …
…Fixes embedded music thumbs not being available via JSON-RPC
02613b0
Jonathan Marshall update old embedded music and video art URLs in the databases 481bb8e
Jonathan Marshall remove temporary workaround for music images in the image handler - t…
…hey're integrated into the texturecache now
c0201d5
@elupus elupus and 1 other commented on an outdated diff Oct 27, 2012
xbmc/TextureCache.cpp
@@ -103,13 +103,16 @@ CStdString CTextureCache::GetWrappedImageURL(const CStdString &image, const CStd
CStdString encoded(image);
CURL::Encode(encoded);
@elupus
elupus Oct 27, 2012 Member

not needed: you should make sure URIUtils::HasEncodedHostname returns true, then CURL does all this for you.

@jmarshallnz
jmarshallnz Oct 27, 2012 Member

Thanks - have added a commit on top to take care of that.

Jonathan Marshall set image:// URLs to use encoded hostnames, thus allowing CURL to tak…
…e care of the encoding/decoding
8521e5e
@jmarshallnz jmarshallnz was assigned Oct 27, 2012
@jmarshallnz jmarshallnz merged commit ecf53e8 into xbmc:master Oct 27, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment