Merge pull request #12 from pickfire/master

My first pull request

2 files changed, 44 insertions, 39 deletions

diff --git a/src/content.rs b/src/content.rs
index 0f81149..ed1d8c5 100644
--- a/src/content.rs
+++ b/src/content.rs
@@ -9,37 +9,36 @@ use cursive::theme::Effect;
 use cursive::utils::markup::StyledString;
 use cursive::views::Dialog;
 use cursive::Cursive;
+use reqwest::Url;
 use serde_json::Value;
 use CONFIGURATION;
 
-pub fn query_url_gen(title: &str) -> String {
-    // query config
-    let mut url = CONFIGURATION.wiki_url.clone();
-    url.push_str("/w/api.php?");
-    url.push_str("action=query&");
-    url.push_str("format=json&");
-    url.push_str("prop=extracts%7Clinks&");
-    url.push_str("indexpageids=1&");
-    url.push_str("titles=");
-    url.push_str(&urlencoding::encode(title));
-    url.push_str("&");
-    url.push_str("redirects=1&");
-    url.push_str("pllimit=100&");
-    url.push_str("explaintext=1");
-    url
+pub fn query_url_gen(title: &str) -> Url {
+    Url::parse_with_params(
+        &(CONFIGURATION.wiki_url.clone() + "/w/api.php"),
+        &[
+            ("action", "query"),
+            ("format", "json"),
+            ("prop", "extracts|links"),
+            ("indexpageids", "1"),
+            ("titles", &urlencoding::encode(&title.replace(" ", "_"))),
+            ("redirects", "1"),
+            ("pllimit", "100"),
+            ("explaintext", "1"),
+        ],
+    ).unwrap()
 }
 
-pub fn search_url_gen(search: &str) -> String {
-    // search config
-    let mut url = CONFIGURATION.wiki_url.clone();
-    url.push_str("/w/api.php?");
-    url.push_str("action=opensearch&");
-    url.push_str("format=json&");
-    url.push_str("search=");
-    url.push_str(&urlencoding::encode(&search));
-    url.push_str("&");
-    url.push_str("limit=20");
-    url
+pub fn search_url_gen(search: &str) -> Url {
+    Url::parse_with_params(
+        &(CONFIGURATION.wiki_url.clone() + "/w/api.php"),
+        &[
+            ("action", "opensearch"),
+            ("format", "json"),
+            ("search", &urlencoding::encode(search)),
+            ("limit", "20"),
+        ],
+    ).unwrap()
 }
 
 pub fn get_extract(v: &Value) -> Result<String, reqwest::Error> {
diff --git a/src/main.rs b/src/main.rs
index 85d25e7..25e6e32 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,7 +6,9 @@ extern crate serde_json;
 extern crate lazy_static;
 
 use cursive::traits::*;
-use cursive::views::{Dialog, DummyView, EditView, LinearLayout, OnEventView, SelectView, TextView};
+use cursive::views::{
+    Dialog, DummyView, EditView, LinearLayout, OnEventView, SelectView, TextView,
+};
 use cursive::Cursive;
 
 use serde_json::Value;
@@ -28,8 +30,6 @@ lazy_static! {
 }
 
 fn main() {
-    parse_arguments();
-
     // Initial setup
     let mut main = Cursive::default();
 
@@ -39,6 +39,12 @@ fn main() {
     main.add_global_callback('q', |s| s.quit());
     main.add_global_callback('s', |s| search(s));
 
+    main.add_layer(TextView::new(
+        "Hit s to search
+Hit q to quit
+Hit t to pop layer",
+    ));
+
     main.run();
 }
 
@@ -66,7 +72,10 @@ fn parse_arguments() -> Configuration {
         std::process::exit(0);
     }
 
-    let lang = matches.value_of("lang").unwrap_or("en").to_string();
+    let lang = matches
+        .value_of("lang")
+        .or(option_env!("LANG").map(|s| s.split_at(2).0))
+        .unwrap_or("en");
     let wiki_url = matches
         .value_of("URL")
         .unwrap_or(&format!("https://{}.wikipedia.org", lang))
@@ -104,7 +113,8 @@ fn search(s: &mut Cursive) {
         Dialog::around(EditView::new().on_submit(go).with_id("search"))
             .title("Search for a page")
             .button("Go", |s| {
-                let search_txt = s.call_on_id("search", |v: &mut EditView| v.get_content())
+                let search_txt = s
+                    .call_on_id("search", |v: &mut EditView| v.get_content())
                     .unwrap();
                 go(s, &search_txt);
             })
@@ -117,16 +127,12 @@ fn search(s: &mut Cursive) {
 
 fn on_submit(s: &mut Cursive, name: &str) {
     // get article data
-    let heading: String = name.to_string();
-    let url = query_url_gen(&name.replace(" ", "_"));
+    let url = query_url_gen(name);
     let mut extract = String::new();
     let mut link_vec: Vec<String> = vec![];
 
-    let mut res = reqwest::get(&url).unwrap();
-    let v: Value = match serde_json::from_str(&res.text().unwrap()) {
-        Ok(x) => x,
-        Err(x) => panic!("Failed to parse json\nReceived error {}", x),
-    };
+    let mut res = reqwest::get(url).unwrap();
+    let v: Value = res.json().expect("Failed to parse json");
 
     match get_extract(&v) {
         Ok(x) => extract = x,
@@ -156,6 +162,6 @@ fn on_submit(s: &mut Cursive, name: &str) {
             ).on_event('t', |s| match s.pop_layer() {
                 _ => (),
             }),
-        ).title(heading),
+        ).title(name),
     );
 }