voluntary_music_metadata_enrichment 0.0.1 → 0.1.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YTE4OWNjY2JlMGYxOGZiNDA3MjY0NjU1YjUzNjg3Y2ZmYzY5NjljZA==
+  data.tar.gz: !binary |-
+    YmRmYTI3MzFkMjkwYzQzYzM4NWE1ZGNhNWJlZGMyYTM3YmEwMDlhNQ==
+SHA512:
+  metadata.gz: !binary |-
+    ZGQ4OTliZDU3NzZhZmQ4YWJkMWIyZDVkNWQ5ZTA5ZWFiZmU1ZmQxOGY2YTU1
+    ZDExN2ExYTRmMzg2M2U5OWQ5MjFjYjI1MWQ3ZGQ5YmE5NGQyMzhlNzk2MGY0
+    MjI3OWQ3ZDZjYTA2ODk0ZmJmMmE4Yzg3MTdiYTgxOGUxMDgyNDk=
+  data.tar.gz: !binary |-
+    YWM0Yzg5MDM2OGYwNDQ3MzE3NGYzYzY0MTdhZjU2NGI4NjQ5NjI0ODU0N2Ew
+    MDgxM2UwMTk4NzU5ZmViOWViZWJkMDY5NmM2MzQzOTM0MmU5YTI5YTBmNWE2
+    OWYzMzZiNDdiZTQyYWI5NzM5MDRjZDQyMDlhN2U3Mzk0NDMxNmU=

data/app/assets/javascripts/voluntary_music_metadata_enrichment/groups/show.js.coffee

@@ -11,4 +11,5 @@ $(document).ready ->
       $("#releases").append data
       return
 
-  new window.Likes.List()
+  new window.Likes.List()
+  new window.VoluntaryMusicMetadataEnrichment.Library.YearsInReview.IndexView(true)

data/app/assets/javascripts/voluntary_music_metadata_enrichment/library/index.js.coffee

@@ -13,7 +13,8 @@ $(document).ready ->
 
   $(document.body).on "ajax:beforeSend", ".destroy_music_library_artist_link", ->
     $(this).find('.ajax_spinner').show()
-
+  
   new window.VoluntaryMusicMetadataEnrichment.Library.YearsInReview.IndexView(true)
   new window.VoluntaryMusicMetadataEnrichment.Library.YearInReviewReleases.IndexView()
-  new window.VoluntaryMusicMetadataEnrichment.Library.YearInReviewTracks.NewView()
+  new window.VoluntaryMusicMetadataEnrichment.Library.YearInReviewTracks.IndexView()
+  new window.Likes.List()

data/app/assets/javascripts/voluntary_music_metadata_enrichment/library/year_in_review_releases/index_view.js.coffee

@@ -5,28 +5,107 @@ window.VoluntaryMusicMetadataEnrichment.Library.YearInReviewReleases.IndexView =
   constructor: ->
     window.VoluntaryMusicMetadataEnrichment.Library.YearInReviewReleases.IndexView.makeCollectionSortable()
     
+    $(document.body).on "click", ".play_album_button", (event) ->
+      target = null
+      
+      if $(this).data('target') == undefined
+        target = '#bootstrap_modal'
+      else
+        target = $(this).data('target')
+        
+      event.preventDefault()
+      
+      iframe = '<iframe src="https://embed.spotify.com/?uri=spotify:album:' + $(this).data('spotify-album-id') + '" frameborder="0" allowtransparency="true" width="300" height="380"></iframe>'
+    
+      if target == '#bootstrap_modal'
+        $(target).html(
+          '<div class="modal-header">' +
+          '<button type="button" id="close_bootstrap_modal_button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>' +
+          '<h3>Play Album</h3>' +
+          '</div>' +
+          '<div class="modal-body" style="overflow-y:none;">' +
+          iframe +
+          '</div>' +
+          '<div class="modal-footer">' +
+          '</div>'
+        )  
+        $(target).modal('show')
+      else
+        $(target).html(iframe)
+    
     $(document.body).on "ajax:beforeSend", ".destroy_music_year_in_review_top_release_link", ->
       $(this).find('.ajax_spinner').show()
     
+    $(document.body).on "ajax:beforeSend", ".create_music_year_in_review_flop_release_link", ->
+      $(this).find('.ajax_spinner').show()
+    
     new window.VoluntaryMusicMetadataEnrichment.Library.YearInReviewReleases.NewView()
     
+    window.competitive_list_for_releases = new CompetitiveList id: '#competitive_list_for_releases', competitor_name_proc: (csv) ->
+      return '<iframe src="https://embed.spotify.com/?uri=spotify:album:' + csv.split(';')[0] + '" frameborder="0" allowtransparency="true" width="300" height="380"></iframe><br/>' + $("#competitor_#{csv.split(';')[1]}").find('.competitor_name').html()
+    
   @makeCollectionSortable: ->
-    $('#year_in_review_music_releases').sortable
+    $('#year_in_review_music_releases').multisortable
       start: (event, ui) =>
-        window.first_position = $('#year_in_review_music_releases li:first').data('position')
-        window.last_position = $('#year_in_review_music_releases li:last').data('position')
+        window.VoluntaryMusicMetadataEnrichment.Library.YearInReviewReleases.IndexView.showSpinnerForSelectedCompetitors()
         
       update: (event, ui) =>
-        source_item = $(ui.item).closest('li')
-        current_position = window.first_position
-        previous_element = null
+        $('#year_in_review_music_releases').sortable('disable')
+        setTimeout (->
+          window.VoluntaryMusicMetadataEnrichment.Library.YearInReviewReleases.IndexView.putPositions(ui.item.data('id'))
+          return
+        ), 1000
+  
+  @showSpinnerForSelectedCompetitors: ->
+    $.each $('#year_in_review_music_releases li.selected'), (index, element) ->
+      $(element).find('.sorting_spinner').show()
+
+  @hideSpinnerForSelectedCompetitors: ->
+    $.each $('#year_in_review_music_releases li.selected'), (index, element) ->
+      $(element).find('.sorting_spinner').hide()
         
-        $.each $('#year_in_review_music_releases li'), (index, element) ->
-          $(element).data('position', current_position)  
-          $('#year_in_review_music_release_position_' + $(element).data('id')).html(current_position)
-          
-          if $(element).data('id') == $(source_item).data('id')
-            $.post '/users/current/library/music/year_in_review_music_releases/' + $(element).data('id') + '/move', { _method: 'put', position: current_position }
-          
-          previous_element = $(element)
-          current_position += 1
+  @putPositions: (competitorId) ->
+    newPositionOfCompetitor = null
+    
+    unless window.matches.length > 0 && $('#year_in_review_music_releases li.selected').length > 1
+      newPositionOfCompetitor = window.VoluntaryMusicMetadataEnrichment.Library.YearInReviewReleases.IndexView.resetPositions(competitorId)
+    
+    if window.matches.length == 0
+      positions = {}
+        
+      $.each $('#year_in_review_music_releases li.selected'), (index, element) ->
+        positions[$(element).data('position')] = $(element).data('id')
+        
+      $.post('/users/current/library/music/year_in_review_music_releases/move', { _method: 'put', positions: positions }).always(=>
+        $('#year_in_review_music_releases').sortable('enable')
+        window.VoluntaryMusicMetadataEnrichment.Library.YearInReviewReleases.IndexView.hideSpinnerForSelectedCompetitors()
+      )  
+    else
+      if $('#year_in_review_music_releases li.selected').length == 1
+        window.competitive_list_for_releases.moveCompetitorToPosition competitorId, newPositionOfCompetitor, => 
+          $('#year_in_review_music_releases').sortable('enable')
+          window.VoluntaryMusicMetadataEnrichment.Library.YearInReviewReleases.IndexView.hideSpinnerForSelectedCompetitors()
+      else
+        alert 'Dragging of multiple elements is not supported in round-robin tournament mode!'
+        window.VoluntaryMusicMetadataEnrichment.Library.YearInReviewReleases.IndexView.cancelSorting()
+        $('#year_in_review_music_releases').sortable('enable')
+        window.VoluntaryMusicMetadataEnrichment.Library.YearInReviewReleases.IndexView.hideSpinnerForSelectedCompetitors()
+        
+  @cancelSorting: ->
+    $wrapper = $('#year_in_review_music_releases')
+
+    $wrapper.find('li').sort((a, b) ->
+      +parseInt($(a).data('position')) - +parseInt($(b).data('position'))
+    ).appendTo $wrapper  
+   
+  @resetPositions: (competitorId) ->
+    position = null
+    current_position = 1
+    
+    $.each $('#year_in_review_music_releases li'), (index, element) ->
+      $(element).data('position', current_position)  
+      $(element).find('.competitor_position').html(current_position)
+      position = current_position if $(element).data('id') == competitorId
+      current_position += 1
+      
+    return position 

data/app/assets/javascripts/voluntary_music_metadata_enrichment/library/year_in_review_releases/new_view.js.coffee

@@ -8,6 +8,8 @@ window.VoluntaryMusicMetadataEnrichment.Library.YearInReviewReleases.NewView = c
         source: $(this).data('source')
         minLength: 2
         appendTo: '#year_in_review_music_release_artist_name_suggestions'
+        search: (event, ui) ->
+          $('#year_in_review_music_release_artist_id').val(null)
         select: (event, ui) ->
           $(this).val(ui.item.value)
           $('#year_in_review_music_release_artist_id').val(ui.item.id)
@@ -20,12 +22,45 @@ window.VoluntaryMusicMetadataEnrichment.Library.YearInReviewReleases.NewView = c
           source: '/music/artists/' + $('#year_in_review_music_release_artist_id').val() + '/releases/autocomplete'
           minLength: 2
           appendTo: '#year_in_review_music_release_release_name_suggestions'
+          search: (event, ui) ->
+            $('#year_in_review_music_release_release_id').val(null)
           select: (event, ui) ->
             $(this).val(ui.item.value)
             $('#year_in_review_music_release_release_id').val(ui.item.id)
             
             return false;
       else
-        alert 'Please select an artist!'
         event.preventDefault()
-        return false
+        return false
+        
+    $(document.body).on "click", "#add_release_button", (event) ->
+      event.preventDefault()
+      
+      artist_id = $('#year_in_review_music_release_artist_id').val()
+      artist_id = if artist_id == null || artist_id == undefined || artist_id == '' then 0 else parseInt(artist_id)
+      artist_name = $('#year_in_review_music_release_artist_name').val()
+      artist_name = if artist_name == null || artist_name == undefined || artist_name == '' then '' else artist_name
+      release_id = $('#year_in_review_music_release_release_id').val()
+      release_id = if release_id == null || release_id == undefined || release_id == '' then 0 else parseInt(release_id)
+      release_name = $('#year_in_review_music_release_release_name').val()
+      release_name = if release_name == null || release_name == undefined || release_name == '' then '' else release_name
+      
+      if artist_id == 0 && artist_name == ''
+        alert 'Please enter an artist name!'
+        return
+      
+      if artist_id > 0 && release_name == ''
+        alert 'Please enter a release name'
+        return
+         
+      if artist_id == 0  
+        $('#new_year_in_review_music_release').attr(
+          'action', '/music/releases/artist_confirmation?music_artist[name]=' + artist_name
+        )
+      else if release_id == 0
+        $('#new_year_in_review_music_release').attr(
+          'action', '/music/releases/name_confirmation?music_release[name]=' + release_name + '&music_release[artist_id]=' + artist_id
+        )
+      
+      $('#new_year_in_review_music_release').attr('method', 'get') if release_id == 0  
+      $('#new_year_in_review_music_release').submit()

data/app/assets/javascripts/voluntary_music_metadata_enrichment/library/year_in_review_tracks/index_view.js.coffee

@@ -5,28 +5,107 @@ window.VoluntaryMusicMetadataEnrichment.Library.YearInReviewTracks.IndexView = c
   constructor: ->
     window.VoluntaryMusicMetadataEnrichment.Library.YearInReviewTracks.IndexView.makeCollectionSortable()
     
+    $(document.body).on "click", ".play_track_button", (event) ->
+      target = null
+      
+      if $(this).data('target') == undefined
+        target = '#bootstrap_modal'
+      else
+        target = $(this).data('target')
+        
+      event.preventDefault()
+      
+      iframe = '<iframe src="https://embed.spotify.com/?uri=spotify:track:' + $(this).data('spotify-track-id') + '&view=coverart" frameborder="0" allowtransparency="true" width="300" height="80"></iframe>'
+      
+      if target == '#bootstrap_modal'
+        $(target).html(
+          '<div class="modal-header">' +
+          '<button type="button" id="close_bootstrap_modal_button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>' +
+          '<h3>Play Track</h3>' +
+          '</div>' +
+          '<div class="modal-body" style="overflow-y:none;">' +
+          iframe +
+          '</div>' +
+          '<div class="modal-footer">' +
+          '</div>'
+        )  
+        $(target).modal('show')
+      else
+        $(target).html(iframe)
+    
     $(document.body).on "ajax:beforeSend", ".destroy_music_year_in_review_top_track_link", ->
       $(this).find('.ajax_spinner').show()
     
+    $(document.body).on "ajax:beforeSend", ".create_music_year_in_review_flop_track_link", ->
+      $(this).find('.ajax_spinner').show()
+    
     new window.VoluntaryMusicMetadataEnrichment.Library.YearInReviewTracks.NewView()
     
+    window.competitive_list_for_tracks = new CompetitiveList id: '#competitive_list_for_tracks', competitor_name_proc: (csv) ->
+      return '<iframe src="https://embed.spotify.com/?uri=spotify:track:' + csv.split(';')[0] + '&view=coverart" frameborder="0" allowtransparency="true" width="300" height="80"></iframe><br/>' + $("#competitor_#{csv.split(';')[1]}").find('.competitor_name').html()
+      
   @makeCollectionSortable: ->
-    $('#year_in_review_music_tracks').sortable
+    $('#year_in_review_music_tracks').multisortable
       start: (event, ui) =>
-        window.first_position = $('#year_in_review_music_tracks li:first').data('position')
-        window.last_position = $('#year_in_review_music_tracks li:last').data('position')
+        window.VoluntaryMusicMetadataEnrichment.Library.YearInReviewTracks.IndexView.showSpinnerForSelectedCompetitors()
         
       update: (event, ui) =>
-        source_item = $(ui.item).closest('li')
-        current_position = window.first_position
-        previous_element = null
+        $('#year_in_review_music_tracks').sortable('disable')
+        setTimeout (->
+          window.VoluntaryMusicMetadataEnrichment.Library.YearInReviewTracks.IndexView.putPositions(ui.item.data('id'))
+          return
+        ), 1000
+  
+  @showSpinnerForSelectedCompetitors: ->
+    $.each $('#year_in_review_music_tracks li.selected'), (index, element) ->
+      $(element).find('.sorting_spinner').show()
+
+  @hideSpinnerForSelectedCompetitors: ->
+    $.each $('#year_in_review_music_tracks li.selected'), (index, element) ->
+      $(element).find('.sorting_spinner').hide()
         
-        $.each $('#year_in_review_music_tracks li'), (index, element) ->
-          $(element).data('position', current_position)  
-          $('#year_in_review_music_track_position_' + $(element).data('id')).html(current_position)
-          
-          if $(element).data('id') == $(source_item).data('id')
-            $.post '/users/current/library/music/year_in_review_music_tracks/' + $(element).data('id') + '/move', { _method: 'put', position: current_position }
-          
-          previous_element = $(element)
-          current_position += 1
+  @putPositions: (competitorId) ->
+    newPositionOfCompetitor = null
+    
+    unless window.matches.length > 0 && $('#year_in_review_music_tracks li.selected').length > 1
+      newPositionOfCompetitor = window.VoluntaryMusicMetadataEnrichment.Library.YearInReviewTracks.IndexView.resetPositions(competitorId)
+    
+    if window.matches.length == 0
+      positions = {}
+        
+      $.each $('#year_in_review_music_tracks li.selected'), (index, element) ->
+        positions[$(element).data('position')] = $(element).data('id')
+        
+      $.post('/users/current/library/music/year_in_review_music_tracks/move', { _method: 'put', positions: positions }).always(=>
+        $('#year_in_review_music_tracks').sortable('enable')
+        window.VoluntaryMusicMetadataEnrichment.Library.YearInReviewTracks.IndexView.hideSpinnerForSelectedCompetitors()
+      )
+    else
+      if $('#year_in_review_music_tracks li.selected').length == 1
+        window.competitive_list_for_tracks.moveCompetitorToPosition competitorId, newPositionOfCompetitor, => 
+          $('#year_in_review_music_tracks').sortable('enable')
+          window.VoluntaryMusicMetadataEnrichment.Library.YearInReviewTracks.IndexView.hideSpinnerForSelectedCompetitors()
+      else
+        alert 'Dragging of multiple elements is not supported in round-robin tournament mode!'
+        window.VoluntaryMusicMetadataEnrichment.Library.YearInReviewTracks.IndexView.cancelSorting()
+        $('#year_in_review_music_tracks').sortable('enable')
+        window.VoluntaryMusicMetadataEnrichment.Library.YearInReviewTracks.IndexView.hideSpinnerForSelectedCompetitors()
+   
+  @cancelSorting: ->
+    $wrapper = $('#year_in_review_music_tracks')
+
+    $wrapper.find('li').sort((a, b) ->
+      +parseInt($(a).data('position')) - +parseInt($(b).data('position'))
+    ).appendTo $wrapper 
+   
+  @resetPositions: (competitorId) ->
+    position = null
+    current_position = 1
+    
+    $.each $('#year_in_review_music_tracks li'), (index, element) ->
+      $(element).data('position', current_position)  
+      $(element).find('.competitor_position').html(current_position)
+      position = current_position if $(element).data('id') == competitorId
+      current_position += 1
+     
+    return position

data/app/assets/javascripts/voluntary_music_metadata_enrichment/library/year_in_review_tracks/new_view.js.coffee

@@ -8,6 +8,8 @@ window.VoluntaryMusicMetadataEnrichment.Library.YearInReviewTracks.NewView = cla
         source: $(this).data('source')
         minLength: 2
         appendTo: '#year_in_review_music_track_artist_name_suggestions'
+        search: (event, ui) ->
+          $('#year_in_review_music_track_artist_id').val(null)
         select: (event, ui) ->
           $(this).val(ui.item.value)
           $('#year_in_review_music_track_artist_id').val(ui.item.id)
@@ -20,12 +22,45 @@ window.VoluntaryMusicMetadataEnrichment.Library.YearInReviewTracks.NewView = cla
           source: '/music/artists/' + $('#year_in_review_music_track_artist_id').val() + '/tracks/autocomplete'
           minLength: 2
           appendTo: '#year_in_review_music_track_track_name_suggestions'
+          search: (event, ui) ->
+            $('#year_in_review_music_track_track_id').val(null)
           select: (event, ui) ->
             $(this).val(ui.item.value)
             $('#year_in_review_music_track_track_id').val(ui.item.id)
             
             return false;
       else
-        alert 'Please select an artist!'
         event.preventDefault()
-        return false
+        return false
+        
+    $(document.body).on "click", "#add_track_button", (event) ->
+      event.preventDefault()
+      
+      artist_id = $('#year_in_review_music_track_artist_id').val()
+      artist_id = if artist_id == null || artist_id == undefined || artist_id == '' then 0 else parseInt(artist_id)
+      artist_name = $('#year_in_review_music_track_artist_name').val()
+      artist_name = if artist_name == null || artist_name == undefined || artist_name == '' then '' else artist_name
+      track_id = $('#year_in_review_music_track_track_id').val()
+      track_id = if track_id == null || track_id == undefined || track_id == '' then 0 else parseInt(track_id)
+      track_name = $('#year_in_review_music_track_track_name').val()
+      track_name = if track_name == null || track_name == undefined || track_name == '' then '' else track_name
+      
+      if artist_id == 0 && artist_name == ''
+        alert 'Please enter an artist name!'
+        return
+       
+      if artist_id > 0 && track_name == ''
+        alert 'Please enter a track name'
+        return
+         
+      if artist_id == 0  
+        $('#new_year_in_review_music_track').attr(
+          'action', '/music/tracks/artist_confirmation?music_artist[name]=' + artist_name
+        )
+      else if track_id == 0
+        $('#new_year_in_review_music_track').attr(
+          'action', '/music/tracks/name_confirmation?music_track[name]=' + track_name + '&music_track[artist_id]=' + artist_id
+        )
+      
+      $('#new_year_in_review_music_track').attr('method', 'get') if track_id == 0 
+      $('#new_year_in_review_music_track').submit()

data/app/assets/javascripts/voluntary_music_metadata_enrichment/library/years_in_review/index_view.js.coffee

@@ -31,6 +31,12 @@ window.VoluntaryMusicMetadataEnrichment.Library.YearsInReview.IndexView = class
           alert 'Failed to load top tracks!'
         )
         event.preventDefault()  
+    
+    $(document.body).on "ajax:beforeSend", ".publish_music_year_in_review_link", ->
+      $(this).find('.ajax_spinner').show()   
+        
+    $(document.body).on "ajax:beforeSend", ".destroy_music_year_in_review_link", ->
+      $(this).find('.ajax_spinner').show()    
         
     $(document.body).on "ajax:beforeSend", "#new_music_year_in_review_form", ->
       $("#years_in_review_spinner").show()

data/app/assets/javascripts/voluntary_music_metadata_enrichment/videos/show.js.coffee

@@ -0,0 +1,2 @@
+$(document).ready ->
+  new window.Likes.List()

data/app/controllers/concerns/music_metadata_enrichment/artist_confirmation.rb

@@ -1,8 +1,10 @@
 module MusicMetadataEnrichment
   module ArtistConfirmation
     extend ActiveSupport::Concern
-  
-    private
+    
+    included do
+      helper_method :render_modal_javascript_response
+    end
     
     def confirm_artist(from)
       build_artist
@@ -13,147 +15,76 @@ module MusicMetadataEnrichment
         if musicbrainz_artist
           @artist.mbid = musicbrainz_artist.id
           @artist.name = musicbrainz_artist.name
-          artist = nil
+          artist = MusicArtist.where(mbid: @artist.mbid).first
           
-          if ['new_release', 'new_track', 'new_video'].include?(from) && (artist = MusicArtist.where(mbid: @artist.mbid).first) && artist.active?
-            working_params = {}
-            
-            if params[:group_id].present?
-              MusicMetadataEnrichment::GroupArtistConnection.create(group_id: params[:group_id], artist_id: artist.id)
-              working_params[:group_id] = params[:group_id]
-            elsif params[:user_id].present?
-              MusicLibraryArtist.create(user_id: params[:user_id], artist_id: artist.id)
-            end
-              
-            case from
-            when 'new_release' then redirect_to name_music_releases_path(working_params.merge(music_release: { artist_id: artist.id }))
-            when 'new_track' then redirect_to name_music_tracks_path(music_track: { artist_id: artist.id })
-            when 'new_video'
-              redirect_to track_name_music_tracks_path(working_params.merge(music_track: { artist_id: artist.id }))
-            end
-          elsif artist && from == 'new_group_artist_connection'
-            redirect_to creation_music_group_artists_path(
-              group_artist_connection: { group_id: params[:group_id], artist_id: artist.id }
-            )
-          elsif artist
-            flash[:notice] = I18n.t('music_releases.select_artist.wait_until_artist_metadata_import_completed')
+          if artist
+            @artist = artist
+          else
+            @artist.save
             
-            if params[:group_id].present?
-              MusicMetadataEnrichment::GroupArtistConnection.create(group_id: params[:group_id], artist_id: artist.id)
-              redirect_to music_group_path(params[:group_id])
-            elsif params[:user_id].present?
-              MusicLibraryArtist.create(user_id: params[:user_id], artist_id: artist.id)
-              redirect_to user_music_library_path(params[:user_id])
-            else
-              redirect_to music_path 
-            end
-          elsif @artist.save
             if from == 'new_artist'
               flash[:notice] = I18n.t('music_artists.name_confirmation.scheduled_metadata_import')
             elsif ['new_release', 'new_track', 'new_video'].include?(from)
               flash[:notice] = I18n.t('music_releases.artist_confirmation.artist_import_scheduled')
             end
-            
-            if params[:group_id].present?
-              MusicMetadataEnrichment::GroupArtistConnection.create(group_id: params[:group_id], artist_id: @artist.id)
-              redirect_to music_group_path(params[:group_id])
-            elsif params[:user_id].present?
-              MusicLibraryArtist.create(user_id: params[:user_id], artist_id: @artist.id)
-              redirect_to user_music_library_path(params[:user_id])  
-            elsif ['new_artist', 'new_release', 'new_track', 'new_video'].include?(from)
-              redirect_to music_path
-            elsif from == 'new_group_artist_connection'
-              redirect_to creation_music_group_artists_path(
-                group_artist_connection: { group_id: params[:group_id], artist_id: @artist.id }
-              )
-            end
-          else
-            render :new
           end
+          
+          redirect_after_artist_available(from)
         else
           flash[:alert] = I18n.t('music_artists.new.mbid_invalid')
           
           if from == 'new_artist'
             if params[:user_id].present?
-              redirect new_user_music_library_artist_path(params[:user_id])
+              @path = new_user_music_library_artist_path(params[:user_id])
             else
-              redirect_to new_music_artist_path
+              @path = new_music_artist_path
             end
           elsif from == 'new_release'
             if params[:group_id].present?
-              redirect_to new_music_group_release_path(params[:group_id])
+              @path = new_music_group_release_path(params[:group_id])
             else
-              redirect_to new_music_release_path
+              @path = new_music_release_path
             end
           elsif from == 'new_track'
-            redirect_to new_music_track_path
+            @path = new_music_track_path
           elsif from == 'new_video'
             if params[:group_id].present?
               new_music_group_video_path(params[:group_id])
             else
-              redirect_to new_music_video_path
+              @path = new_music_video_path
             end
           elsif from == 'new_group_artist_connection'
-            redirect_to new_music_group_artist_path(params[:group_id])
+            @path = new_music_group_artist_path(params[:group_id])
           end
         end
       elsif @artist.name.present?
-        3.times do
-          @artists = MusicBrainz::Artist.search(@artist.name)
-          
-          if @artists.nil?
-            sleep 5
-          else
-            break
-          end
-        end
+        @artists = MusicBrainz::Artist.search(@artist.name)
       else
-        render :new
+        @template = :new
+      end
+      
+      if @template.present? && !request.xhr?
+        render @template
+      elsif @path.present? && !request.xhr?
+        redirect_to @path
       end
     end
   
-    def create_artist(from, name_and_mbid)
-      @artist = MusicArtist.where(mbid: name_and_mbid.split(';').last).first
+    def create_artist(from, name_and_mbid, artist_not_found = false)
+      @artist = MusicArtist.where(mbid: name_and_mbid.split(';').last).first unless artist_not_found
       
-      if @artist
-        if params[:group_id].present?
-          flash[:notice] = I18n.t('music_artists.create.group_connection_successful')
-          MusicMetadataEnrichment::GroupArtistConnection.create(group_id: params[:group_id], artist_id: @artist.id)
-          redirect_to music_group_path(params[:group_id])
-        elsif params[:user_id].present?
-          flash[:notice] = I18n.t('music_artists.create.library_addition_successful')
-          MusicLibraryArtist.create(user_id: params[:user_id], artist_id: @artist.id)
-          redirect_to user_music_library_path(params[:user_id])  
-        else
-          flash[:notice] = I18n.t('music_artists.create.already_created')
-          redirect_to music_artist_path(@artist.id)
-        end
-      else
+      unless @artist
         @artist = MusicArtist.create(name: name_and_mbid.split(';').first, mbid: name_and_mbid.split(';').last)
         
-        if @artist.valid?
+        if @artist.persisted?
           if from == 'new_artist'
             flash[:notice] = I18n.t('music_artists.create.scheduled_artist_for_import')
           elsif ['new_release', 'new_track', 'new_video'].include? from
             flash[:notice] = I18n.t('music_releases.select_artist.scheduled_artist_for_import')
           end
-          
-          if ['new_artist', 'new_release', 'new_track', 'new_video'].include? from
-            if params[:group_id].present?
-              MusicMetadataEnrichment::GroupArtistConnection.create(group_id: params[:group_id], artist_id: @artist.id)
-              redirect_to music_group_path(params[:group_id])
-            else
-              redirect_to music_path
-            end
-          elsif from == 'new_group_artist_connection'
-            redirect_to creation_music_group_artists_path(
-              group_artist_connection: { group_id: params[:group_id], artist_id: @artist.id }
-            )
-          end
         else
           params[:music_artist][:name] = @artist.name
           params[:music_artist][:mbid] = @artist.mbid
-          render :new
         end
       end
     end
@@ -161,47 +92,82 @@ module MusicMetadataEnrichment
     def artist_selection(from)
       params[:music_artist] ||= {}
       name_and_mbid = params[:music_artist].delete(:name_and_mbid)
-      artist = MusicArtist.where(mbid: name_and_mbid.split(';').last).first
-   
-      if artist && from == 'new_group_artist_connection'
-        redirect_to creation_music_group_artists_path(
-          group_artist_connection: { group_id: params[:group_id], artist_id: artist.id }
-        )
-      elsif artist && artist.active?
-        if params[:group_id].present?
-          MusicMetadataEnrichment::GroupArtistConnection.create(group_id: params[:group_id], artist_id: artist.id)
-        end
-          
-        if from == 'new_release'
-          redirect_to name_music_releases_path(
-            (params[:group_id].present? ? {group_id: params[:group_id]} : {}).merge(music_release: { artist_id: artist.id })
-          )
-        elsif from == 'new_track'
-          redirect_to name_music_tracks_path(music_track: { artist_id: artist.id })
-        elsif from == 'new_video'
-          redirect_to track_name_music_videos_path(
-            (params[:group_id].present? ? {group_id: params[:group_id]} : {}).merge(music_track: { artist_id: artist.id })
-          )
-        end
-      elsif artist
-        flash[:notice] = I18n.t('music_releases.select_artist.wait_until_artist_metadata_import_completed')
+      @artist = MusicArtist.where(mbid: name_and_mbid.split(';').last).first
+      create_artist(from, name_and_mbid, true) unless @artist
+      redirect_after_artist_available(from)
+    end
+    
+    def build_artist
+      params[:music_artist] ||= {}
+      @artist = MusicArtist.new
+      @artist.name = params[:music_artist][:name]
+      @artist.mbid = params[:music_artist][:mbid]
+    end
+    
+    def redirect_after_artist_available(from)
+      if !@artist.persisted?
+        render :new
+      elsif ['new_release', 'new_track', 'new_video'].include?(from) # && @artist.active?
+        working_params = {}
         
         if params[:group_id].present?
           MusicMetadataEnrichment::GroupArtistConnection.create(group_id: params[:group_id], artist_id: @artist.id)
-          redirect_to music_group_path(params[:group_id])
+          working_params[:group_id] = params[:group_id]
+        elsif params[:user_id].present?
+          MusicLibraryArtist.create(user_id: params[:user_id], artist_id: @artist.id)
+        end
+          
+        case from
+        when 'new_release'
+          if @artist.is_classical?
+            flash[:alert] = I18n.t('music_releases.artist_confirmation.classical_releases_not_supported')
+            
+            @path = params[:group_id].present? ? music_group_path(params[:group_id]) : music_path  
+          else
+            @path = name_music_releases_path(working_params.merge(music_release: { artist_id: @artist.id }))
+          end
+        when 'new_track' then 
+          @path = name_music_tracks_path(music_track: { artist_id: @artist.id })
+        when 'new_video'
+          @path = track_name_music_videos_path(working_params.merge(music_track: { artist_id: @artist.id }))
         else
-          redirect_to music_path 
+          if params[:group_id].present?
+            @path = music_group_path(params[:group_id])
+          elsif params[:user_id].present?
+            @path = user_music_library_path(params[:user_id])
+          else
+            @path = music_path
+          end
         end
-      else
-        create_artist(from, name_and_mbid)
+      elsif from == 'new_group_artist_connection'
+        @path = creation_music_group_artists_path(
+          group_artist_connection: { group_id: params[:group_id], artist_id: @artist.id }
+        )
       end
+      
+      redirect_to @path unless @path.blank? || request.xhr?
     end
     
-    def build_artist
-      params[:music_artist] ||= {}
-      @artist = MusicArtist.new
-      @artist.name = params[:music_artist][:name]
-      @artist.mbid = params[:music_artist][:mbid]
+    def set_template_name_for_xhr_or_render
+      if @template.present? && !request.xhr?
+        render @template
+      elsif @template.blank? && @path.blank?
+        @template = action_name
+      end
+    end
+    
+    def render_modal_javascript_response
+      @data ||= { year_in_review_music_id: params[:year_in_review_music_id] }
+      @method ||= :get
+      render(
+        partial: 'shared/modal_javascript_response.js', 
+        locals: { 
+          title: t("year_in_review_music_#{controller_name}.new.new_#{controller_name.singularize}"), 
+          namespace: "music_metadata_enrichment/#{controller_name}/",
+          ajax_data: @data, ajax_method: @method
+        },
+        layout: false
+      )
     end
   end
 end