rename clear option to preload_clear

README.md

@@ -59,9 +59,6 @@ aquatic-crawler --infohash /path/to/info-hash-ipv4.json\
 
           [default: ei]
 
-      --clear
-          Clear previous index collected on crawl session start
-
       --infohash <INFOHASH>
           Absolute path(s) or URL(s) to import infohashes from the Aquatic tracker JSON/API
 
@@ -105,6 +102,9 @@ aquatic-crawler --infohash /path/to/info-hash-ipv4.json\
       --preload <PRELOAD>
           Directory path to store preloaded data (e.g. `.torrent` files)
 
+      --preload-clear
+          Clear previous data collected on crawl session start
+
       --preload-regex <PRELOAD_REGEX>
           Preload only files match regex pattern (list only without preload by default)
           * see also `preload_max_filesize`, `preload_max_filecount` options

src/config.rs

@@ -11,10 +11,6 @@ pub struct Config {
     #[arg(short, long, default_value_t = String::from("ei"))]
     pub debug: String,
 
-    /// Clear previous index collected on crawl session start
-    #[arg(long, default_value_t = false)]
-    pub clear: bool,
-
     /// Absolute path(s) or URL(s) to import infohashes from the Aquatic tracker JSON/API
     ///
     /// * PR#233 feature
@@ -69,6 +65,10 @@ pub struct Config {
     #[arg(long)]
     pub preload: Option<String>,
 
+    /// Clear previous data collected on crawl session start
+    #[arg(long, default_value_t = false)]
+    pub preload_clear: bool,
+
     /// Preload only files match regex pattern (list only without preload by default)
     /// * see also `preload_max_filesize`, `preload_max_filecount` options
     ///

src/main.rs

@@ -38,7 +38,7 @@ async fn main() -> Result<()> {
         config.preload_max_filecount,
         config.preload_max_filesize,
         config.preload_total_size,
-        config.clear,
+        config.preload_clear,
     )?;
     let trackers = Trackers::init(&config.tracker)?;
     let torrent = config.export_torrents.map(|p| Torrent::init(&p).unwrap());

src/preload.rs

@@ -17,14 +17,14 @@ impl Preload {
         max_filecount: Option<usize>,
         max_filesize: Option<u64>,
         total_size: Option<u64>,
-        clear: bool,
+        is_clear: bool,
     ) -> Result<Self> {
         let path = PathBuf::from_str(directory)?;
         if let Ok(t) = fs::metadata(&path) {
             if t.is_file() {
                 bail!("Storage destination is not directory!");
             }
-            if t.is_dir() && clear {
+            if t.is_dir() && is_clear {
                 for i in fs::read_dir(&path)? {
                     let r = i?.path();
                     if r.is_dir() {
@@ -97,7 +97,7 @@ pub fn init(
     max_filecount: Option<usize>,
     max_filesize: Option<u64>,
     total_size: Option<u64>,
-    clear: bool,
+    is_clear: bool,
 ) -> Result<Option<Preload>> {
     Ok(match path {
         Some(ref p) => Some(Preload::init(
@@ -106,14 +106,14 @@ pub fn init(
             max_filecount,
             max_filesize,
             total_size,
-            clear,
+            is_clear,
         )?),
         None => {
             if regex.is_some()
                 || max_filecount.is_some()
                 || max_filesize.is_some()
                 || total_size.is_some()
-                || clear
+                || is_clear
             {
                 bail!("`--preload` directory is required for this configuration!")
             }