log cleanup

Author: leafty

backend/doi/dataverse.go

@@ -25,18 +25,13 @@ func activateDataverse(resolvedURL *url.URL) (isActive bool) {
 
 // Resolve the main API endpoint for a DOI hosted on a Dataverse installation
 func resolveDataverseEndpoint(resolvedURL *url.URL) (provider Provider, endpoint *url.URL, err error) {
-	fs.Logf(nil, "dataverseURL = %s", resolvedURL.String())
-
 	queryValues := resolvedURL.Query()
 	persistentID := queryValues.Get("persistentId")
 
-	fs.Logf(nil, "persistentId = %s", persistentID)
-
 	query := url.Values{}
 	query.Add("persistentId", persistentID)
 	endpointURL := resolvedURL.ResolveReference(&url.URL{Path: "/api/datasets/:persistentId/", RawQuery: query.Encode()})
 
-	fs.Logf(nil, "endpointURL = %s", endpointURL)
 	return Dataverse, endpointURL, nil
 }
 
@@ -94,23 +89,18 @@ func (f *Fs) listDataverseDoiFiles(ctx context.Context) (entries []*Object, err
 	}
 
 	filesURL := f.endpoint
-	fs.Logf(f, "filesURL = '%s'", filesURL.String())
 	var res *http.Response
 	var result api.DataverseDatasetResponse
 	opts := rest.Opts{
 		Method:     "GET",
 		Path:       strings.TrimLeft(filesURL.EscapedPath(), "/"),
 		Parameters: filesURL.Query(),
 	}
-	fs.Logf(f, "filesAPIPath = '%s?%s'", opts.Path, opts.Parameters.Encode())
 	err = f.pacer.Call(func() (bool, error) {
 		res, err = f.srv.CallJSON(ctx, &opts, nil, &result)
 		return shouldRetry(ctx, res, err)
 	})
 	if err != nil {
-		if res != nil {
-			fs.Logf(f, "%s", res.Status)
-		}
 		return nil, fmt.Errorf("readDir failed: %w", err)
 	}
 	modTime, modTimeErr := time.Parse(time.RFC3339, result.Data.LatestVersion.LastUpdateTime)

backend/doi/doi.go

@@ -197,7 +197,6 @@ func resolveEndpoint(ctx context.Context, srv *rest.Client, pacer *fs.Pacer, opt
 		return resolveZenodoEndpoint(ctx, srv, pacer, resolvedURL, opt.Doi)
 	}
 
-	// TODO: improve auto-detect
 	hostname := strings.ToLower(resolvedURL.Hostname())
 	if hostname == "dataverse.harvard.edu" || activateDataverse(resolvedURL) {
 		return resolveDataverseEndpoint(resolvedURL)
@@ -293,8 +292,6 @@ func NewFs(ctx context.Context, name, root string, m configmap.Mapper) (fs.Fs, e
 		CanHaveEmptyDirectories: true,
 	}).Fill(ctx, f)
 
-	fs.Logf(f, "name = '%s', root = '%s'", name, root)
-
 	isFile, err := f.httpConnection(ctx, opt)
 	if err != nil {
 		return nil, err
@@ -361,8 +358,6 @@ func (f *Fs) Rmdir(ctx context.Context, dir string) error {
 
 // NewObject creates a new remote http file object
 func (f *Fs) NewObject(ctx context.Context, remote string) (fs.Object, error) {
-	fs.Logf(nil, "remote = %s", remote)
-
 	var entries []*Object
 	var err error
 	switch f.provider {
@@ -379,7 +374,6 @@ func (f *Fs) NewObject(ctx context.Context, remote string) (fs.Object, error) {
 
 	for _, entry := range entries {
 		if entry.Remote() == remote {
-			fs.Logf(nil, "Found: %s -> %s", entry.Remote(), entry.contentURL)
 			return entry, nil
 		}
 	}
@@ -477,23 +471,14 @@ func (o *Object) Open(ctx context.Context, options ...fs.OpenOption) (in io.Read
 		RootURL: o.contentURL,
 		Options: options,
 	}
-	fs.Logf(o, "Open with URL = '%s'", o.contentURL)
-	for _, opt := range opts.Options {
-		k, v := opt.Header()
-		fs.Logf(o, "header '%s' = '%s'", k, v)
-	}
 	var res *http.Response
 	err = o.fs.pacer.Call(func() (bool, error) {
 		res, err = o.fs.srv.Call(ctx, &opts)
 		return shouldRetry(ctx, res, err)
 	})
 	if err != nil {
-		fs.Logf(o, "Open failed: '%s'", res.Status)
-		fs.Logf(o, "Open failed: '%s'", err.Error())
 		return nil, fmt.Errorf("Open failed: %w", err)
 	}
-	fs.Logf(o, "Open response: '%s'", res.Status)
-	fs.Logf(o, "Open response: '%v'", res.Header)
 
 	// Handle non-compliant redirects
 	if res.Header.Get("Location") != "" {
@@ -505,12 +490,8 @@ func (o *Object) Open(ctx context.Context, options ...fs.OpenOption) (in io.Read
 				return shouldRetry(ctx, res, err)
 			})
 			if err != nil {
-				fs.Logf(o, "Open failed: '%s'", res.Status)
-				fs.Logf(o, "Open failed: '%s'", err.Error())
 				return nil, fmt.Errorf("Open failed: %w", err)
 			}
-			fs.Logf(o, "Open response: '%s'", res.Status)
-			fs.Logf(o, "Open response: '%v'", res.Header)
 		}
 	}
 

backend/doi/doi_test.go

@@ -0,0 +1,16 @@
+// Test DOI filesystem interface
+package doi
+
+import (
+	"testing"
+
+	"github.com/rclone/rclone/fstest/fstests"
+)
+
+// TestIntegration runs integration tests against the remote
+func TestIntegration(t *testing.T) {
+	fstests.Run(t, &fstests.Opt{
+		RemoteName: "TestDoi:",
+		NilObject:  (*Object)(nil),
+	})
+}

backend/doi/invenio.go

@@ -26,8 +26,6 @@ func activateInvenio(ctx context.Context, srv *rest.Client, pacer *fs.Pacer, res
 
 // Resolve the main API endpoint for a DOI hosted on an InvenioDRM installation
 func resolveInvenioEndpoint(ctx context.Context, srv *rest.Client, pacer *fs.Pacer, resolvedURL *url.URL) (provider Provider, endpoint *url.URL, err error) {
-	fs.Logf(nil, "invenioURL = %s", resolvedURL.String())
-
 	var res *http.Response
 	opts := rest.Opts{
 		Method:  "GET",
@@ -65,7 +63,6 @@ func resolveInvenioEndpoint(ctx context.Context, srv *rest.Client, pacer *fs.Pac
 	// If there is no linkset header, try to grab the record ID from the URL
 	recordID := ""
 	resURL := res.Request.URL
-	fs.Logf(nil, "resURL = %s", resURL.String())
 	match := invenioRecordRegex.FindStringSubmatch(resURL.EscapedPath())
 	if match != nil {
 		recordID = match[1]
@@ -138,7 +135,6 @@ func (f *Fs) listInvevioDoiFiles(ctx context.Context) (entries []*Object, err er
 		Method: "GET",
 		Path:   strings.TrimLeft(filesURL.EscapedPath(), "/"),
 	}
-	fs.Logf(f, "filesAPIPath = '%s'", opts.Path)
 	err = f.pacer.Call(func() (bool, error) {
 		res, err := f.srv.CallJSON(ctx, &opts, nil, &result)
 		return shouldRetry(ctx, res, err)

backend/doi/zenodo.go

@@ -17,8 +17,6 @@ var zenodoRecordRegex = regexp.MustCompile(`zenodo[.](.+)`)
 
 // Resolve the main API endpoint for a DOI hosted on Zenodo
 func resolveZenodoEndpoint(ctx context.Context, srv *rest.Client, pacer *fs.Pacer, resolvedURL *url.URL, doi string) (provider Provider, endpoint *url.URL, err error) {
-	fs.Logf(nil, "zenodoURL = %s", resolvedURL.String())
-
 	match := zenodoRecordRegex.FindStringSubmatch(doi)
 	if match == nil {
 		return "", nil, fmt.Errorf("could not derive API endpoint URL from '%s'", resolvedURL.String())
@@ -45,6 +43,5 @@ func resolveZenodoEndpoint(ctx context.Context, srv *rest.Client, pacer *fs.Pace
 		return "", nil, err
 	}
 
-	fs.Logf(nil, "endpointURL = %s", endpointURL.String())
 	return Zenodo, endpointURL, nil
 }