X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f98e0188777b3e2d229c968824b3e64307dae4e6..6525b509825dbbf1cbe8b30b34080aafc4e5bde3:/services/api/app/models/collection.rb diff --git a/services/api/app/models/collection.rb b/services/api/app/models/collection.rb index 4772768c8f..85b12a377b 100644 --- a/services/api/app/models/collection.rb +++ b/services/api/app/models/collection.rb @@ -190,22 +190,16 @@ class Collection < ArvadosModel end def manifest_files + return '' if !self.manifest_text + names = '' - if self.manifest_text - self.manifest_text.scan(/ \d+:\d+:(\S+)/) do |name| - names << name.first.gsub('\040',' ') + "\n" - break if names.length > 2**12 - end + self.manifest_text.scan(/ \d+:\d+:(\S+)/) do |name| + names << name.first.gsub('\040',' ') + "\n" end - - if self.manifest_text and names.length < 2**12 - self.manifest_text.scan(/^\.\/(\S+)/m) do |stream_name| - names << stream_name.first.gsub('\040',' ') + "\n" - break if names.length > 2**12 - end + self.manifest_text.scan(/^\.\/(\S+)/m) do |stream_name| + names << stream_name.first.gsub('\040',' ') + "\n" end - - names[0,2**12] + names end def default_empty_manifest