Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
56c5aaa1d3 | ||
|
|
235174b404 | ||
|
|
f837b0f5d0 | ||
|
|
79a3e47a1b | ||
|
|
d8cb2cee19 | ||
|
|
7d9142dc13 | ||
|
|
f9339ae9a1
|
||
|
|
a0bf202b39
|
||
|
|
f5cb2ed892 | ||
|
|
cd0ea8a387 | ||
|
|
e7f6ddec9a | ||
|
|
9ec9fa1516 | ||
|
|
f2a650ef27 | ||
|
|
c391939960 | ||
|
|
340c90211f | ||
|
|
e737280a3c | ||
|
|
18d1d2730f | ||
|
|
fc1f3fa814 | ||
|
|
3151405d32 | ||
|
|
154c9f493e | ||
|
|
7e3fff50c1 | ||
|
|
27d76c1c51 | ||
|
|
4a109467e3 | ||
|
|
71c99cdb50 | ||
|
|
2c0a662733 | ||
|
|
6f9029d4e3 | ||
|
|
75dd476d71 | ||
|
|
c930c146e5 | ||
|
|
903ada907f | ||
|
|
2c916856e9 | ||
|
|
42e39df59f | ||
|
|
49842756ba |
@@ -0,0 +1,65 @@
|
||||
name: clean_file pr
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches:
|
||||
- main
|
||||
|
||||
jobs:
|
||||
check:
|
||||
name: Check
|
||||
runs-on: ubuntu-24.04
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
with:
|
||||
toolchain: 1.97
|
||||
- uses: Swatinem/rust-cache@v2
|
||||
- run: |
|
||||
mkdir -p ~/.ssh
|
||||
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/deploy_key
|
||||
chmod 600 ~/.ssh/deploy_key
|
||||
ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
|
||||
eval $(ssh-agent -s)
|
||||
ssh-add -v ~/.ssh/deploy_key
|
||||
cargo check
|
||||
|
||||
fmt:
|
||||
name: Rustfmt
|
||||
runs-on: ubuntu-24.04
|
||||
needs: setup_ssh
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
with:
|
||||
toolchain: 1.97
|
||||
- uses: Swatinem/rust-cache@v2
|
||||
- run: rustup component add rustfmt
|
||||
- run: |
|
||||
mkdir -p ~/.ssh
|
||||
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/deploy_key
|
||||
chmod 600 ~/.ssh/deploy_key
|
||||
ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
|
||||
eval $(ssh-agent -s)
|
||||
ssh-add -v ~/.ssh/deploy_key
|
||||
cargo fmt --all -- --check
|
||||
|
||||
clippy:
|
||||
name: Clippy
|
||||
runs-on: ubuntu-24.04
|
||||
needs: setup_ssh
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
with:
|
||||
toolchain: 1.97
|
||||
- uses: Swatinem/rust-cache@v2
|
||||
- run: rustup component add clippy
|
||||
- run: |
|
||||
mkdir -p ~/.ssh
|
||||
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/deploy_key
|
||||
chmod 600 ~/.ssh/deploy_key
|
||||
ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
|
||||
eval $(ssh-agent -s)
|
||||
ssh-add -v ~/.ssh/deploy_key
|
||||
cargo clippy -- -D warnings
|
||||
@@ -0,0 +1,103 @@
|
||||
name: clean_file Build
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
|
||||
jobs:
|
||||
check:
|
||||
name: Check
|
||||
runs-on: ubuntu-24.04
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
with:
|
||||
toolchain: 1.97
|
||||
- uses: Swatinem/rust-cache@v2
|
||||
- run: |
|
||||
mkdir -p ~/.ssh
|
||||
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/deploy_key
|
||||
chmod 600 ~/.ssh/deploy_key
|
||||
ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
|
||||
eval $(ssh-agent -s)
|
||||
ssh-add -v ~/.ssh/deploy_key
|
||||
cargo check
|
||||
|
||||
test:
|
||||
name: Test Suite
|
||||
runs-on: ubuntu-24.04
|
||||
needs: setup_ssh
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
with:
|
||||
toolchain: 1.97
|
||||
- uses: Swatinem/rust-cache@v2
|
||||
- run: |
|
||||
mkdir -p ~/.ssh
|
||||
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/deploy_key
|
||||
chmod 600 ~/.ssh/deploy_key
|
||||
ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
|
||||
eval $(ssh-agent -s)
|
||||
ssh-add -v ~/.ssh/deploy_key
|
||||
cargo test
|
||||
|
||||
fmt:
|
||||
name: Rustfmt
|
||||
runs-on: ubuntu-24.04
|
||||
needs: setup_ssh
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
with:
|
||||
toolchain: 1.97
|
||||
- uses: Swatinem/rust-cache@v2
|
||||
- run: rustup component add rustfmt
|
||||
- run: |
|
||||
mkdir -p ~/.ssh
|
||||
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/deploy_key
|
||||
chmod 600 ~/.ssh/deploy_key
|
||||
ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
|
||||
eval $(ssh-agent -s)
|
||||
ssh-add -v ~/.ssh/deploy_key
|
||||
cargo fmt --all -- --check
|
||||
|
||||
clippy:
|
||||
name: Clippy
|
||||
runs-on: ubuntu-24.04
|
||||
needs: setup_ssh
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
with:
|
||||
toolchain: 1.97
|
||||
- uses: Swatinem/rust-cache@v2
|
||||
- run: rustup component add clippy
|
||||
- run: |
|
||||
mkdir -p ~/.ssh
|
||||
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/deploy_key
|
||||
chmod 600 ~/.ssh/deploy_key
|
||||
ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
|
||||
eval $(ssh-agent -s)
|
||||
ssh-add -v ~/.ssh/deploy_key
|
||||
cargo clippy -- -D warnings
|
||||
|
||||
build:
|
||||
name: build
|
||||
runs-on: ubuntu-24.04
|
||||
needs: setup_ssh
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
with:
|
||||
toolchain: 1.97
|
||||
- uses: Swatinem/rust-cache@v2
|
||||
- run: |
|
||||
mkdir -p ~/.ssh
|
||||
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/deploy_key
|
||||
chmod 600 ~/.ssh/deploy_key
|
||||
ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
|
||||
eval $(ssh-agent -s)
|
||||
ssh-add -v ~/.ssh/deploy_key
|
||||
cargo build --release
|
||||
@@ -1,37 +0,0 @@
|
||||
name: Rust
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ main, master ]
|
||||
pull_request:
|
||||
branches: [ main, master ]
|
||||
|
||||
env:
|
||||
# Customize the profile here (e.g., release, debug)
|
||||
PROFILE: release
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest # Only target ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
|
||||
- name: Install Rust
|
||||
uses: actions-rs/toolchain@v1
|
||||
with:
|
||||
toolchain: stable
|
||||
override: true
|
||||
|
||||
- name: Build
|
||||
uses: actions-rs/cargo@v1
|
||||
with:
|
||||
command: build
|
||||
args: --release # Or --debug, depending on the env.PROFILE
|
||||
|
||||
- name: Run tests
|
||||
uses: actions-rs/cargo@v1
|
||||
with:
|
||||
command: test
|
||||
args: --release # Or --debug, depending on the env.PROFILE
|
||||
|
||||
+2
-1
@@ -1 +1,2 @@
|
||||
/target
|
||||
target/
|
||||
numbers.json
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
stages:
|
||||
- build
|
||||
- test
|
||||
|
||||
build:
|
||||
stage: build
|
||||
image: rust:1.85
|
||||
script:
|
||||
- cargo build --release
|
||||
artifacts:
|
||||
paths:
|
||||
- target/release/clean_file
|
||||
expire_in: 1 week
|
||||
cache:
|
||||
key: "cargo-cache"
|
||||
paths:
|
||||
- target/
|
||||
- ~/.cargo/
|
||||
|
||||
test:
|
||||
stage: test
|
||||
image: rust:1.85
|
||||
script:
|
||||
- cargo test
|
||||
cache:
|
||||
key: "cargo-cache"
|
||||
paths:
|
||||
- target/
|
||||
- ~/.cargo/
|
||||
Generated
+1899
File diff suppressed because it is too large
Load Diff
+9
-5
@@ -1,11 +1,15 @@
|
||||
[package]
|
||||
name = "clean_file"
|
||||
description = "Software tool that sanitizes a list of phone numbers"
|
||||
version = "0.3.0"
|
||||
version = "1.1.1"
|
||||
edition = "2024"
|
||||
license = "MIT"
|
||||
description = "A tool to sanitize US phone numbers"
|
||||
rust-version = "1.96"
|
||||
|
||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[dependencies]
|
||||
serde = { version = "1.0.218", features = ["derive"] }
|
||||
serde_json = "1.0.140"
|
||||
tokio = { version = "1.52.3", features = ["full"] }
|
||||
serde_json = { version = "1.0.150" }
|
||||
schedtxt_models = { git = "ssh://git@git.kundeng.us/phoenix/schedtxt_models.git", tag = "v0.5.3", features = ["contact"] }
|
||||
|
||||
[dev-dependencies]
|
||||
|
||||
+22
@@ -0,0 +1,22 @@
|
||||
Copyright (c) 2026 Kun Deng.
|
||||
|
||||
Permission is hereby granted, free of charge, to any person
|
||||
obtaining a copy of this software and associated documentation
|
||||
files (the "Software"), to deal in the Software without
|
||||
restriction, including without limitation the rights to use,
|
||||
copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the
|
||||
Software is furnished to do so, subject to the following
|
||||
conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be
|
||||
included in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
OTHER DEALINGS IN THE SOFTWARE.
|
||||
@@ -0,0 +1,3 @@
|
||||
# clean_file
|
||||
A CLI tool to sanitize a phone numbers. Takes unformatted US phone numbers and
|
||||
standardizes them.
|
||||
+21
-28
@@ -1,39 +1,32 @@
|
||||
use std::env;
|
||||
|
||||
mod parser;
|
||||
|
||||
fn main() {
|
||||
let args: Vec<String> = env::args().collect();
|
||||
pub mod parser;
|
||||
pub mod version;
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() {
|
||||
let args: Vec<String> = std::env::args().collect();
|
||||
if args.len() < 2 {
|
||||
println!("Provide path to file");
|
||||
return;
|
||||
println!("Invalid arguments provided");
|
||||
std::process::exit(-1);
|
||||
}
|
||||
|
||||
let filepath: &String = args.get(1).unwrap();
|
||||
if version::contains_version(&args) {
|
||||
version::print_version();
|
||||
std::process::exit(-1);
|
||||
}
|
||||
|
||||
println!("Filepath is: {:?}", filepath);
|
||||
|
||||
let myparser = parser::parser::NumberParser {
|
||||
let filepath = &args[1];
|
||||
println!("Filepath: {filepath:?}");
|
||||
let prsr = parser::NumberParser {
|
||||
filepath: filepath.clone(),
|
||||
};
|
||||
|
||||
let rawvalues = myparser.filedump();
|
||||
|
||||
let parsed_values = myparser.updatevalues(&rawvalues);
|
||||
|
||||
let newupdated = myparser.removedups(&parsed_values);
|
||||
|
||||
myparser.print_values(&newupdated, true);
|
||||
|
||||
let result = myparser.save_file(parsed_values);
|
||||
|
||||
match result {
|
||||
Ok(o) => {
|
||||
println!("Successfully saved file: {:?}", o);
|
||||
}
|
||||
Err(er) => {
|
||||
println!("Error saving file: {:?}", er);
|
||||
match prsr.file_dump().await {
|
||||
Ok(contacts) => {
|
||||
prsr.print_phone_numbers(&contacts);
|
||||
prsr.save_file(contacts, parser::DEFAULT_OUTPUT_FILE).await;
|
||||
}
|
||||
Err(err) => {
|
||||
eprintln!("Error: {err:?}");
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
-212
@@ -1,212 +0,0 @@
|
||||
pub mod parser {
|
||||
use std::collections::HashSet;
|
||||
use std::fs::File;
|
||||
use std::io::prelude::*;
|
||||
use std::io::{BufRead, BufReader};
|
||||
|
||||
use serde::Deserialize;
|
||||
use serde::Serialize;
|
||||
|
||||
#[derive(Clone, Deserialize, Serialize)]
|
||||
pub struct SomeObject {
|
||||
pub value: String,
|
||||
}
|
||||
|
||||
pub struct NumberParser {
|
||||
pub filepath: String,
|
||||
}
|
||||
|
||||
impl NumberParser {
|
||||
pub fn filedump(&self) -> Vec<SomeObject> {
|
||||
println!("\nDumping files");
|
||||
let mut objs: Vec<SomeObject> = Vec::new();
|
||||
|
||||
if let Ok(lines) = self.read_lines(&self.filepath) {
|
||||
for line in lines {
|
||||
if let Ok(phonenumber) = line {
|
||||
let contains_letters = phonenumber.chars().any(|c| c.is_alphabetic());
|
||||
|
||||
if contains_letters {
|
||||
continue;
|
||||
}
|
||||
|
||||
let myobj: SomeObject = SomeObject { value: phonenumber };
|
||||
|
||||
if !myobj.value.is_empty() {
|
||||
objs.push(myobj);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return objs;
|
||||
}
|
||||
|
||||
pub fn updatevalues(&self, vals: &Vec<SomeObject>) -> Vec<SomeObject> {
|
||||
println!("\nUpdating values");
|
||||
let mut updated: Vec<SomeObject> = Vec::new();
|
||||
|
||||
for a in vals {
|
||||
let mut parsed: String = a.value.clone();
|
||||
if a.value.len() < 2 {
|
||||
println!("{} is an invalid number", a.value);
|
||||
continue;
|
||||
}
|
||||
|
||||
let pars = self.remove_some_data(&parsed);
|
||||
parsed.clear();
|
||||
parsed = pars;
|
||||
|
||||
println!("{}", parsed.clone());
|
||||
|
||||
let updated_parsed = self.add_prefix(parsed);
|
||||
|
||||
let myobj: SomeObject = SomeObject {
|
||||
value: updated_parsed.clone(),
|
||||
};
|
||||
|
||||
updated.push(myobj);
|
||||
}
|
||||
|
||||
return updated;
|
||||
}
|
||||
|
||||
pub fn removedups(&self, vals: &Vec<SomeObject>) -> Vec<SomeObject> {
|
||||
println!("\nRemoving duplicates");
|
||||
let mut tmp: HashSet<String> = HashSet::new();
|
||||
let mut mm: Vec<SomeObject> = Vec::new();
|
||||
mm.clone_from(vals);
|
||||
mm.retain(|e| tmp.insert(e.value.clone()));
|
||||
|
||||
let mut updated: Vec<SomeObject> = Vec::new();
|
||||
|
||||
for t in tmp {
|
||||
let so: SomeObject = SomeObject { value: t.clone() };
|
||||
|
||||
updated.push(so);
|
||||
}
|
||||
|
||||
return updated;
|
||||
}
|
||||
pub fn print_values(&self, vals: &Vec<SomeObject>, print_total: bool) {
|
||||
println!("\nPrinting values");
|
||||
|
||||
for o in vals {
|
||||
println!("Value: {}", o.value);
|
||||
}
|
||||
|
||||
if print_total {
|
||||
println!("\nTotal numbers: {:?}", vals.len());
|
||||
}
|
||||
}
|
||||
|
||||
pub fn save_file(&self, vals: Vec<SomeObject>) -> std::io::Result<()> {
|
||||
println!("\nSaving file");
|
||||
let filename: String = String::from("numbers.json");
|
||||
let mut all_numbers: Vec<String> = Vec::new();
|
||||
|
||||
for val in &vals {
|
||||
all_numbers.push(val.value.clone());
|
||||
}
|
||||
|
||||
let json = serde_json::to_string_pretty(&all_numbers).unwrap();
|
||||
let mut file = File::create(filename)?;
|
||||
file.write_all(json.as_bytes())?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn read_lines(&self, filename: &str) -> std::io::Result<std::io::Lines<BufReader<File>>> {
|
||||
let file = File::open(filename)?;
|
||||
Ok(BufReader::new(file).lines())
|
||||
}
|
||||
|
||||
fn remove_some_data(&self, unparsed: &String) -> String {
|
||||
println!("Unparsed: {}", unparsed);
|
||||
|
||||
let mut parsed: String = String::new();
|
||||
let mychars = unparsed.chars();
|
||||
|
||||
for i in 0..unparsed.len() {
|
||||
let mychar_wrap = mychars.clone().nth(i);
|
||||
|
||||
if let None = mychar_wrap {
|
||||
continue;
|
||||
}
|
||||
|
||||
let mychar = mychar_wrap.unwrap();
|
||||
|
||||
if mychar.is_numeric() {
|
||||
parsed.push(mychar.clone());
|
||||
}
|
||||
}
|
||||
|
||||
println!("Parsed: {}", parsed);
|
||||
|
||||
return parsed;
|
||||
}
|
||||
|
||||
fn add_prefix(&self, raw: String) -> String {
|
||||
let mut mychars = raw.chars().clone();
|
||||
let first_char: char = mychars.nth(0).clone().unwrap();
|
||||
let second_char: char = mychars.nth(1).clone().unwrap();
|
||||
|
||||
let mut parsed: String = raw.clone();
|
||||
|
||||
if first_char == '1' {
|
||||
parsed.insert(0, '+');
|
||||
} else if first_char != '+' {
|
||||
if second_char != '1' {
|
||||
parsed.insert(0, '+');
|
||||
parsed.insert(1, '1');
|
||||
} else {
|
||||
parsed.insert(0, '+');
|
||||
parsed.insert(1, '1');
|
||||
}
|
||||
}
|
||||
|
||||
return parsed;
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn removing_text() {
|
||||
let sometext: String = String::from("a1234567890");
|
||||
let numberparser = NumberParser {
|
||||
filepath: String::new(),
|
||||
};
|
||||
let removetext = numberparser.remove_some_data(&sometext);
|
||||
let mut result = true;
|
||||
|
||||
for i in 0..removetext.len() {
|
||||
let c = removetext.chars().nth(i).unwrap();
|
||||
|
||||
if !c.is_numeric() {
|
||||
result = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
assert_eq!(result, true);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn adding_prefix() {
|
||||
let sometext: String = String::from("1234567890");
|
||||
let numberparser = NumberParser {
|
||||
filepath: String::new(),
|
||||
};
|
||||
let modified = numberparser.add_prefix(sometext);
|
||||
|
||||
let chars = modified.chars().clone();
|
||||
let firstcharcheck: char = chars.clone().nth(0).unwrap();
|
||||
let secondcharcheck: char = chars.clone().nth(1).unwrap();
|
||||
|
||||
assert_eq!(firstcharcheck, '+');
|
||||
assert_eq!(secondcharcheck, '1');
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,263 @@
|
||||
use std::io::BufRead;
|
||||
|
||||
pub const DEFAULT_OUTPUT_FILE: &str = "numbers.json";
|
||||
const LETTERS: &str = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
|
||||
|
||||
#[derive(Clone, Debug, Default)]
|
||||
pub struct NumberParser {
|
||||
pub filepath: String,
|
||||
}
|
||||
|
||||
impl NumberParser {
|
||||
pub async fn file_dump(
|
||||
&self,
|
||||
) -> Result<Vec<schedtxt_models::contact::Contact>, std::io::Error> {
|
||||
println!("Dumping files");
|
||||
let mut objs: Vec<schedtxt_models::contact::Contact> = Vec::new();
|
||||
|
||||
match self.read_lines(&self.filepath).await {
|
||||
Ok(lines) => {
|
||||
for line in lines {
|
||||
let contains_letters = line.chars().any(|c| LETTERS.contains(c));
|
||||
if contains_letters {
|
||||
continue;
|
||||
} else {
|
||||
let my_obj = schedtxt_models::contact::Contact {
|
||||
phone_number: line.clone(),
|
||||
..Default::default()
|
||||
};
|
||||
if !my_obj.phone_number.is_empty() {
|
||||
objs.push(my_obj);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let updated_contacts = self.update_contacts(&objs).await;
|
||||
let removed_duplicates = self.remove_dups(&updated_contacts).await;
|
||||
|
||||
Ok(removed_duplicates)
|
||||
}
|
||||
Err(err) => Err(err),
|
||||
}
|
||||
}
|
||||
|
||||
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(_) => {
|
||||
println!("Saved to: {filename:?}");
|
||||
}
|
||||
Err(err) => {
|
||||
eprintln!("Error: {err:?}");
|
||||
}
|
||||
},
|
||||
Err(err) => {
|
||||
eprintln!("Error: {err:?}");
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
pub fn print_phone_numbers(&self, contacts: &Vec<schedtxt_models::contact::Contact>) {
|
||||
println!("Printing phone numbers");
|
||||
|
||||
for contact in contacts {
|
||||
println!("Phone Number: {:?}", contact.phone_number);
|
||||
}
|
||||
|
||||
println!("Total phone numbers: {:?}", contacts.len());
|
||||
}
|
||||
|
||||
async fn read_lines(&self, filename: &String) -> Result<Vec<String>, std::io::Error> {
|
||||
match std::fs::File::open(filename) {
|
||||
Ok(file) => {
|
||||
let reader = std::io::BufReader::new(file);
|
||||
reader.lines().collect()
|
||||
}
|
||||
Err(err) => Err(err),
|
||||
}
|
||||
}
|
||||
|
||||
async fn remove_dups(
|
||||
&self,
|
||||
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 {
|
||||
unique_items.insert(val.phone_number.clone());
|
||||
}
|
||||
|
||||
for unique_item in unique_items {
|
||||
let contact = schedtxt_models::contact::Contact {
|
||||
phone_number: unique_item,
|
||||
..Default::default()
|
||||
};
|
||||
unique_contacts.push(contact);
|
||||
}
|
||||
|
||||
unique_contacts
|
||||
}
|
||||
|
||||
async fn update_contacts(
|
||||
&self,
|
||||
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();
|
||||
if phone_number.len() < 2 {
|
||||
println!("Invalid number: {phone_number:?}");
|
||||
continue;
|
||||
}
|
||||
|
||||
let pars = self.remove_some_data(&phone_number).await;
|
||||
|
||||
match self.add_prefix(&pars) {
|
||||
Ok(updated_parsed) => {
|
||||
let contact = schedtxt_models::contact::Contact {
|
||||
phone_number: updated_parsed,
|
||||
..Default::default()
|
||||
};
|
||||
updated.push(contact);
|
||||
}
|
||||
Err(err) => {
|
||||
eprintln!("Error: {err:?}");
|
||||
std::process::exit(-2);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
updated
|
||||
}
|
||||
|
||||
fn add_prefix(&self, raw: &String) -> Result<String, std::io::Error> {
|
||||
if raw.is_empty() {
|
||||
Err(std::io::Error::other("Empty"))
|
||||
} else {
|
||||
let mut parsed: String = String::new();
|
||||
let first_char = raw.chars().nth(0).unwrap();
|
||||
|
||||
if first_char == '1' {
|
||||
parsed = format!("+{raw}");
|
||||
} else if first_char != '+' {
|
||||
parsed = format!("+1{raw}");
|
||||
}
|
||||
|
||||
Ok(parsed)
|
||||
}
|
||||
}
|
||||
|
||||
async fn remove_some_data(&self, unparsed: &str) -> String {
|
||||
let mut parsed: String = String::new();
|
||||
|
||||
for ch in unparsed.chars() {
|
||||
if ch == ' ' {
|
||||
continue;
|
||||
} else {
|
||||
if ch.is_numeric() {
|
||||
parsed.push(ch);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
parsed
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use schedtxt_models::contact::Contact;
|
||||
|
||||
const TEST_NUMBERS_0: &str = "tests/numbers-0.txt";
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_file_dump() {
|
||||
let file_exists = {
|
||||
let path = std::path::Path::new(TEST_NUMBERS_0);
|
||||
path.exists()
|
||||
};
|
||||
|
||||
assert_eq!(true, file_exists, "File does not exists {TEST_NUMBERS_0:?}");
|
||||
|
||||
let filename = String::from(TEST_NUMBERS_0);
|
||||
let prsr = super::NumberParser { filepath: filename };
|
||||
let original: Vec<Contact> = vec![
|
||||
Contact {
|
||||
phone_number: String::from("+13055550112"),
|
||||
..Default::default()
|
||||
},
|
||||
Contact {
|
||||
phone_number: String::from("+13175550123"),
|
||||
..Default::default()
|
||||
},
|
||||
Contact {
|
||||
phone_number: String::from("+14155550135"),
|
||||
..Default::default()
|
||||
},
|
||||
Contact {
|
||||
phone_number: String::from("+16085550190"),
|
||||
..Default::default()
|
||||
},
|
||||
Contact {
|
||||
phone_number: String::from("+17135550167"),
|
||||
..Default::default()
|
||||
},
|
||||
Contact {
|
||||
phone_number: String::from("+16025550177"),
|
||||
..Default::default()
|
||||
},
|
||||
Contact {
|
||||
phone_number: String::from("+13605550158"),
|
||||
..Default::default()
|
||||
},
|
||||
Contact {
|
||||
phone_number: String::from("+12175550194"),
|
||||
..Default::default()
|
||||
},
|
||||
];
|
||||
|
||||
match prsr.file_dump().await {
|
||||
Ok(contacts) => {
|
||||
assert!((contacts.len() > 0), "No contacts has been parsed");
|
||||
|
||||
let phone_numbers_1: std::collections::HashSet<_> =
|
||||
contacts.iter().map(|p| p.phone_number.clone()).collect();
|
||||
let phone_numbers_2: std::collections::HashSet<_> =
|
||||
original.iter().map(|p| p.phone_number.clone()).collect();
|
||||
assert_eq!(phone_numbers_1, phone_numbers_2, "No match");
|
||||
}
|
||||
Err(err) => {
|
||||
assert!(false, "Error: {err:?}");
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_save_file() {
|
||||
let prsr = super::NumberParser {
|
||||
filepath: String::from(TEST_NUMBERS_0),
|
||||
};
|
||||
let results = prsr.file_dump().await;
|
||||
assert!(results.is_ok(), "File dump not successful");
|
||||
let test_output_file: &str = "test-numbers.json";
|
||||
|
||||
let contacts = results.unwrap();
|
||||
prsr.save_file(contacts, test_output_file).await;
|
||||
let file_exists = {
|
||||
let path = std::path::Path::new(test_output_file);
|
||||
path.exists()
|
||||
};
|
||||
|
||||
assert!(file_exists, "Contacts were not saved");
|
||||
match std::fs::remove_file(test_output_file) {
|
||||
Ok(_) => {
|
||||
println!("File removed");
|
||||
}
|
||||
Err(err) => {
|
||||
assert!(false, "Error: {err:?}");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
pub fn print_version() {
|
||||
let name = env!("CARGO_PKG_NAME");
|
||||
let version = env!("CARGO_PKG_VERSION");
|
||||
|
||||
println!("{name:?} {version:?}");
|
||||
}
|
||||
|
||||
pub fn contains_version(args: &Vec<String>) -> bool {
|
||||
let valid_flags = vec!["-v", "--version"];
|
||||
|
||||
for arg in args {
|
||||
for valid_flag in &valid_flags {
|
||||
if valid_flag == arg {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
false
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
(217) 555-0194
|
||||
(602) 555-0177
|
||||
(713) 555-0167
|
||||
(608) 555-0190
|
||||
(305) 555-0112
|
||||
(415) 555-0135
|
||||
(608) 555-0190
|
||||
(602) 555-0177
|
||||
(317) 555-0123
|
||||
(360) 555-0158
|
||||
Reference in New Issue
Block a user