diff --git a/SDI-tp1/soap/.soap-client.py.swp b/SDI-tp1/soap/.soap-client.py.swp index a0eefe4da911bc73235b4121abce3909b3a5d421..d9907ad2928ab17b24f37d2f76af56c9bf455001 100644 Binary files a/SDI-tp1/soap/.soap-client.py.swp and b/SDI-tp1/soap/.soap-client.py.swp differ diff --git a/SDI-tp1/soap/.soap-server.py.swp b/SDI-tp1/soap/.soap-server.py.swp index 0be9d4e15e6e4bed4c04150016572675fdf81853..c8d9d2b208520ea8e793df6f52c8e0c0cb15aab9 100644 Binary files a/SDI-tp1/soap/.soap-server.py.swp and b/SDI-tp1/soap/.soap-server.py.swp differ diff --git a/SDI-tp1/soap/soap-client.py b/SDI-tp1/soap/soap-client.py index ddc4f8f76f1ecc46ffa17cf706d6a3c9c6f4f557..b3ea35e4d635e02543312e195052519aa20b1951 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 366f3b8ec481345e45a2872626a27753faf96ed4..0000000000000000000000000000000000000000 --- 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 16b14f5da9e2fcd6f3f38cc9e584cef2f3c90ebe..0000000000000000000000000000000000000000 --- a/SDI-tp1/soap/testupload +++ /dev/null @@ -1 +0,0 @@ -test file