Skip to content

Commit

Permalink
add more code for clap v4
Browse files Browse the repository at this point in the history
  • Loading branch information
@snshn
snshn committed Jun 24, 2024
1 parent 40acdd5 commit e5e39a4
Show file tree
Hide file tree
Showing 4 changed files with 332 additions and 235 deletions.
293 changes: 293 additions & 0 deletions src/args.rs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,293 @@
use clap::{Arg, Args, ArgAction, Command, Parser, Subcommand, ValueEnum};
use std::env;

use crate::opts::Options;

const ASCII: &'static str = " \
_____ ______________ __________ ___________________ ___
| \\ / \\ | | | | | |
| \\_/ __ \\_| __ | | ___ ___ |__| |
| | | | | | | | | | | |
| |\\ /| |__| _ |__| |____| | | | | __ |
| | \\___/ | | \\ | | | | | | |
|___| |__________| \\_____________________| |___| |___| |___|
";

/*
#[derive(Parser, Debug)]
#[command(
version,
// author = format!("\n{}\n\n", env!("CARGO_PKG_AUTHORS").replace(':', "\n")).as_str(),
// about = format!("{}\n{}", ASCII, env!("CARGO_PKG_DESCRIPTION")).as_str()
)]
pub struct Options {
/// Remove audio sources
#[arg(short = 'a', long = "no-audio")]
pub no_audio: bool,
/// Set custom base URL
#[arg(short = 'b', long = "base-url")]
pub base_url: Option<String>,
/// Treat list of specified domains as blacklist
#[arg(short = 'B', long = "blacklist-domains")]
pub blacklist_domains: bool,
/// Remove CSS
#[arg(short = 'c', long = "no-css")]
pub no_css: bool,
/// Specify cookie file
#[arg(short = 'C', long = "cookies")]
pub cookie_file: Option<String>,
/// Specify domains to use for white/black-listing
#[arg(short = 'd', long = "domains")]
pub domains: Option<Vec<String>>,
/// Ignore network errors
#[arg(short = 'e', long = "ignore-errors")]
pub ignore_errors: bool,
/// Enforce custom charset
#[arg(short = 'E', long = "encoding")]
pub encoding: Option<String>,
/// Remove frames and iframes
#[arg(short = 'f', long = "no-frames")]
pub no_frames: bool,
/// Remove fonts
#[arg(short = 'F', long = "no-fonts")]
pub no_fonts: bool,
/// Remove images
#[arg(short = 'i', long = "no-images")]
pub no_images: bool,
/// Cut off document from the Internet
#[arg(short = 'I', long = "isolate")]
pub isolate: bool,
/// Remove JavaScript
#[arg(short = 'j', long = "no-js")]
pub no_js: bool,
/// Allow invalid X.509 (TLS) certificates
#[arg(short = 'k', long = "insecure")]
pub insecure: bool,
/// Exclude timestamp and source information
#[arg(short = 'M', long = "no-metadata")]
pub no_metadata: bool,
/// Replace NOSCRIPT elements with their contents
#[arg(short = 'n', long = "unwrap-noscript")]
pub unwrap_noscript: bool,
/// Write output to <file>, use - for STDOUT
#[arg(short = 'o', long = "output", default_value = "-")]
pub output: String,
/// Suppress verbosity
#[arg(short = 's', long = "silent")]
pub silent: bool,
/// Adjust network request timeout
// #[arg(short = 't', long = "timeout", default_value = format!("{}", DEFAULT_NETWORK_TIMEOUT).as_str())]
#[arg(short = 't', long = "timeout", default_value = "60")]
pub timeout: u64,
/// Set custom User-Agent string
#[arg(short = 'u', long = "user-agent", default_value = "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:73.0) Gecko/20100101 Firefox/73.0")]
pub user_agent: String,
/// Remove video sources
#[arg(short = 'v', long = "no-video")]
pub no_video: bool,
/// URL or file path, use - for STDIN
#[arg(name = "target", default_value = "-")]
pub target: String,
*/

/*
/// Files to cat
#[arg(name = "FILES", default_value = "-")]
files: Vec<String>,
/// Print line numbers
#[arg(short, long = "number")]
number_lines: bool,
/// Print line numbers for nonblank lines
#[arg(short = 'b', long = "number-nonblank", conflicts_with = "number_lines")]
number_nonblank_lines: bool,
/// Show $ at the end of each line
#[arg(short = 'E', long = "show-ends")]
show_ends: bool,
*/
// }

impl Options {
pub fn from_args() -> Options {
/*
let app = App::new(env!("CARGO_PKG_NAME"))
.version(env!("CARGO_PKG_VERSION"))
.author(format!("\n{}\n\n", env!("CARGO_PKG_AUTHORS").replace(':', "\n")).as_str())
.about(format!("{}\n{}", ASCII, env!("CARGO_PKG_DESCRIPTION")).as_str())
.args_from_usage("-a, --no-audio 'Remove audio sources'")
.args_from_usage("-b, --base-url=[http://localhost/] 'Set custom base URL'")
.args_from_usage(
"-B, --blacklist-domains 'Treat list of specified domains as blacklist'",
)
.args_from_usage("-c, --no-css 'Remove CSS'")
.args_from_usage("-C, --cookies=[cookies.txt] 'Specify cookie file'")
.arg(
Arg::with_name("domains")
.short('d')
.long("domain")
.takes_value(true)
.value_name("example.com")
.action(ArgAction::Append)
.help("Specify domains to use for white/black-listing"),
)
.args_from_usage("-e, --ignore-errors 'Ignore network errors'")
.args_from_usage("-E, --encoding=[UTF-8] 'Enforce custom charset'")
.args_from_usage("-f, --no-frames 'Remove frames and iframes'")
.args_from_usage("-F, --no-fonts 'Remove fonts'")
.args_from_usage("-i, --no-images 'Remove images'")
.args_from_usage("-I, --isolate 'Cut off document from the Internet'")
.args_from_usage("-j, --no-js 'Remove JavaScript'")
.args_from_usage("-k, --insecure 'Allow invalid X.509 (TLS) certificates'")
.args_from_usage("-M, --no-metadata 'Exclude timestamp and source information'")
.args_from_usage(
"-n, --unwrap-noscript 'Replace NOSCRIPT elements with their contents'",
)
.args_from_usage(
"-o, --output=[document.html] 'Write output to <file>, use - for STDOUT'",
)
.args_from_usage("-s, --silent 'Suppress verbosity'")
.args_from_usage("-t, --timeout=[60] 'Adjust network request timeout'")
.args_from_usage("-u, --user-agent=[Firefox] 'Set custom User-Agent string'")
.args_from_usage("-v, --no-video 'Remove video sources'")
.arg(
Arg::with_name("target")
.required(true)
.takes_value(true)
.index(1)
.help("URL or file path, use - for STDIN"),
)
.get_matches();
*/

let matches = Command::new(env!("CARGO_PKG_NAME"))
.about(format!("{}\n{}", ASCII, env!("CARGO_PKG_DESCRIPTION")).as_str())
.version(env!("CARGO_PKG_VERSION"))
.subcommand_required(false)
.arg_required_else_help(false)
.arg(
Arg::new("no_audio")
.short('a')
.long("no-audio")
.help("Remove audio sources")
)
.arg(Arg::from_usage("-b, --base-url=[http://localhost/] 'Set custom base URL'"))
.arg(
Arg::from(
"-B, --blacklist-domains 'Treat list of specified domains as blacklist'",
)
)
.arg(Arg::from("-c, --no-css 'Remove CSS'"))
.arg(Arg::from("-C, --cookies=[cookies.txt] 'Specify cookie file'"))
.arg(
Arg::new("domains")
.short('d')
.long("domain")
.exclusive(true)
// .num_args(1)
.value_name("example.com")
.action(ArgAction::Set)
.help("Specify domains to use for white/black-listing"),
)
.arg(Arg::from("-e, --ignore-errors 'Ignore network errors'"))
.arg(Arg::from("-E, --encoding=[UTF-8] 'Enforce custom charset'"))
.arg(Arg::from("-f, --no-frames 'Remove frames and iframes'"))
.arg(Arg::from("-F, --no-fonts 'Remove fonts'"))
.arg(Arg::from("-i, --no-images 'Remove images'"))
.arg(Arg::from("-I, --isolate 'Cut off document from the Internet'"))
.arg(Arg::from("-j, --no-js 'Remove JavaScript'"))
.arg(Arg::from("-k, --insecure 'Allow invalid X.509 (TLS) certificates'"))
.arg(Arg::from("-M, --no-metadata 'Exclude timestamp and source information'"))
.arg(
Arg::from(
"-n, --unwrap-noscript 'Replace NOSCRIPT elements with their contents'",
)
)
.arg(
Arg::from(
"-o, --output=[document.html] 'Write output to <file>, use - for STDOUT'",
)
)
.arg(Arg::from("-s, --silent 'Suppress verbosity'"))
.arg(Arg::from("-t, --timeout=[60] 'Adjust network request timeout'"))
.arg(Arg::from("-u, --user-agent=[Firefox] 'Set custom User-Agent string'"))
.arg(Arg::from("-v, --no-video 'Remove video sources'"))
.arg(
Arg::new("target")
.required(true)
.num_args(1)
.index(1)
.help("URL or file path, use - for STDIN"),
)
.get_matches();

let mut options: Options = Options {
..Default::default()
};

// Process the command
options.target = matches
.value_of("target")
.expect("please set target")
.to_string();
options.no_audio = matches.is_present("no-audio");
if let Some(base_url) = matches.value_of("base-url") {
options.base_url = Some(base_url.to_string());
}
options.blacklist_domains = matches.is_present("blacklist-domains");
options.no_css = matches.is_present("no-css");
if let Some(cookie_file) = matches.value_of("cookies") {
options.cookie_file = Some(cookie_file.to_string());
}
if let Some(encoding) = matches.value_of("encoding") {
options.encoding = Some(encoding.to_string());
}
if let Some(domains) = matches.get_many::<String>("domains") {
let list_of_domains: Vec<String> = domains.map(|v| v.clone()).collect::<Vec<_>>();
options.domains = Some(list_of_domains);
}
options.ignore_errors = matches.is_present("ignore-errors");
options.no_frames = matches.is_present("no-frames");
options.no_fonts = matches.is_present("no-fonts");
options.no_images = matches.is_present("no-images");
options.isolate = matches.is_present("isolate");
options.no_js = matches.is_present("no-js");
options.insecure = matches.is_present("insecure");
options.no_metadata = matches.is_present("no-metadata");
options.output = matches.value_of("output").unwrap_or("").to_string();
options.silent = matches.is_present("silent");
options.timeout = matches
.value_of("timeout")
.unwrap_or(&DEFAULT_NETWORK_TIMEOUT.to_string())
.parse::<u64>()
.unwrap();
if let Some(user_agent) = matches.value_of("user-agent") {
options.user_agent = Some(user_agent.to_string());
} else {
options.user_agent = Some(DEFAULT_USER_AGENT.to_string());
}
options.unwrap_noscript = matches.is_present("unwrap-noscript");
options.no_video = matches.is_present("no-video");

options
}
}
1 change: 1 addition & 0 deletions src/lib.rs
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
pub mod args;
pub mod cookies;
pub mod css;
pub mod html;
Expand Down
1 change: 1 addition & 0 deletions src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ use std::process;
use std::time::Duration;
use url::Url;

use monolith::args;
use monolith::cookies::{parse_cookie_file_contents, Cookie};
use monolith::html::{
add_favicon, create_metadata_tag, get_base_url, get_charset, has_favicon, html_to_dom,
Expand Down
Loading

0 comments on commit e5e39a4

Please sign in to comment.