Add Shortcut module and enhance file system interactions

Author: AlixANNERAUD

Modules/Authentication/Cargo.toml

@@ -9,4 +9,4 @@ Users = { path = "../Users" }
 Task = { path = "../Task" }
 File_system = { path = "../File_system" }
 sha2 = { version = "0.10", features = ["asm"] }
-miniserde = "0.1.41"
+miniserde = "0.1"

Modules/Authentication/src/Error.rs

@@ -14,6 +14,7 @@ pub enum Error_type {
     Failed_to_get_new_user_identifier(Users::Error_type),
     Failed_to_create_user(Users::Error_type),
     Failed_to_write_user_file(File_system::Error_type),
+    Failed_to_create_users_directory(File_system::Error_type),
     Failed_to_read_group_directory(File_system::Error_type),
     Failed_to_get_group_file_path,
     Failed_to_open_group_file(File_system::Error_type),
@@ -23,6 +24,7 @@ pub enum Error_type {
     Failed_to_get_new_group_identifier(Users::Error_type),
     Failed_to_create_group(Users::Error_type),
     Failed_to_write_group_file(File_system::Error_type),
+    Failed_to_create_groups_directory(File_system::Error_type),
     Invalid_password,
     Failed_to_open_random_device(File_system::Error_type),
     Failed_to_read_random_device(File_system::Error_type),
@@ -57,6 +59,9 @@ impl Display for Error_type {
             Self::Failed_to_add_user(Error) => {
                 write!(Formatter, "Failed to add user: {}", Error)
             }
+            Self::Failed_to_create_users_directory(Error) => {
+                write!(Formatter, "Failed to create users directory: {}", Error)
+            }
             Self::Failed_to_read_group_directory(Error) => {
                 write!(Formatter, "Failed to read group directory: {}", Error)
             }
@@ -75,6 +80,9 @@ impl Display for Error_type {
             Self::Failed_to_add_group(Error) => {
                 write!(Formatter, "Failed to add group: {}", Error)
             }
+            Self::Failed_to_create_groups_directory(Error) => {
+                write!(Formatter, "Failed to create group directory: {}", Error)
+            }
             Self::Invalid_password => {
                 write!(Formatter, "Invalid password")
             }

Modules/Authentication/src/Group.rs

@@ -4,7 +4,7 @@ use Users::{
     Group_identifier_inner_type, Group_identifier_type, User_identifier_inner_type,
     User_identifier_type,
 };
-use Virtual_file_system::{File_type, Virtual_file_system_type};
+use Virtual_file_system::{Directory_type, File_type, Virtual_file_system_type};
 
 use crate::{Error_type, Group_folder_path, Result_type};
 
@@ -104,6 +104,11 @@ pub fn Create_group<'a>(
         vec![],
     );
 
+    match Directory_type::Create(Virtual_file_system, Group_folder_path) {
+        Ok(_) | Err(File_system::Error_type::Already_exists) => {}
+        Err(Error) => Err(Error_type::Failed_to_create_groups_directory(Error))?,
+    };
+
     let Group_file_path = Get_group_file_path(Group_name)?;
 
     let Group_file = File_type::Open(

Modules/Authentication/src/User.rs

@@ -4,7 +4,7 @@ use Users::{
     Group_identifier_inner_type, Group_identifier_type, User_identifier_inner_type,
     User_identifier_type,
 };
-use Virtual_file_system::{File_type, Virtual_file_system_type};
+use Virtual_file_system::{Directory_type, File_type, Virtual_file_system_type};
 
 use crate::{
     Error_type,
@@ -145,6 +145,11 @@ pub fn Create_user<'a>(
         Salt,
     );
 
+    match Directory_type::Create(Virtual_file_system, Users_folder_path) {
+        Ok(_) | Err(File_system::Error_type::Already_exists) => {}
+        Err(Error) => Err(Error_type::Failed_to_create_users_directory(Error))?,
+    }
+
     let User_file_path = Path_type::New(Users_folder_path)
         .to_owned()
         .Append(User_name)

Modules/Executable/src/lib.rs

@@ -64,8 +64,8 @@ fn Get_overridden_user(
     Ok(Some(New_user))
 }
 
-pub fn Execute<P: AsRef<Path_type>>(
-    Path: P,
+pub fn Execute(
+    Path: impl AsRef<Path_type>,
     Inputs: String,
     Standard: Standard_type,
 ) -> Result_type<Join_handle_type<isize>> {

Modules/Executables/Shell/Graphical/Cargo.toml

@@ -13,11 +13,14 @@ Users = { path = "../../../Users" }
 Shared = { path = "../../../Shared" }
 Time = { path = "../../../Time" }
 Authentication = { path = "../../../Authentication" }
+miniserde = "0.1"
+Command_line_shell = { path = "../Command_line" }
 
 [dev-dependencies]
 Drivers = { path = "../../../Drivers" }
 Time = { path = "../../../Time" }
 LittleFS = { path = "../../../LittleFS" }
+Terminal = { path = "../../Terminal" }
 
 [[test]]
 name = "Integration_test"

Modules/Executables/Shell/Graphical/Tests/Integration_test.rs

@@ -11,9 +11,11 @@ use Graphical_shell::Shell_executable_type;
 #[test]
 fn main() {
     use Drivers::Native::Window_screen;
-    use File_system::Permissions_type;
+    use File_system::{Flags_type, Open_type, Permissions_type};
     use Graphics::{Get_minimal_buffer_size, Input_type_type, Point_type};
+    use Terminal::Terminal_executable_type;
     use Users::Group_identifier_type;
+    use Virtual_file_system::File_type;
 
     // - Initialize the task manager.
     let Task_instance = Task::Initialize().unwrap();
@@ -55,27 +57,35 @@ fn main() {
 
     let Task = Task_instance.Get_current_task_identifier().unwrap();
 
-    Virtual_file_system::Get_instance()
-        .Mount_static_device(Task, &"/Shell", Create_device!(Shell_executable_type))
+    Virtual_file_system::Create_default_hierarchy(Virtual_file_system::Get_instance(), Task)
         .unwrap();
+
     Virtual_file_system::Get_instance()
-        .Set_permissions("/Shell", Permissions_type::All_full)
+        .Mount_static_device(
+            Task,
+            &"/Binaries/Graphical_shell",
+            Create_device!(Shell_executable_type),
+        )
         .unwrap();
 
     Virtual_file_system::Get_instance()
-        .Create_directory(&"/Devices", Task)
+        .Mount_static_device(
+            Task,
+            &"/Binaries/Command_line_shell",
+            Create_device!(Shell_executable_type),
+        )
         .unwrap();
 
     Virtual_file_system::Get_instance()
-        .Create_directory(&"/Xila", Task)
+        .Set_permissions("/Binaries/Command_line_shell", Permissions_type::Executable)
         .unwrap();
 
     Virtual_file_system::Get_instance()
-        .Create_directory(&"/Xila/Users", Task)
+        .Create_directory(&"/Configuration/Graphical_shell", Task)
         .unwrap();
 
     Virtual_file_system::Get_instance()
-        .Create_directory(&"/Xila/Groups", Task)
+        .Create_directory(&"/Configuration/Graphical_shell/Shortcuts", Task)
         .unwrap();
 
     Drivers::Native::Console::Mount_devices(Task, Virtual_file_system::Get_instance()).unwrap();
@@ -88,6 +98,36 @@ fn main() {
         )
         .unwrap();
 
+    Virtual_file_system::Get_instance()
+        .Mount_static_device(
+            Task,
+            &"/Devices/Null",
+            Create_device!(Drivers::Common::Null_device_type),
+        )
+        .unwrap();
+
+    Virtual_file_system::Get_instance()
+        .Mount_static_device(
+            Task,
+            &"/Binaries/Terminal",
+            Create_device!(Terminal_executable_type),
+        )
+        .unwrap();
+
+    Virtual_file_system::Get_instance()
+        .Set_permissions("/Binaries/Terminal", Permissions_type::Executable)
+        .unwrap();
+
+    // Write terminal shortcut.
+    File_type::Open(
+        Virtual_file_system::Get_instance(),
+        "/Configuration/Graphical_shell/Shortcuts/Terminal",
+        Flags_type::New(Mode_type::Write_only, Some(Open_type::Create), None),
+    )
+    .unwrap()
+    .Write(Terminal::Shortcut.as_bytes())
+    .unwrap();
+
     let Group_identifier = Group_identifier_type::New(1000);
 
     Authentication::Create_group(
@@ -138,7 +178,7 @@ fn main() {
         .Set_environment_variable(Task, "Host", "xila")
         .unwrap();
 
-    let Result = Executable::Execute("/Shell", "".to_string(), Standard)
+    let Result = Executable::Execute("/Binaries/Graphical_shell", "".to_string(), Standard)
         .unwrap()
         .Join()
         .unwrap();