localhots/oldhaven
1
0
Fork 0
Code Releases Activity

Handle bad tracks, tracks with weird names

Browse Source
This commit is contained in:
magnolia-fan 2011-11-24 02:26:04 +04:00
parent 3205af0be6
commit 270d80ee0e
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/player.coffee
View File

@ -86,6 +86,10 @@ class window.Player
$('.playlist li').removeClass 'now' $('.playlist li').removeClass 'now'
$obj.addClass 'now' $obj.addClass 'now'
_vk_music.search track.artist, track.name, track.duration, (audio) -> _vk_music.search track.artist, track.name, track.duration, (audio) ->
if audio is null
console.log audio
_player.setTrack _player.nextTrack(true)
else
_player.playSource audio.url _player.playSource audio.url
if track.length == 0 if track.length == 0
len = parseInt(audio.duration, 10) len = parseInt(audio.duration, 10)
@ -96,8 +100,8 @@ class window.Player
if r.result is 'success' if r.result is 'success'
$('.playlist li[data-id="'+track.id+'"] .song-duration').text(duration) $('.playlist li[data-id="'+track.id+'"] .song-duration').text(duration)
$($('.album div[data-id="'+track.id+'"]').siblings()[0]).text(duration) $($('.album div[data-id="'+track.id+'"]').siblings()[0]).text(duration)
_player.updateNowListening track
this.updateNowListening track false
false false
getTrackInfo: (id) -> getTrackInfo: (id) ->

2
app/assets/javascripts/vksearch/vkontakte_search.coffee
View File

@ -59,7 +59,7 @@ class window.VkontakteMusic
data data
prepareQuery: (artist, track) -> prepareQuery: (artist, track) ->
artist+" "+track.replace(/\(.*\)/i, '').split('/')[0] artist+" "+this.trim(/[\w\d\s]+/.exec(track)[0]).replace(/\(.*\)/i, '').split('/')[0]
trim: (str) -> trim: (str) ->
while str.indexOf(' ') isnt -1 while str.indexOf(' ') isnt -1