Updated sftp file handle implementation. Added sftp file read test.

Author: Pan

ssh/sftp_handles.pxd

@@ -23,6 +23,7 @@ cimport c_sftp
 cdef class SFTPFile:
     cdef c_sftp.sftp_file _file
     cdef SFTP sftp
+    cdef bint closed
 
     @staticmethod
     cdef SFTPFile from_ptr(c_sftp.sftp_file _file, SFTP sftp)

ssh/sftp_handles.pyx

@@ -14,18 +14,24 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-130
 
+from libc.stdlib cimport malloc, free
+
 from sftp_attributes cimport SFTPAttributes
 
 from .exceptions import SFTPHandleError
 
-from c_ssh cimport uint32_t, uint64_t
+from c_ssh cimport uint32_t, uint64_t, ssh_get_error
 cimport c_sftp
 
 
 cdef class SFTPFile:
 
     def __cinit__(self, SFTP sftp):
         self.sftp = sftp
+        self.closed = False
+
+    def __dealloc__(self):
+        pass
 
     @staticmethod
     cdef SFTPFile from_ptr(c_sftp.sftp_file _file, SFTP sftp):
@@ -44,28 +50,59 @@ cdef class SFTPFile:
 
     def __next__(self):
         size, data = self.read()
-        while size > 0:
-            return size
+        if size > 0:
+            return size, data
         raise StopIteration
 
     @property
     def sftp_session(self):
         return self.sftp
 
     def fstat(self):
-        pass
+        cdef SFTPAttributes _attrs
+        cdef c_sftp.sftp_attributes c_attrs
+        with nogil:
+            c_attrs = c_sftp.sftp_fstat(self._file)
+        if c_attrs is NULL:
+            raise SFTPHandleError(ssh_get_error(self.sftp.session._session))
+        _attrs = SFTPAttributes.from_ptr(c_attrs, self.sftp)
+        return _attrs
 
     def close(self):
-        pass
+        cdef int rc
+        if self.closed:
+            return 0
+        with nogil:
+            rc = c_sftp.sftp_close(self._file)
+        if rc < 0:
+            raise SFTPHandleError(ssh_get_error(self.sftp.session._session))
+        self.closed = True
+        return rc
 
     def set_nonblocking(self):
-        pass
+        with nogil:
+            c_sftp.sftp_file_set_nonblocking(self._file)
 
     def set_blocking(self):
-        pass
+        with nogil:
+            c_sftp.sftp_file_set_blocking(self._file)
 
     def read(self, size_t count=1024000):
-        pass
+        cdef ssize_t size
+        cdef bytes buf = b''
+        cdef char *c_buf
+        with nogil:
+            c_buf = <char *>malloc(sizeof(char) * count)
+            if c_buf is NULL:
+                with gil:
+                    raise MemoryError
+            size = c_sftp.sftp_read(self._file, c_buf, count)
+        try:
+            if size > 0:
+                buf = c_buf[:size]
+        finally:
+            free(c_buf)
+        return size, buf
 
     def async_read_begin(self, uint32_t length=1024000):
         pass

tests/test_sftp.py

@@ -70,7 +70,7 @@ def test_sftp_readdir(self):
             self.assertEqual(attrs.name, b'.')
             self.assertTrue(len(attrs.longname) > 1)
 
-    def test_sftp_file(self):
+    def test_sftp_file_read(self):
         self._auth()
         sftp = self.session.sftp_new()
         sftp.init()
@@ -83,17 +83,12 @@ def test_sftp_file(self):
         with open(remote_filename, 'wb') as test_fh:
             test_fh.write(test_file_data)
         try:
-            remote_fh = sftp.open(remote_filename, os.O_RDONLY, 0)
-            self.assertIsInstance(remote_fh, SFTPFile)
+            with sftp.open(remote_filename, os.O_RDONLY, 0) as remote_fh:
+                self.assertIsInstance(remote_fh, SFTPFile)
+                remote_data = b""
+                for rc, data in remote_fh:
+                    remote_data += data
+                self.assertEqual(remote_fh.close(), 0)
+                self.assertEqual(remote_data, test_file_data)
         finally:
             os.unlink(remote_filename)
-        # with sftp.open(remote_filename, 0, 0) as remote_fh:
-        #     try:
-        #         self.assertTrue(remote_fh is not None)
-        #         remote_data = b""
-        #         for rc, data in remote_fh:
-        #             remote_data += data
-        #         self.assertEqual(remote_fh.close(), 0)
-        #         self.assertEqual(remote_data, test_file_data)
-        #     finally:
-        #         os.unlink(remote_filename)