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

fixes #1149

Browse Source
This commit is contained in:
albert
2013-04-04 18:24:06 -04:00
parent 79c0c481cd
commit e0a5b748d9
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/logical/post_query_builder.rb
View File

@@ -157,6 +157,8 @@ class PostQueryBuilder
if q[:source] if q[:source]
if q[:source] == "none%" if q[:source] == "none%"
relation = relation.where("(posts.source = '' OR posts.source IS NULL)") relation = relation.where("(posts.source = '' OR posts.source IS NULL)")
elsif q[:source] == "http%"
relation = relation.where("(posts.source like ?)", "http%")
elsif q[:source] =~ /^%\.?pixiv(?:\.net(?:\/img)?)?(?:%\/|(?=%$))(.+)$/ elsif q[:source] =~ /^%\.?pixiv(?:\.net(?:\/img)?)?(?:%\/|(?=%$))(.+)$/
relation = relation.where("SourcePattern(posts.source) LIKE ? ESCAPE E'\\\\'", "pixiv/" + $1) relation = relation.where("SourcePattern(posts.source) LIKE ? ESCAPE E'\\\\'", "pixiv/" + $1)
has_constraints! has_constraints!

2
app/models/artist.rb
View File

@@ -114,7 +114,7 @@ class Artist < ActiveRecord::Base
Artist.new.tap do |artist| Artist.new.tap do |artist|
if params[:name] if params[:name]
artist.name = params[:name] artist.name = params[:name]
post = Post.tag_match("source:http* #{artist.name}").first post = Post.tag_match("source:http #{artist.name}").first
unless post.nil? || post.source.blank? unless post.nil? || post.source.blank?
artist.url_string = post.source artist.url_string = post.source
end end

4
test/unit/post_test.rb
View File

@@ -935,10 +935,10 @@ class PostTest < ActiveSupport::TestCase
should "return posts for a pixiv source search" do should "return posts for a pixiv source search" do
url = "http://i1.pixiv.net/img123/img/artist-name/789.png" url = "http://i1.pixiv.net/img123/img/artist-name/789.png"
post = FactoryGirl.create(:post, :source => url) post = FactoryGirl.create(:post, :source => url)
assert_equal(1, Post.tag_match("source:pixiv/artist-name/*").count)
assert_equal(0, Post.tag_match("source:pixiv/artist-fake/*").count)
assert_equal(1, Post.tag_match("source:*.pixiv.net/img*/artist-name/*").count) assert_equal(1, Post.tag_match("source:*.pixiv.net/img*/artist-name/*").count)
assert_equal(0, Post.tag_match("source:*.pixiv.net/img*/artist-fake/*").count) assert_equal(0, Post.tag_match("source:*.pixiv.net/img*/artist-fake/*").count)
assert_equal(1, Post.tag_match("source:pixiv/artist-name/*").count)
assert_equal(0, Post.tag_match("source:pixiv/artist-fake/*").count)
end end
should "return posts for a pixiv id search (type 1)" do should "return posts for a pixiv id search (type 1)" do