Refactor into content.rs

1 files changed, 8 insertions, 20 deletions

diff --git a/src/main.rs b/src/main.rs
index 951c94c..1573cdb 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,33 +3,21 @@ extern crate serde_json;
 
 use serde_json::Value;
 
-fn main() {
-    println!("{}", get_extract("scale"));
-}
+pub mod content;
 
-fn get_extract(title: &str) -> String {
+fn main() {
     let url = format!("https://en.wikipedia.org/w/api.php?action=query&format=json&prop=extracts&list=&meta=&indexpageids=1&continue=%7C%7Cimageinfo&titles={}&exlimit=20&explaintext=1&exsectionformat=plain", title);
     let res = reqwest::get(&url);
 
     match res {
-        Ok(mut res) => {
+        Ok(res) => {
             if res.status().is_success() {
-                let mut v: Value = serde_json::from_str(&res.text().unwrap()).unwrap();
-
-                // Fetch page and pageids of requested title(s)
-                let pageid = &v["query"]["pageids"][0];
-                let pageid_str = match pageid {
-                    Value::String(id) => id,
-                    _ => panic!("wut"),
-                };
-
-                format!("{:#}", &v["query"]["pages"][pageid_str]["extract"])
-            } else {
-                format!("Error while parsing url.\nRecieved {}", res.status())
+                content::get_extract("")
             }
-        },
-        Err(_) => {
-            format!("Failed to parse URL")
+        }
+
+        Err(_) {
+            panic!("Oh no!");
         }
     }
 }