changed the logic

inlife · Dec 12, 2024 · 08fbdcc · 08fbdcc
1 parent 0602080
commit 08fbdcc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/packages/nexrender-action-decompress/index.js b/packages/nexrender-action-decompress/index.js
@@ -33,6 +33,12 @@ const decompress = (job, settings, asset, action) => {
                 // Default behavior - extract all files
                 zip.extractAllTo(job.workpath, action.overwrite || false);
             }
+
+            if (asset.decompressed) {
+                asset.src = asset.dest;
+                asset.dest = path.join(job.workpath, asset.decompressed);
+            }
+
             break;
 
         case 'zip-7z':
@@ -52,17 +58,17 @@ const decompress = (job, settings, asset, action) => {
                 myStream.on('error', (err) => reject(err))
             });
 
+            if (asset.decompressed) {
+                asset.src = asset.dest;
+                asset.dest = path.join(job.workpath, asset.decompressed);
+            }
+
             return promise;
 
         default:
             return Promise.resolve();
     }
 
-    if (asset.decompressed) {
-        asset.src = asset.dest;
-        asset.dest = path.join(job.workpath, asset.decompressed);
-    }
-
     return Promise.resolve();
 }
 

diff --git a/packages/nexrender-worker/src/instance.js b/packages/nexrender-worker/src/instance.js
@@ -1,8 +1,8 @@
 const { createClient } = require('@nexrender/api')
 const { init, render } = require('@nexrender/core')
 const { getRenderingStatus } = require('@nexrender/types/job')
-const pkg = require('../package.json')
 const { withTimeout } = require('@nexrender/core/src/helpers/timeout');
+const pkg = require('../package.json')
 
 const NEXRENDER_API_POLLING = process.env.NEXRENDER_API_POLLING || 30 * 1000;
 const NEXRENDER_TOLERATE_EMPTY_QUEUES = process.env.NEXRENDER_TOLERATE_EMPTY_QUEUES;