Merge branch '3413-keep-trash-list'

[arvados.git] / apps / workbench / app / models / collection.rb

diff --git a/apps/workbench/app/models/collection.rb b/apps/workbench/app/models/collection.rb
index 1f3e0dc5ac41a0ef1cc07fbc77e67ac0fcc95b37..40fd930e38a99ae453ff11e01defcedec35af5fb 100644 (file)
--- a/apps/workbench/app/models/collection.rb
+++ b/apps/workbench/app/models/collection.rb
@@ -1,3 +1,5 @@
+require "arvados/keep"
+
 class Collection < ArvadosBase
   MD5_EMPTY = 'd41d8cd98f00b204e9800998ecf8427e'
 
@@ -18,25 +20,33 @@ class Collection < ArvadosBase
     true
   end
 
+  def manifest
+    if @manifest.nil? or manifest_text_changed?
+      @manifest = Keep::Manifest.new(manifest_text || "")
+    end
+    @manifest
+  end
+
+  def files
+    # This method provides backwards compatibility for code that relied on
+    # the old files field in API results.  New code should use manifest
+    # methods directly.
+    manifest.files
+  end
+
   def content_summary
     ApplicationController.helpers.human_readable_bytes_html(total_bytes) + " " + super
   end
 
   def total_bytes
-    if files
-      tot = 0
-      files.each do |file|
-        tot += file[2]
-      end
-      tot
-    else
-      0
-    end
+    manifest.files.inject(0) { |sum, filespec| sum + filespec.last }
   end
 
   def files_tree
-    return [] if files.empty?
-    tree = files.group_by { |file_spec| File.split(file_spec.first) }
+    tree = manifest.files.group_by do |file_spec|
+      File.split(file_spec.first)
+    end
+    return [] if tree.empty?
     # Fill in entries for empty directories.
     tree.keys.map { |basedir, _| File.split(basedir) }.each do |splitdir|
       until tree.include?(splitdir)
@@ -78,7 +88,7 @@ class Collection < ArvadosBase
 
   def uuid
     if self[:uuid].nil?
-      return self.portable_data_hash
+      return self[:portable_data_hash]
     else
       super
     end
@@ -86,7 +96,7 @@ class Collection < ArvadosBase
 
   def portable_data_hash
     if self[:portable_data_hash].nil?
-      return self.uuid
+      return self[:uuid]
     else
       super
     end
@@ -100,4 +110,8 @@ class Collection < ArvadosBase
     end
   end
 
+  def textile_attributes
+    [ 'description' ]
+  end
+
 end