Update sftp_notice_publisher.py

Author: CaptainOfHacks

ted_sws/notice_publisher/adapters/sftp_notice_publisher.py

@@ -1,25 +1,28 @@
 import pysftp
 
-from ted_sws.notice_publisher.adapters.notice_publisher_abc import NoticePublisherABC
 from ted_sws import config
+from ted_sws.notice_publisher.adapters.sftp_publisher_abc import SFTPPublisherABC
 
 
-class SFTPNoticePublisher(NoticePublisherABC):
+class SFTPPublisher(SFTPPublisherABC):
+    """
+
+    """
+
     connection: pysftp.Connection = None
     default_host = config.SFTP_HOST
     default_user = config.SFTP_USER
     default_pass = config.SFTP_PASSWORD
     default_port = config.SFTP_PORT
 
-    def __init__(self, hostname=default_host, username=default_user, password=default_pass, port=default_port,
-                 remote_path=None):
+    def __init__(self, hostname=default_host, username=default_user, password=default_pass, port=default_port):
         """Constructor Method"""
         # Set connection object to None (initial value)
         self.hostname = hostname
         self.username = username
         self.password = password
-        self.port = port or self.default_port
-        self.remote_path = remote_path
+        self.port = port
+        self.is_connected = False
 
     def connect(self):
         """Connects to the sftp server and returns the sftp connection object"""
@@ -39,30 +42,31 @@ def connect(self):
         except Exception as err:
             raise Exception(err)
 
+        self.is_connected = True
+
     def disconnect(self):
         """Closes the sftp connection"""
-        self.connection.close()
+        if self.is_connected:
+            self.connection.close()
+            self.is_connected = False
 
-    def publish(self, source_path, remote_path=None) -> bool:
-        return self.upload(source_path, remote_path)
+    def __del__(self):
+        self.disconnect()
 
-    def upload(self, source_path, remote_path=None) -> bool:
+    def publish(self, source_path, remote_path) -> bool:
         """
-       Uploads the notice's METS manifestation to the sftp server remote path.
+        Publish file_content to the sftp server remote path.
        """
-        if remote_path is None:
-            remote_path = self.remote_path
-
-        if remote_path is None:
-            raise ValueError("No remote path specified.")
-
         try:
             self.connection.put(source_path, remote_path)
             return True
         except Exception as err:
             raise Exception(err)
 
     def remove(self, remote_path) -> bool:
+        """
+
+        """
         try:
             self.connection.unlink(remote_path)
             return True