support pool version archive

This commit is contained in:
Albert Yi
2016-12-14 18:09:45 -08:00
parent 3c038f76f9
commit ee4ebce4d7
22 changed files with 300 additions and 64 deletions

View File

@@ -1,16 +1,35 @@
class PoolVersionsController < ApplicationController
respond_to :html, :xml, :json
before_filter :check_availabililty
def index
if params[:search] && params[:search][:pool_id].present?
@pool = Pool.find(params[:search][:pool_id])
end
@pool_versions = PoolVersion.search(params[:search]).order("updated_at desc").paginate(params[:page], :limit => params[:limit], :search_count => params[:search])
@pool_versions = PoolArchive.search(params[:search]).order("updated_at desc").paginate(params[:page], :limit => params[:limit], :search_count => params[:search])
respond_with(@pool_versions) do |format|
format.xml do
render :xml => @pool_versions.to_xml(:root => "pool-versions")
end
end
end
private
def check_availabililty
if !PoolArchive.enabled?
respond_to do |format|
format.html do
flash[:notice] = "Archive service is not configured. Pool versions are not saved."
redirect_to :back
end
format.json do
render json: {success: false, reason: "Archive service is not configured"}.to_json, status: 501
end
end
return false
end
end
end

View File

@@ -2,13 +2,13 @@ module PoolVersionsHelper
def pool_version_diff(pool_version)
html = ""
html << pool_version.changes[:added_posts].map do |post_id|
html << pool_version.added_post_ids.map do |post_id|
'<ins><a href="/posts/' + post_id.to_s + '">' + post_id.to_s + '</a></ins>'
end.join(" ")
html << " "
html << pool_version.changes[:removed_posts].map do |post_id|
html << pool_version.removed_post_ids.map do |post_id|
'<del><a href="/posts/' + post_id.to_s + '">' + post_id.to_s + '</a></del>'
end.join(" ")

View File

@@ -11,7 +11,6 @@ class Pool < ActiveRecord::Base
validate :updater_can_remove_posts
belongs_to :creator, :class_name => "User"
belongs_to :updater, :class_name => "User"
has_many :versions, lambda {order("pool_versions.id ASC")}, :class_name => "PoolVersion", :dependent => :destroy
before_validation :normalize_post_ids
before_validation :normalize_name
before_validation :initialize_is_active, :on => :create
@@ -158,6 +157,14 @@ class Pool < ActiveRecord::Base
end
end
def versions
if PoolArchive.enabled?
PoolArchive.where("pool_id = ?", id).order("id asc")
else
raise "Archive service not configured"
end
end
def is_series?
category == "series"
end
@@ -200,8 +207,10 @@ class Pool < ActiveRecord::Base
raise RevertError.new("You cannot revert to a previous version of another pool.")
end
self.post_ids = version.post_ids
self.post_ids = version.post_ids.join(" ")
self.name = version.name
self.description = version.description
synchronize!
end
@@ -294,7 +303,7 @@ class Pool < ActiveRecord::Base
def synchronize!
synchronize
save
save if post_ids_changed?
end
def post_id_array
@@ -336,17 +345,10 @@ class Pool < ActiveRecord::Base
end
def create_version(force = false)
if post_ids_changed? || name_changed? || description_changed? || is_active_changed? || is_deleted_changed? || category_changed? || force
last_version = versions.last
if last_version && last_version.updater_ip_addr == CurrentUser.ip_addr && CurrentUser.user.id == last_version.updater_id && last_version.created_at > 1.hour.ago
# merge
last_version.update_column(:post_ids, post_ids)
last_version.update_column(:name, name)
else
# create
versions.create(:post_ids => post_ids, :name => name)
end
if PoolArchive.enabled?
PoolArchive.queue(self)
else
Rails.logger.warn("Archive service is not configured. Pool versions will not be saved.")
end
end

View File

@@ -0,0 +1,77 @@
class PoolArchive < ActiveRecord::Base
establish_connection "archive_#{Rails.env}".to_sym
self.table_name = "pool_versions"
module SearchMethods
def for_user(user_id)
where("updater_id = ?", user_id)
end
def search(params)
q = where("true")
return q if params.blank?
if params[:updater_id].present?
q = q.for_user(params[:updater_id].to_i)
end
if params[:updater_name].present?
q = q.where("updater_id = ?", User.name_to_id(params[:updater_name]))
end
if params[:pool_id].present?
q = q.where("pool_id = ?", params[:pool_id].to_i)
end
q
end
end
extend SearchMethods
def self.enabled?
Danbooru.config.aws_sqs_archives_url.present?
end
def self.sqs_service
SqsService.new(Danbooru.config.aws_sqs_archives_url)
end
def self.queue(pool)
# queue updates to sqs so that if archives goes down for whatever reason it won't
# block pool updates
raise "Archive service is not configured" if !enabled?
json = {
pool_id: pool.id,
post_ids: pool.post_ids.scan(/\d+/).map(&:to_i),
updater_id: CurrentUser.id,
updater_ip_addr: CurrentUser.ip_addr.to_s,
created_at: pool.created_at.try(:iso8601),
updated_at: pool.updated_at.try(:iso8601),
description: pool.description,
name: pool.name,
is_active: pool.is_active?,
is_deleted: pool.is_deleted?,
category: pool.category
}
msg = "add pool version\n#{json.to_json}"
sqs_service.send_message(msg)
end
def pool
Pool.find(pool_id)
end
def updater
User.find(updater_id)
end
def updater_name
User.id_to_name(updater_id)
end
def pretty_name
name.tr("_", " ")
end
end

View File

@@ -34,6 +34,46 @@ class PoolVersion < ActiveRecord::Base
extend SearchMethods
def self.export_to_archives(starting_version_id = 0)
raise "SQS URL not setup" if Danbooru.config.aws_sqs_archives_url.nil?
credentials = Aws::Credentials.new(
Danbooru.config.aws_access_key_id,
Danbooru.config.aws_secret_access_key
)
sqs = Aws::SQS::Client.new(
credentials: credentials,
region: Danbooru.config.aws_sqs_region
)
last_version_id = 0
where("id > ?", starting_version_id).find_each do |version|
last_version_id = version.id
json = {
id: version.id,
pool_id: version.pool_id,
post_ids: version.post_ids.scan(/\d+/).map(&:to_i),
updater_id: version.updater_id,
updater_ip_addr: version.updater_ip_addr.to_s,
created_at: version.created_at.try(:iso8601),
updated_at: version.updated_at.try(:iso8601),
description: version.pool.description,
name: version.name,
is_active: version.pool.is_active?,
is_deleted: version.pool.is_deleted?,
category: version.pool.category
}
msg = "add pool version\n#{json.to_json}"
sqs.send_message(
message_body: msg,
queue_url: Danbooru.config.aws_sqs_archives_url
)
end
puts "last version id: #{last_version_id}"
end
def updater_name
User.id_to_name(updater_id)
end
@@ -81,7 +121,7 @@ class PoolVersion < ActiveRecord::Base
intersect << id
other_array.delete_at(index)
end
intersect
intersect
end
end

View File

@@ -178,7 +178,11 @@ class UserPresenter
end
def pool_version_count(template)
template.link_to(user.pool_version_count, template.pool_versions_path(:search => {:updater_id => user.id}))
if PoolArchive.enabled?
template.link_to(user.pool_version_count, template.pool_versions_path(:search => {:updater_id => user.id}))
else
"N/A"
end
end
def inviter(template)

View File

@@ -22,9 +22,9 @@
<% @pool_versions.each do |pool_version| %>
<tr>
<td><%= link_to pool_version.pretty_name, pool_path(pool_version.pool_id), :class => "pool-category-#{pool_version.pool.category}" %></td>
<td><%= link_to pool_version.post_id_array.size, pool_versions_path(:search => {:pool_id => pool_version.pool_id}) %></td>
<td><%= link_to pool_version.post_ids.size, pool_versions_path(:search => {:pool_id => pool_version.pool_id}) %></td>
<td><%= pool_version_diff(pool_version) %></td>
<td><%= link_to_user pool_version.updater%></td>
<td><%= link_to_user pool_version.updater %></td>
<% if CurrentUser.is_moderator? %>
<td>
<%= pool_version.updater_ip_addr %>

View File

@@ -19,7 +19,9 @@
<li><%= link_to "Delete", pool_path(@pool), :method => :delete, :data => {:confirm => "Are you sure you want to delete this pool?"}, :remote => true %></li>
<% end %>
<% end %>
<li><%= link_to "History", pool_versions_path(:search => {:pool_id => @pool.id}) %></li>
<% if PoolArchive.enabled? %>
<li><%= link_to "History", pool_versions_path(:search => {:pool_id => @pool.id}) %></li>
<% end %>
<% if @pool.post_count <= 100 && CurrentUser.is_member? %>
<li><%= link_to "Order", edit_pool_order_path(@pool) %></li>
<% end %>

View File

@@ -53,7 +53,9 @@
<li><h1>Pools</h1></li>
<li><%= link_to("Help", wiki_pages_path(:title => "help:pools")) %></li>
<li><%= link_to("Listing", pools_path) %></li>
<li><%= link_to("Changes", pool_versions_path) %></li>
<% if PoolArchive.enabled? %>
<li><%= link_to("Changes", pool_versions_path) %></li>
<% end %>
</ul>
<ul>
<li><h1>Reports</h1></li>

View File

@@ -84,10 +84,12 @@
<td><%= presenter.artist_commentary_version_count(self) %></td>
</tr>
<tr>
<th>Pool Changes</th>
<td><%= presenter.pool_version_count(self) %></td>
</tr>
<% if PoolArchive.enabled? %>
<tr>
<th>Pool Changes</th>
<td><%= presenter.pool_version_count(self) %></td>
</tr>
<% end %>
<tr>
<th>Forum Posts</th>