From dc8356e19fce4629856bdead4a08b5ea2ce9df7d Mon Sep 17 00:00:00 2001
From: Jaby <Jaby>
Date: Sun, 16 Oct 2022 16:14:52 +0200
Subject: [PATCH] Small Layout improvement

---
 src/Tools/psxcdgen_ex/src/types/layout.rs | 27 ++++++++++++-----------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/Tools/psxcdgen_ex/src/types/layout.rs b/src/Tools/psxcdgen_ex/src/types/layout.rs
index 88a90717..9e9ccd5b 100644
--- a/src/Tools/psxcdgen_ex/src/types/layout.rs
+++ b/src/Tools/psxcdgen_ex/src/types/layout.rs
@@ -13,9 +13,22 @@ impl DefaultLayout {
         layout.push(Layout::PVD(parent.pvd.clone()));
         layout.push(Layout::PathTables);
 
-        add_dir_and_subdir(&mut layout, parent.root.clone());
+        Self::add_dir_and_subdir(&mut layout, parent.root.clone());
         layout
     }
+
+    fn add_dir_and_subdir(layout: &mut Vec<Layout>, dir: SharedPtr<Directory>) {
+        layout.push(Layout::Directory(dir.clone()));
+        
+        let dir = dir.borrow();
+        for file in dir.files.iter() {
+            layout.push(Layout::File(file.clone()));
+        }
+
+        for dir in dir.dirs.iter() {
+            Self::add_dir_and_subdir(layout, dir.clone());
+        }
+    }    
 }
 
 pub enum Layout {
@@ -26,15 +39,3 @@ pub enum Layout {
     File(SharedPtr<File>)
 }           
 
-fn add_dir_and_subdir(layout: &mut Vec<Layout>, dir: SharedPtr<Directory>) {
-    layout.push(Layout::Directory(dir.clone()));
-    
-    let dir = dir.borrow();
-    for file in dir.files.iter() {
-        layout.push(Layout::File(file.clone()));
-    }
-
-    for dir in dir.dirs.iter() {
-        add_dir_and_subdir(layout, dir.clone());
-    }
-}
\ No newline at end of file