meta=KeyValueArgument(
'set container metadata (can be repeated)',
'--meta'),
- with_output=FlagArgument('show request headers', ('--with-output')),
+ with_output=FlagArgument('show response headers', ('--with-output')),
json_output=FlagArgument('show headers in json', ('-j', '--json'))
)
@errors.pithos.container
def _run(self, container):
r = self.client.create_container(
- container=container,
- sizelimit=self['limit'],
- versioning=self['versioning'],
- metadata=self['meta'])
+ container=container, sizelimit=self['limit'],
+ versioning=self['versioning'], metadata=self['meta'])
if self['json_output']:
print_json(r)
elif self['with_output']:
source_version=ValueArgument(
'copy specific version',
('-S', '--source-version')),
- with_output=FlagArgument('show request headers', ('--with-output')),
+ with_output=FlagArgument('show response headers', ('--with-output')),
json_output=FlagArgument('show headers in json', ('-j', '--json'))
)
'Suffix of src to replace with add_suffix, if matched',
'--suffix-to-replace',
default=''),
- with_output=FlagArgument('show request headers', ('--with-output')),
+ with_output=FlagArgument('show response headers', ('--with-output')),
json_output=FlagArgument('show headers in json', ('-j', '--json'))
)
progress_bar=ProgressBarArgument(
'do not show progress bar',
('-N', '--no-progress-bar'),
- default=False)
+ default=False),
+ with_output=FlagArgument('show response headers', ('--with-output')),
+ json_output=FlagArgument('show headers in json', ('-j', '--json'))
)
@errors.generic.all
(progress_bar, upload_cb) = self._safe_progress_bar('Appending')
try:
f = open(local_path, 'rb')
- self.client.append_object(self.path, f, upload_cb)
+ r = self.client.append_object(self.path, f, upload_cb)
+ if self['json_output']:
+ print_json(r)
+ elif self['with_output']:
+ print_items(r)
except Exception:
self._safe_progress_bar_finish(progress_bar)
raise
recursive=FlagArgument(
'Recursively upload directory *contents* + subdirectories',
('-R', '--recursive')),
- details=FlagArgument(
- 'Show a detailed list of uploaded objects at the end',
- ('-l', '--details'))
+ with_output=FlagArgument(
+ 'Show uploaded objects response headers',
+ ('--with-output')),
+ json_output=FlagArgument('show headers in json', ('-j', '--json'))
)
def _check_container_limit(self, path):
rpath, f,
etag=self['etag'], withHashFile=self['use_hashes'],
**params)
- if self['details']:
+ if self['with_output'] or self['json_output']:
r['name'] = '%s: %s' % (self.client.container, rpath)
uploaded.append(r)
else:
upload_cb=upload_cb,
container_info_cache=container_info_cache,
**params)
- if self['details']:
+ if self['with_output'] or self['json_output']:
r['name'] = '%s: %s' % (self.client.container, rpath)
uploaded.append(r)
except Exception:
raise
finally:
self._safe_progress_bar_finish(progress_bar)
- if self['details']:
+ if self['json_output']:
+ print_json(uploaded)
+ elif self['with_output']:
print_items(uploaded)
else:
print('Upload completed')
'--if-unmodified-since'),
object_version=ValueArgument(
'get the specific version',
- ('-j', '--object-version'))
+ ('-O', '--object-version'))
)
@errors.generic.all
'--if-unmodified-since'),
object_version=ValueArgument(
'get the specific version',
- ('-j', '--object-version')),
+ ('-O', '--object-version')),
poolsize=IntArgument('set pool size', '--with-pool-size'),
progress_bar=ProgressBarArgument(
'do not show progress bar',
download_cb) = self._safe_progress_bar(
'Download %s' % rpath)
self.client.download_object(
- rpath,
- f,
+ rpath, f,
download_cb=download_cb,
range_str=self['range'],
version=self['object_version'],
finally:
stdout.flush()
timeout += 0.1
-
print('\nDownload canceled by user')
if local_path is not None:
print('to resume, re-run with --resume')
'--if-unmodified-since'),
object_version=ValueArgument(
'get the specific version',
- ('-j', '--object-version'))
+ ('-O', '--object-version')),
+ json_output=FlagArgument('show headers in json', ('-j', '--json'))
)
@errors.generic.all
if_none_match=self['if_none_match'],
if_modified_since=self['if_modified_since'],
if_unmodified_since=self['if_unmodified_since'])
- print_dict(data)
+ printer = print_json if self['json_output'] else print_dict
+ printer(data)
def main(self, container___path):
super(self.__class__, self)._run(
yes=FlagArgument('Do not prompt for permission', '--yes'),
recursive=FlagArgument(
'empty dir or container and delete (if dir)',
- ('-R', '--recursive'))
+ ('-R', '--recursive')),
+ with_output=FlagArgument('show response headers', ('--with-output')),
+ json_output=FlagArgument('show headers in json', ('-j', '--json'))
)
def __init__(self, arguments={}):
@errors.pithos.container
@errors.pithos.object_path
def _run(self):
+ r = {}
if self.path:
if self['yes'] or ask_user(
'Delete %s:%s ?' % (self.container, self.path)):
- self.client.del_object(
+ r = self.client.del_object(
self.path,
until=self['until'],
delimiter=self['delimiter'])
else:
ask_msg = 'Delete container'
if self['yes'] or ask_user('%s %s ?' % (ask_msg, self.container)):
- self.client.del_container(
+ r = self.client.del_container(
until=self['until'],
delimiter=self['delimiter'])
else:
print('Aborted')
+ return
+ if self['json_output']:
+ print_json(r)
+ elif self['with_output']:
+ print_dict(r)
def main(self, container____path__=None):
super(self.__class__, self)._run(container____path__)
arguments = dict(
yes=FlagArgument('Do not prompt for permission', '--yes'),
- force=FlagArgument('purge even if not empty', ('-F', '--force'))
+ force=FlagArgument('purge even if not empty', ('-F', '--force')),
+ with_output=FlagArgument('show response headers', ('--with-output')),
+ json_output=FlagArgument('show headers in json', ('-j', '--json'))
)
@errors.generic.all
def _run(self):
if self['yes'] or ask_user('Purge container %s?' % self.container):
try:
- self.client.purge_container()
+ r = self.client.purge_container()
except ClientError as ce:
if ce.status in (409,):
if self['force']:
self.client.del_container(delimiter='/')
- self.client.purge_container()
+ r = self.client.purge_container()
else:
raiseCLIError(ce, details=['Try -F to force-purge'])
else:
raise
+ if self['json_output']:
+ print_json(r)
+ elif self['with_output']:
+ print_dict(r)
else:
print('Aborted')
class file_unpublish(_file_container_command):
"""Unpublish an object"""
+ arguments = dict(
+ with_output=FlagArgument('show response headers', ('--with-output')),
+ json_output=FlagArgument('show headers in json', ('-j', '--json'))
+ )
+
@errors.generic.all
@errors.pithos.connection
@errors.pithos.container
@errors.pithos.object_path
def _run(self):
- self.client.unpublish_object(self.path)
+ r = self.client.unpublish_object(self.path)
+ if self['json_output']:
+ print_json(r)
+ elif self['with_output']:
+ print_dict(r)
def main(self, container___path):
super(self.__class__, self)._run(
@command(pithos_cmds)
-class file_permissions(_file_container_command):
- """Get read and write permissions of an object
- Permissions are lists of users and user groups. There is read and write
+class file_permissions(_pithos_init):
+ """Manage user and group accessibility for objects
+ Permissions are lists of users and user groups. There are read and write
permissions. Users and groups with write permission have also read
permission.
"""
+
+@command(pithos_cmds)
+class file_permissions_get(_file_container_command):
+ """Get read and write permissions of an object"""
+
@errors.generic.all
@errors.pithos.connection
@errors.pithos.container
@command(pithos_cmds)
-class file_setpermissions(_file_container_command):
+class file_permissions_set(_file_container_command):
"""Set permissions for an object
New permissions overwrite existing permissions.
Permission format:
- read=<username>[,usergroup[,...]]
- write=<username>[,usegroup[,...]]
E.g. to give read permissions for file F to users A and B and write for C:
- . /file setpermissions F read=A,B write=C
+ . /file permissions set F read=A,B write=C
"""
@errors.generic.all
@command(pithos_cmds)
-class file_delpermissions(_file_container_command):
+class file_permissions_delete(_file_container_command):
"""Delete all permissions set on object
- To modify permissions, use /file setpermssions
+ To modify permissions, use /file permissions set
"""
@errors.generic.all
arguments = dict(
object_version=ValueArgument(
'show specific version \ (applies only for objects)',
- ('-j', '--object-version'))
+ ('-O', '--object-version')),
+ json_output=FlagArgument('show headers in json', ('-j', '--json'))
)
@errors.generic.all
r = self.client.get_object_info(
self.path,
version=self['object_version'])
- print_dict(r)
+ printer = print_json if self['json_output'] else print_dict
+ printer(r)
def main(self, container____path__=None):
super(self.__class__, self)._run(container____path__)
@command(pithos_cmds)
-class file_meta(_file_container_command):
+class file_metadata(_pithos_init):
+ """Metadata are attached on objects. They are formed as key:value pairs.
+ They can have arbitary values.
+ """
+
+
+@command(pithos_cmds)
+class file_metadata_get(_file_container_command):
"""Get metadata for account, containers or objects"""
arguments = dict(
until=DateArgument('show metadata until then', '--until'),
object_version=ValueArgument(
'show specific version \ (applies only for objects)',
- ('-j', '--object-version'))
+ ('-O', '--object-version')),
+ json_output=FlagArgument('show headers in json', ('-j', '--json'))
)
@errors.generic.all
else:
r = self.client.get_account_meta(until=until)
r = pretty_keys(r, '-')
- if r:
- print(bold(self.client.account))
+ print(bold(self.client.account))
elif self.path is None:
if self['detail']:
r = self.client.get_container_info(until=until)
r = self.client.get_object_meta(
self.path,
version=self['object_version'])
- if r:
r = pretty_keys(pretty_keys(r, '-'))
if r:
- print_dict(r)
+ printer = print_json if self['json_output'] else print_dict
+ printer(r)
def main(self, container____path__=None):
super(self.__class__, self)._run(container____path__)
@command(pithos_cmds)
-class file_setmeta(_file_container_command):
- """Set a piece of metadata for account, container or object
- Metadata are formed as key:value pairs
- """
+class file_metadata_set(_file_container_command):
+ """Set a piece of metadata for account, container or object"""
@errors.generic.all
@errors.pithos.connection
@command(pithos_cmds)
-class file_delmeta(_file_container_command):
+class file_metadata_delete(_file_container_command):
"""Delete metadata with given key from account, container or object
- Metadata are formed as key:value objects
- - to get metadata of current account: /file meta
- - to get metadata of a container: /file meta <container>
- - to get metadata of an object: /file meta <container>:<path>
+ - to get metadata of current account: /file metadata get
+ - to get metadata of a container: /file metadata get <container>
+ - to get metadata of an object: /file metadata get <container>:<path>
"""
@errors.generic.all
cnt_back_up = self.container
try:
self.container = container or cnt_back_up
- self.container_delete(until=unicode(time()))
+ r = self.container_delete(until=unicode(time()))
finally:
self.container = cnt_back_up
+ return r.headers
def upload_object_unchunked(
self, obj, f,
ret = [''] * num_of_blocks
self._init_thread_limit()
flying = dict()
- for blockid, blockhash in enumerate(remote_hashes):
- start = blocksize * blockid
- is_last = start + blocksize > total_size
- end = (total_size - 1) if is_last else (start + blocksize - 1)
- (start, end) = _range_up(start, end, range_str)
- if start < end:
- self._watch_thread_limit(flying.values())
- flying[blockid] = self._get_block_async(obj, **restargs)
- for runid, thread in flying.items():
- if (blockid + 1) == num_of_blocks:
- thread.join()
- elif thread.isAlive():
- continue
- if thread.exception:
- raise thread.exception
- ret[runid] = thread.value.content
- self._cb_next()
- flying.pop(runid)
- return ''.join(ret)
+ try:
+ for blockid, blockhash in enumerate(remote_hashes):
+ start = blocksize * blockid
+ is_last = start + blocksize > total_size
+ end = (total_size - 1) if is_last else (start + blocksize - 1)
+ (start, end) = _range_up(start, end, range_str)
+ if start < end:
+ self._watch_thread_limit(flying.values())
+ flying[blockid] = self._get_block_async(obj, **restargs)
+ for runid, thread in flying.items():
+ if (blockid + 1) == num_of_blocks:
+ thread.join()
+ elif thread.isAlive():
+ continue
+ if thread.exception:
+ raise thread.exception
+ ret[runid] = thread.value.content
+ self._cb_next()
+ flying.pop(runid)
+ return ''.join(ret)
+ except KeyboardInterrupt:
+ sendlog.info('- - - wait for threads to finish')
+ for thread in activethreads():
+ thread.join()
#Command Progress Bar method
def _cb_next(self, step=1):
raise ClientError(
'Container "%s" is not empty' % self.container,
r.status_code)
+ return r.headers
def get_container_versioning(self, container=None):
"""
:param delimiter: (str)
"""
self._assert_container()
- self.object_delete(obj, until=until, delimiter=delimiter)
+ r = self.object_delete(obj, until=until, delimiter=delimiter)
+ return r.headers
def set_object_meta(self, obj, metapairs):
"""
"""
:param obj: (str) remote object path
"""
- self.object_post(obj, update=True, public=False)
+ r = self.object_post(obj, update=True, public=False)
+ return r.headers
def get_object_info(self, obj, version=None):
"""
filesize = fstat(source_file.fileno()).st_size
nblocks = 1 + (filesize - 1) // blocksize
offset = 0
+ headers = {}
if upload_cb:
- upload_gen = upload_cb(nblocks)
- upload_gen.next()
- for i in range(nblocks):
- block = source_file.read(min(blocksize, filesize - offset))
- offset += len(block)
- self.object_post(
- obj,
- update=True,
- content_range='bytes */*',
- content_type='application/octet-stream',
- content_length=len(block),
- data=block)
+ self.progress_bar_gen = upload_cb(nblocks)
+ self._cb_next()
+ flying = {}
+ self._init_thread_limit()
+ try:
+ for i in range(nblocks):
+ block = source_file.read(min(blocksize, filesize - offset))
+ offset += len(block)
- if upload_cb:
- upload_gen.next()
+ self._watch_thread_limit(flying.values())
+ unfinished = {}
+ flying[i] = SilentEvent(
+ method=self.object_post,
+ obj=obj,
+ update=True,
+ content_range='bytes */*',
+ content_type='application/octet-stream',
+ content_length=len(block),
+ data=block)
+ flying[i].start()
+
+ for key, thread in flying.items():
+ if thread.isAlive():
+ if i < nblocks:
+ unfinished[key] = thread
+ continue
+ thread.join()
+ if thread.exception:
+ raise thread.exception
+ headers[key] = thread.value.headers
+ self._cb_next()
+ flying = unfinished
+ except KeyboardInterrupt:
+ sendlog.info('- - - wait for threads to finish')
+ for thread in activethreads():
+ thread.join()
+ return headers.values()
def truncate_object(self, obj, upto_bytes):
"""
projects / kamaki / commitdiff