diff --git a/README.md b/README.md index 7b8433134dccbc6ff13a9e903d74c9ff52298035..8193b09c94cc4aca8efeffc652eab66afeccdfc6 100644 --- a/README.md +++ b/README.md @@ -95,7 +95,7 @@ curl -X GET -H "Authorization: Bearer valid-token-1" -H "X-FTP-User: anonymous" curl -X GET -H "Authorization: Bearer valid-token-1" -H "X-FTP-User: anonymous" -H "X-FTP-Pass: anonymous" http://localhost:8080/ftps/mon-ftp/fichier1 -o fichier1 ``` --download dossier : +- download dossier (ne fonctionne pas bien pour le moment je crois) : ```shell curl -X GET -H "Authorization: Bearer valid-token-1" -H "X-FTP-User: anonymous" -H "X-FTP-Pass: anonymous" http://localhost:8080/ftps/mon-ftp/dossier1 -o dossier1.zip @@ -107,7 +107,7 @@ unzip dossier1.zip curl -X PUT -H "Authorization: Bearer valid-token-1" -H "X-FTP-User: user" -H "X-FTP-Pass: password" --upload-file fichier2 http://localhost:8080/ftps/mon-ftp/fichier2 ``` -- upload dossier : +- upload dossier (ne fonctionne pas bien pour le moment je crois) : ```shell curl -X PUT -H "Authorization: Bearer valid-token-1" -H "X-FTP-User: user" -H "X-FTP-Pass: password" --upload-file dossier2.zip http://localhost:8080/ftps/mon-ftp/dossier2.zip @@ -117,6 +117,16 @@ curl -X POST -H "Authorization: Bearer valid-token-1" -H "X-FTP-User: user" -H " **Note comprise entre 12 et 13 si—en plus—le proxy FlopBox, permet de télécharger (download) et téléverser (upload) un gros fichier binaire (image, vidéo, etc.):** +- download fichier : +```shell +curl -X GET -H "Authorization: Bearer valid-token-1" -H "X-FTP-User: anonymous" -H "X-FTP-Pass: anonymous" http://localhost:8080/ftps/mon-ftp/image.png -o image.png +``` + +- upload fichier : +```shell +curl -X PUT -H "Authorization: Bearer valid-token-1" -H "X-FTP-User: user" -H "X-FTP-Pass: password" --upload-file image2.jpg http://localhost:8080/ftps/mon-ftp/image2.jpg +``` + **Note comprise entre 13 et 14 si—en plus—le proxy FlopBox permet de gérer plusieurs serveurs FTP différents (ajout, suppression, modification des serveurs):** - ajout : @@ -153,7 +163,7 @@ curl -X POST -H "X-Resource-Type: file" -H "Authorization: Bearer valid-token-1" - renommer : ```shell -curl -X POST -H "Authorization: Bearer valid-token-1" -H "X-FTP-User: user" -H "X-FTP-Pass: password" -H "Content-Type: text/plain" -d "nouveau_nom" http://localhost:8080/ftps/mon-ftp/dossier/rename +curl -X PUT -H "Authorization: Bearer valid-token-1" -H "X-FTP-User: user" -H "X-FTP-Pass: password" -H "Content-Type: text/plain" -d "nouveau_nom" http://localhost:8080/ftps/mon-ftp/dossier/rename ``` - supprimer dossier/fichier : diff --git a/dossier_serveur_ftp/fichier2 b/dossier_serveur_ftp/fichier2 deleted file mode 100644 index deae8dcdc3f3a6d87cbc145dec37ea4b711bf4f4..0000000000000000000000000000000000000000 --- a/dossier_serveur_ftp/fichier2 +++ /dev/null @@ -1 +0,0 @@ -FICHIER2 diff --git a/dossier_serveur_ftp/image.png b/dossier_serveur_ftp/image.png new file mode 100644 index 0000000000000000000000000000000000000000..8741baa19d02a003db73c33bd779a324bc1a57fa Binary files /dev/null and b/dossier_serveur_ftp/image.png differ diff --git a/src/main/java/fil/sr2/flopbox/FTPResource.java b/src/main/java/fil/sr2/flopbox/FTPResource.java index 5c48aca5d3e5be82b0a2012b322fa4820e36e275..3f87922f536a997f3e824253c6f578986ae698b5 100644 --- a/src/main/java/fil/sr2/flopbox/FTPResource.java +++ b/src/main/java/fil/sr2/flopbox/FTPResource.java @@ -224,8 +224,7 @@ public class FTPResource { } } - // POST pour renommer une ressource - @POST + @PUT @Path("/{alias}/{path: .+}/rename") @Consumes(MediaType.TEXT_PLAIN) public Response renameResource(