From af60949e65828f97d1f390e8474565b3026bd58b Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordanpetridis@protonmail.com>
Date: Tue, 3 Oct 2017 14:59:51 +0300
Subject: [PATCH] Merged cli.rs to main.rs

---
 src/cli.rs  | 27 ---------------------------
 src/lib.rs  |  5 -----
 src/main.rs | 37 ++++++++++++++++++++++++++++++++++---
 3 files changed, 34 insertions(+), 35 deletions(-)
 delete mode 100644 src/cli.rs

diff --git a/src/cli.rs b/src/cli.rs
deleted file mode 100644
index c5bb401..0000000
--- a/src/cli.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use structopt::StructOpt;
-use loggerv;
-use errors::*;
-use downloader;
-
-#[derive(StructOpt, Debug)]
-#[structopt(name = "example", about = "An example of StructOpt usage.")]
-struct Opt {
-    /// Enable logging, use multiple `v`s to increase verbosity
-    #[structopt(short = "v", long = "verbose")]
-    verbosity: u64,
-}
-
-pub fn run() -> Result<()> {
-    let args = Opt::from_args();
-
-    loggerv::init_with_verbosity(args.verbosity)?;
-
-    let foo = args;
-    info!("{:?}", foo);
-
-    ::init()?;
-    let db = ::establish_connection();
-    downloader::latest_dl(&db, 2)?;
-
-    Ok(())
-}
diff --git a/src/lib.rs b/src/lib.rs
index 58f1902..54b99d4 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,9 +1,5 @@
 #![recursion_limit = "1024"]
 
-extern crate structopt;
-#[macro_use]
-extern crate structopt_derive;
-
 #[macro_use]
 extern crate error_chain;
 
@@ -29,7 +25,6 @@ extern crate rss;
 extern crate time;
 extern crate xdg;
 
-pub mod cli;
 pub mod schema;
 pub mod models;
 pub mod feedparser;
diff --git a/src/main.rs b/src/main.rs
index 02a118a..94e1074 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,10 +1,41 @@
-#![recursion_limit = "1024"]
+#[macro_use]
+extern crate log;
+extern crate loggerv;
+
+#[macro_use]
+extern crate structopt_derive;
+extern crate structopt;
 
 #[macro_use]
 extern crate error_chain;
+
 extern crate hammond;
 
+use structopt::StructOpt;
+use hammond::errors::*;
+use hammond::downloader;
 
-use hammond::cli::run;
+#[derive(StructOpt, Debug)]
+#[structopt(name = "example", about = "An example of StructOpt usage.")]
+struct Opt {
+    /// Enable logging, use multiple `v`s to increase verbosity
+    #[structopt(short = "v", long = "verbose")]
+    verbosity: u64,
+}
 
-quick_main!(run);
+fn run() -> Result<()> {
+    let args = Opt::from_args();
+
+    loggerv::init_with_verbosity(args.verbosity)?;
+
+    let foo = args;
+    info!("{:?}", foo);
+
+    hammond::init()?;
+    let db = hammond::establish_connection();
+    downloader::latest_dl(&db, 2)?;
+
+    Ok(())
+}
+
+quick_main!(run);
\ No newline at end of file