Fix ftp module import and small changes

CHANGELOG.md

@@ -0,0 +1,25 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+### Added
+
+- A deletefile method to the fs_local class (#1).
+- Dependency ftputil to the project settings (#1).
+
+### Fixed 
+
+- Broken import in ftp filesystem module (#1).
+- The intorods.filesys.sync.sync method uses `<fs>.mkdir(path, parents=True)`,
+  added `parents` kwarg to mkdir for all filesystem classes (#1).
+
+## [0.0.7] - 2023-06-07
+
+### Added
+
+- Migrated internal RIVM version to github.

pyproject.toml

@@ -20,6 +20,7 @@ classifiers = [
 
 dependencies = [
     "cryptography",
+    "ftputil",
     "paramiko",
     "python-irodsclient",
     "pyyaml",

src/intorods/__init__.py

@@ -1 +1 @@
-__VERSION__ = "0.0.7"
+__VERSION__ = "0.0.8"

src/intorods/filesys/fs_base.py

@@ -233,7 +233,7 @@ def getfolder(self, path):
         return self.getfile(path)
 
     @abstractmethod
-    def mkdir(self, path):
+    def mkdir(self, path, parents=False):
         pass
 
     def createfile(self, path):

src/intorods/filesys/fs_ftp.py

@@ -8,7 +8,7 @@
 
 import stat
 import ftputil
-from filesys.fs_base import factory, fsobject_base, fs_base
+from intorods.filesys.fs_base import factory, fsobject_base, fs_base
 import os
 from datetime import datetime
 
@@ -100,7 +100,7 @@ def ls(self, path):
             pass
         return result
 
-    def mkdir(self, path):
+    def mkdir(self, path, parents=False):
         exit(1)
 
     def open(self, path, mode):

src/intorods/filesys/fs_irods.py

@@ -203,7 +203,7 @@ def mkdir(self, path, parents=False):
         if parents:
             parentdir, dir = os.path.split(path)
             if not self.folderexists(parentdir):
-                self.mkdir(parentdir, True)
+                self.mkdir(parentdir, parents=True)
         self.irods_session.collections.create(path)
         return folder_irods(self, path)
 

src/intorods/filesys/fs_local.py

@@ -100,11 +100,17 @@ def lsfilenames(self, path):
         result = [f.name for f in os.scandir(path) if not f.is_dir()]
         return result
 
-    def mkdir(self, path):
-        os.mkdir(path)
+    def mkdir(self, path, parents=False):
+        if parents:
+            os.makedirs(path)
+        else:
+            os.mkdir(path)
 
     def open(self, path, mode):
         return open(path, mode)
 
+    def deletefile(self, path):
+        os.remove(path)
+
 
 factory.register('local', fs_local.factory, '')

src/intorods/filesys/fs_scp.py

@@ -103,7 +103,7 @@ def ls(self, path):
             result.append(fileobject)
         return result
 
-    def mkdir(self, path):
+    def mkdir(self, path, parents=False):
         exit(1)
 
     def open(self, path, mode):

src/intorods/filesys/fs_sftp.py

@@ -126,7 +126,7 @@ def ls(self, path):
     def lsfilenames(self, path):
         return self.sftp.listdir(path)
 
-    def mkdir(self, path):
+    def mkdir(self, path, parents=False):
         exit(1)
 
     def open(self, path, mode):

src/intorods/filesys/fs_smb.py

@@ -7,6 +7,8 @@
 import logging
 import socket
 import tempfile
+import os
+
 from smb.SMBConnection import SMBConnection
 from smb import smb_constants
 from intorods.filesys.fs_base import factory, fsobject_base, fs_base
@@ -152,7 +154,11 @@ def lsfilenames(self, path):
             result.append(entry.filename)
         return result
 
-    def mkdir(self, path):
+    def mkdir(self, path, parents=False):
+        if parents:
+            parentdir, dir = os.path.split(path)
+            if not self.folderexists(parentdir):
+                self.mkdir(parentdir, parents=True)
         self.smb_conn.createDirectory(self.share, uxtowin(path))
 
 # TODO