From 37543bd1d97cf10920f67e977b3cd436ff0bc29e Mon Sep 17 00:00:00 2001
From: Nick Craig-Wood <nick@craig-wood.com>
Date: Tue, 22 Mar 2016 10:26:37 +0000
Subject: [PATCH] b2: Fix parsing of mod time when not in metadata

This files this error `Failed to parse mod time string "":
"src_last_modified_millis" not found in metadata`.
---
 b2/b2.go               | 50 ++++++++++++++++++++----------------------
 b2/b2_internal_test.go |  6 +++--
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/b2/b2.go b/b2/b2.go
index dfb2dcbc3..8f8bffbaa 100644
--- a/b2/b2.go
+++ b/b2/b2.go
@@ -751,28 +751,19 @@ func timeString(modTime time.Time) string {
 }
 
 // parseTimeString converts a decimal string number of milliseconds
-// elapsed since January 1, 1970 UTC into a time.Time
-func parseTimeString(timeString string) (result time.Time, err error) {
+// elapsed since January 1, 1970 UTC into a time.Time and stores it in
+// the modTime variable.
+func (o *Object) parseTimeString(timeString string) (err error) {
 	if timeString == "" {
-		return result, fmt.Errorf("%q not found in metadata", timeKey)
+		return nil
 	}
 	unixMilliseconds, err := strconv.ParseInt(timeString, 10, 64)
 	if err != nil {
-		return result, err
+		fs.Debug(o, "Failed to parse mod time string %q: %v", timeString, err)
+		return err
 	}
-	return time.Unix(unixMilliseconds/1E3, (unixMilliseconds%1E3)*1E6).UTC(), nil
-}
-
-// ModTime returns the modification time of the object
-//
-// It attempts to read the objects mtime and if that isn't present the
-// LastModified returned in the http headers
-//
-// SHA-1 will also be updated once the request has completed.
-func (o *Object) ModTime() (result time.Time) {
-	// The error is logged in readFileMetadata
-	_ = o.readFileMetadata()
-	return o.modTime
+	o.modTime = time.Unix(unixMilliseconds/1E3, (unixMilliseconds%1E3)*1E6).UTC()
+	return nil
 }
 
 // readFileMetadata attempts to read the modified time and
@@ -822,17 +813,26 @@ func (o *Object) readFileMetadata() error {
 	o.sha1 = response.SHA1
 
 	// Parse the result
-	timeString := response.Info[timeKey]
-	parsed, err := parseTimeString(timeString)
+	err = o.parseTimeString(response.Info[timeKey])
 	if err != nil {
-		fs.Debug(o, "Failed to parse mod time string %q: %v", timeString, err)
 		return err
 	}
-	o.modTime = parsed
 
 	return nil
 }
 
+// ModTime returns the modification time of the object
+//
+// It attempts to read the objects mtime and if that isn't present the
+// LastModified returned in the http headers
+//
+// SHA-1 will also be updated once the request has completed.
+func (o *Object) ModTime() (result time.Time) {
+	// The error is logged in readFileMetadata
+	_ = o.readFileMetadata()
+	return o.modTime
+}
+
 // SetModTime sets the modification time of the local fs object
 func (o *Object) SetModTime(modTime time.Time) {
 	// Not possible with B2
@@ -920,12 +920,10 @@ func (o *Object) Open() (in io.ReadCloser, err error) {
 	}
 
 	// Parse the time out of the headers if possible
-	timeString := resp.Header.Get(timeHeader)
-	parsed, err := parseTimeString(timeString)
+	err = o.parseTimeString(resp.Header.Get(timeHeader))
 	if err != nil {
-		fs.Debug(o, "Failed to parse mod time string %q: %v", timeString, err)
-	} else {
-		o.modTime = parsed
+		_ = resp.Body.Close()
+		return nil, err
 	}
 	if o.sha1 == "" {
 		o.sha1 = resp.Header.Get(sha1Header)
diff --git a/b2/b2_internal_test.go b/b2/b2_internal_test.go
index ef1ed851f..f64e83bcb 100644
--- a/b2/b2_internal_test.go
+++ b/b2/b2_internal_test.go
@@ -149,10 +149,12 @@ func TestParseTimeString(t *testing.T) {
 	}{
 		{"0", fstest.Time("1970-01-01T00:00:00.000000000Z"), ""},
 		{"981173110123", fstest.Time("2001-02-03T04:05:10.123000000Z"), ""},
-		{"", time.Time{}, `"src_last_modified_millis" not found in metadata`},
+		{"", time.Time{}, ""},
 		{"potato", time.Time{}, `strconv.ParseInt: parsing "potato": invalid syntax`},
 	} {
-		got, err := parseTimeString(test.in)
+		o := Object{}
+		err := o.parseTimeString(test.in)
+		got := o.modTime
 		var gotError string
 		if err != nil {
 			gotError = err.Error()