X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/40bbccf9acf872cd610adeb317f06f5ba57504a0..cadb785fc63280862d71376def0128e4c70951f0:/services/api/app/models/collection.rb diff --git a/services/api/app/models/collection.rb b/services/api/app/models/collection.rb index 2cbabc38ad..8258d1f53c 100644 --- a/services/api/app/models/collection.rb +++ b/services/api/app/models/collection.rb @@ -129,18 +129,30 @@ class Collection < ArvadosModel def set_file_names if self.manifest_text_changed? - file_names = [] - if self.manifest_text - self.manifest_text.split.each do |part| - file_name = part.rpartition(':')[-1] - file_names << file_name if file_name != '.' - end - end - self.file_names = file_names.uniq.join(" ")[0,2**16] + self.file_names = manifest_files end true end + def manifest_files + 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**13 + end + end + + if self.manifest_text and names.length < 2**13 + self.manifest_text.scan(/^\.\/(\S+)/m) do |stream_name| + names << stream_name.first.gsub('\040',' ') + "\n" + break if names.length > 2**13 + end + end + + names[0,2**13] + end + def check_encoding if manifest_text.encoding.name == 'UTF-8' and manifest_text.valid_encoding? true @@ -284,6 +296,10 @@ class Collection < ArvadosModel find_all_for_docker_image(search_term, search_tag, readers).first end + def self.searchable_columns operator + super - ["manifest_text"] + end + protected def portable_manifest_text portable_manifest = self[:manifest_text].dup