fix(drivers/crypt): return error when upstream driver is down

Author: jyxjjj

drivers/crypt/driver.go

@@ -69,12 +69,9 @@ func (d *Crypt) Init(ctx context.Context) error {
 		return fmt.Errorf("can't find remote storage: %w", err)
 	}
 
-	// ensure the remote (upper-level) storage is initialized and healthy
-	// If the upper-level storage failed to initialize, refuse to load this crypt driver.
-	if storage.Config().CheckStatus && storage.GetStorage().Status != op.WORK {
-		return fmt.Errorf("remote storage not ready (status=%s)", storage.GetStorage().Status)
-	}
-
+	// keep reference to remote (upper-level) storage; don't refuse to load here
+	// upper-level storage readiness will be checked per-operation via
+	// GetStorageAndActualPath (wrapped by getActualPathForRemote)
 	d.remoteStorage = storage
 
 	p, _ := strings.CutPrefix(d.Password, obfuscatedPrefix)
@@ -119,7 +116,11 @@ func (d *Crypt) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([
 	// return d.list(ctx, d.RemotePath, path)
 	// remoteFull
 
-	objs, err := fs.List(ctx, d.getPathForRemote(path, true), &fs.ListArgs{NoLog: true, Refresh: args.Refresh})
+	actualPath, err := d.getActualPathForRemote(path, true)
+	if err != nil {
+		return nil, err
+	}
+	objs, err := fs.List(ctx, actualPath, &fs.ListArgs{NoLog: true, Refresh: args.Refresh})
 	// the obj must implement the model.SetPath interface
 	// return objs, err
 	if err != nil {
@@ -201,17 +202,21 @@ func (d *Crypt) Get(ctx context.Context, path string) (model.Obj, error) {
 			Path:     "/",
 		}, nil
 	}
-	remoteFullPath := ""
 	var remoteObj model.Obj
-	var err, err2 error
 	firstTryIsFolder, secondTry := guessPath(path)
-	remoteFullPath = d.getPathForRemote(path, firstTryIsFolder)
-	remoteObj, err = fs.Get(ctx, remoteFullPath, &fs.GetArgs{NoLog: true})
+	remoteActualPath, err := d.getActualPathForRemote(path, firstTryIsFolder)
+	if err != nil {
+		return nil, fmt.Errorf("failed to convert path to remote path: %w", err)
+	}
+	remoteObj, err = fs.Get(ctx, remoteActualPath, &fs.GetArgs{NoLog: true})
 	if err != nil {
 		if errs.IsObjectNotFound(err) && secondTry {
 			// try the opposite
-			remoteFullPath = d.getPathForRemote(path, !firstTryIsFolder)
-			remoteObj, err2 = fs.Get(ctx, remoteFullPath, &fs.GetArgs{NoLog: true})
+			remoteActualPath, err2 := d.getActualPathForRemote(path, !firstTryIsFolder)
+			if err2 != nil {
+				return nil, fmt.Errorf("failed to convert path to remote path: %w", err2)
+			}
+			remoteObj, err2 = fs.Get(ctx, remoteActualPath, &fs.GetArgs{NoLog: true})
 			if err2 != nil {
 				return nil, err2
 			}