[FIX] server: change str.starts_with with PathBuf::starts_with

This change avoid matching "dir1" as a subidrectory of "dir" as it starts with the same string. PathBuf will match on path components instead

Author: fda-odoo

server/src/core/entry_point.rs

@@ -232,7 +232,7 @@ impl EntryPointMgr {
 
     pub fn remove_entries_with_path(&mut self, path: &String) {
         for entry in self.iter_all() {
-            if entry.borrow().path.starts_with(path) { //delete any entrypoint that would be in a subdirectory too
+            if PathBuf::from(entry.borrow().path.clone()).starts_with(path) { //delete any entrypoint that would be in a subdirectory too
                 entry.borrow_mut().to_delete = true;
             }
         }
@@ -289,14 +289,14 @@ impl EntryPointMgr {
 
     /// Transform the path of an addon to the odoo relative path.
     /// Otherwise, return the path as is.
-    pub fn transform_addon_path(&self, path: &str) -> String {
+    pub fn transform_addon_path(&self, path: &PathBuf) -> String {
         for entry in self.addons_entry_points.iter() {
             if entry.borrow().is_valid_for(path) {
-                let path_str = path.to_string();
+                let path_str = path.sanitize();
                 return path_str.replace(&entry.borrow().path, entry.borrow().addon_to_odoo_path.as_ref().unwrap());
             }
         }
-        path.to_string()
+        path.sanitize()
     }
 }
 
@@ -336,7 +336,7 @@ impl EntryPoint {
         res
     }
 
-    pub fn is_valid_for(&self, path: &str) -> bool {
+    pub fn is_valid_for(&self, path: &PathBuf) -> bool {
         path.starts_with(&self.path)
     }
 

server/src/core/file_mgr.rs

@@ -412,7 +412,7 @@ impl FileMgr {
 
     pub fn delete_path(session: &mut SessionInfo, uri: &String) {
         //delete all files that are the uri or in subdirectory
-        let matching_keys: Vec<String> = session.sync_odoo.get_file_mgr().borrow_mut().files.keys().filter(|k| k.starts_with(uri)).cloned().collect();
+        let matching_keys: Vec<String> = session.sync_odoo.get_file_mgr().borrow_mut().files.keys().filter(|k| PathBuf::from(k).starts_with(uri)).cloned().collect();
         for key in matching_keys {
             let to_del = session.sync_odoo.get_file_mgr().borrow_mut().files.remove(&key);
             if let Some(to_del) = to_del {

server/src/core/import_resolver.rs

@@ -4,7 +4,7 @@ use tracing::{error, info};
 use std::collections::{HashMap, HashSet};
 use std::rc::Rc;
 use std::cell::RefCell;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 
 use ruff_text_size::TextRange;
 use ruff_python_ast::{Alias, Identifier};
@@ -286,10 +286,10 @@ fn _get_or_create_symbol(session: &mut SessionInfo, for_entry: &Rc<RefCell<Entry
                 let mut found = false;
                 let entry_point_mgr = session.sync_odoo.entry_point_mgr.clone();
                 let entry_point_mgr = entry_point_mgr.borrow();
-                let from_path = session.sync_odoo.entry_point_mgr.borrow().transform_addon_path(from_path);
-                let from_path = from_path.as_str();
+                let from_path = session.sync_odoo.entry_point_mgr.borrow().transform_addon_path(&PathBuf::from(from_path));
+                let from_path = PathBuf::from(from_path);
                 for entry in entry_point_mgr.iter_for_import(for_entry) {
-                    if ((entry.borrow().is_public() && (level.is_none() || level.unwrap() == 0)) || entry.borrow().is_valid_for(from_path)) && entry.borrow().addon_to_odoo_path.is_none() {
+                    if ((entry.borrow().is_public() && (level.is_none() || level.unwrap() == 0)) || entry.borrow().is_valid_for(&from_path)) && entry.borrow().addon_to_odoo_path.is_none() {
                         let entry_point = entry.borrow().get_symbol();
                         if let Some(entry_point) = entry_point {
                             let mut next_symbol = entry_point.borrow().get_symbol(&(vec![branch.clone()], vec![]), u32::MAX);

server/src/core/odoo.rs

@@ -435,7 +435,7 @@ impl SyncOdoo {
         //find which entrypoint to use
         for entry in self.entry_point_mgr.borrow().iter_all() {
             let entry_point = entry.borrow();
-            if entry_point.is_public() || from_path.starts_with(&entry_point.path) {
+            if entry_point.is_public() || PathBuf::from(from_path).starts_with(&entry_point.path) {
                 let symbols = entry_point.root.borrow().get_symbol(&(entry_point.addon_to_odoo_tree.as_ref().unwrap_or(&entry_point.tree).iter().chain(&tree.0).map(|x| x.clone()).collect(), tree.1.clone()), position);
                 if !symbols.is_empty() {
                     return symbols;
@@ -767,7 +767,7 @@ impl SyncOdoo {
         let mut parents = vec![];
         let ep_mgr = session.sync_odoo.entry_point_mgr.clone();
         for entry in ep_mgr.borrow().iter_all() {
-            if entry.borrow().is_valid_for(path.sanitize().as_str()) {
+            if entry.borrow().is_valid_for(path) {
                 let tree = entry.borrow().get_tree_for_entry(path);
                 let path_symbol = entry.borrow().root.borrow().get_symbol(&tree, u32::MAX);
                 if path_symbol.is_empty() {
@@ -801,7 +801,7 @@ impl SyncOdoo {
     pub fn get_symbol_of_opened_file(session: &mut SessionInfo, path: &PathBuf) -> Option<Rc<RefCell<Symbol>>> {
         let path_in_tree = path.to_tree_path();
         for entry in session.sync_odoo.entry_point_mgr.borrow().iter_for_import(session.sync_odoo.entry_point_mgr.borrow().main_entry_point.as_ref().unwrap()) {
-            if (entry.borrow().typ == EntryPointType::MAIN || entry.borrow().addon_to_odoo_path.is_some()) && entry.borrow().is_valid_for(path.as_os_str().to_str().unwrap()) {
+            if (entry.borrow().typ == EntryPointType::MAIN || entry.borrow().addon_to_odoo_path.is_some()) && entry.borrow().is_valid_for(path) {
                 let tree = entry.borrow().get_tree_for_entry(path);
                 let path_symbol = entry.borrow().root.borrow().get_symbol(&tree, u32::MAX);
                 if path_symbol.is_empty() {
@@ -838,7 +838,7 @@ impl SyncOdoo {
      */
     pub fn path_to_main_entry_tree(&self, path: &PathBuf) -> Option<Tree> {
         for entry in self.entry_point_mgr.borrow().iter_main() {
-            if (entry.borrow().typ == EntryPointType::MAIN || entry.borrow().addon_to_odoo_path.is_some()) && entry.borrow().is_valid_for(path.sanitize().as_str()) {
+            if (entry.borrow().typ == EntryPointType::MAIN || entry.borrow().addon_to_odoo_path.is_some()) && entry.borrow().is_valid_for(path) {
                 let tree = entry.borrow().get_tree_for_entry(path);
                 return Some(tree);
             }
@@ -1338,7 +1338,7 @@ impl Odoo {
             }
         }
         for entry in ep_mgr.borrow().iter_all_but_main() {
-            if entry.borrow().is_valid_for(path.as_str()) {
+            if entry.borrow().is_valid_for(&PathBuf::from(path)) {
                 let tree = entry.borrow().get_tree_for_entry(&PathBuf::from(path.clone()));
                 entry.borrow_mut().search_symbols_to_rebuild(session, &tree);
             }

server/src/core/symbols/namespace_symbol.rs

@@ -1,7 +1,7 @@
 use byteyarn::Yarn;
 use weak_table::PtrWeakHashSet;
 
-use std::{cell::RefCell, collections::HashMap, rc::{Rc, Weak}};
+use std::{cell::RefCell, collections::HashMap, path::PathBuf, rc::{Rc, Weak}};
 
 use crate::constants::{BuildSteps, OYarn};
 
@@ -53,7 +53,7 @@ impl NamespaceSymbol {
         let mut best_length: i32 = -1;
         let mut index = 0;
         while index < self.directories.len() {
-            if file.borrow().paths()[0].starts_with(&self.directories[index].path) && self.directories[index].path.len() as i32 > best_length {
+            if PathBuf::from(&file.borrow().paths()[0]).starts_with(&self.directories[index].path) && self.directories[index].path.len() as i32 > best_length {
                 best_index = index as i32;
                 best_length = self.directories[index].path.len() as i32;
             }