fetch when update

main.py

@@ -5,6 +5,7 @@ import time
 from datetime import datetime
 from tkinter import messagebox
 import os
+import git
 
 from paramiko import file
 import pymssql
@@ -43,7 +44,9 @@ def sshConnect(cs, sd):
     data_root_dir = './data/'+cs+sd
     stdin, stdout, stderr = ssh.exec_command('mkdir ' + data_root_dir)
     #TODO: 여기에 도커 명령어 및 동시 녹화 코드 입력
-    stdin, stdout, stderr = ssh.exec_command('docker run --rm --name mail_recorder --gpus 1 --privileged -v /dev:/dev -v /home/mc365/sources:/sources -v /home/mc365/data/'+cs+sd+':/data/'+cs+sd+' stereolabs/zed:3.5-gl-devel-cuda11.1-ubuntu18.04 python3 /sources/recorder.py')
+    cmd = 'docker run --rm --name mail_recorder --gpus 1 --privileged -v /dev:/dev -v /home/mc365/sources:/sources -v /home/mc365/data/'+cs+sd+':/data/'+cs+sd+' stereolabs/zed:3.5-gl-devel-cuda11.1-ubuntu18.04 python3 /sources/rec_ubuntu.py'
+    print(cmd)
+    stdin, stdout, stderr = ssh.exec_command(cmd)
     f = open(filepath, 'w')
     r_time = time.ctime(time.time())
     f.write('record succesfully started at ' + str(r_time) + '\n')
@@ -75,11 +78,10 @@ def sshQuit(cs, sd):
 
     ssh = paramiko.SSHClient()
     ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-    ssh.connect(settings[4],port= settings[3], username=settings[5], password=settings[6])       
-    stdin, stdout, stderr = ssh.exec_command('docker stop mail_recorder')
-    time.sleep(10)
-    stdin, stdout, stderr = ssh.exec_command('mv ' + data_root_dir + ' /hdd/')
-
+    ssh.connect(settings[4],port= settings[3], username=settings[5], password=settings[6])
+    t = ssh.get_transport()
+    c = t.open_session()
+    c.exec_command('docker stop mail_recorder && mv ' + data_root_dir + ' /hdd/')   
         
 
 
@@ -159,4 +161,11 @@ entry_customer_code.pack()
 
 button_confirm.pack()
 
-window.mainloop()
+if __name__ == "__main__":
+    lastmod = int(os.path.getmtime('./main.py'))
+    print(lastmod)
+    os.system('git clone -b alpha https://git.apl.hongik.ac.kr/Ellis/mailsys_client.git')
+    if lastmod != int(os.path.getmtime('./main.py')):
+        pass
+    else:
+        window.mainloop()

requirements.txt

@@ -1 +1,2 @@
-paramiko==2.7.2
+paramiko==2.7.2
+GitPython==3.1.18

settings.json

@@ -2,8 +2,8 @@
     "window_name":"365mc M.A.I.L system Recorder",
     "window_position": "240x240+300+300",
     "branch_location": "서울",
-    "surgery_room_number": 803,
-    "ddns": "mailsys36.iptime.org",
+    "surgery_room_number": 1003,
+    "ddns": "mailsys36.asuscomm.com",
     "account": "mc365",
     "password": "tkadbrdhmc1!"
 }