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

Merge pull request #2871 from evazion/feat-filetype-metatag

Browse Source 
Add filetype: metatag.
This commit is contained in:
Albert Yi
2017-02-02 11:44:33 -08:00
committed by GitHub
parent a54cf09832 558e4e5443
commit 7a05af657a
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/autocomplete.js
View File

@@ -101,7 +101,7 @@
);
var prefixes = "-|~|general:|gen:|artist:|art:|copyright:|copy:|co:|character:|char:|ch:";
var metatags = "order|-status|status|-rating|rating|-locked|locked|child|" +
var metatags = "order|-status|status|-rating|rating|-locked|locked|child|filetype|-filetype|" +
"-user|user|-approver|approver|commenter|comm|noter|noteupdater|artcomm|-fav|fav|ordfav|" +
"sub|-pool|pool|ordpool|favgroup";
@@ -159,6 +159,8 @@
case "locked":
case "-locked":
case "child":
case "filetype":
case "-filetype":
Danbooru.Autocomplete.static_metatag_source(term, resp, metatag);
return;
}
@@ -336,7 +338,10 @@
],
child: [
"any", "none"
]
],
filetype: [
"jpg", "png", "gif", "swf", "zip", "webm", "mp4"
],
}
Danbooru.Autocomplete.static_metatag_source = function(term, resp, metatag) {

8
app/logical/post_query_builder.rb
View File

@@ -183,6 +183,14 @@ class PostQueryBuilder
relation = relation.where("posts.is_deleted = FALSE")
end
if q[:filetype]
relation = relation.where("posts.file_ext": q[:filetype])
end
if q[:filetype_neg]
relation = relation.where.not("posts.file_ext": q[:filetype_neg])
end
# The SourcePattern SQL function replaces Pixiv sources with "pixiv/[suffix]", where
# [suffix] is everything past the second-to-last slash in the URL. It leaves non-Pixiv
# URLs unchanged. This is to ease database load for Pixiv source searches.

8
app/models/tag.rb
View File

@@ -1,6 +1,6 @@
class Tag < ActiveRecord::Base
COSINE_SIMILARITY_RELATED_TAG_THRESHOLD = 1000
METATAGS = "-user|user|-approver|approver|commenter|comm|noter|noteupdater|artcomm|-pool|pool|ordpool|-favgroup|favgroup|-fav|fav|ordfav|sub|md5|-rating|rating|-locked|locked|width|height|mpixels|ratio|score|favcount|filesize|source|-source|id|-id|date|age|order|limit|-status|status|tagcount|gentags|arttags|chartags|copytags|parent|-parent|child|pixiv_id|pixiv|search|upvote|downvote"
METATAGS = "-user|user|-approver|approver|commenter|comm|noter|noteupdater|artcomm|-pool|pool|ordpool|-favgroup|favgroup|-fav|fav|ordfav|sub|md5|-rating|rating|-locked|locked|width|height|mpixels|ratio|score|favcount|filesize|source|-source|id|-id|date|age|order|limit|-status|status|tagcount|gentags|arttags|chartags|copytags|parent|-parent|child|pixiv_id|pixiv|search|upvote|downvote|filetype|-filetype"
SUBQUERY_METATAGS = "commenter|comm|noter|noteupdater|artcomm"
attr_accessible :category, :as => [:moderator, :janitor, :gold, :platinum, :member, :anonymous, :default, :builder, :admin]
attr_accessible :is_locked, :as => [:moderator, :admin]
@@ -606,6 +606,12 @@ class Tag < ActiveRecord::Base
when "status"
q[:status] = $2.downcase
when "filetype"
q[:filetype] = $2.downcase
when "-filetype"
q[:filetype_neg] = $2.downcase
when "pixiv_id", "pixiv"
q[:pixiv_id] = parse_helper($2)