update playcount correctly without having to reload the collection

diff --git a/apps/media/index.php b/apps/media/index.php
index bd994e06341661568712533761b0c50148511da2..0fe7c12f63c60b9e7f9492a38ee02207bfd05290 100644 (file)
--- a/apps/media/index.php
+++ b/apps/media/index.php
@@ -39,7 +39,6 @@ OC_UTIL::addScript('media','playlist');
 OC_UTIL::addScript('media','collection');
 OC_UTIL::addScript('media','jquery.jplayer.min');
 OC_UTIL::addStyle('media','player');
-OC_UTIL::addStyle('media','playlist');
 OC_UTIL::addStyle('media','music');
 
 OC_APP::setActiveNavigationEntry( 'media_playlist' );

diff --git a/apps/media/js/collection.js b/apps/media/js/collection.js
index 0a6e0e4eb3f704a26fe6450a5d3b143cb6f7c7ec..5aa0d058bdca5e7f4e60edc56ff1852822379673 100644 (file)
--- a/apps/media/js/collection.js
+++ b/apps/media/js/collection.js
@@ -23,7 +23,6 @@ Collection={
                                                        for(var w=0;w<album.songs.length;w++){
                                                                album.songs[w].album_name=album.album_name;
                                                                album.songs[w].artist_name=artist.artist_name;
-                                                               album.songs[w].artist_name=artist.artist_name;
                                                        }
                                                }
                                        }
@@ -101,14 +100,30 @@ Collection={
                        var li=template.clone();
                        var song=album.songs[i];
                        li.removeClass('template');
-                       li.addClass('song',song);
+                       li.addClass('song');
+                       li.data('song',song);
                        li.children('span').text(song.song_name);
                        li.children('button').click(function(){
-                               PlayList.add($(this).parent().data('span'));
+                               PlayList.add($(this).parent().data('song'));
                        })
                        ul.append(li);
                }
                albumLi.append(ul);
+       },
+       registerPlay:function(){
+               var item=PlayList.items[PlayList.current];
+               for(var i=0;i<Collection.artists.length;i++){
+                       var artist=Collection.artists[i];
+                       for(var j=0;j<artist.albums.length;j++){
+                               var album=artist.albums[j]
+                               for(var w=0;w<album.songs.length;w++){
+                                       var song=album.songs[w];
+                                       if(song.song_name==item.name && song.artist_name==item.artist && song.album_name==item.album){
+                                               song.song_playcount++;
+                                       }
+                               }
+                       }
+               }
        }
 }
 

diff --git a/apps/media/js/player.js b/apps/media/js/player.js
index 7beb01b6013ad600f9c8ec446d385c931bf10f4c..2e910bc0d598a41783c47ef15fcdc02d1112bc93 100644 (file)
--- a/apps/media/js/player.js
+++ b/apps/media/js/player.js
@@ -31,7 +31,11 @@ var PlayList={
                                        PlayList.init(PlayList.items[index].type,PlayList.play);
                                }else{
                                        PlayList.player.jPlayer("setMedia", PlayList.items[PlayList.current]);
+                                       PlayList.items[index].playcount++;
                                        PlayList.player.jPlayer("play");
+                                       if(Collection){
+                                               Collection.registerPlay();
+                                       }
                                }
                        }else{
                                PlayList.init(PlayList.items[index].type,PlayList.play);