Skip to content

Commit

Permalink
Bump clap and strum
Browse files Browse the repository at this point in the history
  • Loading branch information
@reknih
reknih committed Mar 6, 2024
1 parent 1a84dfe commit 767c5fd
Show file tree
Hide file tree
Showing 2 changed files with 82 additions and 49 deletions.
6 changes: 3 additions & 3 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ archive = ["ciborium"]
csl-json = ["citationberg/json"]

[dependencies]
citationberg = "0.1.1"
citationberg = "0.3.0"
indexmap = { version = "2.0.2", features = ["serde"] }
numerals = "0.1.4"
paste = "1.0.14"
Expand All @@ -30,8 +30,8 @@ unscanny = "0.1.0"
url = { version = "2.4", features = ["serde"] }
biblatex = { version = "0.9", optional = true }
ciborium = { version = "0.2.1", optional = true }
clap = { version = "3.1", optional = true, features = ["cargo"] }
strum = { version = "0.25", features = ["derive"], optional = true }
clap = { version = "4", optional = true, features = ["cargo"] }
strum = { version = "0.26", features = ["derive"], optional = true }

[dev-dependencies]
heck = "0.4"
Expand Down
125 changes: 79 additions & 46 deletions src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,21 @@ use std::path::Path;
use std::process::exit;
use std::str::FromStr;

use citationberg::taxonomy::Locator;
use citationberg::{
IndependentStyle, Locale, LocaleCode, LocaleFile, LongShortForm, Style,
};
use clap::{crate_version, Arg, Command};
use strum::{EnumVariantNames, VariantNames};
use clap::{crate_version, Arg, ArgAction, Command};
use strum::VariantNames;

use hayagriva::archive::{locales, ArchivedStyle};
use hayagriva::{io, BibliographyDriver, CitationItem, CitationRequest};
use hayagriva::{
io, BibliographyDriver, CitationItem, CitationRequest, LocatorPayload,
SpecificLocator,
};
use hayagriva::{BibliographyRequest, Selector};

#[derive(Debug, Copy, Clone, PartialEq, EnumVariantNames)]
#[derive(Debug, Copy, Clone, PartialEq, VariantNames)]
#[strum(serialize_all = "kebab_case")]
pub enum Format {
#[cfg(feature = "biblatex")]
Expand Down Expand Up @@ -55,42 +59,45 @@ fn main() {
Arg::new("format")
.long("format")
.help("What input file format to expect")
.possible_values(Format::VARIANTS)
.value_parser(clap::builder::PossibleValuesParser::new(Format::VARIANTS))
.ignore_case(true)
.takes_value(true)
.num_args(1)
.global(true),
).arg(
Arg::new("selector")
.long("select")
.help("Filter the bibliography using selectors")
.takes_value(true)
.num_args(1)
.global(true)
)
.arg(
Arg::new("key")
.long("key")
.short('k')
.help("Filter the bibliography using a comma-separated list of keys")
.takes_value(true)
.num_args(1)
.global(true)
)
.arg(
Arg::new("show-keys")
.long("show-keys")
.help("Show the keys of all filtered entries")
.action(ArgAction::SetTrue)
.global(true)
)
.arg(
Arg::new("show-bound")
.long("show-bound")
.help("Show the bound entries of your selector for each key")
.action(ArgAction::SetTrue)
.global(true)
)
.arg(
Arg::new("no-fmt")
.long("no-fmt")
.short('n')
.help("Suppress the formatting of output with ANSI / VT100 character sequences")
.action(ArgAction::SetTrue)
.global(true)
)
.subcommand(
Expand All @@ -102,37 +109,38 @@ fn main() {
.short('s')
.help("Set the citation style")
.ignore_case(true)
.takes_value(true)
.num_args(1)
.required_unless_present("csl")
)
.arg(
Arg::new("csl")
.long("csl")
.help("Set a CSL file to use the style therein")
.takes_value(true)
.num_args(1)
)
.arg(
Arg::new("locale")
.long("locale")
.help("Which locale to force for the citation (e.g. `en-US`)")
.takes_value(true)
.num_args(1)
)
.arg(
Arg::new("locales")
.long("locales")
.help("Set a comma-separated list of CSL locales")
.takes_value(true)
.num_args(1)
)
.arg(
Arg::new("locators")
.long("locators")
.help("Specify additional information for the citations, e.g. \"p. 6,p. 4\", in a comma-separated list.")
.takes_value(true)
.num_args(1)
)
.arg(
Arg::new("combined")
.long("combined")
.short('c')
.action(ArgAction::SetTrue)
.help("Combine all keys into one citation (ignored for Chicago Notes)")
)
)
Expand All @@ -145,26 +153,26 @@ fn main() {
.short('s')
.help("Set the referencing style")
.ignore_case(true)
.takes_value(true)
.num_args(1)
.required_unless_present("csl")
)
.arg(
Arg::new("csl")
.long("csl")
.help("Set a CSL file to use the style therein")
.takes_value(true)
.num_args(1)
)
.arg(
Arg::new("locale")
.long("locale")
.help("Which locale to force for the citation (e.g. `en-US`)")
.takes_value(true)
.num_args(1)
)
.arg(
Arg::new("locales")
.long("locales")
.help("Set a comma-separated list of CSL locales")
.takes_value(true)
.help("Set a space-separated list of CSL locales")
.num_args(1)
)
)
.subcommand(
Expand All @@ -173,9 +181,9 @@ fn main() {
)
.get_matches();

let input = Path::new(matches.value_of("INPUT").unwrap());
let input = Path::new(matches.get_one::<String>("INPUT").unwrap());

let format = matches.value_of_t("format").unwrap_or_else(|_| {
let format = matches.get_one("format").cloned().unwrap_or_else(|| {
#[allow(unused_mut)]
let mut format = Format::Yaml;

Expand Down Expand Up @@ -224,15 +232,19 @@ fn main() {

let bib_len = bibliography.len();

let selector = matches.value_of("selector").map(|src| match Selector::parse(src) {
Ok(selector) => selector,
Err(err) => {
eprintln!("Error while parsing selector: {}", err);
exit(7);
}
});
let selector =
matches
.get_one("selector")
.cloned()
.map(|src| match Selector::parse(src) {
Ok(selector) => selector,
Err(err) => {
eprintln!("Error while parsing selector: {}", err);
exit(7);
}
});

let bibliography = if let Some(keys) = matches.value_of("key") {
let bibliography = if let Some(keys) = matches.get_one::<String>("key") {
let mut res = vec![];
for key in keys.split(',') {
if let Some(entry) = bibliography.iter().find(|e| e.key() == key) {
Expand All @@ -246,7 +258,7 @@ fn main() {
bibliography
};

if matches.is_present("show-keys") || matches.is_present("show-bound") {
if matches.get_flag("show-keys") || matches.get_flag("show-bound") {
println!(
"Selected {} of {} entries in the bibliography\n",
bibliography.len(),
Expand All @@ -255,7 +267,7 @@ fn main() {

for entry in &bibliography {
println!("{}", entry.key());
if matches.is_present("show-bound") {
if matches.get_flag("show-bound") {
if let Some(selector) = &selector {
for (k, v) in selector.apply(entry).unwrap() {
println!(
Expand Down Expand Up @@ -294,7 +306,8 @@ fn main() {
Some(("reference", sub_matches)) => {
let style: Option<&String> = sub_matches.get_one("style");
let csl: Option<&String> = sub_matches.get_one("csl");
let locale_path: Option<&String> = sub_matches.get_one("locales");
let locale_path =
sub_matches.get_one::<String>("locales").map(|s| s.split(','));
let locale_str: Option<&String> = sub_matches.get_one("locale");

let (style, locales, locale) =
Expand Down Expand Up @@ -322,7 +335,7 @@ fn main() {
.map(|b| b.items)
.unwrap_or_default()
{
let alternate = matches.is_present("no-fmt");
let alternate = matches.get_flag("no-fmt");

if let Some(prefix) = row.first_field {
if alternate {
Expand All @@ -342,26 +355,43 @@ fn main() {
Some(("cite", sub_matches)) => {
let style: Option<&String> = sub_matches.get_one("style");
let csl: Option<&String> = sub_matches.get_one("csl");
let locale_path: Option<&String> = sub_matches.get_one("locales");
let locale_path =
sub_matches.get_one::<String>("locales").map(|s| s.split(','));
let locale_str: Option<&String> = sub_matches.get_one("locale");
let collapse = sub_matches.is_present("combined");
let collapse = sub_matches.get_flag("combined");
let locators: Vec<_> = sub_matches
.get_one::<String>("locators")
.into_iter()
.flat_map(|s| s.split(','))
.collect();

let (style, locales, locale) =
retrieve_assets(style, csl, locale_path, locale_str);

let assign_locator = |(i, e)| {
let mut item = CitationItem::with_entry(e);
if let Some(&locator) = locators.get(i) {
item.locator = Some(SpecificLocator(
Locator::Custom,
LocatorPayload::Str(locator),
));
}
item
};

let mut driver = BibliographyDriver::new();
if collapse {
driver.citation(CitationRequest::new(
bibliography.iter().map(CitationItem::with_entry).collect(),
bibliography.iter().enumerate().map(assign_locator).collect(),
&style,
locale.clone(),
&locales,
None,
));
} else {
for entry in &bibliography {
for (i, entry) in bibliography.iter().enumerate() {
driver.citation(CitationRequest::new(
vec![CitationItem::with_entry(entry)],
vec![assign_locator((i, entry))],
&style,
locale.clone(),
&locales,
Expand All @@ -376,7 +406,7 @@ fn main() {
.map(|b| b.items)
.unwrap_or_default()
{
let alternate = matches.is_present("no-fmt");
let alternate = matches.get_flag("no-fmt");

if let Some(prefix) = row.first_field {
if alternate {
Expand Down Expand Up @@ -419,10 +449,10 @@ fn main() {
}
}

fn retrieve_assets(
fn retrieve_assets<'a>(
style: Option<&String>,
csl: Option<&String>,
locale_path: Option<&String>,
locale_paths: Option<impl Iterator<Item = &'a str>>,
locale_str: Option<&String>,
) -> (IndependentStyle, Vec<Locale>, Option<LocaleCode>) {
let locale: Option<_> = locale_str.map(|l: &String| LocaleCode(l.into()));
Expand All @@ -443,12 +473,15 @@ fn retrieve_assets(
(None, None) => panic!("must specify style or CSL file"),
};

let locales: Vec<Locale> = match locale_path {
Some(locale_path) => {
let file_str =
fs::read_to_string(locale_path).expect("could not read locale file");
vec![LocaleFile::from_xml(&file_str).expect("locale file malformed").into()]
}
let locales: Vec<Locale> = match locale_paths {
Some(locale_paths) => locale_paths
.into_iter()
.map(|locale_path| {
let file_str =
fs::read_to_string(locale_path).expect("could not read locale file");
LocaleFile::from_xml(&file_str).expect("locale file malformed").into()
})
.collect(),
None => locales(),
};

Expand Down

0 comments on commit 767c5fd

Please sign in to comment.