summaryrefslogtreecommitdiffstats
path: root/apps/media/lib_media.php
diff options
context:
space:
mode:
authorRobin Appelman <icewind1991@gmail.com>2011-07-31 00:50:04 +0200
committerRobin Appelman <icewind1991@gmail.com>2011-07-31 00:50:04 +0200
commite6821e9d7c716d4808c11789ff7065430213f2d0 (patch)
tree12cfec0c09ce218a617a9cb7a7b733ac8c1d4dc1 /apps/media/lib_media.php
parent0503c3499ee03bcb220416ac1162cafcf5b38bc4 (diff)
downloadnextcloud-server-e6821e9d7c716d4808c11789ff7065430213f2d0.tar.gz
nextcloud-server-e6821e9d7c716d4808c11789ff7065430213f2d0.zip
Show play and add-to-playlist buttons in instant search results
for now this only works from inside the media app
Diffstat (limited to 'apps/media/lib_media.php')
-rw-r--r--apps/media/lib_media.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/media/lib_media.php b/apps/media/lib_media.php
index 67d111936f1..062672b91e8 100644
--- a/apps/media/lib_media.php
+++ b/apps/media/lib_media.php
@@ -93,15 +93,15 @@ class OC_MediaSearchProvider extends OC_Search_Provider{
$results[]=new OC_Search_Result($artist['artist_name'],'',OC_Helper::linkTo( 'apps/media', 'index.php#artist='.urlencode($artist['artist_name']) ),'Music');
}
foreach($albums as $album){
- $artist=urlencode(OC_MEDIA_COLLECTION::getArtistName($album['album_artist']));
- $results[]=new OC_Search_Result($album['album_name'],'',OC_Helper::linkTo( 'apps/media', 'index.php#artist='.$artist.'&album='.urlencode($album['album_name']) ),'Music');
+ $artist=OC_MEDIA_COLLECTION::getArtistName($album['album_artist']);
+ $results[]=new OC_Search_Result($album['album_name'],'by '.$artist,OC_Helper::linkTo( 'apps/media', 'index.php#artist='.urlencode($artist).'&album='.urlencode($album['album_name']) ),'Music');
}
foreach($songs as $song){
$minutes=floor($song['song_length']/60);
$secconds=$song['song_length']%60;
- $artist=urlencode(OC_MEDIA_COLLECTION::getArtistName($song['song_artist']));
- $album=urlencode(OC_MEDIA_COLLECTION::getalbumName($song['song_album']));
- $results[]=new OC_Search_Result($song['song_name'],"$minutes:$secconds",OC_Helper::linkTo( 'apps/media', 'index.php#artist='.$artist.'&album='.$album.'&song='.urlencode($song['song_name']) ),'Music');
+ $artist=OC_MEDIA_COLLECTION::getArtistName($song['song_artist']);
+ $album=OC_MEDIA_COLLECTION::getalbumName($song['song_album']);
+ $results[]=new OC_Search_Result($song['song_name'],"by $artist, in $album $minutes:$secconds",OC_Helper::linkTo( 'apps/media', 'index.php#artist='.urlencode($artist).'&album='.urlencode($album).'&song='.urlencode($song['song_name']) ),'Music');
}
return $results;
}