update

francis-du · Jan 20, 2021 · efec48f · efec48f
1 parent b124b26
commit efec48f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 16 deletions.
diff --git a/src/common/network.rs b/src/common/network.rs
@@ -31,7 +31,7 @@ impl HttpClient for ProxyClient {
     {
         let client = match std::env::var("PROXY") {
             Ok(proxy_url) => {
-                info!("proxy with {}", &proxy_url);
+                info!("Using proxy {}", &proxy_url);
                 let client;
                 if proxy_url.contains("https://") {
                     client = reqwest::Client::builder()
@@ -67,8 +67,8 @@ pub fn set_proxy() -> Result<(), reqwest::Error> {
     match json["proxy"].as_str() {
         None => {}
         Some(proxy) => {
-            std::env::set_var("PROXY", format!("http:://{}", &proxy));
-            info!("Setup proxy http://{}", proxy);
+            info!("Setup proxy http://{}", &proxy);
+            std::env::set_var("PROXY", format!("http://{}", proxy));
         }
     };
 

diff --git a/src/handler/get_handle.rs b/src/handler/get_handle.rs
@@ -2,7 +2,7 @@ use log::{error, info};
 use rand::{thread_rng, Rng};
 use serde::{Deserialize, Serialize};
 use tide::Request;
-use wikipedia::Wikipedia;
+use wikipedia::{Wikipedia};
 
 use crate::common::network::ProxyClient;
 use crate::common::semantics;
@@ -67,7 +67,7 @@ pub async fn search(req: Request<()>) -> tide::Result {
             let language = semantics::identify(query.words.clone());
             wiki.set_base_url(format!("https://{}.wikipedia.org/w/api.php", language).as_str());
         }
-        info!("Base URL => {}", wiki.base_url());
+        info!("Wikipedia api address {}", wiki.base_url());
 
         // data processing
         let words = query.words.as_str();
@@ -106,7 +106,7 @@ pub async fn search(req: Request<()>) -> tide::Result {
                 }
             }
             Err(err) => {
-                error!("search keyword {} wiki error - {:?}", words.clone(), err);
+                error!("Search keyword `{}` wiki error,type => {:?}", words.clone(), err);
             }
         };
         response.push(wiki_info);

diff --git a/src/main.rs b/src/main.rs
@@ -57,10 +57,6 @@ enum SubCommand {
 async fn main() -> tide::Result<()> {
     let opts: Opts = Opts::from_args();
 
-    if opts.proxy {
-        network::set_proxy()?;
-    }
-
     match opts.debug {
         true => {
             match Logger::default().level("debug").setup() {
@@ -81,6 +77,10 @@ async fn main() -> tide::Result<()> {
         }
     }
 
+    if opts.proxy {
+        network::set_proxy()?;
+    }
+
     match opts.subcmd {
         SubCommand::App => {
             app::APP::new()

diff --git a/src/static/index.html b/src/static/index.html
@@ -251,7 +251,7 @@ <h1>Wiki Search</h1>
         }
 
         function search(words) {
-            document.getElementById("main").style.display = "none";
+            // document.getElementById("main").style.display = "none";
             document.getElementById("loading").style.display = "";
 
             $.ajax({
@@ -276,11 +276,6 @@ <h1>Wiki Search</h1>
             });
         }
 
-        function switchSearch() {
-            document.getElementById("chart").style.display = "none";
-            document.getElementById("main").style.display = "";
-        }
-
         function draw(data) {
             document.getElementById("chart").style.height = "100%";
             document.getElementById("chart").style.width = "100%";