from getpass import getuser
from optparse import OptionParser
-from os.path import basename
+from os import environ
from sys import argv, exit, stdin, stdout
from pithos.lib.client import Client, Fault
from datetime import datetime
import types
import re
import time as _time
+import os
DEFAULT_HOST = 'pithos.dev.grnet.gr'
DEFAULT_API = 'v1'
parser.add_option('--host', dest='host', metavar='HOST',
default=DEFAULT_HOST, help='use server HOST')
parser.add_option('--user', dest='user', metavar='USERNAME',
- default=getuser(), help='use account USERNAME')
+ default=_get_user(),
+ help='use account USERNAME')
+ parser.add_option('--token', dest='token', metavar='AUTH',
+ default=_get_auth(),
+ help='use account AUTH')
parser.add_option('--api', dest='api', metavar='API',
default=DEFAULT_API, help='use api API')
parser.add_option('-v', action='store_true', dest='verbose',
val = getattr(options, key)
setattr(self, key, val)
- self.client = Client(self.host, self.user, self.api, self.verbose,
+ self.client = Client(self.host, self.token, self.user, self.api, self.verbose,
self.debug)
self.parser = parser
print_list(l)
def list_objects(self, container):
- params = {'limit':self.limit, 'marker':self.marker,
- 'prefix':self.prefix, 'delimiter':self.delimiter,
- 'path':self.path, 'meta':self.meta}
+ #prepate params
+ params = {}
+ attrs = ['limit', 'marker', 'prefix', 'delimiter', 'path', 'meta']
+ for a in [a for a in attrs if getattr(self, a)]:
+ params[a] = getattr(self, a)
+
+ if self.until:
+ t = _time.strptime(self.until, self.format)
+ params['until'] = int(_time.mktime(t))
+
headers = {'IF_MODIFIED_SINCE':self.if_modified_since,
'IF_UNMODIFIED_SINCE':self.if_unmodified_since}
container, sep, object = container.partition('/')
if object:
return
- if self.until:
- t = _time.strptime(self.until, self.format)
- params['until'] = int(_time.mktime(t))
-
detail = 'json'
#if request with meta quering disable trash filtering
show_trashed = True if self.meta else False
- l = self.client.list_objects(container, detail, params, headers,
- include_trashed = show_trashed)
+ l = self.client.list_objects(container, detail, headers,
+ include_trashed = show_trashed, **params)
print_list(l, detail=self.detail)
@cli_command('meta')
def execute(self, container, *args):
headers = {}
+ meta = {}
for arg in args:
key, sep, val = arg.partition('=')
- headers['X_CONTAINER_META_%s' %key.strip().upper()] = val.strip()
- ret = self.client.create_container(container, headers)
+ meta[key] = val
+ ret = self.client.create_container(container, headers, **meta)
if not ret:
print 'Container already exists'
parser.add_option('--if-unmodified-since', action='store', type='str',
dest='if-unmodified-since', default=None,
help='show output if not modified since then')
- parser.add_option('-f', action='store', type='str',
+ parser.add_option('-o', action='store', type='str',
dest='file', default=None,
help='save output in file')
parser.add_option('--version', action='store', type='str',
@cli_command('put')
class PutObject(Command):
syntax = '<container>/<object> <path> [key=val] [...]'
- description = 'create/override object with path contents or standard input'
+ description = 'create/override object'
def add_options(self, parser):
+ parser.add_option('--use_hashes', action='store_true', dest='use_hashes',
+ default=False, help='provide hashmap instead of data')
parser.add_option('--chunked', action='store_true', dest='chunked',
default=False, help='set chunked transfer mode')
parser.add_option('--etag', action='store', dest='etag',
parser.add_option('--type', action='store',
dest='content-type', default=False,
help='create object with specific content type')
- parser.add_option('--touch', action='store_true',
- dest='touch', default=False,
- help='create object with zero data')
parser.add_option('--sharing', action='store',
dest='sharing', default=None,
help='define sharing object policy')
+ parser.add_option('-f', action='store',
+ dest='srcpath', default=None,
+ help='file descriptor to read from (pass - for standard input)')
+ parser.add_option('--public', action='store',
+ dest='public', default=None,
+ help='make object publicly accessible (\'True\'/\'False\')')
+
+ def execute(self, path, *args):
+ if path.find('=') != -1:
+ raise Fault('Missing path argument')
+
+ #prepare user defined meta
+ meta = {}
+ for arg in args:
+ key, sep, val = arg.partition('=')
+ meta[key] = val
- def execute(self, path, srcpath='-', *args):
headers = {}
- if self.manifest:
- headers['X_OBJECT_MANIFEST'] = self.manifest
+ manifest = getattr(self, 'manifest')
+ if manifest:
+ # if it's manifestation file
+ # send zero-byte data with X-Object-Manifest header
+ self.touch = True
+ headers['X_OBJECT_MANIFEST'] = manifest
if self.sharing:
headers['X_OBJECT_SHARING'] = self.sharing
for a in attrs:
headers[a.replace('-', '_').upper()] = getattr(self, a)
- #prepare user defined meta
- for arg in args:
- key, sep, val = arg.partition('=')
- headers['X_OBJECT_META_%s' %key.strip().upper()] = val.strip()
-
container, sep, object = path.partition('/')
f = None
- chunked = False
- if not self.touch:
- f = srcpath != '-' and open(srcpath) or stdin
- chunked = (self.chunked or f == stdin) and True or False
- self.client.create_object(container, object, f, chunked=chunked,
- headers=headers)
+ if self.srcpath:
+ f = open(self.srcpath) if self.srcpath != '-' else stdin
+
+ if self.use_hashes and not f:
+ raise Fault('Illegal option combination')
+ if self.public not in ['True', 'False', None]:
+ raise Fault('Not acceptable value for public')
+ public = eval(self.public) if self.public else None
+ self.client.create_object(container, object, f, chunked=self.chunked,
+ headers=headers, use_hashes=self.use_hashes,
+ public=public, **meta)
if f:
f.close()
@cli_command('copy', 'cp')
class CopyObject(Command):
syntax = '<src container>/<src object> [<dst container>/]<dst object>'
- description = 'copies an object to a different location'
+ description = 'copy an object to a different location'
def add_options(self, parser):
parser.add_option('--version', action='store',
dest='version', default=False,
help='copy specific version')
+ parser.add_option('--public', action='store',
+ dest='public', default=None,
+ help='publish/unpublish object (\'True\'/\'False\')')
def execute(self, src, dst):
src_container, sep, src_object = src.partition('/')
if version:
headers = {}
headers['X_SOURCE_VERSION'] = version
+ if self.public and self.nopublic:
+ raise Fault('Conflicting options')
+ if self.public not in ['True', 'False', None]:
+ raise Fault('Not acceptable value for public')
+ public = eval(self.public) if self.public else None
self.client.copy_object(src_container, src_object, dst_container,
- dst_object, headers)
+ dst_object, public, headers)
@cli_command('set')
class SetMeta(Command):
def add_options(self, parser):
parser.add_option('-a', action='store_true', dest='append',
default=True, help='append data')
- parser.add_option('--start', action='store',
- dest='start',
+ parser.add_option('--offset', action='store',
+ dest='offset',
default=None, help='starting offest to be updated')
parser.add_option('--range', action='store', dest='content-range',
default=None, help='range of data to be updated')
parser.add_option('--sharing', action='store',
dest='sharing', default=None,
help='define sharing object policy')
- parser.add_option('--touch', action='store_true',
- dest='touch', default=False,
- help='change object properties')
+ parser.add_option('--nosharing', action='store_true',
+ dest='no_sharing', default=None,
+ help='clear object sharing policy')
+ parser.add_option('-f', action='store',
+ dest='srcpath', default=None,
+ help='file descriptor to read from: pass - for standard input')
+ parser.add_option('--public', action='store',
+ dest='public', default=None,
+ help='publish/unpublish object (\'True\'/\'False\')')
- def execute(self, path, srcpath='-', *args):
+ def execute(self, path, *args):
+ if path.find('=') != -1:
+ raise Fault('Missing path argument')
+
headers = {}
if self.manifest:
headers['X_OBJECT_MANIFEST'] = self.manifest
if self.sharing:
headers['X_OBJECT_SHARING'] = self.sharing
- if getattr(self, 'start'):
- headers['CONTENT_RANGE'] = 'bytes %s-/*' % getattr(self, 'start')
- elif self.append:
- headers['CONTENT_RANGE'] = 'bytes */*'
+ if self.no_sharing:
+ headers['X_OBJECT_SHARING'] = ''
attrs = ['content-encoding', 'content-disposition']
attrs = [a for a in attrs if getattr(self, a)]
headers[a.replace('-', '_').upper()] = getattr(self, a)
#prepare user defined meta
+ meta = {}
for arg in args:
key, sep, val = arg.partition('=')
- headers['X_OBJECT_META_%s' %key.strip().upper()] = val.strip()
+ meta[key] = val
container, sep, object = path.partition('/')
f = None
chunked = False
- if not self.touch:
- f = srcpath != '-' and open(srcpath) or stdin
- chunked = (self.chunked or f == stdin) and True or False
+ if self.srcpath:
+ f = self.srcpath != '-' and open(self.srcpath) or stdin
+ if f:
+ chunked = True if (self.chunked or f == stdin) else False
+ if self.public not in ['True', 'False', None]:
+ raise Fault('Not acceptable value for public')
+ public = eval(self.public) if self.public else None
self.client.update_object(container, object, f, chunked=chunked,
- headers=headers)
+ headers=headers, offset=self.offset,
+ public=public, **meta)
if f:
f.close()
@cli_command('move', 'mv')
class MoveObject(Command):
syntax = '<src container>/<src object> [<dst container>/]<dst object>'
- description = 'moves an object to a different location'
+ description = 'move an object to a different location'
+
+ def add_options(self, parser):
+ parser.add_option('--public', action='store',
+ dest='public', default=None,
+ help='publish/unpublish object (\'True\'/\'False\')')
def execute(self, src, dst):
src_container, sep, src_object = src.partition('/')
if not sep:
dst_container = src_container
dst_object = dst
-
+ if self.public not in ['True', 'False', None]:
+ raise Fault('Not acceptable value for public')
+ public = eval(self.public) if self.public else None
self.client.move_object(src_container, src_object, dst_container,
- dst_object, headers)
+ dst_object, public, headers)
@cli_command('remove')
class TrashObject(Command):
syntax = '<container>/<object>'
- description = 'trashes an object'
+ description = 'trash an object'
def execute(self, src):
src_container, sep, src_object = src.partition('/')
self.client.trash_object(src_container, src_object)
@cli_command('restore')
-class TrashObject(Command):
+class RestoreObject(Command):
syntax = '<container>/<object>'
- description = 'trashes an object'
+ description = 'restore a trashed object'
def execute(self, src):
src_container, sep, src_object = src.partition('/')
self.client.restore_object(src_container, src_object)
@cli_command('unset')
-class TrashObject(Command):
+class UnsetObject(Command):
syntax = '<container>/[<object>] key [key] [...]'
- description = 'deletes metadata info'
+ description = 'delete metadata info'
def execute(self, path, *args):
#in case of account fix the args
@cli_command('group')
class SetGroup(Command):
syntax = 'key=val [key=val] [...]'
- description = 'sets group account info'
+ description = 'set group account info'
- def execute(self, path='', **args):
- if len(args) == 0:
- args = list(args)
- args.append(path)
- args = tuple(args)
- path = ''
+ def execute(self, *args):
groups = {}
for arg in args:
key, sep, val = arg.partition('=')
groups[key] = val
- self.client.set_account_groups(groups)
+ self.client.set_account_groups(**groups)
+
+@cli_command('policy')
+class SetPolicy(Command):
+ syntax = 'container key=val [key=val] [...]'
+ description = 'set container policies'
+
+ def execute(self, path, *args):
+ if path.find('=') != -1:
+ raise Fault('Missing container argument')
+
+ container, sep, object = path.partition('/')
+
+ if object:
+ raise Fault('Only containers have policies')
+
+ policies = {}
+ for arg in args:
+ key, sep, val = arg.partition('=')
+ policies[key] = val
+
+ self.client.set_container_policies(container, **policies)
+
+@cli_command('publish')
+class PublishObject(Command):
+ syntax = '<container>/<object>'
+ description = 'publish an object'
+
+ def execute(self, src):
+ src_container, sep, src_object = src.partition('/')
+
+ self.client.publish_object(src_container, src_object)
+
+@cli_command('unpublish')
+class UnpublishObject(Command):
+ syntax = '<container>/<object>'
+ description = 'unpublish an object'
+
+ def execute(self, src):
+ src_container, sep, src_object = src.partition('/')
+
+ self.client.unpublish_object(src_container, src_object)
def print_usage():
cmd = Command('', [])
for id, t in data['versions']:
f.write('%s @ %s\n' % (str(id).rjust(30), datetime.fromtimestamp(t)))
+def _get_user():
+ try:
+ return os.environ['PITHOS_USER']
+ except KeyError:
+ return getuser()
+
+def _get_auth():
+ try:
+ return os.environ['PITHOS_AUTH']
+ except KeyError:
+ return '0000'
+
+
def main():
try:
name = argv[1]
projects / pithos / blobdiff