[ARVADOS] updated: f747bc4aa9dfc2647986d7ce81e3e5c4da9d41d7
git at public.curoverse.com
git at public.curoverse.com
Mon Mar 9 16:57:38 EDT 2015
Summary of changes:
.../app/assets/stylesheets/application.css.scss | 6 ++
.../app/controllers/actions_controller.rb | 27 +++--
.../app/controllers/application_controller.rb | 11 ++
.../app/controllers/projects_controller.rb | 3 +
apps/workbench/app/helpers/application_helper.rb | 4 +-
.../application/_name_and_description.html.erb | 1 -
.../app/views/collections/_show_files.html.erb | 2 +-
.../_show_description.html.erb} | 7 --
apps/workbench/app/views/projects/show.html.erb | 10 +-
.../test/integration/anonymous_access_test.rb | 6 ++
.../workbench/test/integration/collections_test.rb | 7 +-
.../test/integration/pipeline_instances_test.rb | 51 +++++++++-
apps/workbench/test/integration/projects_test.rb | 15 ++-
...tion_portable_data_hash_with_hinted_manifest.rb | 112 +++++++++++++++++++++
services/api/db/structure.sql | 4 +-
services/api/test/fixtures/collections.yml | 4 +-
16 files changed, 238 insertions(+), 32 deletions(-)
copy apps/workbench/app/views/{application/_name_and_description.html.erb => projects/_show_description.html.erb} (54%)
create mode 100644 services/api/db/migrate/20150303210106_fix_collection_portable_data_hash_with_hinted_manifest.rb
via f747bc4aa9dfc2647986d7ce81e3e5c4da9d41d7 (commit)
via 42efffeca3922e6bd41a35bb193080f9bf5a8953 (commit)
via cab38660eec30ff5d4e023f5d607d783ffd91785 (commit)
via c11612fdde6d2f9cdf3347f41a80f11a8ac65fac (commit)
via ef09ad4c9162eaf913e1a9bb65991b87116e40c0 (commit)
via 349983851afa2bce63fbff33933d33a5ba13b8eb (commit)
via de828286fa92432a0075a5f16103011e52cd09d1 (commit)
via e6c2f09b14d03db040f2b81c451a7630bb78f1b1 (commit)
via efd59dbd5925023e9986875d9b0af4a456388db7 (commit)
via 19656a41f019488120f950b06ecf9e19074b11a3 (commit)
via 2a610a9d5d7e9446935436ff37267b8ada25fdbd (commit)
via cf3a1032b04dd30774e21680f5f26d75922919e3 (commit)
via 633660dcd81d4ddea5c0a55a7731af35c4586052 (commit)
via 8f4c794c573d64e4be53ace480248cdfabe26fc7 (commit)
via ca111ab9aa86c7c25e547a44a46be71f3977c649 (commit)
via 1df8b46242badf6ae0189cbbe33b75695a455d2c (commit)
via 1fa86a46b6a7b6000528e67f899608d058c159ae (commit)
via aa50f466c7515de653141964d13f3e204d46bb29 (commit)
via 8c19d0da4331ba9c2605543f70c0f55875f41497 (commit)
via 9b3c1e9692fbb590c20b334f1e2ec1c799baba91 (commit)
via 1c6d77f980ea3d560fec8c4f0dafe3fe0d2b23fc (commit)
via 8680153856ed2319735b6a1f832601354bbdfa61 (commit)
via 57991d19a58903863194043717b2875417a40fe7 (commit)
via d0583fc94ca74daf94327ad3446ff72bd5e5bea1 (commit)
via 6ba419ef43b3e06b2bc48b0204146349ab64ab5b (commit)
from b5c6c4747c589d3627ce1bb0edb8dacd8313c7e9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit f747bc4aa9dfc2647986d7ce81e3e5c4da9d41d7
Author: Radhika Chippada <radhika at curoverse.com>
Date: Mon Mar 9 16:57:09 2015 -0400
5145: better pattern matching for manifest text files
diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index 0f3a853..6569abe 100644
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -169,10 +169,15 @@ class ActionsController < ApplicationController
manifest_file = m[4].split('/')[-1]
uniq_file = derive_unique_filename(manifest_file, manifest_files)
normalized = arv_normalize mt, '--extract', ".#{m[4]}"
- normalized = normalized.gsub(manifest_file) {|s| uniq_file}
+ index = normalized.rindex manifest_file
+ part1 = normalized[0, index]
+ part2 = normalized[index, normalized.length]
+ part2 = part2.gsub(manifest_file) {|s| uniq_file}
+ normalized = part1 + part2
combined += normalized
manifest_files << uniq_file
else
+ mt = arv_normalize mt
manifest_streams = mt.split "\n"
adjusted_streams = []
manifest_streams.each do |stream|
@@ -185,7 +190,7 @@ class ActionsController < ApplicationController
end
manifest_parts.each do |part|
- part_match = /\d*:\d*:(.*)/.match(part)
+ part_match = /\d*:\d*:(\S+)/.match(part)
if part_match
uniq_file = derive_unique_filename(part_match[1], manifest_files)
adjusted_parts << (part.gsub(part_match[1]) {|s| uniq_file})
diff --git a/services/api/test/fixtures/collections.yml b/services/api/test/fixtures/collections.yml
index 5611d69..b09dae4 100644
--- a/services/api/test/fixtures/collections.yml
+++ b/services/api/test/fixtures/collections.yml
@@ -79,7 +79,7 @@ multilevel_collection_1:
modified_by_user_uuid: zzzzz-tpzed-d9tiejq69daie8f
modified_at: 2014-02-03T17:22:54Z
updated_at: 2014-02-03T17:22:54Z
- manifest_text: ". 0:0:file1 0:0:file2 0:0:file3\n./dir1 0:0:file1 0:0:file2 0:0:file3\n./dir1/subdir 0:0:file1 0:0:file2 0:0:file3\n./dir2 0:0:file1 0:0:file2 0:0:file3\n"
+ manifest_text: ". 85877ca2d7e05498dd3d109baf2df106+95+A3a4e26a366ee7e4ed3e476ccf05354761be2e4ae at 545a9920 0:0:file1 0:0:file2 0:0:file3\n./dir1 85877ca2d7e05498dd3d109baf2df106+95+A3a4e26a366ee7e4ed3e476ccf05354761be2e4ae at 545a9920 0:0:file1 0:0:file2 0:0:file3\n./dir1/subdir 85877ca2d7e05498dd3d109baf2df106+95+A3a4e26a366ee7e4ed3e476ccf05354761be2e4ae at 545a9920 0:0:file1 0:0:file2 0:0:file3\n./dir2 85877ca2d7e05498dd3d109baf2df106+95+A3a4e26a366ee7e4ed3e476ccf05354761be2e4ae at 545a9920 0:0:file1 0:0:file2 0:0:file3\n"
name: multilevel_collection_1
multilevel_collection_2:
commit 42efffeca3922e6bd41a35bb193080f9bf5a8953
Merge: b5c6c47 cab3866
Author: Radhika Chippada <radhika at curoverse.com>
Date: Mon Mar 9 15:08:10 2015 -0400
Merge branch 'master' into 5145-combine-collections-repeated-filenames
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list