XML-CSV part 2

server/Cargo.toml

@@ -38,6 +38,7 @@ byteyarn = "0.5.1"
 roxmltree = "0.20.0"
 dirs = "5.0"
 toml = "0.8.22"
+# ittapi = "0.3" # profiling with VTune profiler
 [target.'cfg(any(target_os = "linux", target_os = "macos"))'.dependencies]
 nix = { version = "0.29.0", features = ["process"] }
 

server/error_code.md

@@ -1,2 +1,2 @@
 # OdooLS Error codes
-OdooLS errors are now defined in their own modules, with the codes being available in [the diagnostics codes list file](src\core\diagnostic_codes_list.rs)
+OdooLS errors are now defined in their own modules, with the codes being available in [the diagnostics codes list file](src\core\diagnostic_codes_list.rs)

server/src/cli_backend.rs

@@ -5,11 +5,11 @@ use tracing::{error, info};
 
 use crate::core::config::ConfigEntry;
 use crate::threads::SessionInfo;
-use crate::utils::PathSanitizer;
+use crate::utils::{get_python_command, PathSanitizer};
 use crate::args::Cli;
 use std::io::Write;
 use std::path::PathBuf;
-use std::fs::File;
+use std::fs::{self, File};
 use serde_json::json;
 use crate::core::{config::{DiagMissingImportsMode}, odoo::SyncOdoo};
 use crate::S;
@@ -42,17 +42,25 @@ impl CliBackend {
         info!("Using tracked folders: {:?}", workspace_folders);
 
         for (id, tracked_folder) in workspace_folders.into_iter().enumerate() {
-            session.sync_odoo.get_file_mgr().borrow_mut().add_workspace_folder(format!("{}", id), PathBuf::from(tracked_folder).sanitize());
+            let tf = fs::canonicalize(tracked_folder.clone());
+            if let Ok(tf) = tf {
+                let tf = tf.sanitize();
+                session.sync_odoo.get_file_mgr().borrow_mut().add_workspace_folder(format!("{}", id), tf);
+            } else {
+                error!("Unable to resolve tracked folder: {}", tracked_folder);
+            }
+
         }
 
         let mut config = ConfigEntry::new();
-        config.addons_paths = addons_paths.into_iter().collect();
-        config.odoo_path = community_path;
+        config.addons_paths = addons_paths.into_iter().map(|p| fs::canonicalize(p).unwrap_or_else(|_| PathBuf::from(S!(""))).sanitize()).collect();
+        config.odoo_path = Some(fs::canonicalize(community_path.unwrap_or(S!(""))).unwrap_or_else(|_| PathBuf::from(S!(""))).sanitize());
         config.refresh_mode = crate::core::config::RefreshMode::Off;
         config.diag_missing_imports = DiagMissingImportsMode::All;
         config.no_typeshed = self.cli.no_typeshed;
-        config.additional_stubs = self.cli.stubs.clone().unwrap_or(vec![]).into_iter().collect();
-        config.stdlib = self.cli.stdlib.clone().unwrap_or(S!(""));
+        config.additional_stubs = self.cli.stubs.clone().unwrap_or(vec![]).into_iter().map(|p| fs::canonicalize(p).unwrap_or_else(|_| PathBuf::from(S!(""))).sanitize()).collect();
+        config.stdlib = self.cli.stdlib.clone().map(|p| fs::canonicalize(p).unwrap_or_else(|_| PathBuf::from(S!(""))).sanitize()).unwrap_or(S!(""));
+        config.python_path = self.cli.python.clone().unwrap_or(get_python_command().unwrap_or(S!("")));
         SyncOdoo::init(&mut session, config);
 
         let output_path = self.cli.output.clone().unwrap_or(S!("output.json"));

server/src/constants.rs

@@ -10,6 +10,7 @@ pub const DEBUG_ODOO_BUILDER: bool = false;
 pub const DEBUG_MEMORY: bool = false;
 pub const DEBUG_THREADS: bool = false;
 pub const DEBUG_STEPS: bool = false;
+pub const DEBUG_STEPS_ONLY_INTERNAL: bool = true;
 pub const DEBUG_REBUILD_NOW: bool = false;
 
 pub type Tree = (Vec<OYarn>, Vec<OYarn>);

server/src/core/diagnostic_codes_list.rs

@@ -400,4 +400,28 @@ OLS05050, DiagnosticSetting::Error, "Data file {0} is not a valid XML or CSV fil
 * An XML_ID should be in the format 'xml_id' or 'module.xml_id', but can't contains more dots
 */
 OLS05051, DiagnosticSetting::Error, "Invalid XML ID '{0}'. It should not contain more than one dot.",
+/**
+* The given parent_id does not exists in the dependents modules, or is not a menuitem
+*/
+OLS05052, DiagnosticSetting::Error, "Parent menuitem with id '{0}' does not exist",
+/**
+ * A menuitem is specifying an action that has not been declared before the menuitem.
+ */
+OLS05053, DiagnosticSetting::Error, "Action with id '{0}' does not exist",
+/**
+ * A menuitem is specifying a group that has not been declared before the menuitem
+ */
+OLS05054, DiagnosticSetting::Error, "Group with id '{0}' does not exist",
+/**
+ * Model not found
+ */
+OLS05055, DiagnosticSetting::Error, "Model '{0}' not found in module '{1}'",
+/**
+ * Model not found
+ */
+OLS05056, DiagnosticSetting::Error, "Model '{0}' not found",
+/**
+ * Field not found in model
+ */
+OLS05057, DiagnosticSetting::Error, "Field '{0}' not found in model '{1}'",
 }

server/src/core/entry_point.rs

@@ -349,6 +349,10 @@ impl EntryPoint {
         self.typ == EntryPointType::PUBLIC || self.typ == EntryPointType::BUILTIN
     }
 
+    pub fn is_main(&self) -> bool {
+        self.typ == EntryPointType::MAIN || self.typ == EntryPointType::ADDON
+    }
+
     pub fn get_symbol(&self) -> Option<Rc<RefCell<Symbol>>> {
         let tree = self.addon_to_odoo_tree.as_ref().unwrap_or(&self.tree).clone();
         let symbol = self.root.borrow().get_symbol(&(tree, vec![]), u32::MAX);