X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/34173202861e94dee58ccd5b189983918813d870..a1c3389d7fe54a7311609e7f74b5a9b3ea825c94:/apps/workbench/app/models/collection.rb

diff --git a/apps/workbench/app/models/collection.rb b/apps/workbench/app/models/collection.rb
index 78b0c36376..13f5357faa 100644
--- 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,37 @@ class Collection < ArvadosBase
     true
   end
 
-  def content_summary
-    ApplicationController.helpers.human_readable_bytes_html(total_bytes) + " " + super
+  def manifest
+    if @manifest.nil? or manifest_text_changed?
+      @manifest = Keep::Manifest.new(manifest_text || "")
+    end
+    @manifest
   end
 
-  def total_bytes
-    if files
-      tot = 0
-      files.each do |file|
-        tot += file[2]
-      end
-      tot
+  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
+    if total_bytes > 0
+      ApplicationController.helpers.human_readable_bytes_html(total_bytes) + " " + super
     else
-      0
+      super + " modified at " + modified_at.to_s
     end
   end
 
+  def total_bytes
+    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)
@@ -56,16 +70,8 @@ class Collection < ArvadosBase
     dir_to_tree.call('.')
   end
 
-  def attribute_editable? attr, *args
-    if %w(name description manifest_text).include? attr.to_s
-      true
-    else
-      super
-    end
-  end
-
-  def self.creatable?
-    false
+  def editable_attributes
+    %w(name description manifest_text)
   end
 
   def provenance
@@ -84,20 +90,12 @@ class Collection < ArvadosBase
     end
   end
 
-  def portable_data_hash
-    if self[:portable_data_hash].nil?
-      return self[:uuid]
-    else
-      super
-    end
+  def friendly_link_name lookup=nil
+    name || portable_data_hash
   end
 
-  def friendly_link_name
-    if self.respond_to? :name
-      self.name
-    else
-      self.portable_data_hash
-    end
+  def textile_attributes
+    [ 'description' ]
   end
 
 end