[cli] Skip export with bad time stamp (#2702)

## Description ## Tests
ente-io · Aug 14, 2024 · 37dec00 · 37dec00
2 parents fda7722 + 39e505a
commit 37dec00
Show file tree

Hide file tree

Showing 21 changed files with 32 additions and 20 deletions.
diff --git a/cli/docs/generated/ente.md b/cli/docs/generated/ente.md
diff --git a/cli/docs/generated/ente_account.md b/cli/docs/generated/ente_account.md
diff --git a/cli/docs/generated/ente_account_add.md b/cli/docs/generated/ente_account_add.md
diff --git a/cli/docs/generated/ente_account_get-token.md b/cli/docs/generated/ente_account_get-token.md
diff --git a/cli/docs/generated/ente_account_list.md b/cli/docs/generated/ente_account_list.md
diff --git a/cli/docs/generated/ente_account_update.md b/cli/docs/generated/ente_account_update.md
diff --git a/cli/docs/generated/ente_admin.md b/cli/docs/generated/ente_admin.md
diff --git a/cli/docs/generated/ente_admin_delete-user.md b/cli/docs/generated/ente_admin_delete-user.md
diff --git a/cli/docs/generated/ente_admin_disable-2fa.md b/cli/docs/generated/ente_admin_disable-2fa.md
diff --git a/cli/docs/generated/ente_admin_disable-passkey.md b/cli/docs/generated/ente_admin_disable-passkey.md
diff --git a/cli/docs/generated/ente_admin_get-user-id.md b/cli/docs/generated/ente_admin_get-user-id.md
diff --git a/cli/docs/generated/ente_admin_list-users.md b/cli/docs/generated/ente_admin_list-users.md
diff --git a/cli/docs/generated/ente_admin_update-subscription.md b/cli/docs/generated/ente_admin_update-subscription.md
diff --git a/cli/docs/generated/ente_auth.md b/cli/docs/generated/ente_auth.md
diff --git a/cli/docs/generated/ente_auth_decrypt.md b/cli/docs/generated/ente_auth_decrypt.md
diff --git a/cli/docs/generated/ente_export.md b/cli/docs/generated/ente_export.md
diff --git a/cli/docs/generated/ente_version.md b/cli/docs/generated/ente_version.md
diff --git a/cli/main.go b/cli/main.go
@@ -15,7 +15,7 @@ import (
 	"strings"
 )
 
-var AppVersion = "0.1.17"
+var AppVersion = "0.1.18"
 
 func main() {
 	cliDBPath, err := GetCLIConfigPath()

diff --git a/cli/pkg/model/errors.go b/cli/pkg/model/errors.go
@@ -12,3 +12,7 @@ func ShouldRetrySync(err error) bool {
 	return strings.Contains(err.Error(), "read tcp") ||
 		strings.Contains(err.Error(), "dial tcp")
 }
+
+func IsBadTimeStampError(err error) bool {
+	return strings.Contains(err.Error(), "year outside of range ")
+}
diff --git a/cli/pkg/model/remote.go b/cli/pkg/model/remote.go
@@ -151,7 +151,7 @@ func (r *RemoteFile) GetCreationTime() time.Time {
 func (r *RemoteFile) GetModificationTime() time.Time {
 	value, ok := r.Metadata["modificationTime"]
 	if !ok {
-		panic("creationTime not found in metadata")
+		panic("modificationTime not found in metadata")
 	}
 	return time.UnixMicro(int64(value.(float64)))
 }

diff --git a/cli/pkg/remote_to_disk_file.go b/cli/pkg/remote_to_disk_file.go
@@ -89,6 +89,10 @@ func (c *ClICtrl) syncFiles(ctx context.Context, account model.Account) error {
 					continue
 				} else if existingEntry.IsLivePhoto() && errors.Is(err, model.ErrLiveZip) {
 					continue
+				} else if model.IsBadTimeStampError(err) {
+					log.Printf("Skipping file due to error %s (%d)", existingEntry.GetTitle(), existingEntry.ID)
+					log.Printf("CreationTime %v, ModidicationTime %v", existingEntry.GetCreationTime(), existingEntry.GetModificationTime())
+					continue
 				} else {
 					return err
 				}