aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main.rs53
1 files changed, 21 insertions, 32 deletions
diff --git a/src/main.rs b/src/main.rs
index 82b0de0..d38d474 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -15,6 +15,9 @@ fn main() {
15 15
16 main.add_global_callback('q', |s| s.quit()); 16 main.add_global_callback('q', |s| s.quit());
17 main.add_global_callback('s', |s| search(s)); 17 main.add_global_callback('s', |s| search(s));
18 main.add_global_callback('t', |s| match s.pop_layer() {
19 _ => ()
20 });
18 21
19 main.run(); 22 main.run();
20} 23}
@@ -30,21 +33,7 @@ fn search(s: &mut Cursive){
30 }; 33 };
31 let choose_result = SelectView::<String>::new() 34 let choose_result = SelectView::<String>::new()
32 .with_all_str(result) 35 .with_all_str(result)
33 .on_submit(|s: &mut Cursive, name: &str| { 36 .on_submit(on_submit);
34 s.pop_layer();
35
36 let url = query_url_gen(&name.replace(" ", "_"));
37 let res = reqwest::get(&url).unwrap();
38
39 let mut extract = String::new();
40
41 match content::get_extract(res) {
42 Ok(x) => extract = x,
43 Err(e) => pop_error(s, content::handler(e))
44 };
45
46 s.add_layer(TextView::new(extract));
47 });
48 s.add_layer(Dialog::around(choose_result) 37 s.add_layer(Dialog::around(choose_result)
49 .title("Search Results")); 38 .title("Search Results"));
50 } 39 }
@@ -65,20 +54,20 @@ fn search(s: &mut Cursive){
65 })); 54 }));
66} 55}
67 56
68// fn on_submit(s: &mut Cursive, name: &String) { 57fn on_submit(s: &mut Cursive, name: &String) {
69// s.pop_layer(); 58 s.pop_layer();
70// 59
71// let title = name.replace(" ", "_"); 60 let title = name.replace(" ", "_");
72// let url = query_url_gen(&title); 61 let url = query_url_gen(&title);
73// let res = reqwest::get(&url).unwrap(); 62 let res = reqwest::get(&url).unwrap();
74// 63
75// let mut extract = String::new(); 64 let mut extract = String::new();
76// 65
77// match content::get_extract(res) { 66 match content::get_extract(res) {
78// 67
79// Ok(x) => extract = x, 68 Ok(x) => extract = x,
80// Err(e) => pop_error(s, content::handler(e)) 69 Err(e) => pop_error(s, content::handler(e))
81// }; 70 };
82// 71
83// s.add_layer(Dialog::around(TextView::new(extract))); 72 s.add_layer(TextView::new(extract));
84// } 73}