Merge branch 'master' into 2767-doc-updates

[arvados.git] / services / api / app / models / collection.rb

diff --git a/services/api/app/models/collection.rb b/services/api/app/models/collection.rb
index efe41cb4bbf3f03dbce4229bdbdeacb1cfd3a163..745f0bf38b610d7d276bfae3c87c8fd8f6c87f1a 100644 (file)
--- a/services/api/app/models/collection.rb
+++ b/services/api/app/models/collection.rb
@@ -1,5 +1,5 @@
 class Collection < ArvadosModel
-  include AssignUuid
+  include HasUuid
   include KindAndEtag
   include CommonApiTemplate
 
@@ -8,6 +8,10 @@ class Collection < ArvadosModel
     t.add :files
   end
 
+  api_accessible :with_data, extend: :user do |t|
+    t.add :manifest_text
+  end
+
   def redundancy_status
     if redundancy_confirmed_as.nil?
       'unconfirmed'
@@ -33,14 +37,14 @@ class Collection < ArvadosModel
         self.uuid.gsub! /$/, '+' + self.manifest_text.length.to_s
         true
       else
-        errors.add :uuid, 'uuid does not match checksum of manifest_text'
+        errors.add :uuid, 'does not match checksum of manifest_text'
         false
       end
     elsif self.manifest_text
-      errors.add :uuid, 'checksum for manifest_text not supplied in uuid'
+      errors.add :uuid, 'not supplied (must match checksum of manifest_text)'
       false
     else
-      errors.add :manifest_text, 'manifest_text not supplied'
+      errors.add :manifest_text, 'not supplied'
       false
     end
   end
@@ -62,18 +66,19 @@ class Collection < ArvadosModel
       return
     end
 
-    normalized_manifest = ""
-    IO.popen(['arv-normalize'], 'w+b') do |io|
-      io.write manifest_text
-      io.close_write
-      while buf = io.read(2**20)
-        normalized_manifest += buf
-      end
-    end
+    #normalized_manifest = ""
+    #IO.popen(['arv-normalize'], 'w+b') do |io|
+    #  io.write manifest_text
+    #  io.close_write
+    #  while buf = io.read(2**20)
+    #    normalized_manifest += buf
+    #  end
+    #end
 
     @data_size = 0
-    @files = []
-    normalized_manifest.split("\n").each do |stream|
+    tmp = {}
+
+    manifest_text.split("\n").each do |stream|
       toks = stream.split(" ")
 
       stream = toks[0].gsub /\\(\\|[0-7]{3})/ do |escape_sequence|
@@ -104,14 +109,42 @@ class Collection < ArvadosModel
               else $1.to_i(8).chr
               end
             end
-            if @files > 0 and @files[-1][0] == stream and @files[-1][1] == filename
-              @files[-1][2] += re[2].to_i
+            fn = stream + '/' + filename
+            i = re[2].to_i
+            if tmp[fn]
+              tmp[fn] += i
             else
-              @files << [stream, filename, re[2].to_i]
+              tmp[fn] = i
             end
           end
         end
       end
     end
+
+    @files = []
+    tmp.each do |k, v|
+      re = k.match(/^(.+)\/(.+)/)
+      @files << [re[1], re[2], v]
+    end
+  end
+
+  def self.uuid_like_pattern
+    "________________________________+%"
+  end
+
+  def self.normalize_uuid uuid
+    hash_part = nil
+    size_part = nil
+    uuid.split('+').each do |token|
+      if token.match /^[0-9a-f]{32,}$/
+        raise "uuid #{uuid} has multiple hash parts" if hash_part
+        hash_part = token
+      elsif token.match /^\d+$/
+        raise "uuid #{uuid} has multiple size parts" if size_part
+        size_part = token
+      end
+    end
+    raise "uuid #{uuid} has no hash part" if !hash_part
+    [hash_part, size_part].compact.join '+'
   end
 end