Update to version 1.0.2

- Fixed wrong path used, that could lead to autocompletion or debugging not working
- Fixed an update issue on VS Code side once a script was send by Cinema 4D to Vs Code unsaved change where not sent.

Author: gr4ph0s

package.json

@@ -5,7 +5,7 @@
   "icon": "image/maxon_logo.png",
   "displayName": "Cinema 4D Connector",
   "description": "Provides helper tool to developer Cinema 4D scripts and plugins.",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/PluginCafe/Cinema4D_Connector-VisualStudioCode_Extension"

src/commands.ts

@@ -121,12 +121,27 @@ export async function DebugScriptContentInScriptManager()
     { throw new Error("Unable to retrieve Cinema 4D path"); }
 
     let pythonPath = os.platform() === 'win32'?
-        path.posix.join(c4dPath, "resource", "modules", "python", "libs", "python39.win64.framework", "python.exe")
+        path.join(c4dPath, "resource", "modules", "python", "libs", "python39.win64.framework", "python.exe")
         :
-        path.posix.join(c4dPath, "resource", "modules", "python", "libs", "python39.macos.framework", "python", "Contents", "MacOS", "python")
+        path.join(c4dPath, "resource", "modules", "python", "libs", "python39.macos.framework", "python", "Contents", "MacOS", "python")
         ;
+
+    if (!fs.existsSync(pythonPath))
+        { pythonPath = os.platform() === 'win32'?
+        path.join(c4dPath, "resource", "modules", "python", "libs", "python310.win64.framework", "python.exe")
+        :
+        path.join(c4dPath, "resource", "modules", "python", "libs", "python310.macos.framework", "python", "Contents", "MacOS", "python")
+        ;}
+
+    if (!fs.existsSync(pythonPath))
+    {  throw new Error("Incorrect path for the c4d python executable, debugger will not work."); }
 
-    let debugAdapterPath = path.posix.join(c4dPath!, "resource", "modules", "python", "libs", "python39", "debugpy", "adapter");
+    let debugAdapterPath = path.join(c4dPath!, "resource", "modules", "python", "libs", "python39", "debugpy", "adapter");
+    if (!fs.existsSync(debugAdapterPath))
+    { debugAdapterPath = path.join(c4dPath!, "resource", "modules", "python", "libs", "python310", "debugpy", "adapter"); }
+
+    if (!fs.existsSync(pythonPath))
+    {  throw new Error("Incorrect path for the debugpy, debugger will not work."); }
 
     let configName = `Python attached to Cinema 4D - PID ${pid}`;
     let configuration: vscode.DebugConfiguration = 
@@ -169,7 +184,7 @@ export async function LoadTemplateScript()
 
     fs.readdirSync(templatePath).forEach(fileName => 
     {
-        let file = path.posix.join(templatePath, fileName);
+        let file = path.join(templatePath, fileName);
         if (fileName.endsWith(".py"))
         {
             fileNames.push(new FileItem(file));

src/settings.ts

@@ -59,6 +59,8 @@ function setPythonExtraPath(inputPath?: string)
 
     let pathToAdd = path.join(c4dPath, "resource", "modules", "python", "libs", "python39");
     if (!fs.existsSync(pathToAdd))
+    { pathToAdd = path.join(c4dPath, "resource", "modules", "python", "libs", "python310"); }
+    if (!fs.existsSync(pathToAdd))
     {  throw new Error("Incorrect path for c4d.path, autocompletion will not work"); }
 
     let pathToAddC4D = path.join(pathToAdd, "c4d");
@@ -166,7 +168,7 @@ export function GetAndStoreTemplateDir()
         let extension = vscode.extensions.getExtension("maxonc4dsdk.cinema4d-connector");
         assert(extension !== undefined);
 
-        templatePath = path.posix.join(extension.extensionPath, "script_template");
+        templatePath = path.join(extension.extensionPath, "script_template");
         if (!templatePath || !fs.existsSync(templatePath))
         {
             throw new Error("Can't compute script template.");