fix --repeat bug with threads

Author: wasabipesto

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "nice_api"
-version = "3.2.0"
+version = "3.2.1"
 edition = "2021"
 authors = ["wasabipesto <[email protected]>"]
 description = "an api for coordinating the search for square-cube pandigitals"

api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nice_client"
-version = "3.2.0"
+version = "3.2.1"
 edition = "2021"
 authors = ["wasabipesto <[email protected]>"]
 description = "a client for distributed search of square-cube pandigitals"

client/Cargo.toml

@@ -73,6 +73,25 @@ fn main() {
     // Parse command line arguments
     let cli = Cli::parse();
 
+    // Configure Rayon
+    // This must be done outside the loop
+    rayon::ThreadPoolBuilder::new()
+        .num_threads(cli.threads)
+        .build_global()
+        .unwrap();
+
+    // Repeat indefinitely if requested
+    // Otherwise, run once
+    if cli.repeat {
+        loop {
+            submian(&cli);
+        }
+    } else {
+        submian(&cli);
+    }
+}
+
+fn submian(cli: &Cli) {
     // Check whether to query the server for a search range or use the benchmark
     let claim_data = if let Some(benchmark) = cli.benchmark {
         get_benchmark_field(benchmark)
@@ -96,12 +115,6 @@ fn main() {
     let chunk_size = 100 * PROCESSING_CHUNK_SIZE;
     let chunks = chunked_ranges(claim_data.range_start, claim_data.range_end, chunk_size);
 
-    // Configure Rayon
-    rayon::ThreadPoolBuilder::new()
-        .num_threads(cli.threads)
-        .build_global()
-        .unwrap();
-
     // Configure TQDM
     #[allow(
         clippy::cast_precision_loss,
@@ -155,7 +168,7 @@ fn main() {
     // Assemble the data package to submit to the server
     let submit_data = DataToServer {
         claim_id: claim_data.claim_id,
-        username: cli.username,
+        username: cli.username.clone(),
         client_version: CLIENT_VERSION.to_string(),
         unique_distribution,
         nice_numbers,
@@ -181,10 +194,4 @@ fn main() {
             Err(e) => println!("Server returned success but an error occured: {e}"),
         }
     }
-
-    // Repeat indefinitely if requested
-    #[allow(clippy::main_recursion)]
-    if cli.repeat {
-        main();
-    }
 }

client/src/main.rs

@@ -1,6 +1,6 @@
 [package]
 name = "nice_common"
-version = "3.2.0"
+version = "3.2.1"
 edition = "2021"
 authors = ["wasabipesto <[email protected]>"]
 description = "common utilities for dealing with square-cube pandigitals"

common/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nice_jobs"
-version = "3.2.0"
+version = "3.2.1"
 edition = "2021"
 authors = ["wasabipesto <[email protected]>"]
 description = "scheduled jobs for the nice project"