csc-cia-stne 0.1.17__tar.gz → 0.1.19__tar.gz

{csc_cia_stne-0.1.17 → csc_cia_stne-0.1.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csc_cia_stne
-Version: 0.1.17
+Version: 0.1.19
 Summary: Biblioteca do time CSC-CIA utilizada no desenvolvimento de RPAs
 License: MIT
 Keywords: karavela,csc,cia,stone,rpa,botcity,stne

{csc_cia_stne-0.1.17 → csc_cia_stne-0.1.19}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "csc_cia_stne"
-version = "0.1.17"
+version = "0.1.19"
 license = { text = "MIT" }
 description = "Biblioteca do time CSC-CIA utilizada no desenvolvimento de RPAs"
 keywords = ["karavela", "csc", "cia", "stone", "rpa", "botcity", "stne"]

{csc_cia_stne-0.1.17 → csc_cia_stne-0.1.19}/src/csc_cia_stne/ftp.py

@@ -8,7 +8,7 @@ from .utilitarios.validations.ftp import InitParamsValidator,UploadDownloadValid
 
 class FTP():
 
-    def __init__(self, host:str , user:str , password:str , timeout:int=30, port:bool=21, tls:bool=True, ssl:bool=True, verify_ssl:bool=False, verify_host:bool=False, tryouts:int=3):
+    def __init__(self, host:str , user:str , password:str , timeout:int=30, port:int=21, tls:bool=True, ssl:bool=True, verify_ssl:bool=False, verify_host:bool=False, tryouts:int=3, sftp:bool=False, ssh_password:bool=False):
 
         self.host = host
         self.user = user
@@ -20,6 +20,8 @@ class FTP():
         self.verify_ssl = verify_ssl
         self.verify_host = verify_host
         self.tryouts = tryouts
+        self.sftp = sftp
+        self.ssh_password = ssh_password
 
         try:
 
@@ -92,7 +94,11 @@ class FTP():
 
             connection_ftp = pycurl.Curl()
 
-            connection_ftp.setopt(connection_ftp.USERPWD, f"{self.user}:{self.password}")
+            connection_ftp.setopt(connection_ftp.USERPWD, f"{self.user}:{self.password}".encode("utf-8"))
+
+            if self.ssh_password:
+
+                connection_ftp.setopt(connection_ftp.SSH_AUTH_TYPES, connection_ftp.SSH_AUTH_PASSWORD)
 
             connection_ftp.setopt(connection_ftp.CONNECTTIMEOUT, self.timeout)  # Tempo limite para conexão
                     
@@ -156,13 +162,20 @@ class FTP():
 
             raise ValueError(f"Erro na validação dos parâmetros de upload/download: {str(e)}")
 
-        filename = os.path.join(os.getcwd(), filename)
+        
+        local_path = os.path.join(os.getcwd(), filename)
 
         connection_ftp = self._login_server()
 
-        remote_path = f"{filepathftp}{filename}"
+        remote_path = f"{filepathftp}{filename.split('/')[-1]}"
 
-        ftp_url = f"ftp://{self.host}{remote_path}"
+        if self.sftp:
+
+            ftp_url = f"sftp://{self.host}:{self.port}{remote_path}"
+
+        else:
+
+            ftp_url = f"ftp://{self.host}:{self.port}{remote_path}"
 
         status_upload = True
 
@@ -178,7 +191,7 @@ class FTP():
 
             try:
 
-                with open(filename, methodfile) as file:
+                with open(local_path, methodfile) as file:
 
                     connection_ftp.setopt(connection_ftp.URL, ftp_url)
 
@@ -262,7 +275,13 @@ class FTP():
         
         connection_ftp = self._login_server()
 
-        ftp_url = f"ftp://{self.host}{filepathftp}"
+        if self.sftp:
+
+            ftp_url = f"sftp://{self.host}:{port}{remote_path}"
+
+        else:
+
+            ftp_url = f"ftp://{self.host}:{port}{remote_path}"
 
         for try_out in range(self.tryouts):
 

{csc_cia_stne-0.1.17 → csc_cia_stne-0.1.19}/src/csc_cia_stne.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csc_cia_stne
-Version: 0.1.17
+Version: 0.1.19
 Summary: Biblioteca do time CSC-CIA utilizada no desenvolvimento de RPAs
 License: MIT
 Keywords: karavela,csc,cia,stone,rpa,botcity,stne