regenerated and pseudo-integrated

2 files changed, 67 insertions, 24 deletions

diff --git a/rust/src/bin/fatcat-tokio.rs b/rust/src/bin/fatcat-tokio.rs
new file mode 100644
index 00000000..cc603908
--- /dev/null
+++ b/rust/src/bin/fatcat-tokio.rs
@@ -0,0 +1,67 @@
+//! Main binary entry point for fatcat implementation.
+
+#![allow(missing_docs)]
+
+// Imports required by this file.
+extern crate fatcat;
+extern crate fatcat_api;
+extern crate hyper;
+extern crate swagger;
+//extern crate openssl;
+//extern crate native_tls;
+extern crate tokio_proto;
+//extern crate tokio_tls;
+extern crate clap;
+
+//use openssl::x509::X509_FILETYPE_PEM;
+//use openssl::ssl::{SslAcceptorBuilder, SslMethod};
+//use openssl::error::ErrorStack;
+use clap::{App, Arg};
+use hyper::server::Http;
+use swagger::auth::AllowAllAuthenticator;
+use tokio_proto::TcpServer;
+
+// Builds an SSL implementation for Simple HTTPS from some hard-coded file names
+/*
+fn ssl() -> Result<SslAcceptorBuilder, ErrorStack> {
+    let mut ssl = SslAcceptorBuilder::mozilla_intermediate_raw(SslMethod::tls())?;
+
+    // Server authentication
+    ssl.set_private_key_file("examples/server-key.pem", X509_FILETYPE_PEM)?;
+    ssl.set_certificate_chain_file("examples/server-chain.pem")?;
+    ssl.check_private_key()?;
+
+    Ok(ssl)
+}
+*/
+
+/// Create custom server, wire it to the autogenerated router,
+/// and pass it to the web server.
+fn main() {
+    let matches = App::new("server")
+        .arg(
+            Arg::with_name("https")
+                .long("https")
+                .help("Whether to use HTTPS or not"),
+        )
+        .get_matches();
+
+    let service_fn = fatcat_api::server::auth::NewService::new(AllowAllAuthenticator::new(
+        fatcat::NewService,
+        "cosmo",
+    ));
+
+    let addr = "127.0.0.1:8080"
+        .parse()
+        .expect("Failed to parse bind address");
+    if matches.is_present("https") {
+        unimplemented!()
+    //let ssl = ssl().expect("Failed to load SSL keys");
+    //let builder: native_tls::TlsAcceptorBuilder = native_tls::backend::openssl::TlsAcceptorBuilderExt::from_openssl(ssl);
+    //let tls_acceptor = builder.build().expect("Failed to build TLS acceptor");
+    //TcpServer::new(tokio_tls::proto::Server::new(Http::new(), tls_acceptor), addr).serve(service_fn);
+    } else {
+        // Using HTTP
+        TcpServer::new(Http::new(), addr).serve(service_fn);
+    }
+}
diff --git a/rust/src/bin/show_creators.rs b/rust/src/bin/show_creators.rs
deleted file mode 100644
index 968d2542..00000000
--- a/rust/src/bin/show_creators.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-
-extern crate fatcat;
-extern crate diesel;
-
-use self::fatcat::*;
-use self::models::*;
-use self::diesel::prelude::*;
-
-fn main() {
-    use diesel_demo::database_schema::creators::dsl::*;
-
-    let connection = establish_connection();
-    let results = creators.filter(published.eq(true))
-        .limit(5)
-        .load::<CreatorRev>(&connection)
-        .expect("Error loading creators");
-
-    println!("Displaying {} creators", results.len());
-    for creator in results {
-        println!("{}", creator.title);
-        println!("----------\n");
-        println!("{}", creator.body);
-    }
-}