From 64f883ee7aab261f8c3d97ab88a099b81d60404a Mon Sep 17 00:00:00 2001 From: Jorge Vasquez Perez Date: Tue, 24 Aug 2021 15:09:17 -0700 Subject: [PATCH] Cleaned up whitespace and tabs. --- wc_helper.jsx | 696 ++++++++++++++++++++++++-------------------------- 1 file changed, 335 insertions(+), 361 deletions(-) diff --git a/wc_helper.jsx b/wc_helper.jsx index 1ad71dd..a835b1d 100644 --- a/wc_helper.jsx +++ b/wc_helper.jsx @@ -12,6 +12,8 @@ TODO: - Get artist initials in Windows too. */ + +// Define the Panel (function wcHelperPanel (thisObj) { /* Build UI */ function buildUI(thisObj) { @@ -21,31 +23,22 @@ var secondButton = "own"; var thirdButton = "render"; var fourthButton = "rename"; + var win = (thisObj instanceof Panel)? thisObj : new Window('palette', windowTitle); - win.spacing = 0; - win.margins = 1; + var myProjectGroup = win.add ("group"); win.projectPathLabel = myProjectGroup.add("statictext"); - var myArtistGroup = win.add ("group"); var artistNameLabel= myArtistGroup.add("statictext"); win.artistName= myArtistGroup.add("statictext"); var artistRoleLabel= myArtistGroup.add("statictext"); win.artistRole= myArtistGroup.add("dropdownlist",undefined,["Offline","Finishing"]) win.artistRole.selection = 0; - - - win.projectPathLabel.text = "asdADSASDASDASDASDASDASDASDASDASDASDASDASDASDASDASDASDASDASDASDASDASASDasdADSASDASDASDASDASDASDASDASDASDASDASDASDASDASDASDASDASDASDASDASDASASDasdADSASDASDASDASDASDASDASDASDASDASDASDASDASDASDASDASDASDASDASDASDASASD"; - + win.projectPathLabel.text = "000000000000000000000000000000000000000000000000000"; artistNameLabel.text = "Artist:"; - artistRoleLabel.text = "Role:"; - //****// - + artistRoleLabel.text = "Role:"; win.artistName.text = system.callSystem("whoami"); - var myButtonGroup = win.add ("group"); - myButtonGroup.spacing = 4; - myButtonGroup.margins = 4; myButtonGroup.orientation = "row"; win.checkbox1 = myButtonGroup.add( "checkbox", undefined, "Dupli:") win.checkbox1.value = true; @@ -56,6 +49,11 @@ win.button4 = myButtonGroup2.add ("button", undefined, fourthButton); myButtonGroup2.alignment = "center"; myButtonGroup2.alignChildren = "center"; + + win.spacing = 0; + win.margins = 1; + myButtonGroup.spacing = 4; + myButtonGroup.margins = 4; win.button1.onClick = function(){ btnPlus1(); @@ -67,406 +65,385 @@ win.button3.onClick = function(){ btnRender(); } - - win.button4.onClick = function(){ + win.button4.onClick = function(){ btnTest(); - //alert( getItemByName( getTodayString() )); } win.onResizing = function(){ updateProjectPath(); } - win.layout.layout(true); + win.layout.layout(true); return win } +// Show the Panel +var w = buildUI(thisObj); +if (w.toString() == "[object Panel]") { + w; +} else { + w.show(); +} - // Show the Panel - var w = buildUI(thisObj); - if (w.toString() == "[object Panel]") { - w; - } else { - w.show(); +/* General functions */ +w.pad = function ( n, i ){ //pad n with zeroes up to i places. + if (String(n).length>=i){ + return String(n) + }else{ + var dif = i- (String(n)).length; + var padding = ""; + for (p=0;p=i){ - return String(n) - }else{ - var dif = i- (String(n)).length; - var padding = ""; - for (p=0;p= 0 ; i -- ) - { - var next_folder_name = t[i].name; - //todo make sure that the folder doesnt exist yet. - var next_folder_index = itemIndexInCollection( next_folder.items , next_folder_name ); - //alert(next_folder_index); - if ( next_folder_index == -1 ){ - next_folder = next_folder.items.addFolder(next_folder_name); - }else{ - next_folder = next_folder.items[next_folder_index]; - } - - + } +} +function versiounUpTodaySelectedComps( inc ){ + var myComps = getSelectedProjectItems(); + for ( var i = 0 ; i < myComps.length ; i ++ ){ + var myComp = myComps[i]; + versiounUpTodaySelectedComp( myComp,inc ); + } +} +function itemIndexInCollection( itemCollection , itemName ){ + var indexInCollection = -1; + for ( var i = 1; i <= itemCollection.length ; i ++){ + if ( itemCollection[i].name == itemName ){ + indexInCollection = i; } - new_comp = myComp.duplicate(); - new_comp.name = myComp.name; - versionUpComp( new_comp, inc ); - new_comp.parentFolder = next_folder; - //myComp.selected = false; - //app.project.activeItem = new_comp; - myComp.selected = false; - new_comp.selected = true; } + return indexInCollection; +} +function versiounUpTodaySelectedComp( myComp, inc ){ + //var my_item = getSelectedProjectItems()[0]; - /* UI Buttons */ - function btnPlus1(){ - var dupli = w.checkbox1.value == true; - if ( dupli ){ - app.beginUndoGroup("Create copies of selected Comps for today and increment.") - versiounUpTodaySelectedComps( 1 ); - }else{ - app.beginUndoGroup("Increment selected Comps.") - versionUpSelectedComps( 1 ); - } - app.endUndoGroup() + var t = getItemTrunk(myComp); + + var date_re = "[0-9\_]{8}" + + var next_n // for folder creation + var new_folder; + var date_pos + //create new folder under date folder's parent. + for ( var i = 0 ; i < t.length ; i ++ ) + { + var date_search = t[i].name.search(date_re); + + if ( date_search == 0 ) + { + var date_pos = i; + var date_string = getTodayString(); + //Check if a dated folder already exists. + new_folder = getItemByName( date_string ); + if ( new_folder == null ){ + new_folder = t[i].parentFolder.items.addFolder( date_string ) + } + }; } - function btnOwn(){ - var dupli = w.checkbox1.value == true; - if ( dupli ){ - app.beginUndoGroup("Own duplicates of selected Comps.") - versiounUpTodaySelectedComps( 0 ); + //alert(date_search); + //create same branch structure as trunk under new date folder. + var next_folder = new_folder; + for ( var i = date_pos-1 ; i >= 0 ; i -- ) + { + var next_folder_name = t[i].name; + //todo make sure that the folder doesnt exist yet. + var next_folder_index = itemIndexInCollection( next_folder.items , next_folder_name ); + //alert(next_folder_index); + if ( next_folder_index == -1 ){ + next_folder = next_folder.items.addFolder(next_folder_name); }else{ - app.beginUndoGroup("Own selected Comps.") - versionUpSelectedComps( 0 ); + next_folder = next_folder.items[next_folder_index]; } + + } + new_comp = myComp.duplicate(); + new_comp.name = myComp.name; + versionUpComp( new_comp, inc ); + new_comp.parentFolder = next_folder; + //myComp.selected = false; + //app.project.activeItem = new_comp; + myComp.selected = false; + new_comp.selected = true; +} - function btnRender(){ - renderSelectedToProjectPath(); +/* UI Buttons */ +function btnPlus1(){ + var dupli = w.checkbox1.value == true; + if ( dupli ){ + app.beginUndoGroup("Create copies of selected Comps for today and increment.") + versiounUpTodaySelectedComps( 1 ); + }else{ + app.beginUndoGroup("Increment selected Comps.") + versionUpSelectedComps( 1 ); } - - function btnTest(){ - compHerder = new CompHerder(); - compHerder.activate(); - //alert("Nothing to test right now.") + app.endUndoGroup() +} +function btnOwn(){ + var dupli = w.checkbox1.value == true; + if ( dupli ){ + app.beginUndoGroup("Own duplicates of selected Comps.") + versiounUpTodaySelectedComps( 0 ); + }else{ + app.beginUndoGroup("Own selected Comps.") + versionUpSelectedComps( 0 ); } - - //// - - - +} +function btnRender(){ + renderSelectedToProjectPath(); +} +function btnTest(){ + compHerder = new CompHerder(); + compHerder.activate(); + //alert("Nothing to test right now.") +} function CompHerder(){ this.methods ={ @@ -554,7 +531,6 @@ function CompHerder(){ } this.init = function init() { - // this.btnLauyout = // "button\ // {\ @@ -696,23 +672,21 @@ function CompHerder(){ myUI.window.tabs.search_tab.replaceGrp.replaceString.onActivate = function(){ myUI.window.tabs.search_tab.replaceGrp.replaceString.text = ""; } - //EVENT HANDLERS + + //EVENT HANDLERS myUI.window.tabs.search_tab.doItBtn.onClick = function(){ var search_str = myUI.window.tabs.search_tab.searchGrp.searchString.text; var replace_str = myUI.window.tabs.search_tab.replaceGrp.replaceString.text; myUI.methods.replace( myUI.methods.getSelectedProjectItems() , search_str , replace_str ); }; - myUI.window.tabs.suprefix.suprefixGrp.pre.prefixBtn.onClick = function(){ var pre = myUI.window.tabs.suprefix.suprefixGrp.pre.prefixString.text; myUI.methods.prefix( myUI.methods.getSelectedProjectItems() , pre ); }; - myUI.window.tabs.suprefix.suprefixGrp.su.sufixBtn.onClick = function(){ var su = myUI.window.tabs.suprefix.suprefixGrp.su.sufixString.text; myUI.methods.suffix( myUI.methods.getSelectedProjectItems() , su ); }; - myUI.window.tabs.rename_tab.renameGrp.renameBtn.onClick = function(){ var new_name = myUI.window.tabs.rename_tab.renameGrp.renameString.text; myUI.methods.rename( myUI.methods.getSelectedProjectItems() , new_name );