X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2449ae26b0d8be41aa5411e62032c9fb1ea9af71..77d9c05d89dabc9e9e9a15f46cd12c8ad61ed64e:/apps/workbench/app/helpers/collections_helper.rb

diff --git a/apps/workbench/app/helpers/collections_helper.rb b/apps/workbench/app/helpers/collections_helper.rb
index c1ceb8b5ee..25f2cb53e6 100644
--- a/apps/workbench/app/helpers/collections_helper.rb
+++ b/apps/workbench/app/helpers/collections_helper.rb
@@ -6,24 +6,27 @@ module CollectionsHelper
   end
 
   ##
-  # Regex match for collection UUIDs, returns a regex match object with the
+  # Regex match for collection portable data hash, returns a regex match object with the
   # hash in group 1, (optional) size in group 2, (optional) subsequent uuid
   # fields in group 3, and (optional) file path within the collection as group
-  # 4; or nil for no match.
+  # 4
+  # returns nil for no match.
   #
-  # +uuid+ the uuid string to match
+  # +pdh+ the portable data hash string to match
   #
-  def self.match(uuid)
-    /^([a-f0-9]{32})(\+[0-9]+)?(\+.*?)?(\/.*)?$/.match(uuid.to_s)
+  def self.match(pdh)
+    /^([a-f0-9]{32})(\+\d+)(\+[^+]+)*?(\/.*)?$/.match(pdh.to_s)
   end
 
   ##
-  # Regex match for collection UUID or "UUID/file" path.
-  # Returns a regex match object with the
-  # UUID in group 1, (optional) file path in group 2; or nil for no match.
+  # Regex match for collection UUIDs, returns a regex match object with the
+  # uuid in group 1, empty groups 2 and 3 (for consistency with the match
+  # method above), and (optional) file path within the collection as group
+  # 4.
+  # returns nil for no match.
   #
   def self.match_uuid_with_optional_filepath(uuid_with_optional_file)
-    /^([0-9a-z]{5}-[0-9a-z]{5}-[0-9a-z]{15})(\/*.*)$/.match(uuid_with_optional_file.to_s)
+    /^([0-9a-z]{5}-4zz18-[0-9a-z]{15})()()(\/.*)?$/.match(uuid_with_optional_file.to_s)
   end
 
   ##
@@ -50,4 +53,21 @@ module CollectionsHelper
     f0 += '/' if not f0.empty?
     file_path = "#{f0}#{file[1]}"
   end
+
+  ##
+  # Check if collection preview is allowed for the given filename with extension
+  #
+  def preview_allowed_for file_name
+    file_type = MIME::Types.type_for(file_name).first
+    if file_type.nil?
+      false
+    elsif (file_type.raw_media_type == "text") || (file_type.raw_media_type == "image")
+      true
+    elsif (file_type.raw_media_type == "application") &&
+          (Rails.configuration.application_mimetypes_with_view_icon.include? (file_type.sub_type))
+      true
+    else
+      false
+    end
+  end
 end