voluntary_music_metadata_enrichment 0.0.1 → 0.1.0

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

@@ -4,47 +4,68 @@ module MusicMetadataEnrichment
     
     private
     
-    def track_creation(from)
+    def track_creation(from, name = nil)
       name_and_mbid = params[:music_track].delete(:name_and_mbid)
-      @track.name = MusicTrack.format_name(name_and_mbid.split(';').first)
+      @track.name = name || MusicTrack.format_name(name_and_mbid.split(';').first)
       
-      if track = MusicTrack.where("artist_id = :artist_id AND LOWER(name) = :name", artist_id: @track.artist_id, name: @track.name.downcase.strip).first
-        if from == 'new_track'
+      if @track.name.length > 255
+        flash[:alert] = I18n.t('errors.messages.too_long.other', count: 255)
+        
+        @path = params[:group_id].present? ? music_group_path(params[:group_id]) :
+         music_path
+      elsif track = MusicTrack.where("artist_id = :artist_id AND LOWER(name) = :name", artist_id: @track.artist_id, name: @track.name.downcase.strip).first
+        @track = track
+        @path = if from == 'new_track'
           flash[:alert] = I18n.t('music_tracks.create.already_exist')
-          redirect_to music_track_path(track.id)
+          music_track_path(track.id)
         elsif from == 'new_video'
-          redirect_to metadata_music_videos_path(
+          metadata_music_videos_path(
             (params[:group_id].present? ? {group_id: params[:group_id]} : {}).merge(music_video: { track_id: track.id })
           ) 
         end
       else
-        if @track.is_bonus_track?
+        is_bonus_track = name.present? ? false : @track.is_bonus_track?
+        
+        if @track.release_name.present?
+          release = MusicRelease.create(artist_id: @track.artist_id, name: @track.release_name, is_lp: @track.release_is_lp)
+        end
+        
+        if name.present? || @track.release_name.present?
+          @track.create_draft_track(name || @track.name)
+          
+          if @track.persisted?
+            flash[:notice] = I18n.t('music_tracks.create.draft_successful')
+          else
+            flash[:alert] = I18n.t('music_tracks.create.draft_failed', errors: @track.errors.full_messages.join('. '))
+          end
+        end  
+          
+        if name.blank? && (@track.artist.is_classical? || is_bonus_track)
           @track.create_bonus_track(name_and_mbid.split(';').last)
-          flash[:notice] = I18n.t('music_tracks.create.successfully_creation')
           
+          if @track.persisted?
+            flash[:notice] = I18n.t('music_tracks.create.bonus_track_successful')
+          else
+            flash[:alert] = I18n.t('music_tracks.create.bonus_track_failed', errors: @track.errors.full_messages.join('. '))
+          end
+        end
+        
+        if @track.persisted?  
           if from == 'new_track'
-            redirect_to music_track_path(@track.id)
+            @path = music_track_path(@track.id)
           elsif from == 'new_video'
-            redirect_to metadata_music_videos_path(
+            @path = metadata_music_videos_path(
               (params[:group_id].present? ? {group_id: params[:group_id]} : {}).merge(music_video: { track_id: @track.id })
             ) 
           end
-        elsif @track.release_name.present?
-          release = MusicRelease.create(artist_id: @track.artist_id, name: @track.release_name)
-          
-          if release.valid?
-            flash[:notice] = I18n.t('music_tracks.create.scheduled_release_for_import')
-          else
-            flash[:alert] = release.errors.full_messages.join('. ')
-          end
-          
-          if params[:group_id].present?
-            redirect_to music_group_path(params[:group_id])
-          else
-            redirect_to music_path
-          end
+        else
+          @path = track_name_music_tracks_path(
+            (params[:group_id].present? ? {group_id: params[:group_id]} : {}).merge(music_track: { artist_id: @track.artist_id })
+          )
         end
       end
+      
+      redirect_to @path unless @path.blank? || request.xhr?
     end
     
     def build_track

data/app/controllers/library/music/year_in_review_release_flops_controller.rb

@@ -0,0 +1,31 @@
+class Library::Music::YearInReviewReleaseFlopsController < ::MusicMetadataEnrichment::ApplicationController
+  include ::MusicMetadataEnrichment::BaseController
+  include Applicat::Mvc::Controller::Resource
+
+  before_action :find_resource, only: [:move, :destroy]
+  authorize_resource class: 'YearInReviewMusicReleaseFlop'
+  
+  def create
+    build_resource
+    
+    if @year_in_review_release_flop.save
+      @year_in_review.releases.where(release_id: @year_in_review_release_flop.release_id).delete_all
+      MusicLibraryArtist.create(user_id: current_user.id, artist_id: @year_in_review_release_flop.artist_id)
+    end
+    
+    render layout: false
+  end
+  
+  private
+  
+  def build_resource
+    @user = current_user
+    find_year_in_review
+    params[:year_in_review_music_release_flop] ||= {}
+    @year_in_review_release_flop = @year_in_review.flop_releases.new(release_id: params[:year_in_review_music_release_flop][:release_id])
+  end
+  
+  def find_year_in_review
+    @year_in_review = @user.years_in_review_music.where(year: params[:year]).first
+  end
+end

data/app/controllers/library/music/year_in_review_releases_controller.rb

@@ -2,7 +2,7 @@ class Library::Music::YearInReviewReleasesController < ::MusicMetadataEnrichment
   include ::MusicMetadataEnrichment::BaseController
   include Applicat::Mvc::Controller::Resource
 
-  before_action :find_resource, only: [:move, :destroy]
+  before_action :find_resource, only: [:destroy]
   authorize_resource class: 'YearInReviewMusicRelease'
   
   def index
@@ -51,6 +51,7 @@ class Library::Music::YearInReviewReleasesController < ::MusicMetadataEnrichment
     build_resource
     
     if @year_in_review_release.save
+      @year_in_review.flop_releases.where(release_id: @year_in_review_release.release_id).delete_all
       MusicLibraryArtist.create(user_id: current_user.id, artist_id: @year_in_review_release.artist_id)
       @notice = I18n.t('year_in_review_music_releases.create.successful') 
       get_year_in_review_releases
@@ -60,13 +61,28 @@ class Library::Music::YearInReviewReleasesController < ::MusicMetadataEnrichment
   end
   
   def move
-    @year_in_review_release.insert_at(params[:position].to_i)
+    year_in_review_releases = current_user.years_in_review_music_releases.where('year_in_review_music_releases.id IN(?)', params[:positions].values).index_by(&:id)
+  
+    params[:positions].keys.map(&:to_i).sort.each do |position|
+      id = params[:positions][position.to_s]
+      year_in_review_releases[id.to_i].reload
+      year_in_review_releases[id.to_i].insert_at(position.to_i)
+    end
+    
+    render nothing: true
+  end
+  
+  def update_all_positions
+    @user = current_user
+    find_year_in_review
+    
+    @year_in_review.update_all_positions_of_users_top_list(@user, :releases, params[:matches], params[:positions])
     
     render nothing: true
   end
   
   def destroy
-    @year_in_review_release.destroy!
+    @year_in_review_release.destroy
     @user = current_user
     params[:user_id], params[:year] = current_user.id, @year_in_review_release.year
     find_year_in_review
@@ -90,7 +106,9 @@ class Library::Music::YearInReviewReleasesController < ::MusicMetadataEnrichment
   private
  
   def find_year_in_review
-    @year_in_review = @user.years_in_review_music.where(year: params[:year]).first
+    @year_in_review = @user.years_in_review_music
+    @year_in_review = @year_in_review.published unless current_user.try(:id) == @user.id
+    @year_in_review = @year_in_review.where(year: params[:year]).first
   end
   
   def build_resource
@@ -106,5 +124,7 @@ class Library::Music::YearInReviewReleasesController < ::MusicMetadataEnrichment
   
   def get_year_in_review_releases
     @year_in_review_releases = @year_in_review.releases.order('position ASC')
+    @year_in_review_tracks = @year_in_review.tracks.order('position ASC').group_by(&:release_id)
+    @year_in_review_tracks_count = @year_in_review_tracks.values.flatten.length
   end
 end

data/app/controllers/library/music/year_in_review_track_flops_controller.rb

@@ -0,0 +1,31 @@
+class Library::Music::YearInReviewTrackFlopsController < ::MusicMetadataEnrichment::ApplicationController
+  include ::MusicMetadataEnrichment::BaseController
+  include Applicat::Mvc::Controller::Resource
+
+  before_action :find_resource, only: [:move, :destroy]
+  authorize_resource class: 'YearInReviewMusicTrackFlop'
+  
+  def create
+    build_resource
+    
+    if @year_in_review_track_flop.save
+      @year_in_review.tracks.where(track_id: @year_in_review_track_flop.track_id).delete_all
+      MusicLibraryArtist.create(user_id: current_user.id, artist_id: @year_in_review_track_flop.artist_id)
+    end
+    
+    render layout: false
+  end
+  
+  private
+  
+  def build_resource
+    @user = current_user
+    find_year_in_review
+    params[:year_in_review_music_track_flop] ||= {}
+    @year_in_review_track_flop = @year_in_review.flop_tracks.new(track_id: params[:year_in_review_music_track_flop][:track_id])
+  end
+  
+  def find_year_in_review
+    @year_in_review = @user.years_in_review_music.where(year: params[:year]).first
+  end
+end

data/app/controllers/library/music/year_in_review_tracks_controller.rb

@@ -2,7 +2,7 @@ class Library::Music::YearInReviewTracksController < ::MusicMetadataEnrichment::
   include ::MusicMetadataEnrichment::BaseController
   include Applicat::Mvc::Controller::Resource
 
-  before_action :find_resource, only: [:move, :destroy]
+  before_action :find_resource, only: [:destroy]
   authorize_resource class: 'YearInReviewMusicTrack'
   
   def index
@@ -19,31 +19,44 @@ class Library::Music::YearInReviewTracksController < ::MusicMetadataEnrichment::
   end
   
   def multiple_new
-    @user = current_user
-    find_year_in_review
-    @tracks = current_user.music_tracks.for_year_in_review(@year_in_review)
-    @tracks = @tracks.where('music_tracks.id > ?', params[:last_id]) if params[:last_id].present?
-    @tracks_left = @tracks.count
-    @tracks = @tracks.order('music_tracks.id ASC').limit(10)
-    params[:last_id] = params[:commit] == I18n.t('general.close') || @tracks.none? ? nil : @tracks.last.id
-    
-    if params[:commit] != I18n.t('general.close') && params[:year_in_review_music_tracks].present?
-      params[:year_in_review_music_tracks].each do |track_id, checked|
-        next unless checked == '1'
-        
-        @year_in_review_track = @year_in_review.tracks.create(track_id: track_id)
+    if params[:commit].present?
+      @user = current_user
+      find_year_in_review
+      @tracks = current_user.music_tracks.for_year_in_review(@year_in_review)
+      @release_ids = []
+      
+      if params[:only_tracks_of_top_releases] == 'true'
+        @release_ids = @year_in_review.releases.map(&:release_id)
+        @tracks = @tracks.where('music_tracks.release_id IN(?)', @release_ids) if @release_ids.any?
+      end
+      
+      if params[:only_tracks_of_top_releases] == 'true' && @release_ids.none?
+        @message = I18n.t('year_in_review_music_tracks.multiple_new.no_top_releases_available')
+      else
+        @tracks = @tracks.where('music_tracks.id > ?', params[:last_id]) if params[:last_id].present?
+        @tracks_left = @tracks.count
+        @tracks = @tracks.order('music_tracks.id ASC').limit(10)
+        params[:last_id] = params[:commit] == I18n.t('general.close') || @tracks.none? ? nil : @tracks.last.id
         
-        next unless @year_in_review_track.persisted?
+        if params[:commit] != I18n.t('general.close') && params[:year_in_review_music_tracks].present?
+          params[:year_in_review_music_tracks].each do |track_id, checked|
+            next unless checked == '1'
+            
+            @year_in_review_track = @year_in_review.tracks.create(track_id: track_id)
+            
+            next unless @year_in_review_track.persisted?
+            
+            MusicLibraryArtist.create(user_id: current_user.id, artist_id: @year_in_review_track.artist_id)
+          end
+        end
         
-        MusicLibraryArtist.create(user_id: current_user.id, artist_id: @year_in_review_track.artist_id)
+        if params[:commit] == I18n.t('general.close') || @tracks.none?
+          get_year_in_review_tracks
+          params[:user_id] = current_user.id 
+        end
       end
     end
     
-    if params[:commit] == I18n.t('general.close') || @tracks.none?
-      get_year_in_review_tracks
-      params[:user_id] = current_user.id 
-    end
-    
     render layout: false
   end
   
@@ -51,6 +64,7 @@ class Library::Music::YearInReviewTracksController < ::MusicMetadataEnrichment::
     build_resource
     
     if @year_in_review_track.save
+      @year_in_review.flop_tracks.where(track_id: @year_in_review_track.track_id).delete_all
       MusicLibraryArtist.create(user_id: current_user.id, artist_id: @year_in_review_track.artist_id)
       @notice = I18n.t('year_in_review_music_tracks.create.successful') 
       get_year_in_review_tracks
@@ -60,13 +74,28 @@ class Library::Music::YearInReviewTracksController < ::MusicMetadataEnrichment::
   end
   
   def move
-    @year_in_review_track.insert_at(params[:position].to_i)
+    year_in_review_tracks = current_user.years_in_review_music_tracks.where('year_in_review_music_tracks.id IN(?)', params[:positions].values).index_by(&:id)
+  
+    params[:positions].keys.map(&:to_i).sort.each do |position|
+      id = params[:positions][position.to_s]
+      year_in_review_tracks[id.to_i].reload
+      year_in_review_tracks[id.to_i].insert_at(position.to_i)
+    end
+    
+    render nothing: true
+  end
+  
+  def update_all_positions
+    @user = current_user
+    find_year_in_review
+    
+    @year_in_review.update_all_positions_of_users_top_list(@user, :tracks, params[:matches], params[:positions])
     
     render nothing: true
   end
   
   def destroy
-    @year_in_review_track.destroy!
+    @year_in_review_track.destroy
     @user = current_user
     params[:user_id], params[:year] = current_user.id, @year_in_review_track.year
     find_year_in_review
@@ -90,7 +119,9 @@ class Library::Music::YearInReviewTracksController < ::MusicMetadataEnrichment::
   private
   
   def find_year_in_review
-    @year_in_review = @user.years_in_review_music.where(year: params[:year]).first
+    @year_in_review = @user.years_in_review_music
+    @year_in_review = @year_in_review.published unless current_user.try(:id) == @user.id
+    @year_in_review = @year_in_review.where(year: params[:year]).first
   end
   
   def build_resource

data/app/controllers/library/music/years_in_review_controller.rb

@@ -20,7 +20,27 @@ class Library::Music::YearsInReviewController < ::MusicMetadataEnrichment::Appli
   
   def show
     @user = User.find(params[:user_id])
-    @year_in_review = @user.years_in_review_music.where(year: params[:year]).first
+    @year_in_review = @user.years_in_review_music
+    @year_in_review = @year_in_review.published unless current_user.try(:id) == @user.id
+    @year_in_review = @year_in_review.where(year: params[:year]).first
+  end
+  
+  def publish
+    @year_in_review = current_user.years_in_review_music.where(id: params[:id]).first
+    @year_in_review.publish
+    
+    render layout: false
+  end
+  
+  def destroy
+    @year_in_review = current_user.years_in_review_music.where(id: params[:id]).first
+    @year_in_review.destroy
+    @user = current_user
+    params[:user_id] = current_user.id
+    get_years_in_review
+    build_year_in_review if user_signed_in?
+    
+    render layout: false
   end
   
   def resource
@@ -35,7 +55,9 @@ class Library::Music::YearsInReviewController < ::MusicMetadataEnrichment::Appli
   end
   
   def get_years_in_review
-    @user = User.find(params[:user_id])
-    @years_in_review = @user.years_in_review_music.order('year DESC').paginate(per_page: 10, page: params[:page] || 1)
+    @user ||= User.find(params[:user_id])
+    @years_in_review = @user.years_in_review_music
+    @years_in_review = @years_in_review.published unless current_user.try(:id) == @user.id
+    @years_in_review = @years_in_review.order('year DESC').paginate(per_page: 10, page: params[:page] || 1)
   end
 end

data/app/controllers/music_metadata_enrichment/application_controller.rb

@@ -8,4 +8,8 @@ class MusicMetadataEnrichment::ApplicationController < ::ApplicationController
   def voluntary_application_javascripts
     ['voluntary/application', 'voluntary_music_metadata_enrichment/application', 'application'] 
   end
+  
+  def voluntary_application_repository_path
+    'volontariat/voluntary_music_metadata_enrichment'
+  end
 end

data/app/controllers/music_metadata_enrichment/artists_controller.rb

@@ -9,20 +9,21 @@ class MusicMetadataEnrichment::ArtistsController < ::MusicMetadataEnrichment::Ap
   
   def index
     if request.xhr? 
-      if request.original_url.match('/groups/') && params[:id]
-        @group = MusicMetadataEnrichment::Group.find(params[:id])
+      if params[:group_id].present? || request.original_url.match('/groups/') && params[:id]
+        @group = MusicMetadataEnrichment::Group.find(params[:group_id] || params[:id])
         @artists = @group.artists
+        @pagination_params = { group_id: (params[:group_id] || params[:id]) }
       elsif params[:user_id].present?
         @artists = User.find(params[:user_id]).music_artists
       end
       
       @artists = @artists.order('name ASC').paginate(per_page: 10, page: params[:page] || 1)
       
-      if request.original_url.match('/groups/') && params[:id] && @artists.any?
+      if @group && @artists.any?
         @group_artist_connections = @group.artist_connections.where('music_metadata_enrichment_group_artist_connections.artist_id IN(?)', @artists.map(&:id))
         
         if user_signed_in?
-          @group_artist_connection_likes = current_user.likes_or_dislikes.for_targets('MusicMetadataEnrichment::GroupArtistConnection', @group_artist_connections.map(&:id)).index_by(&:target_id)
+          @group_artist_connection_likes = MusicMetadataEnrichment::GroupArtistConnection.likes_or_dislikes_for(current_user, @group_artist_connections.map(&:id))
         end
         
         @group_artist_connections = @group_artist_connections.index_by(&:artist_id)
@@ -36,7 +37,7 @@ class MusicMetadataEnrichment::ArtistsController < ::MusicMetadataEnrichment::Ap
   
   def autocomplete
     render json: (
-      MusicArtist.select('id, name').where("name LIKE ?", "#{params[:term]}%").order(:name).limit(10).map{|a| { id: a.id, value: a.name } }
+      MusicArtist.select('id, name, disambiguation').where("LOWER(name) LIKE ?", "#{params[:term].to_s.strip.downcase}%").order(:name).limit(10).map{|a| { id: a.id, value: a.name + (a.disambiguation.present? ? " (#{a.disambiguation})" : '') } }
     ), root: false
   end
   
@@ -52,6 +53,7 @@ class MusicMetadataEnrichment::ArtistsController < ::MusicMetadataEnrichment::Ap
     params[:music_artist] ||= {}
     name_and_mbid = params[:music_artist].delete(:name_and_mbid)
     create_artist('new_artist', name_and_mbid)
+    redirect_after_artist_available(from)
   end
   
   def show
@@ -60,13 +62,13 @@ class MusicMetadataEnrichment::ArtistsController < ::MusicMetadataEnrichment::Ap
   end
   
   def by_name
-     if params[:name].blank?
-       flash[:alert] = I18n.t('music_artists.by_name.name_blank')
-       redirect_to music_artists_path and return
-     end
+    if params[:name].blank?
+      flash[:alert] = I18n.t('music_artists.by_name.name_blank')
+      redirect_to music_artists_path and return
+    end
      
-     @artists = MusicArtist.where("LOWER(name) = ?", params[:name].downcase.strip)
-     @artist = @artists.first if params[:page].blank? && @artists.count == 1
+    @artists = MusicArtist.where("LOWER(name) = ?", params[:name].downcase.strip)
+    @artist = @artists.first if params[:page].blank? && @artists.count == 1
     
     if @artist
       get_variables_for_show
@@ -90,4 +92,4 @@ class MusicMetadataEnrichment::ArtistsController < ::MusicMetadataEnrichment::Ap
   def get_variables_for_show
     @releases = @artist.releases.order('released_at ASC')
   end
-end
+end