-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
9f5129b
commit 0d44d08
Showing
11 changed files
with
276 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,83 @@ | ||
# frozen_string_literal: true | ||
class Jp2DerivativeService | ||
class Factory | ||
attr_reader :change_set_persister | ||
delegate :metadata_adapter, to: :change_set_persister | ||
delegate :query_service, to: :metadata_adapter | ||
def initialize(change_set_persister:) | ||
@change_set_persister = change_set_persister | ||
end | ||
|
||
def new(change_set) | ||
Jp2DerivativeService.new(change_set: change_set, change_set_persister: change_set_persister, original_file: original_file(change_set.resource)) | ||
end | ||
|
||
def original_file(resource) | ||
members(resource).find { |x| x.use.include?(Valkyrie::Vocab::PCDMUse.OriginalFile) } | ||
end | ||
|
||
def members(resource) | ||
metadata_adapter.query_service.find_members(resource: resource) | ||
end | ||
end | ||
|
||
attr_reader :change_set, :change_set_persister, :original_file | ||
delegate :mime_type, to: :original_file | ||
def initialize(change_set:, change_set_persister:, original_file:) | ||
@change_set = change_set | ||
@change_set_persister = change_set_persister | ||
@original_file = original_file | ||
end | ||
|
||
def valid? | ||
mime_type == ['image/tiff'] | ||
end | ||
|
||
def create_derivatives | ||
Hydra::Derivatives::Jpeg2kImageDerivatives.create( | ||
filename, | ||
outputs: [ | ||
label: 'intermediate_file', | ||
recipe: :default, | ||
service: { | ||
datastream: 'intermediate_file' | ||
}, | ||
url: URI("file://#{temporary_output.path}") | ||
] | ||
) | ||
change_set.files = [build_file] | ||
change_set_persister.save(change_set: change_set) | ||
end | ||
|
||
def cleanup_derivatives; end | ||
|
||
class IoDecorator < SimpleDelegator | ||
attr_reader :original_filename, :content_type, :use | ||
def initialize(io, original_filename, content_type, use) | ||
@original_filename = original_filename | ||
@content_type = content_type | ||
@use = use | ||
super(io) | ||
end | ||
end | ||
|
||
def build_file | ||
IoDecorator.new(temporary_output, "intermediate_file.jp2", mime_type, use) | ||
end | ||
|
||
def use | ||
[Valkyrie::Vocab::PCDMUse.ServiceFile] | ||
end | ||
|
||
def filename | ||
return Pathname.new(file_object.io.path) if file_object.io.respond_to?(:path) && File.exist?(file_object.io.path) | ||
end | ||
|
||
def file_object | ||
@file_object ||= Valkyrie::StorageAdapter.find_by(id: original_file.file_identifiers[0]) | ||
end | ||
|
||
def temporary_output | ||
@temporary_file ||= Tempfile.new | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
# frozen_string_literal: true | ||
class CreateDerivativesJob < ApplicationJob | ||
delegate :query_service, to: :metadata_adapter | ||
|
||
def perform(file_set_id) | ||
file_set = query_service.find_by(id: Valkyrie::ID.new(file_set_id)) | ||
Valkyrie::DerivativeService.for(FileSetChangeSet.new(file_set)).create_derivatives | ||
end | ||
|
||
def metadata_adapter | ||
Valkyrie.config.metadata_adapter | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
defaults: &defaults | ||
derivative_path: <%= Rails.root.join("tmp", "derivatives") %> | ||
jp2_recipes: | ||
default_color: > | ||
-rate 2.4,1.48331273,.91673033,.56657224,.35016049,.21641118,.13374944,.08266171 | ||
-jp2_space sRGB | ||
-double_buffering 10 | ||
-num_threads 1 | ||
-no_weights | ||
Clevels=6 | ||
Clayers=8 | ||
Cblk=\{64,64\} | ||
Cuse_sop=yes | ||
Cuse_eph=yes | ||
Corder=RPCL | ||
ORGgen_plt=yes | ||
ORGtparts=R | ||
Stiles=\{1024,1024\} | ||
default_gray: > | ||
-rate 2.4,1.48331273,.91673033,.56657224,.35016049,.21641118,.13374944,.08266171 | ||
-jp2_space sLUM | ||
-double_buffering 10 | ||
-num_threads 1 | ||
-no_weights | ||
Clevels=6 | ||
Clayers=8 | ||
Cblk=\{64,64\} | ||
Cuse_sop=yes | ||
Cuse_eph=yes | ||
Corder=RPCL | ||
ORGgen_plt=yes | ||
ORGtparts=R | ||
Stiles=\{1024,1024\} | ||
geo_color: > | ||
-no_palette | ||
-rate 2.4,1.48331273,.91673033,.56657224,.35016049,.21641118,.13374944,.08266171 | ||
-jp2_space sRGB | ||
-double_buffering 10 | ||
-num_threads 1 | ||
-no_weights | ||
Clevels=6 | ||
Clayers=8 | ||
Cblk=\{64,64\} | ||
Cuse_sop=yes | ||
Cuse_eph=yes | ||
Corder=RPCL | ||
ORGgen_plt=yes | ||
ORGtparts=R | ||
Stiles=\{1024,1024\} | ||
geo_gray: > | ||
-no_palette | ||
-rate 2.4,1.48331273,.91673033,.56657224,.35016049,.21641118,.13374944,.08266171 | ||
-jp2_space sLUM | ||
-double_buffering 10 | ||
-num_threads 1 | ||
-no_weights | ||
Clevels=6 | ||
Clayers=8 | ||
Cblk=\{64,64\} | ||
Cuse_sop=yes | ||
Cuse_eph=yes | ||
Corder=RPCL | ||
ORGgen_plt=yes | ||
ORGtparts=R | ||
Stiles=\{1024,1024\} | ||
development: | ||
<<: *defaults | ||
|
||
test: | ||
<<: *defaults | ||
|
||
production: | ||
<<: *defaults | ||
|
||
staging: | ||
<<: *defaults |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
# frozen_string_literal: true | ||
module Figgy | ||
def config | ||
@config ||= config_yaml.with_indifferent_access | ||
end | ||
|
||
private | ||
|
||
def config_yaml | ||
YAML.safe_load(ERB.new(File.read(Rails.root.join("config", "config.yml"))).result, [], [], true)[Rails.env] | ||
end | ||
|
||
module_function :config, :config_yaml | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
# frozen_string_literal: true | ||
require 'rails_helper' | ||
require 'valkyrie/specs/shared_specs' | ||
include ActionDispatch::TestProcess | ||
|
||
RSpec.describe Jp2DerivativeService do | ||
it_behaves_like "a Valkyrie::DerivativeService" | ||
|
||
let(:thumbnail) { Valkyrie::Vocab::PCDMUse.ThumbnailImage } | ||
let(:derivative_service) do | ||
Jp2DerivativeService::Factory.new(change_set_persister: change_set_persister) | ||
end | ||
let(:adapter) { Valkyrie::MetadataAdapter.find(:indexing_persister) } | ||
let(:storage_adapter) { Valkyrie.config.storage_adapter } | ||
let(:persister) { adapter.persister } | ||
let(:query_service) { adapter.query_service } | ||
let(:file) { fixture_file_upload('files/example.tif', 'image/tiff') } | ||
let(:change_set_persister) { PlumChangeSetPersister.new(metadata_adapter: adapter, storage_adapter: storage_adapter) } | ||
let(:scanned_resource) do | ||
change_set_persister.save(change_set: ScannedResourceChangeSet.new(ScannedResource.new, files: [file])) | ||
end | ||
let(:book_members) { query_service.find_members(resource: scanned_resource) } | ||
let(:valid_resource) { book_members.first } | ||
let(:valid_change_set) { DynamicChangeSet.new(valid_resource) } | ||
|
||
describe '#valid?' do | ||
subject(:valid_file) { derivative_service.new(valid_change_set) } | ||
|
||
context 'when given a valid mime_type' do | ||
it { is_expected.to be_valid } | ||
end | ||
|
||
context 'when given an invalid mime_type' do | ||
it 'does not validate' do | ||
# rubocop:disable RSpec/SubjectStub | ||
allow(valid_file).to receive(:mime_type).and_return(['image/jpeg']) | ||
# rubocop:enable RSpec/SubjectStub | ||
is_expected.not_to be_valid | ||
end | ||
end | ||
end | ||
|
||
it "creates a JP2 and attaches it to the fileset" do | ||
derivative_service.new(valid_change_set).create_derivatives | ||
|
||
reloaded = query_service.find_by(id: valid_resource.id) | ||
members = query_service.find_members(resource: reloaded) | ||
derivative = members.find { |x| x.use.include?(Valkyrie::Vocab::PCDMUse.ServiceFile) } | ||
|
||
expect(derivative).to be_present | ||
derivative_file = Valkyrie::StorageAdapter.find_by(id: derivative.file_identifiers.first) | ||
expect(derivative_file.read).not_to be_blank | ||
end | ||
end |