From 10ca4dd3ad13781c52e8cdc18bbb0370cef145a3 Mon Sep 17 00:00:00 2001 From: evazion Date: Sat, 8 Sep 2018 15:39:50 -0500 Subject: [PATCH] artists: replace artist finder with fetch source data. * On posts, automatically trigger "Fetch source data" when clicking the Edit tab, instead of triggering the artist finder button. This way we find both the artist and the translated tags in one ajax call. * Remove the "Artist" finder button next to the source field. This isn't necessary given that "Fetch source data" finds the artist itself. * Remove the /artists/finder.json API endpoint. This is no longer used after removing the "Artist" finder button. --- app/controllers/artists_controller.rb | 14 -------------- app/javascript/src/javascripts/posts.js.erb | 2 +- .../src/javascripts/related_tag.js.erb | 19 ++----------------- app/views/posts/partials/show/_edit.html.erb | 1 - app/views/uploads/new.html.erb | 1 - config/routes.rb | 1 - test/functional/artists_controller_test.rb | 6 ++---- 7 files changed, 5 insertions(+), 39 deletions(-) diff --git a/app/controllers/artists_controller.rb b/app/controllers/artists_controller.rb index 1c83352fd..21deaee0d 100644 --- a/app/controllers/artists_controller.rb +++ b/app/controllers/artists_controller.rb @@ -92,20 +92,6 @@ class ArtistsController < ApplicationController end end - def finder - @artists = Artist.find_artists(params[:url], params[:referer_url]) - - respond_with(@artists) do |format| - format.xml do - render :xml => @artists.to_xml(:include => [:sorted_urls], :root => "artists") - end - format.json do - render :json => @artists.to_json(:include => [:sorted_urls]) - expires_in params[:expiry].to_i.days if params[:expiry] - end - end - end - private def load_artist diff --git a/app/javascript/src/javascripts/posts.js.erb b/app/javascript/src/javascripts/posts.js.erb index 7d617b8b1..9a1eb4b96 100644 --- a/app/javascript/src/javascripts/posts.js.erb +++ b/app/javascript/src/javascripts/posts.js.erb @@ -441,7 +441,7 @@ Post.initialize_post_sections = function() { $("#share").hide(); $("#post_tag_string").focus().selectEnd().height($("#post_tag_string")[0].scrollHeight); $("#related-tags-button").trigger("click"); - $("#find-artist-button").trigger("click"); + $("#fetch-data-manual").trigger("click"); $("#recommended").hide(); } else if (e.target.hash === "#recommended") { $("#comments").hide(); diff --git a/app/javascript/src/javascripts/related_tag.js.erb b/app/javascript/src/javascripts/related_tag.js.erb index 55acec5a0..85980c60e 100644 --- a/app/javascript/src/javascripts/related_tag.js.erb +++ b/app/javascript/src/javascripts/related_tag.js.erb @@ -1,3 +1,4 @@ +import Upload from './uploads'; import Utility from './utility'; import Cookie from './cookie'; @@ -16,7 +17,6 @@ RelatedTag.initialize_buttons = function() { <% TagCategory.related_button_list.each do |category| %> RelatedTag.common_bind("#related-<%= category %>-button", "<%= category %>"); // eslint-disable-line indent <% end %> - $("#find-artist-button").on("click.danbooru", RelatedTag.find_artist); } RelatedTag.tags_include = function(name) { @@ -281,21 +281,6 @@ RelatedTag.toggle_tag = function(e) { e.preventDefault(); } -RelatedTag.find_artist = function(e) { - $("#artist-tags").html("Loading..."); - var url = $("#upload_source,#post_source"); - var referer_url = $("#upload_referer_url"); - $.get("/artists/finder.json", {"url": url.val(), "referer_url": referer_url.val()}, RelatedTag.process_artist); - if (e) { - e.preventDefault(); - } -} - -RelatedTag.process_artist = function(data) { - RelatedTag.recent_artists = data; - RelatedTag.build_all(); -} - RelatedTag.toggle = function() { if ($("#related-tags").is(":visible")) { RelatedTag.hide(); @@ -332,7 +317,7 @@ RelatedTag.disable_artist_url = function(e) { is_active: false } } - }).done(RelatedTag.find_artist); + }).done(Upload.fetch_data_manual); } }); return false; diff --git a/app/views/posts/partials/show/_edit.html.erb b/app/views/posts/partials/show/_edit.html.erb index f70a07af4..2b5ddc82a 100644 --- a/app/views/posts/partials/show/_edit.html.erb +++ b/app/views/posts/partials/show/_edit.html.erb @@ -69,7 +69,6 @@ <%= f.label :source %> <%= f.text_field :source %> <%= button_tag "Similar", :id => "similar-button", :type => "button", :class => "ui-button ui-widget ui-corner-all sub gradient" %> - <%= button_tag "Artist", :id => "find-artist-button", :type => "button", :class => "ui-button ui-widget ui-corner-all sub gradient" %> <% if Danbooru.config.iqdbs_server %> diff --git a/app/views/uploads/new.html.erb b/app/views/uploads/new.html.erb index 077cc9cda..314735a67 100644 --- a/app/views/uploads/new.html.erb +++ b/app/views/uploads/new.html.erb @@ -43,7 +43,6 @@ <%= f.label :source %> <%= f.text_field :source, :size => 50, :value => params[:url] %> <%= button_tag "Similar", :id => "similar-button", :type => "button", :class => "ui-button ui-widget ui-corner-all sub gradient" %> - <%= button_tag "Artist", :id => "find-artist-button", :type => "button", :class => "ui-button ui-widget ui-corner-all sub gradient" %> You can enter a URL to have <%= Danbooru.config.app_name %> automatically download and process it diff --git a/config/routes.rb b/config/routes.rb index 6a8f10b87..d4a354b7a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -79,7 +79,6 @@ Rails.application.routes.draw do collection do get :show_or_new get :banned - get :finder end end resources :artist_urls, only: [:update] diff --git a/test/functional/artists_controller_test.rb b/test/functional/artists_controller_test.rb index ad3ba74e7..99ba4e9dd 100644 --- a/test/functional/artists_controller_test.rb +++ b/test/functional/artists_controller_test.rb @@ -3,7 +3,7 @@ require 'test_helper' class ArtistsControllerTest < ActionDispatch::IntegrationTest def assert_artist_found(expected_artist, source_url = nil) if source_url - get_auth finder_artists_path(format: "json", url: source_url), @user + get_auth artists_path(format: "json", search: { url_matches: source_url }), @user if response.body =~ /Net::OpenTimeout/ skip "Remote connection to #{source_url} failed" return @@ -16,9 +16,7 @@ class ArtistsControllerTest < ActionDispatch::IntegrationTest end def assert_artist_not_found(source_url) - tries = 0 - - get_auth finder_artists_path(format: "json", url: source_url), @user + get_auth artists_path(format: "json", search: { url_matches: source_url }), @user if response.body =~ /Net::OpenTimeout/ skip "Remote connection to #{source_url} failed" return