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

Merge branch 'master' of github.com:r888888888/danbooru

Browse Source
This commit is contained in:
r888888888
2013-04-14 18:23:41 -07:00
parent f5b0f856d6 6afd7e02a4
commit 8b77a3733e
2 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/logical/post_query_builder.rb
View File

@@ -120,6 +120,7 @@ class PostQueryBuilder
relation = add_range_relation(q[:fav_count], "posts.fav_count", relation) relation = add_range_relation(q[:fav_count], "posts.fav_count", relation)
relation = add_range_relation(q[:filesize], "posts.file_size", relation) relation = add_range_relation(q[:filesize], "posts.file_size", relation)
relation = add_range_relation(q[:date], "posts.created_at", relation) relation = add_range_relation(q[:date], "posts.created_at", relation)
relation = add_range_relation(q[:age], "extract(epoch from (CURRENT_TIMESTAMP - posts.created_at))", relation)
relation = add_range_relation(q[:general_tag_count], "posts.tag_count_general", relation) relation = add_range_relation(q[:general_tag_count], "posts.tag_count_general", relation)
relation = add_range_relation(q[:artist_tag_count], "posts.tag_count_artist", relation) relation = add_range_relation(q[:artist_tag_count], "posts.tag_count_artist", relation)
relation = add_range_relation(q[:copyright_tag_count], "posts.tag_count_copyright", relation) relation = add_range_relation(q[:copyright_tag_count], "posts.tag_count_copyright", relation)

32
app/models/tag.rb
View File

@@ -1,5 +1,5 @@
class Tag < ActiveRecord::Base class Tag < ActiveRecord::Base
METATAGS = "-user|user|-approver|approver|commenter|comm|noter|-pool|pool|-fav|fav|sub|md5|-rating|rating|-locked|locked|width|height|mpixels|score|favcount|filesize|source|id|date|order|-status|status|tagcount|gentags|arttags|chartags|copytags|parent|-parent|pixiv_id|pixiv" METATAGS = "-user|user|-approver|approver|commenter|comm|noter|-pool|pool|-fav|fav|sub|md5|-rating|rating|-locked|locked|width|height|mpixels|score|favcount|filesize|source|id|date|age|order|-status|status|tagcount|gentags|arttags|chartags|copytags|parent|-parent|pixiv_id|pixiv"
attr_accessible :category attr_accessible :category
has_one :wiki_page, :foreign_key => "name", :primary_key => "title" has_one :wiki_page, :foreign_key => "name", :primary_key => "title"
@@ -186,6 +186,33 @@ class Tag < ActiveRecord::Base
nil nil
end end
when :age
object =~ /(\d+)(s(econds?)?|mi(nutes?)?|h(ours?)?|d(ays?)?|w(eeks?)?|mo(nths?)?|y(ears?)?)/i
size = $1.to_i
unit = $2
conversion_factor = case unit
when /^s/i
1.second
when /^mi/i
1.minute
when /^h/i
1.hour
when /^d/i
1.day
when /^w/i
1.week
when /^mo/i
1.month
when /^y/i
1.year
else
1.second
end
(size * conversion_factor).to_i
when :filesize when :filesize
object =~ /\A(\d+(?:\.\d*)?|\d*\.\d+)([kKmM]?)[bB]?\Z/ object =~ /\A(\d+(?:\.\d*)?|\d*\.\d+)([kKmM]?)[bB]?\Z/
@@ -350,6 +377,9 @@ class Tag < ActiveRecord::Base
when "date" when "date"
q[:date] = parse_helper($2, :date) q[:date] = parse_helper($2, :date)
when "age"
q[:age] = parse_helper($2, :age)
when "tagcount" when "tagcount"
q[:post_tag_count] = parse_helper($2) q[:post_tag_count] = parse_helper($2)