From 94a2fb40e59ac4a6ad91abc3083b2f1d286d1ae3 Mon Sep 17 00:00:00 2001
From: "anthony.boulmier" <anthony.boulmier@hesge.ch>
Date: Mon, 19 Sep 2016 14:38:01 +0200
Subject: [PATCH] correct way to check for cmd
---
SDI-tp1/soap/.soap-client.py.swp | Bin 12288 -> 12288 bytes
SDI-tp1/soap/.soap-server.py.swp | Bin 12288 -> 12288 bytes
SDI-tp1/soap/soap-client.py | 5 +---
SDI-tp1/soap/test | 43 -------------------------------
SDI-tp1/soap/testupload | 1 -
5 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 SDI-tp1/soap/test
delete mode 100644 SDI-tp1/soap/testupload
diff --git a/SDI-tp1/soap/.soap-client.py.swp b/SDI-tp1/soap/.soap-client.py.swp
index a0eefe4da911bc73235b4121abce3909b3a5d421..d9907ad2928ab17b24f37d2f76af56c9bf455001 100644
GIT binary patch
delta 327
zcmZojXh@JsG6?hZRWR2xVPIfj5MW@CxN|@Jr<?>sf6hdyNcLbCPyJvQ&y8jI%$r{_
ztMf4GZWa{y%+I@?lYyb03!+1JvY>)-{Y5?oh6{WQ3|)K-3}Ji>4554s45EAt49|HP
z7&h@TFs$WeU`XR-U@+rlU|{5BU|`^7V0g&Gz_6W%fngR8149xI1A{vc1A{&f0|N&S
z1H%Vy28Pqz3=C_z85oMW85o?o85lIV85p>^85r(!F)$q9Vqoa!Vqj?FVqj?HVi0F&
z;et3Rl#78un~Q<rKPLmjBhJl?EX<sf1+-Y?6!3z{0$Mtg1+=t4c(Z`kM5f9Ab@(RV
n&{;hBrY?w9o_tleWO9k#DqbChl+@x9TlMmc%;b#8vigq!<(5P3
delta 327
zcmZojXh@JsG6?hZRWR2xVPIfj5MW?PK7T*_u$%<Lrqqd2k<7&@nH#I}nI{^sY<|hC
z&ckT1Sy13JKd%WV1A_n;M1#R(K?URb`+N)x_xKnXX7DjEr0_8?Sn@G2Snx40{NQC^
zIK|7rFqM~qA%~ZNA)S|jL4lWn;R6o?!)_i1hDkgO3=?@67>alp7(93w7_@m97(R0|
zFx=o~U^u|dz%Y}WfuWI`fgy&Qfx(WOfq{jaf#C`l1H&#Z28KCY3=9Qa3=Dx>48jZw
zTnr52Tnr3iTnr4NTp;IdW@NGA++43Ukx8;RwIn_zH7&6;r=(b;JR>tX!&beZv_xHV
ilI}sQlIf`>>Y9@`>TZ?7rZp$C7$hC4w|laj{v!Y<^i5m<
diff --git a/SDI-tp1/soap/.soap-server.py.swp b/SDI-tp1/soap/.soap-server.py.swp
index 0be9d4e15e6e4bed4c04150016572675fdf81853..c8d9d2b208520ea8e793df6f52c8e0c0cb15aab9 100644
GIT binary patch
delta 44
zcmZojXh@hK!PK8KQ7V!>*u_&n*u`^WSurys!{&F)&t#aUac*X0Imoejx@IOD08cOu
Ar~m)}
delta 44
zcmZojXh@hK!L%uLqEsYvaZ2XKs$yo=(vmb?i_PztpUE)2;@r&0a*$*5bj?gQ0CCO`
AApigX
diff --git a/SDI-tp1/soap/soap-client.py b/SDI-tp1/soap/soap-client.py
index ddc4f8f..b3ea35e 100644
--- a/SDI-tp1/soap/soap-client.py
+++ b/SDI-tp1/soap/soap-client.py
@@ -9,21 +9,18 @@ SERVER_URL = 'http://127.0.0.1:8123'
if __name__ == '__main__':
parser = argparse.ArgumentParser(description='Simple SOAP FTP client')
- subparsers = parser.add_subparsers(help='sub-command help')
+ subparsers = parser.add_subparsers(help='sub-command help', dest='which')
parser_list = subparsers.add_parser('list',help='list directory')
parser_list.add_argument('directory', type=str)
- parser_list.set_defaults(which='list')
parser_get = subparsers.add_parser('get', help='get file')
parser_get.add_argument('file', type=str)
parser_get.add_argument('destination', type=str)
- parser_get.set_defaults(which='get')
parser_put = subparsers.add_parser('put', help='put file in ftp')
parser_put.add_argument('source', type=str)
parser_put.add_argument('destination', type=str)
- parser_put.set_defaults(which='put')
args = parser.parse_args()
server = SOAPpy.SOAPProxy(SERVER_URL)
diff --git a/SDI-tp1/soap/test b/SDI-tp1/soap/test
deleted file mode 100644
index 366f3b8..0000000
--- a/SDI-tp1/soap/test
+++ /dev/null
@@ -1,43 +0,0 @@
-import SOAPpy
-import sys
-import argparse
-from os.path import expanduser, join, abspath
-from os import listdir
-
-main_directory = None
-
-def list(relative_directory):
- global main_directory
- dirlist = listdir(join(main_directory, relative_directory))
- return (main_directory, dirlist)
-
-def get(relative_path):
- global main_directory
- with open(join(main_directory,relative_path), 'r') as f:
- payload = f.read()
- return (main_directory, relative_path, payload)
-
-def put(relative_path, payload):
- global main_directory
- try:
- with open(join(main_directory, relative_path), 'w+') as f:
- f.write(payload)
- except:
- return 'Error while writing file :('
- return 'File added successfuly!'
-
-def start_ftp(**kwargs):
- global main_directory
- main_directory = kwargs.get('directory')
- server = SOAPpy.SOAPServer(('0.0.0.0', kwargs.get('port')))
- server.registerFunction(list)
- server.registerFunction(get)
- server.registerFunction(put)
- server.serve_forever()
-
-if __name__ == '__main__':
- parser = argparse.ArgumentParser(description='Simple FTP server using SOAP')
- parser.add_argument('-p', '--port', type=int, required=True, help='Listening port')
- parser.add_argument('-d', '--directory', type=str, required=True, help='Home directory of the FTP')
- args = parser.parse_args()
- start_ftp(port=args.port, directory=abspath(args.directory))
diff --git a/SDI-tp1/soap/testupload b/SDI-tp1/soap/testupload
deleted file mode 100644
index 16b14f5..0000000
--- a/SDI-tp1/soap/testupload
+++ /dev/null
@@ -1 +0,0 @@
-test file
--
GitLab