From c7fc121c7c17234ce6a010c2e248aacb0f6ee9a9 Mon Sep 17 00:00:00 2001 From: Sunshine Date: Wed, 11 Dec 2019 21:13:11 -0500 Subject: [PATCH 1/2] use clean URLs as hashmap keys --- .travis.yml | 6 +++--- src/http.rs | 14 +++++++++----- src/tests/utils.rs | 19 ++++++++++++++++++- src/utils.rs | 11 +++++++++++ 4 files changed, 41 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index d3753ef..3d6df91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,9 +16,9 @@ before_script: - rustup component add rustfmt script: - - cargo build --all --locked --verbose - - cargo test --all --locked --verbose - - cargo fmt --all -- --check + - cargo build --all --locked --verbose + - cargo test --all --locked --verbose + - cargo fmt --all -- --check jobs: allow_failures: diff --git a/src/http.rs b/src/http.rs index 813840d..cd245cf 100644 --- a/src/http.rs +++ b/src/http.rs @@ -1,7 +1,7 @@ use reqwest::header::CONTENT_TYPE; use reqwest::Client; use std::collections::HashMap; -use utils::{data_to_dataurl, is_data_url}; +use utils::{clean_url, data_to_dataurl, is_data_url}; pub fn retrieve_asset( cache: &mut HashMap, @@ -11,15 +11,17 @@ pub fn retrieve_asset( mime: &str, opt_silent: bool, ) -> Result<(String, String), reqwest::Error> { + let cache_key = clean_url(&url); + if is_data_url(&url).unwrap() { Ok((url.to_string(), url.to_string())) } else { - if cache.contains_key(&url.to_string()) { + if cache.contains_key(&cache_key) { // url is in cache if !opt_silent { eprintln!("{} (from cache)", &url); } - let data = cache.get(&url.to_string()).unwrap(); + let data = cache.get(&cache_key).unwrap(); Ok((data.to_string(), url.to_string())) } else { // url not in cache, we request it @@ -33,6 +35,8 @@ pub fn retrieve_asset( } } + let new_cache_key = clean_url(response.url().to_string()); + if as_dataurl { // Convert response into a byte array let mut data: Vec = vec![]; @@ -50,12 +54,12 @@ pub fn retrieve_asset( }; let dataurl = data_to_dataurl(&mimetype, &data); // insert in cache - cache.insert(response.url().to_string(), dataurl.to_string()); + cache.insert(new_cache_key, dataurl.to_string()); Ok((dataurl, response.url().to_string())) } else { let content = response.text().unwrap(); // insert in cache - cache.insert(response.url().to_string(), content.clone()); + cache.insert(new_cache_key, content.clone()); Ok((content, response.url().to_string())) } } diff --git a/src/tests/utils.rs b/src/tests/utils.rs index facfd9f..a49f7cb 100644 --- a/src/tests/utils.rs +++ b/src/tests/utils.rs @@ -1,5 +1,6 @@ use crate::utils::{ - data_to_dataurl, detect_mimetype, is_data_url, is_valid_url, resolve_url, url_has_protocol, + clean_url, data_to_dataurl, detect_mimetype, is_data_url, is_valid_url, resolve_url, + url_has_protocol, }; use url::ParseError; @@ -158,3 +159,19 @@ fn test_is_data_url() { assert!(!is_data_url("//kernel.org").unwrap_or(false)); assert!(!is_data_url("").unwrap_or(false)); } + +#[test] +fn test_clean_url() { + assert_eq!( + clean_url("https://somewhere.com/font.eot#iefix"), + "https://somewhere.com/font.eot" + ); + assert_eq!( + clean_url("https://somewhere.com/font.eot#"), + "https://somewhere.com/font.eot" + ); + assert_eq!( + clean_url("https://somewhere.com/font.eot?#"), + "https://somewhere.com/font.eot" + ); +} diff --git a/src/utils.rs b/src/utils.rs index 81a16e9..2f9dabe 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -196,3 +196,14 @@ pub fn resolve_css_imports( resolved_css } } + +pub fn clean_url>(url: T) -> String { + let mut result = Url::parse(url.as_ref()).unwrap(); + // Clear fragment + result.set_fragment(None); + // Get rid of stray question mark + if result.query() == Some("") { + result.set_query(None); + } + result.to_string() +} From 169b9657e5c711e397856c149c4a0ea1d52c29c5 Mon Sep 17 00:00:00 2001 From: Sunshine Date: Wed, 18 Dec 2019 11:48:37 -0500 Subject: [PATCH 2/2] ignore failures for both beta and nightly in the pipeline --- .travis.yml | 19 ++++++++++--------- appveyor.yml | 1 + 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3d6df91..a1cc380 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,23 +4,24 @@ cache: cargo sudo: false os: - - linux - - osx + - linux + - osx rust: - - stable - - beta - - nightly + - stable + - beta + - nightly before_script: - - rustup component add rustfmt + - rustup component add rustfmt script: - - cargo build --all --locked --verbose - - cargo test --all --locked --verbose - - cargo fmt --all -- --check + - cargo build --all --locked --verbose + - cargo test --all --locked --verbose + - cargo fmt --all -- --check jobs: allow_failures: + - rust: beta - rust: nightly fast_finish: true diff --git a/appveyor.yml b/appveyor.yml index 2b618fa..adf84e2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -94,6 +94,7 @@ environment: # or test failure in the matching channels/targets from failing the entire build. matrix: allow_failures: + - channel: beta - channel: nightly # If you only care about stable channel build failures, uncomment the following line: