Merge branch 'feature-naming-scheme' into develop

[kamaki] / kamaki / cli / commands / pithos.py

diff --git a/kamaki/cli/commands/pithos.py b/kamaki/cli/commands/pithos.py
index 0c5be19..60c00a3 100644 (file)
--- a/kamaki/cli/commands/pithos.py
+++ b/kamaki/cli/commands/pithos.py
@@ -818,6 +818,11 @@ class file_upload(_pithos_container, _optional_output_cmd):
             'Use * for all users',
             '--write-permission'),
         public=FlagArgument('make object publicly accessible', '--public'),
+        max_threads=IntArgument('set max threads (default 5)', '--threads'),
+        progress_bar=ProgressBarArgument(
+            'do not show progress bar',
+            ('-N', '--no-progress-bar'),
+            default=False),
         overwrite=FlagArgument('Force (over)write', ('-f', '--force')),
         recursive=FlagArgument(
             'Recursively upload directory *contents* + subdirectories',
@@ -932,8 +937,7 @@ class file_upload(_pithos_container, _optional_output_cmd):
             yield open(lpath, 'rb'), rpath
 
     def _run(self, local_path, remote_path):
-        if self['max_threads'] > 0:
-            self.client.MAX_THREADS = int(self['max_threads'])
+        self.client.MAX_THREADS = int(self['max_threads'] or 5)
         params = dict(
             content_encoding=self['content_encoding'],
             content_type=self['content_type'],
@@ -1211,7 +1215,7 @@ class file_download(_pithos_container):
     @errors.pithos.local_path
     @errors.pithos.local_path_download
     def _run(self, local_path):
-        self.client.MAX_THREADS = self['max_threads'] or 5
+        self.client.MAX_THREADS = int(self['max_threads'] or 5)
         progress_bar = None
         try:
             for rpath, output_file in self._src_dst(local_path):