bump ver and minor changes to FileCommand

Author: amstocker

ipfsApi/__init__.py

@@ -3,4 +3,4 @@
 from .client import *
 
 
-__version__ = '0.1.12'
+__version__ = '0.2.0'

ipfsApi/commands.py

@@ -38,13 +38,11 @@ def __init__(self, path, accept_multiple=True):
 
     def request(self, client, f, **kwargs):
         if kwargs.pop('recursive', False):
-            return self.recursive(client, f, **kwargs)
+            return self.directory(client, f, recursive=True, **kwargs)
         if isinstance(f, (list, tuple)):
             return self.multiple(client, f, **kwargs)
         if isinstance(f, six.string_types) and os.path.isdir(f):
-            ls = [os.path.join(f, p) for p in os.listdir(f)]
-            fs = [p for p in ls if os.path.isfile(p)]
-            return self.multiple(client, fs, **kwargs)
+            return self.directory(client, f, **kwargs)
         else:
             return self.single(client, f, **kwargs)
 
@@ -65,7 +63,8 @@ def multiple(self, client, files, **kwargs):
         body, headers = multipart.stream_files(files)
         return client.request(self.path, data=body, headers=headers, **kwargs)
 
-    def recursive(self, client, dirname, fnpattern='*', **kwargs):
+    def directory(self, client, dirname,
+                  fnpattern='*', recursive=False, **kwargs):
         """
         Loads a directory recursively into IPFS, files are matched against the
         given pattern.
@@ -75,7 +74,7 @@ def recursive(self, client, dirname, fnpattern='*', **kwargs):
                 "[%s] does not accept multiple files." % self.path)
         body, headers = multipart.stream_directory(dirname,
                                                    fnpattern=fnpattern,
-                                                   recursive=True)
+                                                   recursive=recursive)
         return client.request(self.path, data=body, headers=headers, **kwargs)
 
 

setup.py

@@ -7,7 +7,7 @@
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='0.1.12',
+    version='0.2.0',
 
     description='IPFS API Bindings for Python',