Dependency name change #9

Merged
phoenix merged 5 commits from dependency_name_change into main 2026-07-13 12:06:24 -04:00
3 changed files with 1027 additions and 238 deletions
Showing only changes of commit 6237e7da89 - Show all commits
Generated
+1012 -219
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -10,7 +10,7 @@ tokio = { version = "1.52.3", features = ["full"] }
futures = { version = "0.3.32" }
serde = { version = "1.0.228", features = ["derive"] }
serde_json = { version = "1.0.150" }
textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.4.0", features = ["contact"] }
schedtxt_models = { git = "ssh://git@git.kundeng.us/phoenix/schedtxt_models.git", tag = "v0.5.3", features = ["contact"] }
[dev-dependencies]
tempfile = { version = "3.27.0" }
+14 -18
View File
@@ -11,9 +11,9 @@ pub struct NumberParser {
impl NumberParser {
pub async fn file_dump(
&self,
) -> Result<Vec<textsender_models::contact::Contact>, std::io::Error> {
) -> Result<Vec<schedtxt_models::contact::Contact>, std::io::Error> {
println!("Dumping files");
let mut objs: Vec<textsender_models::contact::Contact> = Vec::new();
let mut objs: Vec<schedtxt_models::contact::Contact> = Vec::new();
match self.read_lines(&self.filepath).await {
Ok(lines) => {
@@ -22,7 +22,7 @@ impl NumberParser {
if contains_letters {
continue;
} else {
let my_obj = textsender_models::contact::Contact {
let my_obj = schedtxt_models::contact::Contact {
phone_number: line.clone(),
..Default::default()
};
@@ -41,11 +41,7 @@ impl NumberParser {
}
}
pub async fn save_file(
&self,
numbers: Vec<textsender_models::contact::Contact>,
filename: &str,
) {
pub async fn save_file(&self, numbers: Vec<schedtxt_models::contact::Contact>, filename: &str) {
match serde_json::to_string(&numbers) {
Ok(json_string) => match std::fs::write(filename, json_string) {
Ok(_) => {
@@ -61,7 +57,7 @@ impl NumberParser {
};
}
pub fn print_phone_numbers(&self, contacts: &Vec<textsender_models::contact::Contact>) {
pub fn print_phone_numbers(&self, contacts: &Vec<schedtxt_models::contact::Contact>) {
println!("Printing phone numbers");
for contact in contacts {
@@ -83,9 +79,9 @@ impl NumberParser {
async fn remove_dups(
&self,
contacts: &Vec<textsender_models::contact::Contact>,
) -> Vec<textsender_models::contact::Contact> {
let mut unique_contacts: Vec<textsender_models::contact::Contact> = Vec::new();
contacts: &Vec<schedtxt_models::contact::Contact>,
) -> Vec<schedtxt_models::contact::Contact> {
let mut unique_contacts: Vec<schedtxt_models::contact::Contact> = Vec::new();
let mut unique_items = std::collections::HashSet::new();
for val in contacts {
@@ -93,7 +89,7 @@ impl NumberParser {
}
for unique_item in unique_items {
let contact = textsender_models::contact::Contact {
let contact = schedtxt_models::contact::Contact {
phone_number: unique_item,
..Default::default()
};
@@ -105,9 +101,9 @@ impl NumberParser {
async fn update_contacts(
&self,
contacts: &Vec<textsender_models::contact::Contact>,
) -> Vec<textsender_models::contact::Contact> {
let mut updated: Vec<textsender_models::contact::Contact> = Vec::new();
contacts: &Vec<schedtxt_models::contact::Contact>,
) -> Vec<schedtxt_models::contact::Contact> {
let mut updated: Vec<schedtxt_models::contact::Contact> = Vec::new();
for ct in contacts {
let phone_number = ct.phone_number.clone();
@@ -120,7 +116,7 @@ impl NumberParser {
match self.add_prefix(&pars) {
Ok(updated_parsed) => {
let contact = textsender_models::contact::Contact {
let contact = schedtxt_models::contact::Contact {
phone_number: updated_parsed,
..Default::default()
};
@@ -172,7 +168,7 @@ impl NumberParser {
#[cfg(test)]
mod tests {
use textsender_models::contact::Contact;
use schedtxt_models::contact::Contact;
const TEST_NUMBERS_0: &str = "tests/numbers-0.txt";