bhcli

commit 3fffb9adb7407ae2b1a99ad0179468b0ada3c217
parent a95925e66ff2b497594ca410247a2a9db1405b3e
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Wed, 29 Mar 2023 19:30:50 -0700

cleanup

Diffstat:
M
src/lechatphp/mod.rs
 | 
12
++++++------

1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/lechatphp/mod.rs b/src/lechatphp/mod.rs
@@ -295,7 +295,7 @@ fn solve_difficulty3(img: &DynamicImage) -> Result<String, CaptchaErr> {
                 }
                 let red_pt = red_px_pts.get(0).unwrap();
                 let angle = get_angle(red_pt, &letter.center());
-                let neighbor = get_letter_in_direction(&letter, angle, &letters_map);
+                let neighbor = get_letter_in_direction(&letter, angle, &letters_map).unwrap();
                 letter = neighbor.clone();
                 break;
             }
@@ -322,12 +322,12 @@ fn solve_difficulty3(img: &DynamicImage) -> Result<String, CaptchaErr> {
 
             let fst_red_pt = red_px_pts.get(0).unwrap();
             let angle = get_angle(fst_red_pt, &letter.center());
-            let mut neighbor = get_letter_in_direction(&letter, angle, &letters_map);
+            let mut neighbor = get_letter_in_direction(&letter, angle, &letters_map).unwrap();
 
             if visited.contains(&neighbor.key()) {
                 let fst_red_pt = red_px_pts.get(1).unwrap();
                 let angle = get_angle(fst_red_pt, &letter.center());
-                neighbor = get_letter_in_direction(&letter, angle, &letters_map);
+                neighbor = get_letter_in_direction(&letter, angle, &letters_map).unwrap();
                 if visited.contains(&neighbor.key()) {
                     if i == 3 {
                         for (_, l) in letters_map.iter() {
@@ -348,10 +348,10 @@ fn solve_difficulty3(img: &DynamicImage) -> Result<String, CaptchaErr> {
 }
 
 
-fn get_letter_in_direction(letter: &Letter, angle: f64, letters_map: &HashMap<char, Letter>) -> Letter {
+fn get_letter_in_direction(letter: &Letter, angle: f64, letters_map: &HashMap<char, Letter>) -> Option<Letter> {
     let mut angle = angle;
     let mut min_angle = f64::MAX;
-    let mut out = Letter::new(Point::new(0, 0), ' ');
+    let mut out: Option<Letter> = None;
     // Visit every other letters
     for (_, other_letter) in letters_map.iter() {
         if other_letter.key() == letter.key() {
@@ -369,7 +369,7 @@ fn get_letter_in_direction(letter: &Letter, angle: f64, letters_map: &HashMap<ch
         if angle_diff < min_angle {
             // Keep track of the letter with the smaller angle difference
             min_angle = angle_diff;
-            out = other_letter.clone();
+            out = Some(other_letter.clone());
         }
     }
     out