diff --git a/app/controllers/artist_controller.rb b/app/controllers/artist_controller.rb index 40b8610..be1e5ec 100644 --- a/app/controllers/artist_controller.rb +++ b/app/controllers/artist_controller.rb @@ -1,7 +1,22 @@ +require 'uri' +require 'open-uri' + class ArtistController < ApplicationController def data data = {} - artist = Artist.find_by_name(params[:name].gsub('+', ' ')) + name = params[:name].gsub('%20', ' ').gsub('+', ' ') + artist = Artist.find_by_name(name) + unless artist + mb_artist = MusicBrainzArtist.getByName(name) + if mb_artist + ImportController.importArtist(name) + render :json => {error:'loading'} + return + else + render :json => {error:404} + return + end + end data['artist'] = {name: artist.name, desc: ActionController::Base.helpers.strip_tags(artist.desc), pic: artist.pic_url} data['albums'] = [] albums = artist.albums @@ -11,10 +26,14 @@ class ArtistController < ApplicationController bonus_tracks = [] album.tracks.each do |track| tmp_track = {name: track.name, live: track.live, acoustic: track.acoustic} - time = (track.length / 1000).round - time_m = (time / 60).floor - time_s = time - time_m * 60 - tmp_track['duration'] = time_m.to_s + ':' + (time_s < 10 ? '0' : '') + time_s.to_s + if track.length + time = (track.length / 1000).round + time_m = (time / 60).floor + time_s = time - time_m * 60 + tmp_track['duration'] = time_m.to_s + ':' + (time_s < 10 ? '0' : '') + time_s.to_s + else + tmp_track['duration'] = '0:00' + end (track.bonus == 0 ? album_tracks : bonus_tracks) << tmp_track end tmp_album['tracks'] = {album: album_tracks, bonus: bonus_tracks} @@ -22,4 +41,26 @@ class ArtistController < ApplicationController end render :json => data end + + def autocomplete + autocomplete = ArtistController.getLastFmAutocomplete(params[:query]) + return render :nothing => true if autocomplete.nil? + suggestions = [] + autocomplete["response"]["docs"].each do |doc| + suggestions << doc["artist"] unless suggestions.include?(doc["artist"]) + end + render :json => { + :query => params[:query], + :suggestions => suggestions + } + end + + def self.getLastFmAutocomplete(query) + return nil if query.nil? or query.strip.empty? + json = ActiveSupport::JSON.decode(open( + 'http://www.last.fm/search/autocomplete' << + '?q=' << URI.escape(query) + ).read) + return json.empty? ? nil : json + end end diff --git a/config/routes.rb b/config/routes.rb index e0c3bfa..c9dbe82 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -56,5 +56,6 @@ Beathaven::Application.routes.draw do # Note: This route will make all actions in every controller accessible via GET requests. # match ':controller(/:action(/:id(.:format)))' + match 'artist/autocomplete' => 'artist#autocomplete' match 'artist(/:name)' => 'artist#data' end diff --git a/public/demo/404.html b/public/demo/404.html new file mode 100644 index 0000000..6c3363d --- /dev/null +++ b/public/demo/404.html @@ -0,0 +1,4 @@ +
+

404

+ Failed while searching?
Wait for autocomplete, it might help.
How about one more try? +
\ No newline at end of file diff --git a/public/demo/index.html b/public/demo/index.html index 8595afb..86da85e 100644 --- a/public/demo/index.html +++ b/public/demo/index.html @@ -9,6 +9,7 @@ + @@ -45,18 +46,17 @@
-
- Foo Fighters -
+
diff --git a/public/demo/search.html b/public/demo/search.html new file mode 100644 index 0000000..c2916b2 --- /dev/null +++ b/public/demo/search.html @@ -0,0 +1,18 @@ + +
+
+ + +
+
\ No newline at end of file diff --git a/public/demo/whee.html b/public/demo/whee.html new file mode 100644 index 0000000..3086cb0 --- /dev/null +++ b/public/demo/whee.html @@ -0,0 +1,4 @@ +
+

WHEE!

+ We never known anything about this artist
but now we found something interesting.
Please come back in a minute. +
\ No newline at end of file diff --git a/public/javascripts/ajax.js b/public/javascripts/ajax.js index 3fa598f..0bb9199 100644 --- a/public/javascripts/ajax.js +++ b/public/javascripts/ajax.js @@ -1,13 +1,50 @@ function loadArtistData(name) { + setArchor('/artist/'+ name +'/'); $.get('/artist/'+ name +'/', function(data){ + if (typeof data.error != 'undefined') { + if (data.error == 'loading') { + loadWheePage(); + } else if (data.error == 404) { + load404Page(); + } + return false; + } Pages.renderArtist(data); }) } +function loadSearchPage() { + setArchor('/search/'); + $.get('/demo/search.html', function(data){ + $('#data-container').html(data); + }) +} +function loadWheePage() { + $.get('/demo/whee.html', function(data){ + $('#data-container').html(data); + }) +} +function load404Page() { + $.get('/demo/404.html', function(data){ + $('#data-container').html(data); + }) +} $(function(){ $('a.data.artist').live('click', function(){ loadArtistData($(this).html()); return false; }); - $('a.data').trigger('click'); + $('.search').live('click', function(){ + loadSearchPage(); + return false; + }); + $('#search_form').live('submit', function(){ + $('.autocomplete-container').remove(); + loadArtistData($('#search_field').val()); + return false; + }); }) + +function setArchor(anchor) { + window.location = '#'+ anchor; +} diff --git a/public/javascripts/jquery.autocomplete.js b/public/javascripts/jquery.autocomplete.js new file mode 100644 index 0000000..4c44bfa --- /dev/null +++ b/public/javascripts/jquery.autocomplete.js @@ -0,0 +1,392 @@ +/** +* Ajax Autocomplete for jQuery, version 1.1.3 +* (c) 2010 Tomas Kirda +* +* Ajax Autocomplete for jQuery is freely distributable under the terms of an MIT-style license. +* For details, see the web site: http://www.devbridge.com/projects/autocomplete/jquery/ +* +* Last Review: 04/19/2010 +*/ + +/*jslint onevar: true, evil: true, nomen: true, eqeqeq: true, bitwise: true, regexp: true, newcap: true, immed: true */ +/*global window: true, document: true, clearInterval: true, setInterval: true, jQuery: true */ + +(function($) { + + var reEscape = new RegExp('(\\' + ['/', '.', '*', '+', '?', '|', '(', ')', '[', ']', '{', '}', '\\'].join('|\\') + ')', 'g'); + + function fnFormatResult(value, data, currentValue) { + var pattern = '(' + currentValue.replace(reEscape, '\\$1') + ')'; + return value.replace(new RegExp(pattern, 'gi'), '$1<\/strong>'); + } + + function Autocomplete(el, options) { + this.el = $(el); + this.el.attr('autocomplete', 'off'); + this.suggestions = []; + this.data = []; + this.badQueries = []; + this.selectedIndex = -1; + this.currentValue = this.el.val(); + this.intervalId = 0; + this.cachedResponse = []; + this.onChangeInterval = null; + this.ignoreValueChange = false; + this.serviceUrl = options.serviceUrl; + this.isLocal = false; + this.options = { + autoSubmit: false, + minChars: 1, + maxHeight: 300, + deferRequestBy: 0, + width: 0, + highlight: true, + params: {}, + fnFormatResult: fnFormatResult, + delimiter: null, + zIndex: 9999 + }; + this.initialize(); + this.setOptions(options); + } + + $.fn.autocomplete = function(options) { + return new Autocomplete(this.get(0)||$(''), options); + }; + + + Autocomplete.prototype = { + + killerFn: null, + + initialize: function() { + + var me, uid, autocompleteElId; + me = this; + uid = Math.floor(Math.random()*0x100000).toString(16); + autocompleteElId = 'Autocomplete_' + uid; + + this.killerFn = function(e) { + if ($(e.target).parents('.autocomplete').size() === 0) { + me.killSuggestions(); + me.disableKillerFn(); + } + }; + + if (!this.options.width) { this.options.width = this.el.width(); } + this.mainContainerId = 'AutocompleteContainter_' + uid; + + $('
').appendTo('body'); + + this.container = $('#' + autocompleteElId); + this.fixPosition(); + if (window.opera) { + this.el.keypress(function(e) { me.onKeyPress(e); }); + } else { + this.el.keydown(function(e) { me.onKeyPress(e); }); + } + this.el.keyup(function(e) { me.onKeyUp(e); }); + this.el.blur(function() { me.enableKillerFn(); }); + this.el.focus(function() { me.fixPosition(); }); + }, + + setOptions: function(options){ + var o = this.options; + $.extend(o, options); + if(o.lookup){ + this.isLocal = true; + if($.isArray(o.lookup)){ o.lookup = { suggestions:o.lookup, data:[] }; } + } + $('#'+this.mainContainerId).css({ zIndex:o.zIndex }); + this.container.css({ maxHeight: o.maxHeight + 'px', width:o.width }); + }, + + clearCache: function(){ + this.cachedResponse = []; + this.badQueries = []; + }, + + disable: function(){ + this.disabled = true; + }, + + enable: function(){ + this.disabled = false; + }, + + fixPosition: function() { + var offset = this.el.offset(); + $('#' + this.mainContainerId).css({ top: (offset.top + this.el.innerHeight()) + 'px', left: offset.left + 'px' }); + }, + + enableKillerFn: function() { + var me = this; + $(document).bind('click', me.killerFn); + }, + + disableKillerFn: function() { + var me = this; + $(document).unbind('click', me.killerFn); + }, + + killSuggestions: function() { + var me = this; + this.stopKillSuggestions(); + this.intervalId = window.setInterval(function() { me.hide(); me.stopKillSuggestions(); }, 300); + }, + + stopKillSuggestions: function() { + window.clearInterval(this.intervalId); + }, + + onKeyPress: function(e) { + if (this.disabled || !this.enabled) { return; } + // return will exit the function + // and event will not be prevented + switch (e.keyCode) { + case 27: //KEY_ESC: + this.el.val(this.currentValue); + this.hide(); + break; + case 9: //KEY_TAB: + case 13: //KEY_RETURN: + if (this.selectedIndex === -1) { + this.hide(); + return; + } + this.select(this.selectedIndex); + if(e.keyCode === 9){ return; } + break; + case 38: //KEY_UP: + this.moveUp(); + break; + case 40: //KEY_DOWN: + this.moveDown(); + break; + default: + return; + } + e.stopImmediatePropagation(); + e.preventDefault(); + }, + + onKeyUp: function(e) { + if(this.disabled){ return; } + switch (e.keyCode) { + case 38: //KEY_UP: + case 40: //KEY_DOWN: + return; + } + clearInterval(this.onChangeInterval); + if (this.currentValue !== this.el.val()) { + if (this.options.deferRequestBy > 0) { + // Defer lookup in case when value changes very quickly: + var me = this; + this.onChangeInterval = setInterval(function() { me.onValueChange(); }, this.options.deferRequestBy); + } else { + this.onValueChange(); + } + } + }, + + onValueChange: function() { + clearInterval(this.onChangeInterval); + this.currentValue = this.el.val(); + var q = this.getQuery(this.currentValue); + this.selectedIndex = -1; + if (this.ignoreValueChange) { + this.ignoreValueChange = false; + return; + } + if (q === '' || q.length < this.options.minChars) { + this.hide(); + } else { + this.getSuggestions(q); + } + }, + + getQuery: function(val) { + var d, arr; + d = this.options.delimiter; + if (!d) { return $.trim(val); } + arr = val.split(d); + return $.trim(arr[arr.length - 1]); + }, + + getSuggestionsLocal: function(q) { + var ret, arr, len, val, i; + arr = this.options.lookup; + len = arr.suggestions.length; + ret = { suggestions:[], data:[] }; + q = q.toLowerCase(); + for(i=0; i< len; i++){ + val = arr.suggestions[i]; + if(val.toLowerCase().indexOf(q) === 0){ + ret.suggestions.push(val); + ret.data.push(arr.data[i]); + } + } + return ret; + }, + + getSuggestions: function(q) { + var cr, me; + cr = this.isLocal ? this.getSuggestionsLocal(q) : this.cachedResponse[q]; + if (cr && $.isArray(cr.suggestions)) { + this.suggestions = cr.suggestions; + this.data = cr.data; + this.suggest(); + } else if (!this.isBadQuery(q)) { + me = this; + me.options.params.query = q; + $.get(this.serviceUrl, me.options.params, function(txt) { me.processResponse(txt); }, 'text'); + } + }, + + isBadQuery: function(q) { + var i = this.badQueries.length; + while (i--) { + if (q.indexOf(this.badQueries[i]) === 0) { return true; } + } + return false; + }, + + hide: function() { + this.enabled = false; + this.selectedIndex = -1; + this.container.hide(); + }, + + suggest: function() { + if (this.suggestions.length === 0) { + this.hide(); + return; + } + + var me, len, div, f, v, i, s, mOver, mClick; + me = this; + len = this.suggestions.length; + f = this.options.fnFormatResult; + v = this.getQuery(this.currentValue); + mOver = function(xi) { return function() { me.activate(xi); }; }; + mClick = function(xi) { return function() { me.select(xi); }; }; + this.container.hide().empty(); + for (i = 0; i < len; i++) { + s = this.suggestions[i]; + if (typeof s == 'string') { + div = $((me.selectedIndex === i ? '
' + f(s, this.data[i], v) + '
'); + div.mouseover(mOver(i)); + div.click(mClick(i)); + this.container.append(div); + } + } + this.enabled = true; + this.container.show(); + }, + + processResponse: function(text) { + var response; + try { + response = eval('(' + text + ')'); + } catch (err) { return; } + if (!$.isArray(response.data)) { response.data = []; } + if(!this.options.noCache){ + this.cachedResponse[response.query] = response; + if (response.suggestions.length === 0) { this.badQueries.push(response.query); } + } + if (response.query === this.getQuery(this.currentValue)) { + this.suggestions = response.suggestions; + this.data = response.data; + this.suggest(); + } + }, + + activate: function(index) { + var divs, activeItem; + divs = this.container.children(); + // Clear previous selection: + if (this.selectedIndex !== -1 && divs.length > this.selectedIndex) { + $(divs.get(this.selectedIndex)).removeClass(); + } + this.selectedIndex = index; + if (this.selectedIndex !== -1 && divs.length > this.selectedIndex) { + activeItem = divs.get(this.selectedIndex); + $(activeItem).addClass('selected'); + } + return activeItem; + }, + + deactivate: function(div, index) { + div.className = ''; + if (this.selectedIndex === index) { this.selectedIndex = -1; } + }, + + select: function(i) { + var selectedValue, f; + selectedValue = this.suggestions[i]; + if (selectedValue) { + this.el.val(selectedValue); + if (this.options.autoSubmit) { + f = this.el.parents('form'); + if (f.length > 0) { f.get(0).submit(); } + } + this.ignoreValueChange = true; + this.hide(); + this.onSelect(i); + } + }, + + moveUp: function() { + if (this.selectedIndex === -1) { return; } + if (this.selectedIndex === 0) { + this.container.children().get(0).className = ''; + this.selectedIndex = -1; + this.el.val(this.currentValue); + return; + } + this.adjustScroll(this.selectedIndex - 1); + }, + + moveDown: function() { + if (this.selectedIndex === (this.suggestions.length - 1)) { return; } + this.adjustScroll(this.selectedIndex + 1); + }, + + adjustScroll: function(i) { + var activeItem, offsetTop, upperBound, lowerBound; + activeItem = this.activate(i); + offsetTop = activeItem.offsetTop; + upperBound = this.container.scrollTop(); + lowerBound = upperBound + this.options.maxHeight - 25; + if (offsetTop < upperBound) { + this.container.scrollTop(offsetTop); + } else if (offsetTop > lowerBound) { + this.container.scrollTop(offsetTop - this.options.maxHeight + 25); + } + this.el.val(this.getValue(this.suggestions[i])); + }, + + onSelect: function(i) { + var me, fn, s, d; + me = this; + fn = me.options.onSelect; + s = me.suggestions[i]; + d = me.data[i]; + me.el.val(me.getValue(s)); + if ($.isFunction(fn)) { fn(s, d, me.el); } + }, + + getValue: function(value){ + var del, currVal, arr, me; + me = this; + del = me.options.delimiter; + if (!del) { return value; } + currVal = me.currentValue; + arr = currVal.split(del); + if (arr.length === 1) { return value; } + return currVal.substr(0, currVal.length - arr[arr.length - 1].length) + value; + } + + }; + +}(jQuery)); diff --git a/public/javascripts/layout.js b/public/javascripts/layout.js index cdc6890..f8efdbd 100644 --- a/public/javascripts/layout.js +++ b/public/javascripts/layout.js @@ -7,6 +7,7 @@ var beathaven = { init: function () { this.drawInterface(); this.adjustSizes(); + load404Page(); }, drawInterface: function() { }, diff --git a/public/javascripts/pages.js b/public/javascripts/pages.js index 4f8168f..ca34220 100644 --- a/public/javascripts/pages.js +++ b/public/javascripts/pages.js @@ -15,38 +15,40 @@ var Pages = { var albums_info = $('
'); $.each(data.albums, function(i, album){ - var album_info = $('\ -
\ -

'+ album.name +' ('+ album.year +')

\ -
\ - '+ album.name +' by '+ data.artist.name +'\ -
\ -
Add to Now Playing
\ + if (album.year != null) { + var album_info = $('\ +
\ +

'+ album.name +' ('+ album.year +')

\ +
\ + '+ album.name +' by '+ data.artist.name +'\ +
\ +
Add to Now Playing
\ +
\ +
\ +
\ +
    \ +
\
\
\ -
\ -
    \ -
\ -
\ -
\ - '); - - $.each(album.tracks.album, function(i, track){ - var track_info = $('\ -
  • \ -
    +
    \ -
    \ - '+ (i+1) +'\ -
    '+ track.name +'
    \ -
    '+ track.duration +'
    \ -
    \ -
    • \ '); - - $(album_info).find('.tracklist ul').append(track_info); - }); - $(albums_info).append(album_info); + $.each(album.tracks.album, function(i, track){ + var track_info = $('\ +
  • \ +
    +
    \ +
    \ + '+ (i+1) +'\ +
    '+ track.name +'
    \ +
    '+ track.duration +'
    \ +
    \ +
    • \ + '); + + $(album_info).find('.tracklist ul').append(track_info); + }); + + $(albums_info).append(album_info); + } }) $('#data-container').html('').append(artist_info).append(albums_info).scrollbar(); diff --git a/public/javascripts/vkontakte.js b/public/javascripts/vkontakte.js index a43a72e..01ff096 100644 --- a/public/javascripts/vkontakte.js +++ b/public/javascripts/vkontakte.js @@ -1,8 +1,24 @@ +function authInfo(response) { + if (typeof response != 'undefined' && response.session) { + $('#vk_login').hide(); + $('#vk_logout').show(); + } else { + $('#vk_login').show(); + $('#vk_logout').hide(); + } +} $(function(){ VK.init({ apiId: 2335068, nameTransportPath: "/demo/xd_receiver.html" }); + VK.Auth.getLoginStatus(authInfo); + $('#vk_login').click(function(){ + VK.Auth.login(authInfo, 8); + }); + $('#vk_logout').click(function(){ + VK.Auth.logout(authInfo); + }); }) function loadTracksData(query, callback) { diff --git a/public/search.html b/public/search.html deleted file mode 100644 index e69de29..0000000 diff --git a/public/stylesheets/misc.css b/public/stylesheets/misc.css index d2b6831..709624e 100644 --- a/public/stylesheets/misc.css +++ b/public/stylesheets/misc.css @@ -28,6 +28,10 @@ font-weight: bold; margin-right: 12px; } + #navigation li a { + color: inherit; + text-decoration: inherit; + } .button { display: inline; width: auto; @@ -42,6 +46,9 @@ border-color: #DDD; } +#vk_login, #vk_logout { + display: none; +} .scrollbar-pane { margin-right: 8px; @@ -65,6 +72,55 @@ background: #AAA; } +#search-container { + width: 100%; + text-align: center; + margin-top: 50px; +} + #search-container #search_field { + width: 300px; + font-size: 24px; + padding: 4px; + border: #CCC 1px solid; + border-radius: 3px; + } + #search-container #search_button { + width: 100px; + font-size: 24px; + padding: 4px; + background-color: #DDD; + border: #CCC 1px solid; + border-radius: 3px; + } + +.autocomplete { + margin: 4px 0 0 -1px; +} + .autocomplete div { + font-size: 24px; + padding: 6px 5px; + background-color: #FAFAFA; + margin-bottom: 1px; + } + .autocomplete div.selected { + background-color: #EAEAEA; + } + +#error_page { + position: absolute; + width: 600px; + text-align: center; + top: 100px; + left: 50%; + margin-left: -600px; +} + #error_page h1 { + font-size: 150px; + } + #error_page span { + font-size: 24px; + } + /* Colorizing * #player-container { background-color: #CFC; } #data-container { background-color: #CCF; }