jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor source pixiv test

Browse Source 
refactor pixiv download tests
refactor upload test
refactor nico seiga test
refactor twitter tests
This commit is contained in:
r888888888
2016-09-27 16:22:54 -07:00
parent 4fa2741ed2
commit fc7afd44ea
134 changed files with 66158 additions and 70930 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/artists_controller.rb
View File

@@ -112,10 +112,15 @@ class ArtistsController < ApplicationController
end
def finder
@artists = Artist.url_matches(params[:url]).order("id desc").limit(20)
if @artists.empty? && params[:referer_url].present? && params[:referer_url] != params[:url]
@artists = Artist.url_matches(params[:referer_url]).order("id desc").limit(20)
begin
@artists = Artist.url_matches(params[:url]).order("id desc").limit(20)
if @artists.empty? && params[:referer_url].present? && params[:referer_url] != params[:url]
@artists = Artist.url_matches(params[:referer_url]).order("id desc").limit(20)
end
rescue PixivApiClient::Error => e
@artists = []
end
respond_with(@artists) do |format|
format.xml do
render :xml => @artists.to_xml(:include => [:urls], :root => "artists")
@@ -131,5 +136,4 @@ private
def load_artist
@artist = Artist.find(params[:id])
end
end