From aa13f67de736a56906c82660c74f08c6d052eb5e Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Fri, 17 Nov 2023 09:59:43 -0600 Subject: [PATCH] Move primary method to the resource level --- app/models/embed/purl/resource.rb | 6 +++++- app/models/embed/purl/resource_file.rb | 4 ---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/embed/purl/resource.rb b/app/models/embed/purl/resource.rb index 393a6e57f..ab50d016a 100644 --- a/app/models/embed/purl/resource.rb +++ b/app/models/embed/purl/resource.rb @@ -43,7 +43,11 @@ def size # @return [ResourceFile] def primary_file - files.find(&:primary?) + files.find { |file| primary_types.include?(file.mimetype) } + end + + def primary_types + @primary_types ||= Array(Settings.primary_mimetypes[type]) end # @return [ResourceFile] diff --git a/app/models/embed/purl/resource_file.rb b/app/models/embed/purl/resource_file.rb index 46d836d06..9e3810dc3 100644 --- a/app/models/embed/purl/resource_file.rb +++ b/app/models/embed/purl/resource_file.rb @@ -46,10 +46,6 @@ def hierarchical_title title.split('/').last end - def primary? - Array(Settings.primary_mimetypes[resource.type]).include?(mimetype) - end - def thumbnail? image? && Settings.resource_types_that_contain_thumbnails.include?(resource.type) end