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

Fix #4491: Have tag rename option for bulk update requests.

Browse Source 
* Add a `rename A -> B` command for bulk update requests.
* Change mass updates to only retag the posts, not to move saved
  searches or blacklists.

A tag rename does the same thing an alias does, except it doesn't
create a permanent alias. More precisely, a tag rename:

* Moves the wiki.
* Moves the artist entry.
* Moves saved searches.
* Moves blacklists.
* Merges the wikis, if both tags have wiki pages.
* Merges the artist entries, if both tags have artist pages.
* Fixes links in wiki pages to point to the new tag.
* Retags the posts.
This commit is contained in:
evazion
2020-08-26 19:25:14 -05:00
parent bbf2b53d83
commit 23944a1794
6 changed files with 61 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/helpers/bulk_update_requests_helper.rb
View File

@@ -1,13 +1,14 @@
module BulkUpdateRequestsHelper
def bur_script_example
<<~EOS
create alias kitty -> cat
remove alias kitty -> cat
create alias bunny -> rabbit
remove alias bunny -> rabbit
create implication cat -> animal
remove implication cat -> animal
create implication bunny -> animal
remove implication bunny -> animal
rename bunny -> rabbit
mass update kitty -> cat
category touhou -> copyright
EOS
end

54
app/jobs/tag_batch_change_job.rb
View File

@@ -1,19 +1,12 @@
class TagBatchChangeJob < ApplicationJob
class Error < StandardError; end
queue_as :bulk_update
def perform(antecedent, consequent, updater, updater_ip_addr)
raise Error.new("antecedent is missing") if antecedent.blank?
def perform(antecedent, consequent)
normalized_antecedent = PostQueryBuilder.new(antecedent).split_query
normalized_consequent = PostQueryBuilder.new(consequent).parse_tag_edit
CurrentUser.scoped(updater, updater_ip_addr) do
CurrentUser.scoped(User.system) do
migrate_posts(normalized_antecedent, normalized_consequent)
migrate_saved_searches(normalized_antecedent, normalized_consequent)
migrate_blacklists(normalized_antecedent, normalized_consequent)
ModAction.log("processed mass update: #{antecedent} -> #{consequent}", :mass_update)
end
end
@@ -26,47 +19,4 @@ class TagBatchChangeJob < ApplicationJob
end
end
end
def migrate_saved_searches(normalized_antecedent, normalized_consequent)
tags = PostQueryBuilder.new(normalized_antecedent.join(" ")).split_query
# https://www.postgresql.org/docs/current/static/functions-array.html
saved_searches = SavedSearch.where("string_to_array(query, ' ') @> ARRAY[?]", tags)
saved_searches.find_each do |ss|
ss.query = (ss.query.split - tags + normalized_consequent).uniq.join(" ")
ss.save
end
end
# this can't handle negated tags or other special cases
def migrate_blacklists(normalized_antecedent, normalized_consequent)
query = normalized_antecedent
adds = normalized_consequent
arel = query.inject(User.none) do |scope, x|
scope.or(User.where_like(:blacklisted_tags, "*#{x}*"))
end
arel.find_each do |user|
changed = false
begin
repl = user.blacklisted_tags.split(/\r\n|\r|\n/).map do |line|
list = PostQueryBuilder.new(line).split_query
if (list & query).size != query.size
next line
end
changed = true
(list - query + adds).join(" ")
end
if changed
user.update(blacklisted_tags: repl.join("\n"))
end
rescue Exception => e
DanbooruLogger.log(e)
end
end
end
end

7
app/jobs/tag_rename_job.rb Normal file
View File

@@ -0,0 +1,7 @@
class TagRenameJob < ApplicationJob
queue_as :bulk_update
def perform(old_tag_name, new_tag_name)
TagMover.new(old_tag_name, new_tag_name, user: User.system).move!
end
end

19
app/logical/bulk_update_request_processor.rb
View File

@@ -26,6 +26,8 @@ class BulkUpdateRequestProcessor
[:remove_alias, Tag.normalize_name($1), Tag.normalize_name($2)]
when /\A(?:remove implication|unimply) (\S+) -> (\S+)\z/i
[:remove_implication, Tag.normalize_name($1), Tag.normalize_name($2)]
when /\Arename (\S+) -> (\S+)\z/i
[:rename, Tag.normalize_name($1), Tag.normalize_name($2)]
when /\A(?:mass update|update) (.+?) -> (.*)\z/i
[:mass_update, $1, $2]
when /\Acategory (\S+) -> (#{Tag.categories.regexp})\z/i
@@ -69,6 +71,12 @@ class BulkUpdateRequestProcessor
errors[:base] << "Can't change category #{args[0]} -> #{args[1]} (the '#{args[0]}' tag doesn't exist)"
end
when :rename
tag = Tag.find_by_name(args[0])
if tag.nil?
errors[:base] << "Can't rename #{args[0]} -> #{args[1]} (the '#{args[0]}' tag doesn't exist)"
end
when :mass_update
# okay
@@ -105,7 +113,10 @@ class BulkUpdateRequestProcessor
tag_implication.reject!
when :mass_update
TagBatchChangeJob.perform_later(args[0], args[1], User.system, "127.0.0.1")
TagBatchChangeJob.perform_later(args[0], args[1])
when :rename
TagRenameJob.perform_later(args[0], args[1])
when :change_category
tag = Tag.find_or_create_by_name(args[0])
@@ -122,7 +133,7 @@ class BulkUpdateRequestProcessor
def affected_tags
commands.flat_map do |command, *args|
case command
when :create_alias, :remove_alias, :create_implication, :remove_implication
when :create_alias, :remove_alias, :create_implication, :remove_implication, :rename
[args[0], args[1]]
when :mass_update
tags = PostQueryBuilder.new(args[0]).tags + PostQueryBuilder.new(args[1]).tags
@@ -136,7 +147,7 @@ class BulkUpdateRequestProcessor
def is_tag_move_allowed?
commands.all? do |command, *args|
case command
when :create_alias
when :create_alias, :rename
BulkUpdateRequestProcessor.is_tag_move_allowed?(args[0], args[1])
when :mass_update
lhs = PostQueryBuilder.new(args[0])
@@ -152,7 +163,7 @@ class BulkUpdateRequestProcessor
def to_dtext
commands.map do |command, *args|
case command
when :create_alias, :create_implication, :remove_alias, :remove_implication
when :create_alias, :create_implication, :remove_alias, :remove_implication, :rename
"#{command.to_s.tr("_", " ")} [[#{args[0]}]] -> [[#{args[1]}]]"
when :mass_update
"mass update {{#{args[0]}}} -> #{args[1]}"