@@ -365,7 +365,7 @@ class OpenMany(PortalCommand):
365365
366366 def __init__ (self , function , receiver , resource , directory , * objects ):
367367 super ().__init__ (function , receiver )
368- self .cloudfolder = str (resource .cloudFolderInfo .uid )
368+ self .uid = str (resource .cloudFolderInfo .uid )
369369 self .directory = automatic_resolution (directory , receiver .context )
370370 self .objects = objects
371371
@@ -383,38 +383,39 @@ def get_parameter(self):
383383
384384 def _execute (self ):
385385 with self .trace_execution ():
386- return self ._function (self ._receiver , self .cloudfolder , self .get_parameter ())
386+ return self ._function (self ._receiver , self .uid , self .get_parameter ())
387387
388388 async def _a_execute (self ):
389389 with self .trace_execution ():
390- return await self ._function (self ._receiver , self .cloudfolder , self .get_parameter ())
390+ return await self ._function (self ._receiver , self .uid , self .get_parameter ())
391391
392392
393393class DownloadMany (PortalCommand ):
394394
395- def __init__ (self , function , receiver , target , objects , destination ):
395+ def __init__ (self , function , receiver , resource , directory , objects , destination ):
396396 super ().__init__ (function , receiver )
397- self .target = automatic_resolution (target , receiver .context )
397+ self .resource = resource
398+ self .directory = automatic_resolution (directory , receiver .context )
398399 self .objects = objects
399400 self .destination = destination
400401
401402 def get_parameter (self ):
402- return commonfs .determine_directory_and_filename (self .target .reference , self .objects , destination = self .destination , archive = True )
403+ return commonfs .determine_directory_and_filename (self .directory .reference , self .objects , destination = self .destination , archive = True )
403404
404405 def _before_command (self ):
405406 for o in self .objects :
406- logger .info ('Downloading: %s' , self .target .join (o ).relative )
407+ logger .info ('Downloading: %s' , self .directory .join (o ).relative )
407408
408409 def _execute (self ):
409410 directory , name = self .get_parameter ()
410411 with self .trace_execution ():
411- with OpenMany (self ._function , self ._receiver , self .target , * self .objects ) as handle :
412+ with OpenMany (self ._function , self ._receiver , self .resource , self . directory , * self .objects ) as handle :
412413 return synfs .write (directory , name , handle )
413414
414415 async def _a_execute (self ):
415416 directory , name = self .get_parameter ()
416417 with self .trace_execution ():
417- async with OpenMany (self ._function , self ._receiver , self .target , * self .objects ) as handle :
418+ async with OpenMany (self ._function , self ._receiver , self .resource , self . directory , * self .objects ) as handle :
418419 return await asynfs .write (directory , name , handle )
419420
420421
0 commit comments