Moved to vfs instead of thumb url call. used mime-type for tbn

Fixed webinterface to use the vfs instead.

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@29742 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

7 files changed, 14 insertions, 22 deletions

diff --git a/web/poc_jsonrpc/albums.html b/web/poc_jsonrpc/albums.html
index 67b3d276f0..edfc36cadd 100644
--- a/web/poc_jsonrpc/albums.html
+++ b/web/poc_jsonrpc/albums.html
@@ -43,10 +43,8 @@ var array = result["albums"];
 for (var property in array) {
   var item = array[property];
   document.write('<a href="nowplaying.html" onclick=CallPlay(' + item["albumid"] + ')>');
-  if (item["thumbnail"])
-    document.write('<img src="thumb/' + item["thumbnail"] + '.jpg" width=100 alt="' + item["album"] + '"></img>');
-  else
-    document.write('<img src="images/DefaultAlbumCover.png" width=100 alt="' + item["album"] + '"></img>');
+  var imgSrc = item["thumbnail"] ? ('vfs/' + escape(item["thumbnail"])) : "images/DefaultAlbumCover.png";
+  document.write('<img src="' + imgSrc + '" width=100 alt="' + item["album"] + '"></img>');
   document.write('</a>');
 }
 
diff --git a/web/poc_jsonrpc/artists.html b/web/poc_jsonrpc/artists.html
index bc962ae61c..d7b545d531 100644
--- a/web/poc_jsonrpc/artists.html
+++ b/web/poc_jsonrpc/artists.html
@@ -24,10 +24,8 @@ function writeArtist(artist) {
   for (var property in array) {
     var item = array[property];
     document.write('<a href="nowplaying.html" onclick=CallPlay(' + item["albumid"] + ')>');
-    if (item["thumbnail"])
-      document.write('<img src="thumb/' + item["thumbnail"] + '.jpg" class="cover" alt="' + item["label"] + '"></img>');
-    else
-      document.write('<img src="images/DefaultAlbumCover.png" class="cover" alt="' + item["label"] + '"></img>');
+    var imgSrc = item["thumbnail"] ? ('vfs/' + escape(item["thumbnail"])) : "images/DefaultAlbumCover.png";
+    document.write('<img src="' + imgSrc + '" class="cover" alt="' + item["label"] + '"></img>');
     document.write('</a>');
   }
 }
diff --git a/web/poc_jsonrpc/movies.html b/web/poc_jsonrpc/movies.html
index afa59ad240..82f7ef39a5 100644
--- a/web/poc_jsonrpc/movies.html
+++ b/web/poc_jsonrpc/movies.html
@@ -46,12 +46,10 @@ for (var property in array) {
   var item = array[property];
 
   document.write('<tr class="' + (property % 2 == 0 ? "even" : "odd") + '"><td class="cover">');
-  var thumbnail = "images/DefaultVideo.png";
-  if (item["thumbnail"])
-    thumbnail = "thumb/" + item["thumbnail"] + ".jpg";
 
   document.write('<a href="nowplaying.html" onclick=CallPlay(' + item["movieid"] + ')>');
-  document.write('<img src="' + thumbnail + '" class="cover"></img>');
+  var imgSrc = item["thumbnail"] ? ('vfs/' + escape(item["thumbnail"])) : "images/DefaultVideo.png";
+  document.write('<img src="' + imgSrc + '" class="cover"></img>');
   document.write('</td><td class="info">');
   document.write('</a>');
 
diff --git a/web/poc_jsonrpc/nowplaying.html b/web/poc_jsonrpc/nowplaying.html
index 7830aad9a9..2eb9eb50a6 100644
--- a/web/poc_jsonrpc/nowplaying.html
+++ b/web/poc_jsonrpc/nowplaying.html
@@ -57,10 +57,8 @@ if (players.length > 0) {
   var array = result["items"];
 
   if (activeItem >= 0) {
-   if (array[activeItem]["thumbnail"])
-     document.write('<img src="thumb/' + array[activeItem]["thumbnail"] + '.jpg"></img>"');
-    else
-      document.write('<img src="images/DefaultAlbumCover.png"></img>');
+    var imgSrc = array[activeItem]["thumbnail"] ? ('vfs/' + escape(array[activeItem]["thumbnail"])) : "images/DefaultAlbumCover.png";
+    document.write('<img src="' + imgSrc + '"></img>');
 
     document.write('<br></br>');
 
diff --git a/web/poc_jsonrpc/tvshowepisodes.html b/web/poc_jsonrpc/tvshowepisodes.html
index d8d7406f2b..9c0d0d8da5 100644
--- a/web/poc_jsonrpc/tvshowepisodes.html
+++ b/web/poc_jsonrpc/tvshowepisodes.html
@@ -49,12 +49,10 @@ if (result) {
   for (var i in array) {
     var item = array[i];
     document.write('<tr class="" + (i % 2 == 0 ? "even" : "odd") + ""><td class="cover">');
-    var thumbnail = "images/DefaultVideo.png";
-    if (item["thumbnail"])
-      thumbnail = "thumb/" + item["thumbnail"] + ".jpg";
 
     document.write('<a href="nowplaying.html" onclick=CallPlay(' + item["episodeid"] + ')>');
-    document.write('<img src="' + thumbnail + '" class="cover"></img>');
+    var imgSrc = item["thumbnail"] ? ('vfs/' + escape(item["thumbnail"])) : "images/DefaultVideo.png";
+    document.write('<img src="' + imgSrc + '" class="cover"></img>');
     document.write('</td><td class="info">');
     document.write('</a>');
 
diff --git a/web/poc_jsonrpc/tvshows.html b/web/poc_jsonrpc/tvshows.html
index 17d7090f98..e4f5164774 100644
--- a/web/poc_jsonrpc/tvshows.html
+++ b/web/poc_jsonrpc/tvshows.html
@@ -35,7 +35,8 @@ var array = result["tvshows"];
 for (var property in array) {
   var item = array[property];
   document.write('<a href="tvshowseasons.html?tvshowid=' + item["tvshowid"] + '">');
-  document.write('<img src="' + (item["thumbnail"] ? ("thumb/" + item["thumbnail"] + ".jpg"): "images/nocover.jpg") + '"></img>');
+  var imgSrc = item["thumbnail"] ? ('vfs/' + escape(item["thumbnail"])) : "images/nocover.jpg";
+  document.write('<img src="' + imgSrc + '"></img>');
   document.write('</a>');
   document.write('<br>');
 }
diff --git a/web/poc_jsonrpc/tvshowseasons.html b/web/poc_jsonrpc/tvshowseasons.html
index 8f00917de3..0d3f688917 100644
--- a/web/poc_jsonrpc/tvshowseasons.html
+++ b/web/poc_jsonrpc/tvshowseasons.html
@@ -43,7 +43,8 @@ if (result) {
 
     document.write('<tr class="' + (i % 2 == 0 ? 'even' : 'odd') + '"><td class="cover">');
     document.write('<a href="tvshowepisodes.html?tvshowid=' + tvshowid + '&season=' + item["season"] + '">');
-    document.write('<img src="' + (item["thumbnail"] ? ("thumb/" + item["thumbnail"] + ".jpg"): "images/nocover.jpg") + '" class="cover" alt="' + item["label"] + '"></img>');
+    var imgSrc = item["thumbnail"] ? ('vfs/' + escape(item["thumbnail"])) : "images/nocover.jpg";
+    document.write('<img src="' + imgSrc + '" class="cover" alt="' + item["label"] + '"></img>');
     document.write('</a>');
     document.write('</td><td class="info">');
     document.write('<h1>' + item["label"] + '</h1>');