[IMP] server: python path as arg in cli mode

Author: fda-odoo

server/src/cli_backend.rs

@@ -5,7 +5,7 @@ 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;
@@ -60,6 +60,7 @@ impl CliBackend {
         config.no_typeshed = self.cli.no_typeshed;
         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/utils.rs

@@ -25,6 +25,17 @@ macro_rules! Sy {
     };
 }
 
+pub fn get_python_command() -> Option<String> {
+    for cmd in &["python3", "python"] {
+        if let Ok(output) = Command::new(cmd).arg("--version").output() {
+            if output.status.success() {
+                return Some(S!(*cmd));
+            }
+        }
+    }
+    None
+}
+
 #[cfg(target_os = "windows")]
 pub fn is_file_cs(path: String) -> bool {
     let mut p = Path::new(&path);

server/tests/setup/setup.rs

@@ -6,24 +6,14 @@ use std::path::PathBuf;
 
 
 use lsp_types::TextDocumentContentChangeEvent;
+use odoo_ls_server::utils::get_python_command;
 use odoo_ls_server::{core::{config::{ConfigEntry, DiagMissingImportsMode}, entry_point::EntryPointMgr, odoo::SyncOdoo}, threads::SessionInfo, utils::PathSanitizer as _};
 
 use odoo_ls_server::S;
 use tracing::{info, level_filters::LevelFilter};
 use tracing_appender::rolling::RollingFileAppender;
 use tracing_subscriber::{fmt, layer::SubscriberExt, FmtSubscriber};
 
-fn get_python_command() -> Option<String> {
-    for cmd in &["python3", "python"] {
-        if let Ok(output) = Command::new(cmd).arg("--version").output() {
-            if output.status.success() {
-                return Some(S!(*cmd));
-            }
-        }
-    }
-    None
-}
-
 pub fn setup_server(with_odoo: bool) -> SyncOdoo {
 
     let file_appender = RollingFileAppender::builder()