Merge pull request #110 from mihaigalos/fix/interactive-mode

Fix interactive mode

Cargo.toml

@@ -54,7 +54,7 @@ strfmt = "0.2.1"
 tokio = { version = "1.20.1", features = ["full"] }
 tokio-util = {version="0.7.3", features = ["full"]}
 untildify = "0.1.1"
-url-parse = "0.5.6"
+url-parse = "0.5.7"
 uuid = { version = "1.1", features = ["v4"] }
 warpy = "0.2.5"
 

src/driver.rs

@@ -17,6 +17,7 @@ pub struct Options {
 }
 
 use url_parse::core::Parser;
+use url_parse::utils::Utils;
 
 use futures_util::FutureExt;
 
@@ -143,14 +144,8 @@ impl Driver {
     }
 
     pub async fn dispatch(input: &str, output: &str, options: &Options) -> io::Result<()> {
-        let path = &Self::navigate(input, options).await;
-        Driver::drive(
-            &(input.to_string() + "/" + path),
-            output,
-            options.silent,
-            &options.expected_sha256,
-        )
-        .await
+        let input = &Self::navigate(input, options).await;
+        Driver::drive(input, output, options.silent, &options.expected_sha256).await
     }
 
     async fn drive(
@@ -187,9 +182,14 @@ impl Driver {
             false => "".to_string(),
             true => Navi::run(input, crate::https::HTTPSHandler::get_links)
                 .await
-                .unwrap_or("".to_string()),
+                .unwrap_or("".to_string() + "/"),
         };
-        path
+
+        if path != "" {
+            let parser = Parser::new(None);
+            return Utils::canonicalize(&parser, input, &path);
+        }
+        input.to_string()
     }
 }