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

search: refactor scan_query callers to use split_query.

Browse Source 
Refactor to use split_query instead of scan_query to split a query on
spaces. Preparation for refactoring scan_query into something smarter.
This commit is contained in:
evazion
2020-04-18 19:57:58 -05:00
parent d0c68e68c2
commit 7726563733
7 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/post.rb
View File

@@ -527,11 +527,11 @@ class Post < ApplicationRecord
module TagMethods
def tag_array
@tag_array ||= PostQueryBuilder.scan_query(tag_string)
@tag_array ||= PostQueryBuilder.split_query(tag_string)
end
def tag_array_was
@tag_array_was ||= PostQueryBuilder.scan_query(tag_string_in_database.presence || tag_string_before_last_save || "")
@tag_array_was ||= PostQueryBuilder.split_query(tag_string_in_database.presence || tag_string_before_last_save || "")
end
def tags
@@ -595,7 +595,7 @@ class Post < ApplicationRecord
# then try to merge the tag changes together.
current_tags = tag_array_was
new_tags = tag_array
old_tags = PostQueryBuilder.scan_query(old_tag_string)
old_tags = PostQueryBuilder.split_query(old_tag_string)
kept_tags = current_tags & new_tags
@removed_tags = old_tags - kept_tags
@@ -632,7 +632,7 @@ class Post < ApplicationRecord
end
def normalize_tags
normalized_tags = PostQueryBuilder.scan_query(tag_string)
normalized_tags = PostQueryBuilder.split_query(tag_string)
normalized_tags = apply_casesensitive_metatags(normalized_tags)
normalized_tags = normalized_tags.map(&:downcase)
normalized_tags = filter_metatags(normalized_tags)

2
app/models/tag.rb
View File

@@ -256,7 +256,7 @@ class Tag < ApplicationRecord
def has_metatag?(tags, *metatags)
return nil if tags.blank?
tags = PostQueryBuilder.scan_query(tags.to_str) if tags.respond_to?(:to_str)
tags = PostQueryBuilder.split_query(tags.to_str) if tags.respond_to?(:to_str)
tags.grep(/\A(?:#{metatags.map(&:to_s).join("|")}):(.+)\z/i) { $1 }.first
end
end