Merge branch 'master' of github.com:actix/examples

README.md

@@ -6,6 +6,7 @@ A curated list of examples related to actix.
 * [kriry.com](http://kriry.com/) : Explore-Interactive net. [source](https://github.com/kriry/waler)
 * [Roseline](https://github.com/DoumanAsh/roseline.rs) : A personal web site and discord & IRC bot to access simple SQLite database. Demonstrates usage of various actix and actix-web concepts.
 * [Actix Auth Server](https://hgill.io/posts/auth-microservice-rust-actix-web-diesel-complete-tutorial-part-1/) : Auth web micro-service with rust using actix-web - complete tutorial. See code in [examples/simple-auth-server](https://github.com/actix/examples/tree/master/simple-auth-server)
+
 ## Contribute
 
 Welcome to contribute !

multipart/.gitignore

@@ -0,0 +1,3 @@
+/target
+**/*.rs.bk
+/tmp

multipart/Cargo.toml

@@ -1,17 +1,15 @@
 [package]
 name = "multipart-example"
-version = "0.1.0"
-authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
-workspace = ".."
+version = "0.3.0"
+authors = ["Bevan Hunt <bevan@bevanhunt.com>"]
 edition = "2018"
-
-[[bin]]
-name = "multipart"
-path = "src/main.rs"
+license = "MIT"
+description = "Simple file uploader in Actix Web with Async/Await"
+keywords = ["actix", "actix-web", "multipart"]
+repository = "https://github.com/actix/examples"
+readme = "README.md"
 
 [dependencies]
-actix-web = "1.0.0"
-actix-multipart = "0.1.1"
-
-env_logger = "0.6"
-futures = "0.1.25"
+futures = "0.3.1"
+actix-multipart = "0.2.0-alpha.3"
+actix-web = "2.0.0-alpha.3"

multipart/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) [2019] [Bevan Hunt]
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

multipart/README.md

@@ -1,25 +1,11 @@
-# multipart
+# Actix Web File Upload with Async/Await
 
-Multipart's `Getting Started` guide for Actix web
+### Run
 
-## Usage
+``` open web browser to localhost:3000 and upload file(s) ```
 
-### server
+### Result
 
-```bash
-cd examples/multipart
-cargo run (or ``cargo watch -x run``)
-# Started http server: 127.0.0.1:8080
-```
-
-### browser
-
-- go to ``http://localhost:8080``
-- upload file
-- you should see the action reflected in server console
-
-### client (optional)
-
-- ``./client.sh``
-- you must see in server console multipart fields
+``` file(s) will show up in ./tmp in the same directory as the running process ```
 
+Note: this is a naive implementation and will panic on any error

multipart/client.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-function SubmitFile () {
-  curl -X POST \
-  -H "Content-Type: multipart/related" \
-  --form "data=@example.png;type=image/png" http://localhost:8080
-}
-
-SubmitFile & SubmitFile & SubmitFile &
-SubmitFile & SubmitFile & SubmitFile &
-SubmitFile & SubmitFile & SubmitFile

multipart/rust-toolchain

@@ -0,0 +1 @@
+nightly-2019-11-25

multipart/src/main.rs

@@ -1,67 +1,27 @@
-use std::cell::Cell;
-use std::fs;
 use std::io::Write;
+use actix_multipart::Multipart;
+use actix_web::{middleware, web, App, Error, HttpResponse, HttpServer};
+use futures::{StreamExt};
 
-use actix_multipart::{Field, Multipart, MultipartError};
-use actix_web::{error, middleware, web, App, Error, HttpResponse, HttpServer};
-use futures::future::{err, Either};
-use futures::{Future, Stream};
-
-pub struct AppState {
-    pub counter: Cell<usize>,
-}
-
-pub fn save_file(field: Field) -> impl Future<Item = i64, Error = Error> {
-    let file_path_string = "upload.png";
-    let file = match fs::File::create(file_path_string) {
-        Ok(file) => file,
-        Err(e) => return Either::A(err(error::ErrorInternalServerError(e))),
-    };
-    Either::B(
-        field
-            .fold((file, 0i64), move |(mut file, mut acc), bytes| {
-                // fs operations are blocking, we have to execute writes
-                // on threadpool
-                web::block(move || {
-                    file.write_all(bytes.as_ref()).map_err(|e| {
-                        println!("file.write_all failed: {:?}", e);
-                        MultipartError::Payload(error::PayloadError::Io(e))
-                    })?;
-                    acc += bytes.len() as i64;
-                    Ok((file, acc))
-                })
-                .map_err(|e: error::BlockingError<MultipartError>| {
-                    match e {
-                        error::BlockingError::Error(e) => e,
-                        error::BlockingError::Canceled => MultipartError::Incomplete,
-                    }
-                })
-            })
-            .map(|(_, acc)| acc)
-            .map_err(|e| {
-                println!("save_file failed, {:?}", e);
-                error::ErrorInternalServerError(e)
-            }),
-    )
-}
-
-pub fn upload(
-    multipart: Multipart,
-    counter: web::Data<Cell<usize>>,
-) -> impl Future<Item = HttpResponse, Error = Error> {
-    counter.set(counter.get() + 1);
-    println!("{:?}", counter.get());
-
-    multipart
-        .map_err(error::ErrorInternalServerError)
-        .map(|field| save_file(field).into_stream())
-        .flatten()
-        .collect()
-        .map(|sizes| HttpResponse::Ok().json(sizes))
-        .map_err(|e| {
-            println!("failed: {}", e);
-            e
-        })
+async fn save_file(mut payload: Multipart) -> Result<HttpResponse, Error> {
+    // iterate over multipart stream
+    while let Some(item) = payload.next().await {
+        let mut field = item?;
+        let content_type = field.content_disposition().unwrap();
+        let filename = content_type.get_filename().unwrap();
+        let filepath = format!("./tmp/{}", filename);
+        let mut f = std::fs::File::create(filepath).unwrap();
+        // Field in turn is stream of *Bytes* object
+        while let Some(chunk) = field.next().await {
+            let data = chunk.unwrap();
+            let mut pos = 0;
+            while pos < data.len() {
+                let bytes_written = f.write(&data[pos..])?;
+                pos += bytes_written;
+            }
+        }
+    }
+    Ok(HttpResponse::Ok().into())
 }
 
 fn index() -> HttpResponse {
@@ -69,7 +29,7 @@ fn index() -> HttpResponse {
         <head><title>Upload Test</title></head>
         <body>
             <form target="/" method="post" enctype="multipart/form-data">
-                <input type="file" name="file"/>
+                <input type="file" multiple name="file"/>
                 <input type="submit" value="Submit"></button>
             </form>
         </body>
@@ -80,18 +40,17 @@ fn index() -> HttpResponse {
 
 fn main() -> std::io::Result<()> {
     std::env::set_var("RUST_LOG", "actix_server=info,actix_web=info");
-    env_logger::init();
-
+    std::fs::create_dir_all("./tmp").unwrap();
+    let ip = "0.0.0.0:3000";
     HttpServer::new(|| {
-        App::new()
-            .data(Cell::new(0usize))
-            .wrap(middleware::Logger::default())
-            .service(
-                web::resource("/")
-                    .route(web::get().to(index))
-                    .route(web::post().to_async(upload)),
-            )
+    App::new()
+    .wrap(middleware::Logger::default())
+    .service(
+        web::resource("/")
+            .route(web::get().to(index))
+            .route(web::post().to(save_file)),
+        )
     })
-    .bind("127.0.0.1:8080")?
+    .bind(ip)?
     .run()
 }