geoblacklight_admin 0.4.1 → 0.5.0

data/app/models/geoblacklight_admin/schema.rb

@@ -164,6 +164,36 @@ module GeoblacklightAdmin
           destination: solr_fields[:reference],
           delimited: false,
           transformation_method: "build_dct_references"
+        },
+        COG: {
+          destination: solr_fields[:reference],
+          delimited: false,
+          transformation_method: "build_dct_references"
+        },
+        PMTiles: {
+          destination: solr_fields[:reference],
+          delimited: false,
+          transformation_method: "build_dct_references"
+        },
+        "XYZ Tiles": {
+          destination: solr_fields[:reference],
+          delimited: false,
+          transformation_method: "build_dct_references"
+        },
+        WMTS: {
+          destination: solr_fields[:reference],
+          delimited: false,
+          transformation_method: "build_dct_references"
+        },
+        TileJSON: {
+          destination: solr_fields[:reference],
+          delimited: false,
+          transformation_method: "build_dct_references"
+        },
+        "Tile Map Service": {
+          destination: solr_fields[:reference],
+          delimited: false,
+          transformation_method: "build_dct_references"
         }
       }
     end
@@ -190,7 +220,13 @@ module GeoblacklightAdmin
         WCS: "wcs",
         oEmbed: "oembed",
         Thumbnail: "thumbnail",
-        Image: "image"
+        Image: "image",
+        COG: "cog",
+        PMTiles: "pmtiles",
+        "XYZ Tiles": "xyz_tiles",
+        WMTS: "wmts",
+        TileJSON: "tile_json",
+        "Tile Map Service": "tile_map_service"
       }
     end
   end

data/app/models/geoblacklight_admin/solr_utils.rb

@@ -0,0 +1,87 @@
+require "json"
+require "rsolr"
+
+module GeoblacklightAdmin
+  # @CUSOMIZATION
+  # This is mostly a copy of the Kithe::SolrUtil module from the Kithe gem
+  # with the exception changing id to geomg_id_s
+
+  # This is all somewhat hacky code, but it gets the job done. Some convenience utilities for dealing
+  # with your Solr index, including issuing a query to delete_all; and finding and deleting "orphaned"
+  # Kithe::Indexable Solr objects that no longer exist in the rdbms.
+  #
+  # Unlike other parts of Kithe's indexing support, this stuff IS very solr-specific, and generally
+  # implemented with [rsolr](https://github.com/rsolr/rsolr).
+  module SolrUtils
+    # based on sunspot, does not depend on Blacklight.
+    # https://github.com/sunspot/sunspot/blob/3328212da79178319e98699d408f14513855d3c0/sunspot_rails/lib/sunspot/rails/searchable.rb#L332
+    #
+    #     solr_index_orphans do |orphaned_id|
+    #        delete(id)
+    #     end
+    #
+    # It is searching for any Solr object with a `Kithe.indexable_settings.model_name_solr_field`
+    # field (default `model_name_ssi`). Then, it takes the ID and makes sure it exists in
+    # the database using Kithe::Model. At the moment we are assuming everything is in Kithe::Model,
+    # rather than trying to use the `model_name_ssi` to fetch from different tables. Could
+    # maybe be enhanced to not.
+    #
+    # This is intended mostly for use by .delete_solr_orphans
+    #
+    # A bit hacky implementation, it might be nice to support a progress bar, we
+    # don't now.
+    def self.solr_orphan_geomg_ids(batch_size: 100, solr_url: Kithe.indexable_settings.solr_url)
+      return enum_for(:solr_index_orphan_ids) unless block_given?
+
+      model_solr_id_attr = Kithe.indexable_settings.solr_id_value_attribute
+
+      solr_page = -1
+
+      rsolr = RSolr.connect url: solr_url
+
+      while (solr_page = solr_page.next)
+        response = rsolr.get "select", params: {
+          rows: batch_size,
+          start: (batch_size * solr_page),
+          fl: "geomg_id_s",
+          q: "* TO *"
+        }
+
+        solr_geomg_ids = response["response"]["docs"].collect { |h| h["geomg_id_s"] }
+
+        break if solr_geomg_ids.empty?
+
+        (solr_geomg_ids - Kithe::Model.where(model_solr_id_attr => solr_geomg_ids).pluck(model_solr_id_attr)).each do |orphaned_geomg_id|
+          yield orphaned_geomg_id
+        end
+      end
+    end
+
+    # Finds any Solr objects that have a `model_name_ssi` field
+    # (or `Kithe.indexable_settings.model_name_solr_field` if non-default), but don't
+    # exist in the rdbms, and deletes them from Solr, then issues a commit.
+    #
+    # Under normal use, you shouldn't have to do this, but can if your Solr index
+    # has gotten out of sync and you don't want to delete it and reindex from
+    # scratch.
+    #
+    # Implemented in terms of .solr_orphan_ids.
+    #
+    # A bit hacky implementation, it might be nice to have a progress bar, we don't now.
+    #
+    # Does return an array of any IDs deleted.
+    def self.delete_solr_orphans(batch_size: 100, solr_url: Kithe.indexable_settings.solr_url)
+      rsolr = RSolr.connect url: solr_url
+      deleted_geomg_ids = []
+
+      solr_orphan_geomg_ids(batch_size: batch_size, solr_url: solr_url) do |orphan_geomg_id|
+        deleted_geomg_ids << orphan_geomg_id
+        rsolr.delete_by_query("geomg_id_s:#{orphan_geomg_id}")
+      end
+
+      rsolr.commit
+
+      deleted_geomg_ids
+    end
+  end
+end

data/app/models/kithe/vips_cli_image_to_png.rb

@@ -0,0 +1,114 @@
+require "tempfile"
+require "tty/command"
+
+module Kithe
+  # Use the [vips](https://jcupitt.github.io/libvips/) command-line utility (via shell-out)
+  # to transform any image type to a PNG, with a specified maximum width (keeping aspect ratio).
+  #
+  # Requires vips command line utilities `vips` and `vipsthumbnail` and to be installed on your system,
+  # eg `brew install vips`, or apt package `vips-tools`.
+  #
+  # If thumbnail_mode:true is given, we ALSO apply some additional best practices
+  # for minimizing size when used as an image _in a browser_, such as removing
+  # color profile information. See eg:
+  #  * https://developers.google.com/speed/docs/insights/OptimizeImages
+  #  * http://libvips.blogspot.com/2013/11/tips-and-tricks-for-vipsthumbnail.html
+  #  * https://github.com/jcupitt/libvips/issues/775
+  #
+  # It takes an open `File` object in, and returns an open TempFile object. It is
+  # built for use with kithe derivatives transformations, eg:
+  #
+  #     class Asset < KitheAsset
+  #       define_derivative(thumb) do |original_file|
+  #         Kithe::VipsCliImageToPng.new(max_width: 100, thumbnail_mode: true).call(original_file)
+  #       end
+  #     end
+  #
+  # We use the vips CLI because we know how, and it means we can avoid worrying
+  # about ruby memory leaks or the GIL. An alternative that uses vips ruby bindings
+  # would also be possible, and might work well, but this is what for us is tried
+  # and true.
+  class VipsCliImageToPng
+    class_attribute :srgb_profile_path, default: Kithe::Engine.root.join("lib", "vendor", "icc", "sRGB2014.icc").to_s
+    class_attribute :vips_thumbnail_command, default: "vipsthumbnail"
+    class_attribute :vips_command, default: "vips"
+
+    attr_reader :max_width, :png_compression
+
+    def initialize(max_width: nil, png_compression: 1, thumbnail_mode: false)
+      @max_width = max_width
+      @png_compression = png_compression
+      @thumbnail_mode = !!thumbnail_mode
+
+      if thumbnail_mode && max_width.nil?
+        # https://github.com/libvips/libvips/issues/1179
+        raise ArgumentError.new("thumbnail_mode currently requires a non-nil max_width")
+      end
+    end
+
+    # Will raise TTY::Command::ExitError if the external Vips command returns non-null.
+    def call(original_file)
+      tempfile = Tempfile.new(["kithe_vips_cli_image_to_png", ".png"])
+
+      vips_args = []
+
+      # If we are resizing, we use `vipsthumbnail`, if we are not resizing,
+      # `vips copy` works better.
+      if max_width
+        # Due to bug in vips, we need to provide a height constraint, we make
+        # really huge one million pixels so it should not come into play, and
+        # we're constraining proportionally by width.
+        # https://github.com/jcupitt/libvips/issues/781
+        vips_args.concat [vips_thumbnail_command, original_file.path]
+        vips_args.concat maybe_profile_normalization_args
+        vips_args.concat ["--size", "#{max_width}x65500"]
+        vips_args.concat ["-o", "#{tempfile.path}#{vips_png_params}"]
+      else
+        # If we arne't making a thumbnail, we need to use `vips copy` instead of `vipsthumbnail`,
+        # to avoid it changing height/width on us. There might be another way.
+        #
+        # Yes, this means we can't do thumbnail-mode normalizations.
+        vips_args.concat [vips_command, "copy", original_file.path]
+        vips_args.concat ["#{tempfile.path}#{vips_png_params}"]
+      end
+
+      TTY::Command.new(printer: :null).run(*vips_args)
+
+      tempfile
+    end
+
+    private
+
+    def thumbnail_mode?
+      @thumbnail_mode
+    end
+
+    # Only if we're in thumbnail_mode mode, normalize to rRGB profile, and then strip
+    # embedded profile info for a smaller size, since browsers assume sRGB
+    def maybe_profile_normalization_args
+      return [] unless thumbnail_mode?
+
+      ["--eprofile", srgb_profile_path, "--delete"]
+    end
+
+    # Params to add on to end of PNG output path, as in:
+    # `vips convert ... -o something.png[Q=85]`
+    #
+    # If we are in thumbnail mode, we strip all profile information for
+    # smaller files.
+    #
+    # Either way we create an interlaced JPG and optimize coding for smaller
+    # file size.
+    #
+    # @returns [String]
+    def vips_png_params
+      if thumbnail_mode?
+        "[compression=#{png_compression},interlace,strip]"
+      else
+        # could be higher Q for downloads if we want, but we don't right now
+        # We do avoid striping metadata, no 'strip' directive.
+        "[compression=#{png_compression},interlace]"
+      end
+    end
+  end
+end

data/app/services/geoblacklight_admin/image_service/iiif.rb

@@ -9,8 +9,8 @@ module GeoblacklightAdmin
       # @param [SolrDocument]
       # @param [Integer] thumbnail size
       # @return [String] iiif thumbnail url
-      def self.image_url(document, size)
-        "#{document.viewer_endpoint.gsub("info.json", "")}full/#{size},/0/default.jpg"
+      def self.image_url(document, _size)
+        "#{document.viewer_endpoint.gsub("info.json", "")}full/max/0/default.jpg"
       end
     end
   end

data/app/services/geoblacklight_admin/image_service/iiif_manifest.rb

@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+module GeoblacklightAdmin
+  class ImageService
+    module IiifManifest
+      require "down"
+      require "json"
+
+      ## IIIF Manifests are messy
+      # - some have a sequence
+      # - some have items
+      # - some have canvases
+      # - some have images
+      # - some have resources
+      # - some have thumbnails
+
+      ## BTAA Examples
+      # Indiana - No IIIF Manifests (that I know of)
+      #
+      # Illinois - IIIF Manifests have thumbnail entries
+      # ex. https://digital.library.illinois.edu/items/a07f9c70-994e-0134-2096-0050569601ca-8/manifest
+      #
+      # Iowa - No IIIF Manifests (that I know of)
+      #
+      # Maryland - No IIIF Manifests (that I know of)
+      #
+      # Michigan - IIIF Manifests have thumbnail entries
+      # ex. https://quod.lib.umich.edu/cgi/i/image/api/search/clark1ic:003287878
+      #
+      # Michigan State -
+      # ex. https://d.lib.msu.edu/maps/1084/manifest
+      #
+      # Minnesota
+      # ex. https://cdm16022.contentdm.oclc.org/iiif/info/p16022coll205/265/manifest.json
+      #
+      # Nebraska -
+      # ex. https://mediacommons.unl.edu/luna/servlet/iiif/m/RUMSEY~8~1~317895~90086920/manifest
+      #
+      # Northwestern -
+      # ex. https://api.dc.library.northwestern.edu/api/v2/works/183249d3-aff6-40d5-b445-8f70addedcc3?as=iiif
+      #
+      # Ohio State - IIIF Manifests do not have thumbnail entries
+      # ex. https://library.osu.edu/dc/concern/generic_works/9k41zr126/manifest
+      #
+      # Penn State -
+      # ex. https://digital.libraries.psu.edu/iiif/2/maps1:30183/manifest.json
+      #
+      # Rutgers - No IIIF Manifests (that I know of)
+      #
+
+      ##
+      # Formats and returns a thumbnail url from a IIIF Manifest
+      # @param [SolrDocument]
+      # @param [Integer] thumbnail size
+      # @return [String] iiif thumbnail url
+      def self.image_url(document, _size)
+        Rails.logger.debug("\n\nViewer Endpoint: #{document.viewer_endpoint}")
+
+        begin
+          tempfile = Down.download(document.viewer_endpoint)
+          manifest_json = JSON.parse(tempfile.read)
+
+          # Sequences - Return the first image if it exists
+          # - best case option
+          if manifest_json.dig("sequences", 0, "canvases", 0, "images", 0, "resource", "@id")
+            Rails.logger.debug("\n Image: sequences \n")
+            if manifest_json.dig("sequences", 0, "canvases", 0, "images", 0, "resource", "@id").include?("osu")
+              Rails.logger.debug("\n Image: sequences - OSU variant \n")
+              manifest_json.dig("sequences", 0, "canvases", 0, "images", 0, "resource", "service", "@id") + "/full/1000,/0/default.jpg"
+            else
+              manifest_json.dig("sequences", 0, "canvases", 0, "images", 0, "resource", "@id")
+            end
+
+          # Items - Return the first item image if it exists
+          # - Northwestern
+          elsif manifest_json.dig("items", 0, "items", 0, "items", 0, "body", "id")
+            Rails.logger.debug("\n Image: items body id \n")
+            manifest_json.dig("items", 0, "items", 0, "items", 0, "body", "id")
+
+          # Items - Return the first item image if it exists
+          # - strange option
+          elsif manifest_json.dig("items", 0, "items", 0, "items", 0, "id")
+            Rails.logger.debug("\n Image: items id \n")
+            manifest_json.dig("items", 0, "items", 0, "items", 0, "id")
+
+          # Thumbnail - Return the "thumbnail" if it exists
+          # - varies in size depending on the provider
+          # - worst case option really
+          # - can be @id or id
+          elsif manifest_json["thumbnail"]
+            Rails.logger.debug("\n Image: thumbnail \n")
+            if manifest_json.dig("thumbnail", "@id")
+              manifest_json.dig("thumbnail", "@id")
+            else
+              manifest_json.dig("thumbnail", "id")
+              manifest_json.dig("thumbnail", "id")
+            end
+
+          # Fail - Gonna fail
+          else
+            Rails.logger.debug("\n Image: failed \n")
+            document.viewer_endpoint
+          end
+        rescue => e
+          Rails.logger.debug("\n Rescued: #{e.inspect} \n")
+          document.viewer_endpoint
+        end
+      end
+    end
+  end
+end

data/app/services/geoblacklight_admin/image_service/tms.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require "addressable/uri"
+
+module GeoblacklightAdmin
+  class ImageService
+    module Tms
+      ##
+      # Formats and returns a thumbnail url for a TMS endpoint from a Web Map Service.
+      # This utilizes the GeoServer specific 'reflect' service to generate
+      # parameters like bbox that are difficult to tweak without more detailed
+      # information about the layer.
+      # @param [SolrDocument]
+      # @param [Integer] thumbnail size
+      # @return [String] tms thumbnail url
+      def self.image_url(document, size)
+        puts "\nTMS IMAGE URL..."
+        puts "document.viewer_endpoint: #{document.viewer_endpoint.inspect}"
+
+        # Begins with:
+        # https://cugir.library.cornell.edu/geoserver/gwc/service/tms/1.0.0/cugir%3Acugir007957@EPSG%3A3857@png/{z}/{x}/{y}.png
+
+        # Works with:
+        # https://cugir.library.cornell.edu/geoserver/wms/reflect?&FORMAT=image%2Fpng&TRANSPARENT=TRUE&LAYERS=cugir007957&WIDTH=1500&HEIGHT=1500
+
+        puts "\nPARSE TMS URL..."
+        # Parse the URL using Addressable::URI which handles more complex URIs
+        parsed_url = Addressable::URI.parse(document.viewer_endpoint)
+
+        puts "Parsed URL: #{parsed_url.inspect}"
+
+        # Build a hash to store the extracted components
+        parsed_data = {
+          base_url: "#{parsed_url.scheme}://#{parsed_url.host}#{parsed_url.port ? ":" + parsed_url.port.to_s : ""}",
+          path_pattern: parsed_url.path
+        }
+
+        puts "Parsed Data: #{parsed_data.inspect}"
+
+        endpoint = parsed_data[:base_url]
+        "#{endpoint}/geoserver/wms/reflect?" \
+          "&FORMAT=image%2Fpng" \
+          "&TRANSPARENT=TRUE" \
+          "&LAYERS=#{document["gbl_wxsIdentifier_s"]}" \
+          "&WIDTH=#{size}" \
+          "&HEIGHT=#{size}"
+      end
+    end
+  end
+end

data/app/services/geoblacklight_admin/image_service/wms.rb

@@ -12,10 +12,7 @@ module GeoblacklightAdmin
       # @param [Integer] thumbnail size
       # @return [String] wms thumbnail url
       def self.image_url(document, size)
-        # Swap proxy url with princeton geoserver url.
-        # Thumbnail requests send geoserver auth.
-        endpoint = document.viewer_endpoint.gsub(Settings.PROXY_GEOSERVER_URL,
-          Settings.INSTITUTION_GEOSERVER_URL)
+        endpoint = document.viewer_endpoint
         "#{endpoint}/reflect?" \
           "&FORMAT=image%2Fpng" \
           "&TRANSPARENT=TRUE" \

data/app/services/geoblacklight_admin/image_service.rb

@@ -10,10 +10,13 @@ module GeoblacklightAdmin
     def initialize(document)
       @document = document
 
+      # State Machine
       @metadata = {}
       @metadata["solr_doc_id"] = document.id
       @metadata["placeheld"] = false
+      @document.thumbnail_state_machine.transition_to!(:processing, @metadata)
 
+      # Logger
       @logger ||= ActiveSupport::TaggedLogging.new(
         Logger.new(
           Rails.root.join("log", "image_service_#{Rails.env}.log")
@@ -28,37 +31,27 @@ module GeoblacklightAdmin
       # Gentle hands
       sleep(1)
 
-      puts "Storing ImageService..."
-      puts "Document ID: #{@document.id}"
-
       io_file = image_tempfile(@document.id)
 
-      if io_file.nil?
-        puts "IO is NIL"
+      if io_file.nil? || @metadata["placeheld"] == true
+        @metadata["IO"] = "NIL"
+        @document.thumbnail_state_machine.transition_to!(:placeheld, @metadata)
       else
-        puts "Attaching IO"
         attach_io(io_file)
       end
 
       log_output
     rescue => e
       @metadata["exception"] = e.inspect
+      @document.thumbnail_state_machine.transition_to!(:failed, @metadata)
       log_output
     end
 
     private
 
     def image_tempfile(document_id)
-      # puts "IMAGE TEMPFILE..."
-      puts "Document Viewer Protocol: #{@document.viewer_protocol}"
-      # puts "Image URL: #{image_url}"
-      # puts "IMAGE DATA: #{image_data}"
-
       @metadata["viewer_protocol"] = @document.viewer_protocol
       @metadata["image_url"] = image_url
-      @metadata["gblsi_thumbnail_uri"] = gblsi_thumbnail_uri
-
-      # puts "IMAGE DATA: #{image_data.inspect}"
 
       return nil unless image_data && @metadata["placeheld"] == false
 
@@ -67,24 +60,18 @@ module GeoblacklightAdmin
       temp_file.write(image_data)
       temp_file.rewind
 
-      # puts "TEMPFILE: #{temp_file.inspect}"
-
       @metadata["image_tempfile"] = temp_file.inspect
       temp_file
     end
 
     def attach_io(io)
-      # Remote content-type headers are untrustworthy
-      # Pull the mimetype and file extension via MimeMagic
-      content_type = Marcel::MimeType.for(File.open(io))
-      mime_type = Marcel::TYPES[content_type][0][0]
+      @document.document_assets.where("json_attributes->>'thumbnail' = ?", "true").destroy_all
 
-      puts "Content Type: #{content_type.inspect}"
-      puts "MIME Type: #{mime_type.inspect}"
+      content_type = Marcel::MimeType.for(File.open(io))
+      @metadata["content_type"] = content_type.inspect
 
       if content_type.start_with?("image")
-
-        puts "\n\nStoring an image!\n\n"
+        @metadata["storing_image"] = io.inspect
 
         asset = Asset.new
         asset.parent_id = @document.id
@@ -92,8 +79,10 @@ module GeoblacklightAdmin
         asset.title = (asset.file&.original_filename || "Untitled")
         asset.thumbnail = true
         asset.save
+
+        @document.thumbnail_state_machine.transition_to!(:succeeded, @metadata)
       else
-        # @TODO: If no thumb, what to do?
+        @document.thumbnail_state_machine.transition_to!(:placeheld, @metadata)
       end
     end
 
@@ -119,7 +108,7 @@ module GeoblacklightAdmin
     end
 
     def gblsi_thumbnail_uri
-      if gblsi_thumbnail_field? && @document.send(Settings.GBLSI_THUMBNAIL_FIELD)
+      if gblsi_thumbnail_field? && @document.send(Settings.GBLSI_THUMBNAIL_FIELD).present?
         @document.send(Settings.GBLSI_THUMBNAIL_FIELD)
       else
         false
@@ -128,7 +117,6 @@ module GeoblacklightAdmin
 
     # Generates hash containing thumbnail mime_type and image.
     def image_data
-      # puts "IMAGE DATA..."
       return nil unless image_url
 
       remote_image
@@ -136,7 +124,6 @@ module GeoblacklightAdmin
 
     # Gets thumbnail image from URL. On error, placehold image.
     def remote_image
-      # puts "remote_image..."
       auth = geoserver_credentials
 
       uri = Addressable::URI.parse(image_url)
@@ -166,12 +153,6 @@ module GeoblacklightAdmin
     # have not been set beyond the default, then a thumbnail url from
     # dct references is used instead.
     def image_url
-      # puts "IMAGE URL..."
-      # puts "gblsi_thumbnail_uri: #{gblsi_thumbnail_uri.inspect}"
-      # puts "restricted_scanned_map?: #{restricted_scanned_map?}"
-      # puts "service_url: #{service_url.inspect}"
-      # puts "image_reference: #{image_reference.inspect}"
-
       @image_url ||= gblsi_thumbnail_uri || service_url || image_reference
     end
 
@@ -186,14 +167,12 @@ module GeoblacklightAdmin
     # from the viewer protocol, and if it's loaded, the image_url
     # method is called.
     def service_url
-      # puts "SERVICE URL..."
       # Follow image_url instead
-      return nil if gblsi_thumbnail_uri
+      return nil if gblsi_thumbnail_uri.present?
 
       @service_url ||=
         begin
           return unless @document.available?
-
           protocol = @document.viewer_protocol
 
           if protocol == "map" || protocol.nil?
@@ -202,8 +181,6 @@ module GeoblacklightAdmin
             return nil
           end
 
-          puts "Image Service: #{protocol.to_s.camelcase}"
-
           "GeoblacklightAdmin::ImageService::#{protocol.to_s.camelcase}".constantize.image_url(@document, image_size)
         rescue NameError
           @metadata["error"] = "service_url NameError"
@@ -229,7 +206,6 @@ module GeoblacklightAdmin
 
     # Capture metadata within image harvest log
     def log_output
-      # @metadata["state"] = @document.sidecar.image_state.current_state
       @metadata.each do |key, value|
         @logger.tagged(@document.id, key.to_s) { @logger.info value }
       end

data/app/services/geoblacklight_admin/item_viewer.rb

@@ -24,7 +24,7 @@ module GeoblacklightAdmin
     end
 
     def viewer_preference
-      [:oembed, :index_map, :tilejson, :xyz, :wmts, :tms, :wms, :iiif, :tiled_map_layer, :dynamic_map_layer,
+      [:cog, :pmtiles, :oembed, :index_map, :tilejson, :xyz, :wmts, :tms, :wms, :iiif_manifest, :iiif, :tiled_map_layer, :dynamic_map_layer,
         :image_map_layer, :feature_layer]
     end
   end

data/app/uploaders/asset_uploader.rb

@@ -1,31 +1,26 @@
 class AssetUploader < Kithe::AssetUploader
-  # gives us md5, sha1, sha512
   plugin :kithe_checksum_signatures
 
-  THUMB_WIDTHS = {
-    mini: 54,
-    large: 525,
-    standard: 208
-  }
+  THUMB_WIDTHS = Settings.GBL_ADMIN_THUMBNAIL_WIDTHS
 
-  # define thumb derivatives for TIFF, PDF, and other image input: :thumb_mini, :thumb_mini_2X, etc.
+  # Define thumb derivatives for image input: :thumb_mini, :thumb_mini_2X, etc.
   THUMB_WIDTHS.each_pair do |key, width|
     # Single-width thumbnails
     Attacher.define_derivative("thumb_#{key}", content_type: "image") do |original_file|
-      Kithe::VipsCliImageToJpeg.new(max_width: width, thumbnail_mode: true).call(original_file)
+      Kithe::VipsCliImageToPng.new(max_width: width, thumbnail_mode: true).call(original_file)
     end
 
     # Double-width thumbnails
     Attacher.define_derivative("thumb_#{key}_2X", content_type: "image") do |original_file|
-      Kithe::VipsCliImageToJpeg.new(max_width: width * 2, thumbnail_mode: true).call(original_file)
+      Kithe::VipsCliImageToPng.new(max_width: width * 2, thumbnail_mode: true).call(original_file)
     end
   end
 
-  # and a full size jpg
+  # And capture a full size jpg
   Attacher.define_derivative("download_full", content_type: "image") do |original_file, attacher:|
     # No need to do this if our original is a JPG
     unless attacher.file.content_type == "image/jpeg"
-      Kithe::VipsCliImageToJpeg.new.call(original_file)
+      Kithe::VipsCliImageToPng.new.call(original_file)
     end
   end
 end

data/app/views/admin/assets/_form.html.erb

@@ -0,0 +1,19 @@
+<% if @asset.errors.any? %>
+  <div class="alert alert-danger mb-4" role="alert">
+    <h2 class="h4" class="alert-heading"><%= pluralize(@asset.errors.count, "error") %> prohibited this asset from being saved</h2>
+    <ol class="mb-0">
+      <% @asset.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+    </ol>
+  </div>
+<% end %>
+
+<div class="form-inputs">
+  <%= f.input :id, {disabled: true} %>
+  <%= f.input :parent_id %>
+</div>
+
+<div class="form-actions">
+  <%= f.button :submit, {class: 'btn btn-primary'} %>
+</div>