bhcli

commit d3c8fe3bcbeb2fc232ca87505baffe5cdbd38ff6
parent 4c844df96015cbe846f2bafad97e0d8942fe57b9
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Thu, 30 Mar 2023 03:18:01 -0700

simplify code

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

1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/src/lechatphp/mod.rs b/src/lechatphp/mod.rs
@@ -314,25 +314,23 @@ fn get_starting_letter(img: &DynamicImage, letters_map: &HashMap<char, Letter>) 
 }
 
 fn get_next_node(red_px_pts: &Vec<Point>, letter: &Letter, letters_map: &HashMap<char, Letter>, visited: &HashSet<Letter>, i: i32, nb_lines: usize) -> Option<Letter> {
-    let mut res: Option<Letter> = None;
-    'lines_loop: for idx in 0..nb_lines {
+    if i == 3 {
+        for (_, l) in letters_map.iter() {
+            if !visited.contains(&l) {
+                return Some(l.clone());
+            }
+        }
+        return None;
+    }
+    for idx in 0..nb_lines {
         let fst_red_pt = red_px_pts.get(idx).unwrap();
         let angle = get_angle(fst_red_pt, &letter.center());
         let neighbor = get_letter_in_direction(&letter, angle, &letters_map).unwrap();
-        if visited.contains(&neighbor) {
-            if i == 3 {
-                for (_, l) in letters_map.iter() {
-                    if !visited.contains(&l) {
-                        res = Some(l.clone());
-                        break 'lines_loop;
-                    }
-                }
-            }
-            continue;
+        if !visited.contains(&neighbor) {
+            return Some(neighbor);
         }
-        res = Some(neighbor);
     }
-    res
+    None
 }