diff options
| author | Robin Appelman <icewind1991@gmail.com> | 2011-08-21 15:28:20 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind1991@gmail.com> | 2011-08-21 15:28:20 +0200 |
| commit | c9a11d0aab4d10f6dfe79d080a8851ee6d86e219 (patch) | |
| tree | 11ceae10acca6d32fa9892e349bf5e2dd6fd1cc4 /apps/media/ajax | |
| parent | 043e62ffd9f1485f77e714403c1610c064c794ba (diff) | |
| download | nextcloud-server-c9a11d0aab4d10f6dfe79d080a8851ee6d86e219.tar.gz nextcloud-server-c9a11d0aab4d10f6dfe79d080a8851ee6d86e219.zip | |
some work on media player interface, artists can be collapsed in the collection view again and single albums/songs can be played
Diffstat (limited to 'apps/media/ajax')
| -rw-r--r-- | apps/media/ajax/api.php | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/apps/media/ajax/api.php b/apps/media/ajax/api.php index a9bd4f745af..3b4932728da 100644 --- a/apps/media/ajax/api.php +++ b/apps/media/ajax/api.php @@ -56,7 +56,6 @@ OC_MEDIA_COLLECTION::$uid=OC_User::getUser(); if($arguments['action']){ switch($arguments['action']){ case 'delete': - unset($_SESSION['collection']); $path=$arguments['path']; OC_MEDIA_COLLECTION::deleteSongByPath($path); $paths=explode(PATH_SEPARATOR,OC_Preferences::getValue(OC_User::getUser(),'media','paths','')); @@ -65,21 +64,13 @@ if($arguments['action']){ OC_Preferences::setValue(OC_User::getUser(),'media','paths',implode(PATH_SEPARATOR,$paths)); } case 'get_collection': - if(!isset($_SESSION['collection'])){ - $artists=OC_MEDIA_COLLECTION::getArtists(); - foreach($artists as &$artist){ - $artist['albums']=OC_MEDIA_COLLECTION::getAlbums($artist['artist_id']); - foreach($artist['albums'] as &$album){ - $album['songs']=OC_MEDIA_COLLECTION::getSongs($artist['artist_id'],$album['album_id']); - } - } - - $_SESSION['collection']=json_encode($artists); - } - echo $_SESSION['collection']; + $data=array(); + $data['artists']=OC_MEDIA_COLLECTION::getArtists(); + $data['albums']=OC_MEDIA_COLLECTION::getAlbums(); + $data['songs']=OC_MEDIA_COLLECTION::getSongs(); + echo json_encode($data); break; case 'scan': - unset($_SESSION['collection']); OC_DB::beginTransaction(); set_time_limit(0); //recursive scan can take a while $path=$arguments['path']; @@ -88,7 +79,6 @@ if($arguments['action']){ flush(); break; case 'scanFile': - unset($_SESSION['collection']); echo (OC_MEDIA_SCANNER::scanFile($arguments['path']))?'true':'false'; break; case 'get_artists': |