riiif.rb in hyrax-5.0.0.rc2

- old
+ new
@@ -1,38 +1,33 @@
 # frozen_string_literal: true
-ActiveSupport::Reloader.to_prepare do
-  Riiif::Image.file_resolver = Riiif::HttpFileResolver.new
+Rails.application.reloader.to_prepare do
   Riiif::Image.info_service = lambda do |id, _file|
     # id will look like a path to a pcdm:file
     # (e.g. rv042t299%2Ffiles%2F6d71677a-4f80-42f1-ae58-ed1063fd79c7)
     # but we just want the id for the FileSet it's attached to.
 
-    # Capture everything before the first slash
     fs_id = id.sub(/\A([^\/]*)\/.*/, '\1')
     resp = Hyrax::SolrService.get("id:#{fs_id}")
     doc = resp['response']['docs'].first
     raise "Unable to find solr document with id:#{fs_id}" unless doc
     { height: doc['height_is'], width: doc['width_is'], format: doc['mime_type_ssi'], channels: doc['alpha_channels_ssi'] }
   end
 
   if Hyrax.config.use_valkyrie?
-    # Use Valkyrie adapter to make sure file is available locally. Riiif will just open it then
-    # id comes in with the format "FILE_SET_ID/files/FILE_ID"
-    Riiif::Image.file_resolver.id_to_uri = lambda do |id|
-      file_metadata = Hyrax.query_service.find_by(id: id.split('/').last)
-      file = Hyrax.storage_adapter.find_by(id: file_metadata.file_identifier)
-      file.disk_path.to_s
-    end
+    Riiif::Image.file_resolver = Hyrax::RiiifFileResolver.new
   else
+    Riiif::Image.file_resolver = Riiif::HttpFileResolver.new
+
     Riiif::Image.file_resolver.id_to_uri = lambda do |id|
       Hyrax::Base.id_to_uri(CGI.unescape(id)).tap do |url|
         Rails.logger.info "Riiif resolved #{id} to #{url}"
       end
     end
   end
+
   Riiif::Image.authorization_service = Hyrax::IiifAuthorizationService
 
   Riiif.not_found_image = Rails.root.join('app', 'assets', 'images', 'us_404.svg')
   Riiif.unauthorized_image = Rails.root.join('app', 'assets', 'images', 'us_404.svg')
 
-  Riiif::Engine.config.cache_duration = 365.days
+  Riiif::Engine.config.cache_duration = 1.day
 end