uploads: autorefresh thumbnails on multi-file uploads page.

Automatically refresh thumbnails on the multi-file upload page as images
are processed in the background.
This commit is contained in:
evazion
2022-02-15 00:47:21 -06:00
parent 37075988ce
commit 36265dbff0
10 changed files with 32 additions and 10 deletions

View File

@@ -3,14 +3,15 @@
class MediaAssetGalleryComponent < ApplicationComponent class MediaAssetGalleryComponent < ApplicationComponent
DEFAULT_SIZE = 180 DEFAULT_SIZE = 180
attr_reader :inline, :size, :options attr_reader :inline, :size, :classes
renders_many :media_assets renders_many :media_assets
renders_one :footer renders_one :footer
def initialize(inline: false, size: DEFAULT_SIZE) def initialize(inline: false, size: DEFAULT_SIZE, classes: [])
super super
@inline = inline @inline = inline
@size = size @size = size
@classes = classes
end end
end end

View File

@@ -1,4 +1,4 @@
<div class="media-asset-gallery media-asset-gallery-<%= size %>"> <%= tag.div class: ["media-asset-gallery", "media-asset-gallery-#{size}", *classes], "data-size": size do %>
<% if media_assets.empty? %> <% if media_assets.empty? %>
<p>No results found.</p> <p>No results found.</p>
<% else %> <% else %>
@@ -10,4 +10,4 @@
<% end %> <% end %>
<%= footer %> <%= footer %>
</div> <% end %>

View File

@@ -5,7 +5,7 @@
class MediaAssetPreviewComponent < ApplicationComponent class MediaAssetPreviewComponent < ApplicationComponent
DEFAULT_SIZE = 180 DEFAULT_SIZE = 180
attr_reader :media_asset, :size, :link_target, :classes, :save_data attr_reader :media_asset, :size, :link_target, :classes, :html, :save_data
delegate :duration_to_hhmmss, :sound_icon, to: :helpers delegate :duration_to_hhmmss, :sound_icon, to: :helpers
renders_one :header renders_one :header
@@ -17,12 +17,13 @@ class MediaAssetPreviewComponent < ApplicationComponent
# @param link_target [ApplicationRecord] What the thumbnail links to (default: the media asset). # @param link_target [ApplicationRecord] What the thumbnail links to (default: the media asset).
# @param save_data [Boolean] If true, save data by not serving higher quality thumbnails # @param save_data [Boolean] If true, save data by not serving higher quality thumbnails
# on 2x pixel density displays. Default: false. # on 2x pixel density displays. Default: false.
def initialize(media_asset:, size: DEFAULT_SIZE, link_target: media_asset, classes: [], save_data: CurrentUser.save_data) def initialize(media_asset:, size: DEFAULT_SIZE, link_target: media_asset, classes: [], html: {}, save_data: CurrentUser.save_data)
super super
@media_asset = media_asset @media_asset = media_asset
@size = size.presence&.to_i || DEFAULT_SIZE @size = size.presence&.to_i || DEFAULT_SIZE
@link_target = link_target @link_target = link_target
@classes = classes @classes = classes
@html = html
@save_data = save_data @save_data = save_data
end end

View File

@@ -1,4 +1,4 @@
<%= tag.article class: ["media-asset-preview media-asset-preview-#{size}", *classes] do -%> <%= tag.article class: ["media-asset-preview media-asset-preview-#{size}", *classes], **html do -%>
<%= link_to link_target, class: "inline-block relative", draggable: "false" do -%> <%= link_to link_target, class: "inline-block relative", draggable: "false" do -%>
<%= header %> <%= header %>

View File

@@ -1,3 +1,5 @@
import Utility from "./utility";
let Upload = {}; let Upload = {};
Upload.IQDB_LIMIT = 5; Upload.IQDB_LIMIT = 5;
@@ -22,6 +24,17 @@ Upload.initialize_all = function() {
if ($("#c-uploads #a-batch").length) { if ($("#c-uploads #a-batch").length) {
$(document).on("click.danbooru", "#c-uploads #a-batch #link", Upload.batch_open_all); $(document).on("click.danbooru", "#c-uploads #a-batch #link", Upload.batch_open_all);
} }
Upload.loadAssets();
}
Upload.loadAssets = async function() {
while ($(".upload-media-asset-loading").length) {
let ids = $(".upload-media-asset-loading").map((i, el) => $(el).attr("data-id")).toArray().join(",");
let size = $(".upload-media-asset-gallery").attr("data-size");
$.get("/upload_media_assets.js", { search: { status: "active failed", id: ids }, size: size });
await Utility.delay(250);
}
} }
Upload.initialize_similar = function() { Upload.initialize_similar = function() {

View File

@@ -29,6 +29,10 @@ class UploadMediaAsset < ApplicationRecord
q.apply_default_order(params) q.apply_default_order(params)
end end
def loading?
pending? || processing?
end
def finished? def finished?
active? || failed? active? || failed?
end end

View File

@@ -1,4 +1,4 @@
<%= render(MediaAssetGalleryComponent.new) do |gallery| %> <%= render(MediaAssetGalleryComponent.new(classes: ["upload-media-asset-gallery"])) do |gallery| %>
<% upload_media_assets.each do |upload_media_asset| %> <% upload_media_assets.each do |upload_media_asset| %>
<% gallery.media_asset do %> <% gallery.media_asset do %>
<%= render "upload_media_assets/preview", upload_media_asset: upload_media_asset, size: gallery.size %> <%= render "upload_media_assets/preview", upload_media_asset: upload_media_asset, size: gallery.size %>

View File

@@ -1,6 +1,6 @@
<% media_asset = upload_media_asset.media_asset %> <% media_asset = upload_media_asset.media_asset %>
<%= render MediaAssetPreviewComponent.new(media_asset: media_asset, size: size, link_target: [upload_media_asset.upload, upload_media_asset]) do |preview| %> <%= render MediaAssetPreviewComponent.new(media_asset: media_asset, size: size, link_target: [upload_media_asset.upload, upload_media_asset], classes: ["upload-media-asset-preview", ("upload-media-asset-loading" if upload_media_asset.loading?)], html: { "data-id": upload_media_asset.id }) do |preview| %>
<% preview.missing_image do %> <% preview.missing_image do %>
<% if upload_media_asset.failed? %> <% if upload_media_asset.failed? %>
Failed Failed

View File

@@ -0,0 +1,3 @@
<% @upload_media_assets.each do |upload_media_asset| %>
$(".upload-media-asset-preview[data-id=<%= upload_media_asset.id %>]").replaceWith("<%= j render("upload_media_assets/preview", upload_media_asset: upload_media_asset, size: params.fetch(:size, 180)) %>");
<% end %>

View File

@@ -1,4 +1,4 @@
<%= render(MediaAssetGalleryComponent.new) do |gallery| %> <%= render(MediaAssetGalleryComponent.new(classes: ["upload-media-asset-gallery"])) do |gallery| %>
<% upload.upload_media_assets.order(id: :asc).each do |upload_media_asset| %> <% upload.upload_media_assets.order(id: :asc).each do |upload_media_asset| %>
<% gallery.media_asset do %> <% gallery.media_asset do %>
<%= render "upload_media_assets/preview", upload_media_asset: upload_media_asset, size: gallery.size %> <%= render "upload_media_assets/preview", upload_media_asset: upload_media_asset, size: gallery.size %>