1.1.0 Update

This update requiere VS Code 1.78.0 or more.

- Add support for Cinema 4D 2024.0.
- Auto detect which Python version to use.
- Added an option to disable the C4D console auto-focus.
- Fix incorrect posix path usage.

Author: maxon-madam

package-lock.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.2",
+  "version": "1.1.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/PluginCafe/Cinema4D_Connector-VisualStudioCode_Extension"
@@ -14,7 +14,7 @@
     "url": "https://github.com/PluginCafe/Cinema4D_Connector-VisualStudioCode_Extension/issues"
   },
   "engines": {
-    "vscode": "^1.62.0"
+    "vscode": "^1.78.0"
   },
   "categories": [
     "Other"
@@ -122,6 +122,13 @@
             "type": "string",
             "order": 3,
             "description": "Path to the directory containing the python scripts used as template."
+          },
+          "c4d.bringconsoleinfront": {
+            "scope": "application",
+            "type": "boolean",
+            "default": true,
+            "order": 4,
+            "description": "If checked, bring in front the Cinema 4D console each time a new statement appears."
           }
         }
       }

package.json

@@ -3,8 +3,8 @@ import * as os from 'os';
 import * as fs from 'fs';
 import * as path from 'path';
 import { client, SET_SCRIPT_CONTENT, fixPath } from './async_client';
-import { c4dFs } from './file_system';
-import { GetAndStoreTemplateDir } from './settings';
+import { c4dFs, getPythonFolder, getPythonExecutablePath } from './file_system';
+import { GetAndStoreTemplateDir, C4D_BRING_IN_FRONT_CONFIG_ID } from './settings';
 import { errShowErrorMessage } from './errors';
 
 import assert = require('assert');
@@ -74,7 +74,10 @@ export function addToC4DConsoleCmd(data: string)
         { throw new Error("Failed to retrieve Cinema 4D Output channel"); }
 
         c4dOutputChannel.append(data);
-        c4dOutputChannel.show();
+
+        let bringInFront = vscode.workspace.getConfiguration().get<boolean>(C4D_BRING_IN_FRONT_CONFIG_ID);
+        if (bringInFront)
+            {c4dOutputChannel.show();}
     }
     catch (err: any)
     {
@@ -120,25 +123,12 @@ export async function DebugScriptContentInScriptManager()
     if (c4dPath === undefined)
     { throw new Error("Unable to retrieve Cinema 4D path"); }
 
-    let pythonPath = os.platform() === 'win32'?
-        path.join(c4dPath, "resource", "modules", "python", "libs", "python39.win64.framework", "python.exe")
-        :
-        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")
-        ;}
+    let pythonPath = getPythonExecutablePath(c4dPath);
 
     if (!fs.existsSync(pythonPath))
     {  throw new Error("Incorrect path for the c4d python executable, debugger will not work."); }
 
-    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"); }
+    let debugAdapterPath = path.posix.join(getPythonFolder(c4dPath), "debugpy", "adapter");
 
     if (!fs.existsSync(pythonPath))
     {  throw new Error("Incorrect path for the debugpy, debugger will not work."); }
@@ -184,7 +174,7 @@ export async function LoadTemplateScript()
 
     fs.readdirSync(templatePath).forEach(fileName => 
     {
-        let file = path.join(templatePath, fileName);
+        let file = path.posix.join(templatePath, fileName);
         if (fileName.endsWith(".py"))
         {
             fileNames.push(new FileItem(file));

src/commands.ts

@@ -1,5 +1,7 @@
 import * as path from 'path';
 import * as vscode from 'vscode';
+import * as os from 'os';
+import * as fs from 'fs';
 import { client } from './async_client';
 import { errShowErrorMessage } from './errors';
 
@@ -282,4 +284,84 @@ export class C4DFS implements vscode.FileSystemProvider
     }
 }
 
-export const c4dFs = new C4DFS();
+export const c4dFs = new C4DFS();
+
+export function getPythonFolder(c4dPath: string)
+{
+    let pyVersionToUse = 39;
+
+    let pyLibs = path.posix.join(c4dPath, "resource", "modules", "python", "libs").replace(/\\/g, "/");
+    const readDirPyLibs = fs.readdirSync(pyLibs);
+
+    readDirPyLibs.every((element: string) => {
+        const fullpath = path.posix.join(pyLibs, element);
+        if (!fs.lstatSync(fullpath).isDirectory())
+            {return true;}
+
+        const prefix = "python";
+
+        if (!element.startsWith(prefix))
+            {return true;}
+        
+        const startIndex = element.indexOf(prefix) + prefix.length;
+        let endIndex = startIndex;
+        for (let index = endIndex; index < element.length; index++) 
+        {
+            if (element.charAt(index) === ".")
+                {break;}
+
+            endIndex++;
+        }
+
+        const numberPart = element.slice(startIndex, endIndex);
+        pyVersionToUse = parseInt(numberPart, 10);
+        return false;
+    });
+
+    return path.posix.join(pyLibs, `python${pyVersionToUse}`);
+}
+
+export function getPythonExecutablePath(c4dPath: string)
+{
+    let pyVersionToUse = 39;
+
+    let pyLibs = path.posix.join(c4dPath, "resource", "modules", "python", "libs").replace(/\\/g, "/");
+    const readDirPyLibs = fs.readdirSync(pyLibs);
+
+    readDirPyLibs.every((element: string) => {
+        const fullpath = path.posix.join(pyLibs, element);
+        if (!fs.lstatSync(fullpath).isDirectory())
+            {return true;}
+
+        const prefix = "python";
+
+        if (!element.startsWith(prefix))
+            {return true;}
+        
+        const startIndex = element.indexOf(prefix) + prefix.length;
+        let endIndex = startIndex;
+        for (let index = endIndex; index < element.length; index++) 
+        {
+            if (element.charAt(index) === ".")
+                {break;}
+
+            endIndex++;
+        }
+
+        const numberPart = element.slice(startIndex, endIndex);
+        pyVersionToUse = parseInt(numberPart, 10);
+        return false;
+    });
+
+
+    if (os.platform() === 'win32')
+    {
+        if (pyVersionToUse >= 311)
+            {return path.posix.join(pyLibs, "win64", "python.exe");}
+        
+        return path.posix.join(pyLibs, `python${pyVersionToUse}.win64.framework`, "python.exe");
+    }
+
+    // Mac OS
+    return path.posix.join(pyLibs, `python${pyVersionToUse}.macos.framework`, "python", "Contents", "MacOS", "python");
+}

src/file_system.ts

@@ -4,13 +4,14 @@ import * as path from "path";
 import { errorHandler, errShowErrorMessage as showErrorMessage} from './errors';
 import { client } from "./async_client";
 import { setupStatusBarClientListener } from "./statusbar";
-import { posix } from "path";
+import { getPythonFolder } from './file_system';
 import assert = require('assert');
 
 export const C4D_PATH_CONFIG_ID     = "c4d.path";
 export const C4D_IP_CONFIG_ID       = "c4d.ip";
 export const C4D_PORT_CONFIG_ID     = "c4d.port";
 export const C4D_TEMPLATE_CONFIG_ID = "c4d.template";
+export const C4D_BRING_IN_FRONT_CONFIG_ID = "c4d.bringconsoleinfront";
 export const C4D_CALL_GET_PATH_ON_CONNECT_ID = 'c4d.call_get_path_on_connect';
 
 const PYTHON_AUTOCOMPLETE_EXTRA_PATH_CONFIG_ID = "python.autoComplete.extraPaths";
@@ -57,11 +58,9 @@ function setPythonExtraPath(inputPath?: string)
     if (!c4dPath || !fs.existsSync(c4dPath))
     { return; }
 
-    let pathToAdd = path.join(c4dPath, "resource", "modules", "python", "libs", "python39");
+    let pathToAdd = path.join(getPythonFolder(c4dPath));
     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"); }
+    {  throw new Error("Unable to Find Python path for c4d.path, autocompletion will not work"); }
 
     let pathToAddC4D = path.join(pathToAdd, "c4d");
     if (!fs.existsSync(pathToAddC4D))
@@ -168,7 +167,7 @@ export function GetAndStoreTemplateDir()
         let extension = vscode.extensions.getExtension("maxonc4dsdk.cinema4d-connector");
         assert(extension !== undefined);
 
-        templatePath = path.join(extension.extensionPath, "script_template");
+        templatePath = path.posix.join(extension.extensionPath, "script_template");
         if (!templatePath || !fs.existsSync(templatePath))
         {
             throw new Error("Can't compute script template.");