From af3d0e8947f7801e204d8e00fd03b575cd87aa39 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Fri, 20 Jan 2017 21:00:36 +0000
Subject: [PATCH] Revert "Fix in trisurf.py in getLastVTU not returning the result if directory does not exist or is empty."
---
trisurf/Remote.py | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/trisurf/Remote.py b/trisurf/Remote.py
index 2bf80f1..977b96a 100644
--- a/trisurf/Remote.py
+++ b/trisurf/Remote.py
@@ -20,20 +20,23 @@
def connect(self, Timeout=5):
if(not self.connected):
-# try:
- print("Trying to connect to: "+self.username+"@"+self.hostname+":"+str(self.port)+".")
- self.ssh.connect(self.hostname, username=self.username, password=self.password, port=self.port, timeout=Timeout)
- self.connected=True
-# except:
-# print("Error establishing connection with "+self.username+"@"+self.hostname+":"+str(self.port)+".")
-# exit(1)
+ try:
+ print("Trying to connect to: "+self.username+"@"+self.hostname+":"+str(self.port)+".")
+ self.ssh.connect(self.hostname, username=self.username, password=self.password, port=self.port, timeout=Timeout)
+ self.connected=True
+ except:
+ print("Error establishing connection with "+self.username+"@"+self.hostname+":"+str(self.port)+".")
+ exit(1)
else:
print("Already connected!")
return
def disconnect(self):
if(self.connected):
- self.ssh.close()
+ try:
+ self.ssh.close()
+ except:
+ print("Cannot disconect. Unknown error.")
else:
print("Cannot disconect. Already disconnected.")
self.connected=False
@@ -52,16 +55,14 @@
print("Cannot execute remote commands. Connect first.")
def send_file(self, local, remote):
- pass
-# sftp=self.ssh.open_sftp()
-# sftp.put(local,remote)
-# sftp.close()
+ sftp=self.ssh.open_sftp()
+ sftp.put(local,remote)
+ sftp.close()
def receive_file(self,remote,local):
- pass
-# sftp=self.ssh.open_sftp()
-# sftp.get(remote,local)
-# sftp.close()
+ sftp=self.ssh.open_sftp()
+ sftp.get(remote,local)
+ sftp.close()
def mkdir_remote(self,directory):
sftp=self.ssh.open_sftp()
@@ -88,4 +89,13 @@
return True
def send_multiple_files_in_directory(self,local_files,directory):
- pass
+ sftp=self.ssh.open_sftp()
+# try:
+# sftp.chdir(directory) # Test if remote_path exists
+# except (IOError,FileNotFoundError):
+# sftp.mkdir(directory) # Create remote_path
+# sftp.chdir(directory)
+ self.mkdir_p(sftp, directory)
+ for f in set(local_files):
+ sftp.put(f, f)
+ sftp.close()
--
Gitblit v1.9.3