Skip to content

Small code improvements #433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snshn merged 3 commits into from
Mar 10, 2025
Merged

Small code improvements #433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b5c1c9
lint code
snshn Mar 10, 2025
560750d
improve linting and formatting Makefile rules
snshn Mar 10, 2025
125aa8c
lint code again
snshn Mar 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,23 @@ clean:
@cargo clean
.PHONY: clean

format:
@cargo fmt --all --
.PHONY: format

format_check:
@cargo fmt --all -- --check
.PHONY: format

install:
@cargo install --force --locked --path .
.PHONY: install

lint:
@cargo fmt --all --
@cargo clippy --fix --allow-dirty
.PHONY: lint

lint_check:
@cargo fmt --all -- --check
@cargo clippy --
.PHONY: lint_check

Expand Down
30 changes: 14 additions & 16 deletions src/cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const TABLE: TableDefinition<&str, &[u8]> = TableDefinition::new("_");
impl Cache {
pub fn new(min_file_size: usize, db_file_path: Option<String>) -> Cache {
let mut cache = Cache {
min_file_size: min_file_size,
min_file_size,
metadata: HashMap::new(),
db: None,
db_ok: None,
Expand Down Expand Up @@ -52,14 +52,14 @@ impl Cache {
data: if self.db_ok.is_some() && self.db_ok.unwrap() {
None
} else {
Some((&*data.to_owned()).to_vec())
Some((data.to_owned()).to_vec())
},
media_type: Some(media_type.to_owned()),
charset: Some(charset),
};

if (self.db_ok.is_none() || !self.db_ok.unwrap()) || data.len() <= self.min_file_size {
cache_metadata_item.data = Some((&*data.to_owned()).to_vec());
cache_metadata_item.data = Some((data.to_owned()).to_vec());
} else {
match self.db.as_ref().unwrap().begin_write() {
Ok(write_txn) => {
Expand All @@ -71,7 +71,7 @@ impl Cache {
}
Err(..) => {
// Fall back to caching everything in memory
cache_metadata_item.data = Some((&*data.to_owned()).to_vec());
cache_metadata_item.data = Some((data.to_owned()).to_vec());
}
}
}
Expand All @@ -90,19 +90,17 @@ impl Cache {
metadata_item.media_type.as_ref().expect("").to_string(),
metadata_item.charset.as_ref().expect("").to_string(),
));
} else {
if self.db_ok.is_some() && self.db_ok.unwrap() {
let read_txn = self.db.as_ref().unwrap().begin_read()?;
let table = read_txn.open_table(TABLE)?;
let data = table.get(key)?;
let bytes = data.unwrap();
} else if self.db_ok.is_some() && self.db_ok.unwrap() {
let read_txn = self.db.as_ref().unwrap().begin_read()?;
let table = read_txn.open_table(TABLE)?;
let data = table.get(key)?;
let bytes = data.unwrap();

return Ok((
bytes.value().to_vec(),
metadata_item.media_type.as_ref().expect("").to_string(),
metadata_item.charset.as_ref().expect("").to_string(),
));
}
return Ok((
bytes.value().to_vec(),
metadata_item.media_type.as_ref().expect("").to_string(),
metadata_item.charset.as_ref().expect("").to_string(),
));
}
}

Expand Down
12 changes: 5 additions & 7 deletions src/cookies.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ impl Cookie {
}

pub fn matches_url(&self, url: &str) -> bool {
match Url::parse(&url) {
match Url::parse(url) {
Ok(url) => {
// Check protocol scheme
match url.scheme() {
Expand All @@ -56,10 +56,8 @@ impl Cookie {
{
return false;
}
} else {
if !url_host.eq_ignore_ascii_case(&self.domain) {
return false;
}
} else if !url_host.eq_ignore_ascii_case(&self.domain) {
return false;
}
} else {
return false;
Expand Down Expand Up @@ -105,9 +103,9 @@ pub fn parse_cookie_file_contents(
}
cookies.push(Cookie {
domain: fields.next().unwrap().to_string().to_lowercase(),
include_subdomains: fields.next().unwrap().to_string() == "TRUE",
include_subdomains: fields.next().unwrap() == "TRUE",
path: fields.next().unwrap().to_string(),
https_only: fields.next().unwrap().to_string() == "TRUE",
https_only: fields.next().unwrap() == "TRUE",
expires: fields.next().unwrap().parse::<u64>().unwrap(),
name: fields.next().unwrap().to_string(),
value: fields.next().unwrap().to_string(),
Expand Down
53 changes: 25 additions & 28 deletions src/core.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ pub struct Options {
pub user_agent: Option<String>,
}

const ANSI_COLOR_RED: &'static str = "\x1b[31m";
const ANSI_COLOR_RESET: &'static str = "\x1b[0m";
const ANSI_COLOR_RED: &str = "\x1b[31m";
const ANSI_COLOR_RESET: &str = "\x1b[0m";
const FILE_SIGNATURES: [[&[u8]; 2]; 18] = [
// Image
[b"GIF87a", b"image/gif"],
Expand Down Expand Up @@ -103,16 +103,16 @@ const PLAINTEXT_MEDIA_TYPES: &[&str] = &[
pub fn create_monolithic_document(
source: String,
options: &Options,
mut cache: &mut Option<Cache>,
cache: &mut Option<Cache>,
) -> Result<Vec<u8>, MonolithError> {
// Check if source was provided
if source.len() == 0 {
if source.is_empty() {
return Err(MonolithError::new("no target specified"));
}

// Check if custom encoding value is acceptable
if let Some(custom_encoding) = options.encoding.clone() {
if !Encoding::for_label_no_replacement(custom_encoding.as_bytes()).is_some() {
if Encoding::for_label_no_replacement(custom_encoding.as_bytes()).is_none() {
return Err(MonolithError::new(&format!(
"unknown encoding \"{}\"",
&custom_encoding
Expand All @@ -129,7 +129,7 @@ pub fn create_monolithic_document(
// Set default target URL to an empty data URL; the user can set it via --base-url
Url::parse("data:text/html,").unwrap()
}
target => match Url::parse(&target) {
target => match Url::parse(target) {
Ok(url) => match url.scheme() {
"data" | "file" | "http" | "https" => url,
unsupported_scheme => {
Expand All @@ -145,7 +145,7 @@ pub fn create_monolithic_document(
match path.exists() {
true => match path.is_file() {
true => {
let canonical_path = fs::canonicalize(&path).unwrap();
let canonical_path = fs::canonicalize(path).unwrap();
match Url::from_file_path(canonical_path) {
Ok(url) => url,
Err(_) => {
Expand Down Expand Up @@ -178,7 +178,7 @@ pub fn create_monolithic_document(
if let Some(user_agent) = &options.user_agent {
header_map.insert(
USER_AGENT,
HeaderValue::from_str(&user_agent).expect("Invalid User-Agent header specified"),
HeaderValue::from_str(user_agent).expect("Invalid User-Agent header specified"),
);
}
let client = Client::builder()
Expand Down Expand Up @@ -209,7 +209,7 @@ pub fn create_monolithic_document(
|| target_url.scheme() == "https"
|| target_url.scheme() == "data"
{
match retrieve_asset(&mut cache, &client, &target_url, &target_url, &options) {
match retrieve_asset(cache, &client, &target_url, &target_url, options) {
Ok((retrieved_data, final_url, media_type, charset)) => {
// Provide output as text (without processing it, the way browsers do)
if !media_type.eq_ignore_ascii_case("text/html")
Expand Down Expand Up @@ -283,7 +283,7 @@ pub fn create_monolithic_document(
// Relative paths could work for documents saved from filesystem
let path: &Path = Path::new(&custom_base_url);
if path.exists() {
match Url::from_file_path(fs::canonicalize(&path).unwrap()) {
match Url::from_file_path(fs::canonicalize(path).unwrap()) {
Ok(file_url) => {
base_url = file_url;
}
Expand All @@ -301,7 +301,7 @@ pub fn create_monolithic_document(
}

// Traverse through the document and embed remote assets
walk_and_embed_assets(&mut cache, &client, &base_url, &dom.document, &options);
walk_and_embed_assets(cache, &client, &base_url, &dom.document, options);

// Update or add new BASE element to reroute network requests and hash-links
if let Some(new_base_url) = options.base_url.clone() {
Expand All @@ -315,7 +315,7 @@ pub fn create_monolithic_document(
{
let favicon_ico_url: Url = resolve_url(&base_url, "/favicon.ico");

match retrieve_asset(&mut cache, &client, &target_url, &favicon_ico_url, &options) {
match retrieve_asset(cache, &client, &target_url, &favicon_ico_url, options) {
Ok((data, final_url, media_type, charset)) => {
let favicon_data_url: Url =
create_data_url(&media_type, &charset, &data, &final_url);
Expand All @@ -334,7 +334,7 @@ pub fn create_monolithic_document(
}

// Serialize DOM tree
let mut result: Vec<u8> = serialize_document(dom, document_encoding, &options);
let mut result: Vec<u8> = serialize_document(dom, document_encoding, options);

// Prepend metadata comment tag
if !options.no_metadata {
Expand Down Expand Up @@ -400,7 +400,7 @@ pub fn detect_media_type_by_file_name(filename: &str) -> String {
}

pub fn domain_is_within_domain(domain: &str, domain_to_match_against: &str) -> bool {
if domain_to_match_against.len() == 0 {
if domain_to_match_against.is_empty() {
return false;
}

Expand Down Expand Up @@ -444,7 +444,7 @@ pub fn domain_is_within_domain(domain: &str, domain_to_match_against: &str) -> b

let parts_match = domain_to_match_against_partial.eq_ignore_ascii_case(domain_partial);

if !parts_match && domain_to_match_against_partial.len() != 0 {
if !parts_match && !domain_to_match_against_partial.is_empty() {
ok = false;
break;
}
Expand All @@ -470,15 +470,13 @@ pub fn parse_content_type(content_type: &str) -> (String, String, bool) {
let mut i: i8 = 0;
for item in &content_type_items {
if i == 0 {
if item.trim().len() > 0 {
if !item.trim().is_empty() {
media_type = item.trim().to_string();
}
} else {
if item.trim().eq_ignore_ascii_case("base64") {
is_base64 = true;
} else if item.trim().starts_with("charset=") {
charset = item.trim().chars().skip(8).collect();
}
} else if item.trim().eq_ignore_ascii_case("base64") {
is_base64 = true;
} else if item.trim().starts_with("charset=") {
charset = item.trim().chars().skip(8).collect();
}

i += 1;
Expand All @@ -502,10 +500,9 @@ pub fn retrieve_asset(
if parent_url.scheme() != "file" {
if !options.silent {
eprintln!(
"{}{} ({}){}",
"{}{} (Security Error){}",
if options.no_color { "" } else { ANSI_COLOR_RED },
&url,
"Security Error",
if options.no_color {
""
} else {
Expand Down Expand Up @@ -541,7 +538,7 @@ pub fn retrieve_asset(
eprintln!("{}", &url);
}

let file_blob: Vec<u8> = fs::read(&path).expect("Unable to read file");
let file_blob: Vec<u8> = fs::read(path).expect("Unable to read file");

Ok((
file_blob.clone(),
Expand Down Expand Up @@ -586,7 +583,7 @@ pub fn retrieve_asset(
if let Some(domains) = &options.domains {
let domain_matches = domains
.iter()
.any(|d| domain_is_within_domain(url.host_str().unwrap(), &d.trim()));
.any(|d| domain_is_within_domain(url.host_str().unwrap(), d.trim()));
if (options.blacklist_domains && domain_matches)
|| (!options.blacklist_domains && !domain_matches)
{
Expand All @@ -596,7 +593,7 @@ pub fn retrieve_asset(

// URL not in cache, we retrieve the file
let mut headers = HeaderMap::new();
if options.cookies.len() > 0 {
if !options.cookies.is_empty() {
for cookie in &options.cookies {
if !cookie.is_expired() && cookie.matches_url(url.as_str()) {
let cookie_header_value: String = cookie.name.clone() + "=" + &cookie.value;
Expand Down Expand Up @@ -651,7 +648,7 @@ pub fn retrieve_asset(
.and_then(|header| header.to_str().ok())
.unwrap_or("");

let (media_type, charset, _is_base64) = parse_content_type(&content_type);
let (media_type, charset, _is_base64) = parse_content_type(content_type);

// Convert response into a byte array
let mut data: Vec<u8> = vec![];
Expand Down
Loading