From a4a1652b72a4fc0fb784f08152ef31f97534c76d Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Mon, 12 Jun 2017 16:59:09 -0400 Subject: [PATCH] 8784: Correct wget args, tweak styles. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- services/keep-web/handler.go | 32 ++++++++++++--- services/keep-web/handler_test.go | 65 ++++++++++++++++++------------- 2 files changed, 65 insertions(+), 32 deletions(-) diff --git a/services/keep-web/handler.go b/services/keep-web/handler.go index a37cfb70b3..be6049a282 100644 --- a/services/keep-web/handler.go +++ b/services/keep-web/handler.go @@ -340,7 +340,7 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) { } else if stat.IsDir() && !strings.HasSuffix(r.URL.Path, "/") { h.seeOtherWithCookie(w, r, basename+"/", credentialsOK) } else if stat.IsDir() { - h.serveDirectory(w, r, &coll, fs, openPath) + h.serveDirectory(w, r, &coll, fs, openPath, stripParts) } else { http.ServeContent(w, r, basename, stat.ModTime(), f) if int64(w.WroteBodyBytes()) != stat.Size() { @@ -352,7 +352,27 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) { } var dirListingTemplate = ` -{{ .Collection.Name }} + + + {{ .Collection.Name }} + +

@@ -360,7 +380,7 @@ var dirListingTemplate = ` Arvados. You can download individual files listed below. To download the entire collection with wget, try:

$ wget --mirror --no-parent --no-host --cut-dirs=3 {{ .Request.URL }}

$ wget --mirror --no-parent --no-host --cut-dirs={{ .StripParts }} https://{{ .Request.Host }}{{ .Request.URL }}

File Listing

@@ -368,9 +388,10 @@ the entire collection with wget, try:

{{end}} +

About Arvados

+ About Arvados: Arvados is a free and open source software bioinformatics platform. To learn more, visit arvados.org. Arvados is not responsible for the files listed on this page. @@ -380,7 +401,7 @@ the entire collection with wget, try:

` -func (h *handler) serveDirectory(w http.ResponseWriter, r *http.Request, collection *arvados.Collection, fs http.FileSystem, base string) { +func (h *handler) serveDirectory(w http.ResponseWriter, r *http.Request, collection *arvados.Collection, fs http.FileSystem, base string, stripParts int) { var files []string var walk func(string) error if !strings.HasSuffix(base, "/") { @@ -426,6 +447,7 @@ func (h *handler) serveDirectory(w http.ResponseWriter, r *http.Request, collect "Collection": collection, "Files": files, "Request": r, + "StripParts": stripParts, }) } diff --git a/services/keep-web/handler_test.go b/services/keep-web/handler_test.go index 508c9cb21e..d394659033 100644 --- a/services/keep-web/handler_test.go +++ b/services/keep-web/handler_test.go @@ -1,6 +1,7 @@ package main import ( + "fmt" "html" "io/ioutil" "net/http" @@ -486,49 +487,58 @@ func (s *IntegrationSuite) TestDirectoryListing(c *check.C) { "Authorization": {"OAuth2 " + arvadostest.ActiveToken}, } for _, trial := range []struct { - uri string - header http.Header - expect []string + uri string + header http.Header + expect []string + cutDirs int }{ { - uri: strings.Replace(arvadostest.FooAndBarFilesInDirPDH, "+", "-", -1) + ".example.com/", - header: authHeader, - expect: []string{"dir1/foo", "dir1/bar"}, + uri: strings.Replace(arvadostest.FooAndBarFilesInDirPDH, "+", "-", -1) + ".example.com/", + header: authHeader, + expect: []string{"dir1/foo", "dir1/bar"}, + cutDirs: 0, }, { - uri: strings.Replace(arvadostest.FooAndBarFilesInDirPDH, "+", "-", -1) + ".example.com/dir1/", - header: authHeader, - expect: []string{"foo", "bar"}, + uri: strings.Replace(arvadostest.FooAndBarFilesInDirPDH, "+", "-", -1) + ".example.com/dir1/", + header: authHeader, + expect: []string{"foo", "bar"}, + cutDirs: 0, }, { - uri: "download.example.com/collections/" + arvadostest.FooAndBarFilesInDirUUID + "/", - header: authHeader, - expect: []string{"dir1/foo", "dir1/bar"}, + uri: "download.example.com/collections/" + arvadostest.FooAndBarFilesInDirUUID + "/", + header: authHeader, + expect: []string{"dir1/foo", "dir1/bar"}, + cutDirs: 2, }, { - uri: "collections.example.com/collections/download/" + arvadostest.FooAndBarFilesInDirUUID + "/" + arvadostest.ActiveToken + "/", - header: nil, - expect: []string{"dir1/foo", "dir1/bar"}, + uri: "collections.example.com/collections/download/" + arvadostest.FooAndBarFilesInDirUUID + "/" + arvadostest.ActiveToken + "/", + header: nil, + expect: []string{"dir1/foo", "dir1/bar"}, + cutDirs: 4, }, { - uri: "collections.example.com/c=" + arvadostest.FooAndBarFilesInDirUUID + "/t=" + arvadostest.ActiveToken + "/", - header: nil, - expect: []string{"dir1/foo", "dir1/bar"}, + uri: "collections.example.com/c=" + arvadostest.FooAndBarFilesInDirUUID + "/t=" + arvadostest.ActiveToken + "/", + header: nil, + expect: []string{"dir1/foo", "dir1/bar"}, + cutDirs: 2, }, { - uri: "download.example.com/c=" + arvadostest.FooAndBarFilesInDirUUID + "/dir1/", - header: authHeader, - expect: []string{"foo", "bar"}, + uri: "download.example.com/c=" + arvadostest.FooAndBarFilesInDirUUID + "/dir1/", + header: authHeader, + expect: []string{"foo", "bar"}, + cutDirs: 1, }, { - uri: "download.example.com/c=" + arvadostest.FooAndBarFilesInDirUUID + "/_/dir1/", - header: authHeader, - expect: []string{"foo", "bar"}, + uri: "download.example.com/c=" + arvadostest.FooAndBarFilesInDirUUID + "/_/dir1/", + header: authHeader, + expect: []string{"foo", "bar"}, + cutDirs: 2, }, { - uri: arvadostest.FooAndBarFilesInDirUUID + ".example.com/dir1?api_token=" + arvadostest.ActiveToken, - header: authHeader, - expect: []string{"foo", "bar"}, + uri: arvadostest.FooAndBarFilesInDirUUID + ".example.com/dir1?api_token=" + arvadostest.ActiveToken, + header: authHeader, + expect: []string{"foo", "bar"}, + cutDirs: 0, }, { uri: "collections.example.com/c=" + arvadostest.FooAndBarFilesInDirUUID + "/theperthcountyconspiracydoesnotexist/", @@ -571,6 +581,7 @@ func (s *IntegrationSuite) TestDirectoryListing(c *check.C) { for _, e := range trial.expect { c.Check(resp.Body.String(), check.Matches, `(?ms).*href="`+e+`".*`) } + c.Check(resp.Body.String(), check.Matches, `(?ms).*--cut-dirs=`+fmt.Sprintf("%d", trial.cutDirs)+` .*`) } } } -- 2.30.2