Merge pull request #2 from kylemotion:fix/render-helper-pc-solve
solved pc path issue and versioned up to 0.1.1
This commit is contained in:
@@ -23,7 +23,7 @@
|
|||||||
//@include "../library/OS.jsx";
|
//@include "../library/OS.jsx";
|
||||||
//@include "../library/json2.js"
|
//@include "../library/json2.js"
|
||||||
|
|
||||||
var versionNumber = '0.1.0';
|
var versionNumber = '0.1.1';
|
||||||
var scriptName = "Show Render Helper" + ' v' + versionNumber;
|
var scriptName = "Show Render Helper" + ' v' + versionNumber;
|
||||||
|
|
||||||
createUI(thisObj)
|
createUI(thisObj)
|
||||||
@@ -41,19 +41,25 @@
|
|||||||
|
|
||||||
var tabMargins = [16,15,16,0];
|
var tabMargins = [16,15,16,0];
|
||||||
var panelMargins = 16;
|
var panelMargins = 16;
|
||||||
|
var separator = getSeparator();
|
||||||
|
|
||||||
var proj = null;
|
var proj = null;
|
||||||
// if(!proj) return
|
// if(!proj) return
|
||||||
if(app.project){
|
if(app.project){
|
||||||
proj = app.project;
|
proj = app.project;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
var DEFAULT_SETTINGS = {
|
var DEFAULT_SETTINGS = {
|
||||||
settings:{
|
settings:{
|
||||||
defaultOutputPath: proj && proj.file ? proj.file.parent.fsName + '/renders' : null,
|
defaultOutputPath: proj && proj.file ? proj.file.parent.fsName + separator + 'renders' : Folder.desktop.fsName,
|
||||||
qcExports: true
|
qcExports: true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
var savedSettings = readSettingsFile();
|
var savedSettings = readSettingsFile();
|
||||||
if(savedSettings.settings){
|
if(savedSettings.settings){
|
||||||
for(var key in savedSettings.settings){
|
for(var key in savedSettings.settings){
|
||||||
@@ -151,7 +157,7 @@
|
|||||||
var locationButton = locationPanel.add("button", undefined, undefined, {name: "locationButton"});
|
var locationButton = locationPanel.add("button", undefined, undefined, {name: "locationButton"});
|
||||||
locationButton.text = "Choose Location...";
|
locationButton.text = "Choose Location...";
|
||||||
var renderLocationText = locationPanel.add("statictext", undefined, undefined, {name: "renderLocationText"});
|
var renderLocationText = locationPanel.add("statictext", undefined, undefined, {name: "renderLocationText"});
|
||||||
renderLocationText.text = truncateFilePath(DEFAULT_SETTINGS.settings.defaultOutputPath);
|
renderLocationText.text = truncateFilePath(DEFAULT_SETTINGS.settings.defaultOutputPath, separator);
|
||||||
renderLocationText.characters = 25;
|
renderLocationText.characters = 25;
|
||||||
|
|
||||||
|
|
||||||
@@ -203,7 +209,7 @@
|
|||||||
var settingsLocationButton = settingsLocationPanel.add("button", undefined, undefined, {name: "settingsLocationButton"});
|
var settingsLocationButton = settingsLocationPanel.add("button", undefined, undefined, {name: "settingsLocationButton"});
|
||||||
settingsLocationButton.text = "Choose Default Location...";
|
settingsLocationButton.text = "Choose Default Location...";
|
||||||
var settingsLocationText = settingsLocationPanel.add("statictext", undefined, undefined, {name: "settingsLocationText"});
|
var settingsLocationText = settingsLocationPanel.add("statictext", undefined, undefined, {name: "settingsLocationText"});
|
||||||
settingsLocationText.text = truncateFilePath(DEFAULT_SETTINGS.settings.defaultOutputPath);
|
settingsLocationText.text = truncateFilePath(DEFAULT_SETTINGS.settings.defaultOutputPath, separator);
|
||||||
|
|
||||||
var settingsQCPanel = settingsGroup.add('panel', undefined, undefined);
|
var settingsQCPanel = settingsGroup.add('panel', undefined, undefined);
|
||||||
settingsQCPanel.orientation = 'column'
|
settingsQCPanel.orientation = 'column'
|
||||||
@@ -226,7 +232,7 @@
|
|||||||
settingsLocationButton.addEventListener('mousedown', function(){
|
settingsLocationButton.addEventListener('mousedown', function(){
|
||||||
var updatedDefaultLocation = Folder.selectDialog('Select a default output location');
|
var updatedDefaultLocation = Folder.selectDialog('Select a default output location');
|
||||||
if(updatedDefaultLocation !== null){
|
if(updatedDefaultLocation !== null){
|
||||||
var truncatedDisplayText = truncateFilePath(updatedDefaultLocation.fsName);
|
var truncatedDisplayText = truncateFilePath(updatedDefaultLocation.fsName, separator);
|
||||||
settingsLocationText.text = truncatedDisplayText;
|
settingsLocationText.text = truncatedDisplayText;
|
||||||
renderLocationText.text = truncatedDisplayText;
|
renderLocationText.text = truncatedDisplayText;
|
||||||
DEFAULT_SETTINGS.settings.defaultOutputPath = updatedDefaultLocation.fsName
|
DEFAULT_SETTINGS.settings.defaultOutputPath = updatedDefaultLocation.fsName
|
||||||
@@ -284,20 +290,20 @@
|
|||||||
|
|
||||||
var renderFolderPath = DEFAULT_SETTINGS.settings.defaultOutputPath;
|
var renderFolderPath = DEFAULT_SETTINGS.settings.defaultOutputPath;
|
||||||
|
|
||||||
function truncateFilePath(filePathString){
|
function truncateFilePath(filePathString, separator) {
|
||||||
var pathArray = filePathString.split('/');
|
var pathArray = filePathString.split(separator);
|
||||||
var startString = pathArray.slice(0,4).join('/');
|
var startString = pathArray.slice(0, 1).join(separator);
|
||||||
var endString = pathArray.slice(-1).join('/');
|
var endString = pathArray.slice(-2,pathArray.length).join(separator);
|
||||||
var outputString = startString + '...../' + endString + '/'
|
|
||||||
|
|
||||||
return outputString
|
var outputString = '...' + separator + endString + separator;
|
||||||
}
|
return outputString;
|
||||||
|
}
|
||||||
|
|
||||||
locationButton.addEventListener('mousedown', function(){
|
locationButton.addEventListener('mousedown', function(){
|
||||||
var renderFolder = Folder.selectDialog('Select render destination');
|
var renderFolder = Folder.selectDialog('Select render destination');
|
||||||
if(renderFolder !== null){
|
if(renderFolder !== null){
|
||||||
renderFolderPath = renderFolder.fsName;
|
renderFolderPath = renderFolder.fsName;
|
||||||
var outputString = truncateFilePath(renderFolderPath)
|
var outputString = truncateFilePath(renderFolderPath, separator)
|
||||||
renderLocationText.text = outputString
|
renderLocationText.text = outputString
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@@ -329,21 +335,30 @@
|
|||||||
alert("No valid comps found to render.");
|
alert("No valid comps found to render.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var nlOMs = {
|
var nlOMs = {
|
||||||
base: [
|
base: [
|
||||||
'AAC26_A_NL',
|
'AAC26a_A_NL',
|
||||||
'AAC26_B_NL',
|
'AAC26a_B_NL',
|
||||||
'AAC26_C_NL',
|
'AAC26a_C_NL',
|
||||||
'AAC26_D_NL',
|
'AAC26a_D_NL',
|
||||||
],
|
],
|
||||||
alpha: [
|
alpha: [
|
||||||
'AAC26_A_NL-A',
|
'AAC26a_A_NL-A',
|
||||||
'AAC26_B_NL-A',
|
'AAC26a_B_NL-A',
|
||||||
'AAC26_C_NL-A',
|
'AAC26a_C_NL-A',
|
||||||
'AAC26_D_NL-A',
|
'AAC26a_D_NL-A',
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if(!Folder.renderFolderPath){
|
||||||
|
renderFolderPath = new Folder(renderFolderPath);
|
||||||
|
if(!renderFolderPath.exists){
|
||||||
|
renderFolderPath.create()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if(renderFolderPath == '') {
|
if(renderFolderPath == '') {
|
||||||
alert('Whoops!\rYou don\'t have a folder destination selcted. Select one and try again.');
|
alert('Whoops!\rYou don\'t have a folder destination selcted. Select one and try again.');
|
||||||
return
|
return
|
||||||
@@ -546,14 +561,25 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function getSettingsFolder(){
|
function getSeparator(){
|
||||||
var folder = new Folder(Folder.userData.fsName + '/km-tools/sparks-render-helper');
|
var os = $.os.toLowerCase().indexOf('mac') >= 0 ? "MAC": "WINDOWS";
|
||||||
|
var separator = os === 'MAC' ? '/' : '\\';
|
||||||
if(!folder.exists){
|
return separator
|
||||||
folder.create()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return folder
|
function getSettingsFolder(){
|
||||||
|
var userDataFolder = new Folder(Folder.userData.fsName);
|
||||||
|
var kmToolsFolder = new Folder(userDataFolder.fsName + '/km-tools');
|
||||||
|
if(!kmToolsFolder.exists){
|
||||||
|
kmToolsFolder.create()
|
||||||
|
}
|
||||||
|
|
||||||
|
var settingsFolder = new Folder(kmToolsFolder.fsName + '/sparks-render-helper');
|
||||||
|
if(!settingsFolder.exists){
|
||||||
|
settingsFolder.create()
|
||||||
|
}
|
||||||
|
|
||||||
|
return settingsFolder
|
||||||
}
|
}
|
||||||
|
|
||||||
function getSettingsFile(){
|
function getSettingsFile(){
|
||||||
|
|||||||
Reference in New Issue
Block a user