From f2c5beb14882094741d233ced98b9ea7dd93e496 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakub@pype.club>
Date: Wed, 8 Apr 2020 14:55:23 +0200
Subject: [PATCH] feat(): improving batchRenamer loading

---
 .../extensions/com.pype/jsx/batchRenamer.jsx  | 14 +++---
 pype/premiere/extensions/com.pype/pypeApp.jsx | 48 ++++++++++++-------
 2 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/pype/premiere/extensions/com.pype/jsx/batchRenamer.jsx b/pype/premiere/extensions/com.pype/jsx/batchRenamer.jsx
index 787e14c2c1..d1786679ad 100644
--- a/pype/premiere/extensions/com.pype/jsx/batchRenamer.jsx
+++ b/pype/premiere/extensions/com.pype/jsx/batchRenamer.jsx
@@ -1,4 +1,4 @@
-/* global app, XMPMeta, ExternalObject, CSXSEvent, Folder */
+/* global $, JSON, app, XMPMeta, ExternalObject, CSXSEvent, Folder */
 /* --------------------------------------
    -. ==  [ part 0f PyPE CluB ] == .-
 _______________.___._____________________
@@ -11,7 +11,7 @@ _______________.___._____________________
 */
 
 // variable br is defined in pypeAvalon.jsx
-var br = {
+$.batchrenamer = {
   getSelectedVideoTrackItems: function () {
     var seq = app.project.activeSequence;
     var selected = [];
@@ -101,19 +101,19 @@ var br = {
         clips: {},
         tags: {}
       };
-      br.setSequencePypeMetadata(sequence, pyMeta);
+      $.batchrenamer.setSequencePypeMetadata(sequence, pyMeta);
       pypeDataValue = xmp.getProperty(kPProPrivateProjectMetadataURI, pypeData);
-      return br.getSequencePypeMetadata(sequence);
+      return $.batchrenamer.getSequencePypeMetadata(sequence);
     } else {
       return JSON.parse(pypeDataValue);
     }
   },
   renameTargetedTextLayer: function (data) {
     $.writeln(data);
-    var selected = br.getSelectedVideoTrackItems();
+    var selected = $.batchrenamer.getSelectedVideoTrackItems();
 
     var seq = app.project.activeSequence;
-    var metadata = br.getSequencePypeMetadata(seq);
+    var metadata = $.batchrenamer.getSequencePypeMetadata(seq);
 
     var startCount = 10;
     var stepCount = 10;
@@ -164,7 +164,7 @@ var br = {
     }
 
     metadata.clips = newItems;
-    br.setSequencePypeMetadata(seq, metadata);
+    $.batchrenamer.setSequencePypeMetadata(seq, metadata);
     return JSON.stringify(metadata);
   }
 };
diff --git a/pype/premiere/extensions/com.pype/pypeApp.jsx b/pype/premiere/extensions/com.pype/pypeApp.jsx
index 42f69cea9b..eec651fdbb 100644
--- a/pype/premiere/extensions/com.pype/pypeApp.jsx
+++ b/pype/premiere/extensions/com.pype/pypeApp.jsx
@@ -1,4 +1,5 @@
-/*************************************************************************
+/* global $, File, Folder, alert */
+/*************************************************************************
  * ADOBE CONFIDENTIAL
  * ___________________
  *
@@ -16,10 +17,6 @@ if (typeof ($) === 'undefined') {
   var $ = {};
 }
 
-if (typeof (br) === 'undefined') {
-  var br = {};
-}
-
 if (typeof (app) === 'undefined') {
   var app = {};
 }
@@ -28,9 +25,26 @@ function keepExtention () {
   return app.setExtensionPersistent('com.pype', 0);
 }
 
-keepExtention()
+keepExtention();
+
+var jsFilesList = ['json2.js'];
 
 $._ext = {
+  evalJSFiles: function (extensionFolder) {
+    var libDir = new File(extensionFolder + '/lib');
+
+    // adding JS from lib
+    for (var jsi = 0; jsi < jsFilesList.length; jsi++) {
+      var js = libDir + '/' + jsFilesList[jsi];
+      try {
+        $.evalFile(js);
+        $.writeln(js);
+      } catch (e) {
+        $.writeln(e);
+        alert('Exception:' + e);
+      }
+    }
+  },
   // Evaluate a file and catch the exception.
   evalFile: function (path) {
     try {
@@ -42,15 +56,10 @@ $._ext = {
     }
   },
   // Evaluate all the files in the given folder
-  evalFiles: function (extensionFolder) {
-    // adding JSON module
-    var json2 = new Folder(extensionFolder + '/lib/json2.js');
-    $.evalFile(json2);
-    $.writeln(JSON.stringify({ thispath: '/taph/thsis.json' }));
-
+  evalJSXFiles: function (extensionFolder, appShortName) {
     // adding all jsx files
-    var folderJsx = new Folder(extensionFolder + '/jsx/')
-    var folderPpro = new Folder(folderJsx + '/PPRO');
+    var folderJsx = new Folder(extensionFolder + '/jsx/');
+    var folderPpro = new Folder(folderJsx + '/' + appShortName);
     var foldersToImport = [folderPpro, folderJsx];
     for (var fi = 0; fi < foldersToImport.length; fi++) {
       if (foldersToImport[fi].exists) {
@@ -94,5 +103,12 @@ $._ext = {
   }
 };
 
-// var dalsiJsxFile = 'C:\\Users\\jezsc\\CODE\\pype-setup\\repos\\pype\\pype\\premiere\\extensions\\com.pype\\jsx\\pype.jsx';
-// $.evalFile(dalsiJsxFile);
+// var extensionFolder = new Folder(
+//   'C:/Users/jezsc/CODE/pype-setup/repos/pype/pype/premiere/extensions/com.pype');
+// $.writeln(extensionFolder);
+// var mainJsx = extensionFolder + '/pypeApp.jsx';
+// var appName = 'PPRO';
+// $.writeln(mainJsx);
+// $.evalFile(mainJsx);
+// $._ext.evalJSXFiles(extensionFolder, appName);
+// $._ext.evalJSFiles(extensionFolder);