feat(*): allow configuring config directory through LoadOptions (#1323)

Author: Nickersoft

cli/Cargo.toml

@@ -19,7 +19,7 @@ odict = { path = "../lib", features = [
   "html",
   "tokenize",
 ] }
-internal = { path = "../internal", features = ["load"] }
+internal = { path = "../internal" }
 clap = { version = "4.5.49", features = ["derive", "cargo"] }
 console = "0.16.1"
 indicatif = "0.18.0"

cli/src/alias/set.rs

@@ -1,5 +1,5 @@
 use clap::{arg, Args};
-use odict::alias::AliasManager;
+use odict::{alias::AliasManager, OpenDictionary};
 
 #[derive(Debug, Args)]
 #[command(args_conflicts_with_subcommands = true)]
@@ -13,7 +13,7 @@ pub struct SetArgs {
 }
 
 pub async fn set<'a>(args: &SetArgs, overwrite: bool) -> anyhow::Result<()> {
-    let dict = internal::load_dictionary(args.path.as_str()).await?;
+    let dict = OpenDictionary::load(args.path.as_str()).await?;
 
     if overwrite {
         anyhow::Ok(AliasManager::default().set(args.name.as_str(), &dict)?)

cli/src/download.rs

@@ -52,10 +52,10 @@ pub async fn download(ctx: &mut CLIContext<'_>, args: &DownloadArgs) -> anyhow::
 
     let downloader = DictionaryDownloader::default();
 
-    let mut options = DownloadOptions::default().caching(!no_cache);
+    let mut options = DownloadOptions::default().with_caching(!no_cache);
 
     if let Some(out_dir) = output {
-        options = options.out_dir(out_dir);
+        options = options.with_out_dir(out_dir);
     }
 
     options = options.on_progress(|downloaded, total, _progress| {

cli/src/dump.rs

@@ -1,9 +1,12 @@
 use std::fs;
 
 use clap::{arg, command, Args};
-use odict::format::{
-    sql::{SQLDialect, ToSQL},
-    xml::ToXML,
+use odict::{
+    format::{
+        sql::{SQLDialect, ToSQL},
+        xml::ToXML,
+    },
+    OpenDictionary,
 };
 
 use crate::{enums::DumpFormat, CLIContext};
@@ -29,7 +32,7 @@ pub async fn dump<'a>(ctx: &mut CLIContext<'a>, args: &DumpArgs) -> anyhow::Resu
         output,
     } = args;
 
-    let dict = internal::load_dictionary(input)
+    let dict = OpenDictionary::load(input)
         .await?
         .contents()?
         .deserialize()?;

cli/src/index.rs

@@ -2,7 +2,10 @@ use std::path::PathBuf;
 
 use clap::{arg, command, Args};
 use indicatif::{ProgressBar, ProgressDrawTarget, ProgressStyle};
-use odict::index::{get_default_index_dir, IndexOptions};
+use odict::{
+    index::{get_default_index_dir, IndexOptions},
+    OpenDictionary,
+};
 
 use crate::CLIContext;
 
@@ -30,7 +33,7 @@ pub struct IndexArgs {
 }
 
 pub async fn index<'a>(ctx: &mut CLIContext<'a>, args: &IndexArgs) -> anyhow::Result<()> {
-    let file = internal::load_dictionary(&args.dictionary).await?;
+    let file = OpenDictionary::load(&args.dictionary).await?;
 
     ctx.println("");
 

cli/src/info.rs

@@ -3,6 +3,7 @@ use clap::{arg, command, Args};
 use console::Style;
 use indicatif::DecimalBytes;
 use num_format::{Locale, ToFormattedString};
+use odict::OpenDictionary;
 
 #[derive(Debug, Args)]
 #[command(args_conflicts_with_subcommands = true)]
@@ -17,7 +18,7 @@ pub async fn info<'a>(ctx: &mut CLIContext<'a>, args: &InfoArgs) -> anyhow::Resu
         dictionary_path: path,
     } = args;
 
-    let file = internal::load_dictionary(path).await?;
+    let file = OpenDictionary::load(path).await?;
 
     let bold = Style::new().bold();
     let dict = file.contents()?;

cli/src/lexicon.rs

@@ -1,4 +1,5 @@
 use clap::{arg, command, Args};
+use odict::OpenDictionary;
 
 use crate::CLIContext;
 
@@ -11,7 +12,7 @@ pub struct LexiconArgs {
 }
 
 pub async fn lexicon<'a>(ctx: &mut CLIContext<'a>, args: &LexiconArgs) -> anyhow::Result<()> {
-    let file = internal::load_dictionary(&args.dictionary).await?;
+    let file = OpenDictionary::load(&args.dictionary).await?;
 
     let dict = file.contents()?;
     let lexicon = dict.lexicon();

cli/src/lookup.rs

@@ -5,6 +5,7 @@ use crate::get_lookup_entries;
 use crate::{context::CLIContext, print_entries};
 use clap::{arg, command, Args};
 use odict::lookup::{LookupOptions, LookupStrategy};
+use odict::OpenDictionary;
 
 #[derive(Debug, Args)]
 #[command(args_conflicts_with_subcommands = true)]
@@ -63,7 +64,7 @@ pub async fn lookup<'a>(ctx: &mut CLIContext<'a>, args: &LookupArgs) -> anyhow::
 
     spinner.enable_steady_tick(Duration::from_millis(100));
 
-    let file = internal::load_dictionary(path).await?;
+    let file = OpenDictionary::load(path).await?;
 
     let mut opts: LookupOptions = LookupOptions::default()
         .follow(*follow)

cli/src/merge.rs

@@ -1,4 +1,5 @@
 use clap::{arg, command, Args};
+use odict::OpenDictionary;
 
 #[derive(Debug, Args)]
 #[command(args_conflicts_with_subcommands = true)]
@@ -18,13 +19,13 @@ pub struct MergeArgs {
 }
 
 pub async fn merge<'a>(args: &MergeArgs) -> anyhow::Result<()> {
-    let mut dict = internal::load_dictionary(&args.destination)
+    let mut dict = OpenDictionary::load(&args.destination)
         .await?
         .contents()?
         .deserialize()?;
 
     for source in &args.sources {
-        let source_dict = internal::load_dictionary(source)
+        let source_dict = OpenDictionary::load(source)
             .await?
             .contents()?
             .deserialize()?;

cli/src/search.rs

@@ -1,6 +1,6 @@
 use clap::{arg, command, Args};
-use odict::index::get_default_index_dir;
 use odict::search::SearchOptions;
+use odict::{index::get_default_index_dir, OpenDictionary};
 
 use crate::{enums::PrintFormat, print_entries, CLIContext, IndexArgs, DEFAULT_INDEX_MEMORY};
 
@@ -26,7 +26,7 @@ pub struct SearchArgs {
 }
 
 pub async fn search<'a>(ctx: &mut CLIContext<'a>, args: &SearchArgs) -> anyhow::Result<()> {
-    let file = internal::load_dictionary(&args.dictionary).await?;
+    let file = OpenDictionary::load(&args.dictionary).await?;
 
     let dict = file.contents()?;