projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2934: add "bar" repository to test fixture
[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 f6c8b26598ed78b99ac16a3b20d11c73692b0546..745f0bf38b610d7d276bfae3c87c8fd8f6c87f1a 100644
(file)
--- a/
services/api/app/models/collection.rb
+++ b/
services/api/app/models/collection.rb
@@
-1,5
+1,5
@@
class Collection < ArvadosModel
class Collection < ArvadosModel
- include
Assign
Uuid
+ include
Has
Uuid
include KindAndEtag
include CommonApiTemplate
include KindAndEtag
include CommonApiTemplate
@@
-65,8
+65,19
@@
class Collection < ArvadosModel
@files = []
return
end
@files = []
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
+
@data_size = 0
@data_size = 0
- @files = []
+ tmp = {}
+
manifest_text.split("\n").each do |stream|
toks = stream.split(" ")
manifest_text.split("\n").each do |stream|
toks = stream.split(" ")
@@
-98,11
+109,27
@@
class Collection < ArvadosModel
else $1.to_i(8).chr
end
end
else $1.to_i(8).chr
end
end
- @files << [stream, filename, re[2].to_i]
+ fn = stream + '/' + filename
+ i = re[2].to_i
+ if tmp[fn]
+ tmp[fn] += i
+ else
+ tmp[fn] = i
+ end
end
end
end
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
end
def self.normalize_uuid uuid