Merge pull request #146 from xeokit/fix-extension-detection

Fix source file extension detection
xeokit · Apr 18, 2024 · 35a5cd7 · 35a5cd7
2 parents b77a079 + d051b8e
commit 35a5cd7
Show file tree

Hide file tree

Showing 10 changed files with 17,086 additions and 14,480 deletions.
diff --git a/convert2xkt.js b/convert2xkt.js
@@ -68,6 +68,14 @@ function log(msg) {
     }
 }
 
+function getFileExtension(fileName) {
+    let ext =  path.extname(source);
+    if (ext.charAt(0) === ".") {
+        ext = ext.substring(1);
+    }
+    return ext;
+}
+
 async function main() {
 
     log(`[convert2xkt] Running convert2xkt v${npmPackage.version}...`);
@@ -148,7 +156,7 @@ async function main() {
             const metaModelSource = (i < manifest.metadataOutFiles.length) ? manifest.metadataOutFiles[i] : null;
             const outputFileName = getFileNameWithoutExtension(source);
             const outputFileNameXKT = `${outputFileName}.xkt`;
-            const ext = path.extname(source);
+            const ext = getFileExtension(source);
 
             let modelAABB;
             // if (manifest.modelBoundsMin && manifest.modelBoundsMax) {

diff --git a/dist/convert2xkt.cjs.js b/dist/convert2xkt.cjs.js
@@ -26767,6 +26767,14 @@ function convert2xkt({
     stats.conversionTime = 0;
     stats.aabb = null;
 
+    function getFileExtension(fileName) {
+       let ext =  path.extname(source);
+       if (ext.charAt(0) === ".") {
+           ext = ext.substring(1);
+       }
+       return ext;
+    }
+
     return new Promise(function (resolve, reject) {
         const _log = log;
         log = (msg) => {
@@ -26795,7 +26803,10 @@ function convert2xkt({
         const startTime = new Date();
 
         const sourceConfigs = configs.sourceConfigs || {};
-        const ext = sourceFormat || path.extname(source);
+        const ext = sourceFormat || getFileExtension();
+
+        log(`Input file extension: "${ext}"`);
+
         let fileTypeConfigs = sourceConfigs[ext];
 
         if (!fileTypeConfigs) {

diff --git a/dist/xeokit-convert.cjs.js b/dist/xeokit-convert.cjs.js
diff --git a/dist/xeokit-convert.cjs.js.map b/dist/xeokit-convert.cjs.js.map