From 254bd074877ddc11a0ff846e2eb740dbfaa059fe Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Thu, 4 Dec 2014 17:58:51 -0500 Subject: [PATCH] 3781: One less Regexp. --- apps/workbench/app/assets/javascripts/arvados_client.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/workbench/app/assets/javascripts/arvados_client.js b/apps/workbench/app/assets/javascripts/arvados_client.js index eaffaf7b58..b3f18ad65b 100644 --- a/apps/workbench/app/assets/javascripts/arvados_client.js +++ b/apps/workbench/app/assets/javascripts/arvados_client.js @@ -61,8 +61,7 @@ function ArvadosClient(arvadosApiToken, arvadosDiscoveryUri) { var nameStub = origName; var suffixInt = null; var ok = false; - var lineMatch, linesRe = /[^\n]+/g; - var streamNameMatch, streamNameRe = /^\S+/; + var lineMatch, linesRe = /(\S+).*/gm; var fileTokenMatch, fileTokensRe = / \d+:\d+:(\S+)/g; while (!ok) { ok = true; @@ -72,10 +71,11 @@ function ArvadosClient(arvadosApiToken, arvadosDiscoveryUri) { replace(/ /g, '\\040'); while (ok && null !== (lineMatch = linesRe.exec(manifest))) { - streamNameMatch = streamNameRe.exec(lineMatch[0]); + // lineMatch is [theEntireLine, streamName] while (ok && null !== (fileTokenMatch = fileTokensRe.exec(lineMatch[0]))) { - if (streamNameMatch[0] + '/' + fileTokenMatch[1] + // fileTokenMatch is [theEntireToken, fileName] + if (lineMatch[1] + '/' + fileTokenMatch[1] === newStreamName + '/' + newName) { ok = false; -- 2.30.2