kt-forpro-tools 1.0.2 → 1.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "kt-forpro-tools",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "description": "",
     "author": "Miguel de Mendoza",
     "main": "src/index.ts",

package/src/slides.ts

@@ -32,6 +32,7 @@ export type KT_SlidesOptions = {
     inDuration?: number;
     comp?: CompItem;
     slideMultiplier?: number;
+    slideDistance?: number;
 };
 
 class KT_Slides {
@@ -47,6 +48,7 @@ class KT_Slides {
     width: number = 1920;
     height: number = 1080;
     segments: number = 6;
+    slideDistance: number = 50;
     slides: Layer[] = [];
     inDuration: number = 1;
     name: string = "Slides";
@@ -55,7 +57,7 @@ class KT_Slides {
     private getNextColor = colorSelector();
 
     constructor(options: KT_SlidesOptions = {}) {
-        const { name, duration, width, height, segments, inDuration, comp, slideMultiplier } = options;
+        const { name, duration, width, height, segments, inDuration, comp, slideMultiplier, slideDistance } = options;
         this.name = name || this.name;
         this.duration = duration || this.duration;
         this.width = width || this.width;
@@ -63,8 +65,9 @@ class KT_Slides {
         this.segments = segments || this.segments;
         this.inDuration = inDuration || this.inDuration;
         this.slideMultiplier = slideMultiplier || this.slideMultiplier;
+        this.slideDistance = slideDistance || this.slideDistance;
         this.initFolders();
-        const compExists = KT_Project.find.comps({ name: this.name + "Master" });
+        const compExists = KT_Project.find.comps({ name: this.name });
         if (compExists && compExists.length > 0) {
             this.masterComp = compExists[0] as CompItem;
             return;
@@ -161,9 +164,9 @@ class KT_Slides {
             flat: true,
             toComp: true,
             compFolder: this.compedSlidesFolder,
+            returnAs: "comps",
         });
 
-        footage = KT_Project.find.comps({ root: this.compedSlidesFolder });
         for (const f of footage) {
             $.writeln("Imported comp: " + f.name);
         }
@@ -179,15 +182,7 @@ class KT_Slides {
         footage.forEach((item, index) => {
             const randomColorIndex = this.getNextColor();
             for (let i = 0; i < this.slideMultiplier; i++) {
-                if (item.name === this.name) $.bp();
-                const subCompName = ((item as FootageItem).name.split(".")[0] + "-" + (i + 1)).replace(
-                    "Artboard ",
-                    "slide"
-                );
-                const subComp = KT_Project.add.compFromFootage(item as FootageItem, {
-                    name: (item as FootageItem).name.split(".")[0] + "-" + (i + 1),
-                    parentFolder: this.compedSlidesFolder,
-                });
+                const subComp = this.precompSlide(item as FootageItem, i);
 
                 const layer = this.addSlide(
                     subComp as AVItem,
@@ -198,6 +193,10 @@ class KT_Slides {
                 this.enableTimeRemap(layer as AVLayer);
                 layer.outPoint = this.masterComp.duration;
                 layer.label = randomColorIndex;
+                if (i === 0) {
+                    const backgroundlayer = layer.source.layers.add(this.backgroundComp);
+                    backgroundlayer.moveToEnd();
+                }
                 this.slides.push(layer);
             }
         });
@@ -256,7 +255,7 @@ class KT_Slides {
         layers.forEach((pivotLayer, index, collection) => {
             pivotLayer = pivotLayer as AVLayer;
             const invertedIndex = collection.length - index;
-            const slideName = pivotLayer.name.split("-")[0] + "_Slide_" + invertedIndex;
+            const slideName = this.getSlideName(pivotLayer, invertedIndex - 1, "_Slide_");
             let precomp = foundComps[slideName];
             if (precomp instanceof CompItem) {
                 const layersToRemove = KT_Layers.find.layers({ comps: precomp });
@@ -273,8 +272,6 @@ class KT_Slides {
 
             // Obtener todas las capas
 
-            // Eliminar todas las capas posteriores a la capa pivote
-
             for (let i = collection.length - 1; i >= 0; i--) {
                 const layer = collection[i];
 
@@ -301,6 +298,28 @@ class KT_Slides {
         });
     };
 
+    cleanUp = () => {
+        const layers = this.masterComp.layers;
+        const comps = this.compsFolder.items;
+        const compsToKeep: string[] = [];
+        for (let i = layers.length; i >= 1; i--) {
+            const layer = layers[i];
+            const nameSplit = layer.name.split("-");
+            const slideIndex = parseInt(nameSplit[nameSplit.length - 1]);
+            const slideName = this.getSlideName(layer, slideIndex, "_Slide_");
+            compsToKeep.push(slideName);
+        }
+
+        for (let i = 1; i <= comps.length; i++) {
+            const item = comps[i];
+            if (is.comp(item)) {
+                if (compsToKeep.indexOf(item.name) < 0) {
+                    item.remove();
+                }
+            }
+        }
+    };
+
     private addSlide(
         source: AVItem,
         duration: number,
@@ -316,6 +335,18 @@ class KT_Slides {
         return layer;
     }
 
+    private precompSlide = (item: FootageItem, i: number): CompItem => {
+        const subCompName = this.getSlideName(item, i);
+        const subComp = KT_Project.add.compFromFootage(item as FootageItem, {
+            name: subCompName,
+            parentFolder: this.compedSlidesFolder,
+        });
+        return subComp as CompItem;
+    };
+
+    private getSlideName = (item: _ItemClasses | Layer, index: number, infix: string = "-"): string => {
+        return item.name.split(".")[0] + infix + (index + 1);
+    };
     private disolveIn = (layer: Layer) => {
         layer.opacity.setValueAtTime(layer.startTime, 0);
         layer.opacity.setValueAtTime(layer.startTime + this.inDuration, 100);
@@ -327,7 +358,7 @@ class KT_Slides {
 
     private slideUp = (layer: Layer) => {
         const finalPosition = layer.position.value;
-        layer.position.setValueAtTime(layer.startTime, [finalPosition[0], finalPosition[1] + 100]);
+        layer.position.setValueAtTime(layer.startTime, [finalPosition[0], finalPosition[1] + this.slideDistance]);
         layer.position.setValueAtTime(layer.startTime + this.inDuration, finalPosition);
         let easeIn = new KeyframeEase(0, 20);
         let easeOut = new KeyframeEase(0, 50);

package/src/tests/index.test.ts

@@ -16,20 +16,22 @@ describe("KtForproTools Tests", () => {
             comp: app.project.activeItem as CompItem,
             slideMultiplier: slideMultiplier,
         });
+
+        slides.cleanUp();
         // slides.import();
-        // slides.splitSlides();
-        const startTime = new Date().getTime();
+        // // slides.splitSlides();
+        // const startTime = new Date().getTime();
         // slides.batchSplitSlides();
-        slides.splitSlides();
+        // // slides.splitSlides();
 
-        const endTime = new Date().getTime();
-        const timeTaken = endTime - startTime;
-        //display time taken in minutes and seconds format mm:ss
-        $.writeln(
-            "Time taken: "
-                .concat(Math.floor(timeTaken / 60000).toFixed(0), ":")
-                .concat(((timeTaken % 60000) / 1000).toFixed(0), "s")
-        );
+        // const endTime = new Date().getTime();
+        // const timeTaken = endTime - startTime;
+        // //display time taken in minutes and seconds format mm:ss
+        // $.writeln(
+        //     "Time taken: "
+        //         .concat(Math.floor(timeTaken / 60000).toFixed(0), ":")
+        //         .concat(((timeTaken % 60000) / 1000).toFixed(0), "s")
+        // );
     });
 });