Revert "Fix in trisurf.py in getLastVTU not returning the result if directo...

Samo Penic

2017-01-20 af3d0e8947f7801e204d8e00fd03b575cd87aa39

Revert "Fix in trisurf.py in getLastVTU not returning the result if directory does not exist or is empty."

This reverts commit 52e871dbc7bf5b61003718cd3342b5ce5d882c6a.

 trisurf/Remote.py

@@ -20,20 +20,23 @@
    
    def connect(self, Timeout=5):
        if(not self.connected):
#            try:
            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)
            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):
            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()	

 trisurf/trisurf.py

@@ -529,9 +529,6 @@
            if file.endswith(".vtu"):
                flist.append(file)
        flist.sort()
        if(len(flist)==0):
            return -1		
        else:
            return(flist[-1])

    def __str__(self):

 trisurf/tsmgr.py

@@ -18,7 +18,7 @@
    
#import io

#from IPython import embed
from IPython import embed

import __main__ as main

@@ -94,12 +94,8 @@
                port=host['port']
            except:
                port=22 #default ssh port
            try:
                rm=Remote.Connection(hostname=host['address'],username=username, port=port)
                rm.connect()
            except:
                host['_conn']=None
                continue
#            print ("Sendind file:"+main.__file__)
            if('remotebasepath' in host):
                remote_dir=host['remotebasepath']
@@ -135,7 +131,6 @@


def status_processes(args,host):
    print("in status processes")
    target_runs=getTargetRunIdxList(args)
    if target_runs==None:
        target_runs=list(range(1,len(host['runs'])+1))
@@ -319,8 +314,6 @@
            #print(remote_dir)
            #print(main.__file__)
            #print('python3 '+main.__file__+' -x '+" ".join(argv))
            if(host['_conn']!=None):
#                print("was here, "+'cd '+remote_dir+ '; python3 '+main.__file__+' -x --originating-host ' +socket.gethostname()+" "+" ".join(argv))
                output=host['_conn'].execute('cd '+remote_dir+ '; python3 '+main.__file__+' -x --originating-host ' +socket.gethostname()+" "+" ".join(argv))
                for line in output:
                    print(line.replace('\n',''))
@@ -330,7 +323,6 @@
        print("Closing connections to remote hosts")
        for host in hosts:
            if(host['name'] !=socket.gethostname()):
                if(host['_conn']):
                    host['_conn'].disconnect()