From 0efbbf8287517b755be1774f6aa49947bed50a0d Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Thu, 7 Jun 2012 11:24:29 -0700
Subject: Adding unique ID to canvas data folders

Also set up for tracking ID created, will be adding support for parsing files without saving later, but flag is now present.
---
 js/document/mediators/template.js | 49 ++++++++++++++++++++++-----------------
 js/document/models/base.js        | 33 ++++++++++++++++++++++++--
 js/mediators/io-mediator.js       | 10 +++++---
 3 files changed, 66 insertions(+), 26 deletions(-)

(limited to 'js')

diff --git a/js/document/mediators/template.js b/js/document/mediators/template.js
index 068a1f48..c9d46f79 100755
--- a/js/document/mediators/template.js
+++ b/js/document/mediators/template.js
@@ -8,7 +8,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 //
 var Montage = 			require("montage/core/core").Montage,
 	Component = 		require("montage/ui/component").Component,
-	TemplateCreator = 	require("node_modules/tools/template/template-creator").TemplateCreator;
+	TemplateCreator = 	require("node_modules/tools/template/template-creator").TemplateCreator,
+	ClassUuid = 		require("js/components/core/class-uuid").ClassUuid;
 ////////////////////////////////////////////////////////////////////////
 //	
 exports.TemplateDocumentMediator = Montage.create(Component, {
@@ -93,7 +94,7 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
     //TODO: Expand to allow more templates, clean up variables
     parseNinjaTemplateToHtml: {
-        value: function (template, ninjaWrapper, libCopyCallback) {
+        value: function (saveExternalData, template, ninjaWrapper, libCopyCallback) {
         	//TODO: Improve reference for rootUrl
             var regexRootUrl,
             	rootUrl = this.application.ninja.coreIoApi.rootUrl + escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1])),
@@ -328,7 +329,7 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
             
             
             
-            //TODO: Make proper webGL/Canvas method
+            
             
             //
             var webgltag, webgllibtag, webglrdgetag, mjstag, mjslibtag, matchingtags = [],
@@ -357,19 +358,33 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
                     }
                 }
             }
+            
+            
+            
+            
+            //TODO: Make proper webGL/Canvas method
+            
+            
             //Checking for webGL elements in document
             if (template.webgl && template.webgl.length > 1) {//TODO: Should be length 0, hack for a temp fix
                 var rdgeDirName, rdgeVersion, cvsDataDir = this.getCanvasDirectory(template.file.root), fileCvsDir, fileCvsDirAppend, cvsDirCounter = 1, fileOrgDataSrc;
                 //
                 if (cvsDataDir && !matchingtags.length && !webgllibtag) {
-                	fileCvsDir = cvsDataDir+template.file.name.split('.'+template.file.extension)[0];
+                	
+                	if (template.libs.canvasId) {
+	                	libsobserver.canvasId = template.libs.canvasId;
+                	} else {
+	                	libsobserver.canvasId = ClassUuid.generate();
+                	}
+                	
+                	//Creating data directory, will include materials at a later time
+                	fileCvsDir = cvsDataDir+template.file.name.split('.'+template.file.extension)[0]+'_'+libsobserver.canvasId;
+                	
                 	if (!this._getUserDirectory(fileCvsDir)) {
-                		fileCvsDirAppend = fileCvsDir+cvsDirCounter;
-                		while (!this._getUserDirectory(fileCvsDirAppend)) {
-                			fileCvsDirAppend = fileCvsDir+(cvsDirCounter++);
-                		}
+                		//TODO: create proper logic not to overwrite files
+                		console.log('error');
                 	}
-                	//TODO: Allow user overwrite
+                	
                 	fileCvsDir += '/';
                 } else if (webgllibtag && webgllibtag.getAttribute && webgllibtag.getAttribute('data-ninja-canvas-json') !== null) {
                 	fileOrgDataSrc = template.file.root+webgllibtag.getAttribute('data-ninja-canvas-json');
@@ -437,17 +452,9 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
                 //Looping through data to create escaped array
                 for (var j = 0; template.webgl[j]; j++) {
                     if (j === 0) {
-                    	//if (fileCvsDir) {
-                    	//	json += '\n\t\t\t"' + template.webgl[j] + '"';
-                    	//} else {
-                    		json += '\n\t\t\t"' + escape(template.webgl[j]) + '"';
-                    	//}
+                    	json += '\n\t\t\t"' + escape(template.webgl[j]) + '"';
                     } else {
-                    	//if (fileCvsDir) {
-                    	//	json += ',\n\t\t\t"' + template.webgl[j] + '"';
-                    	//} else {
-                    		json += ',\n\t\t\t"' + escape(template.webgl[j]) + '"';
-                    	//}
+                    	json += ',\n\t\t\t"' + escape(template.webgl[j]) + '"';
                     }
                 }
                 //Closing array (make-shift JSON string to validate data in <script> tag)
@@ -590,9 +597,9 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
             }
             //
             if (libsobserver.montage || libsobserver.canvas) {
-            	return {content: this.getPrettyHtml(cleanHTML.replace(this.getAppTemplatesUrlRegEx(), '')), libs: true};
+            	return {content: this.getPrettyHtml(cleanHTML.replace(this.getAppTemplatesUrlRegEx(), '')), libs: true, montageId: libsobserver.montageId, canvasId: libsobserver.canvasId};
             } else {
-	            return {content: this.getPrettyHtml(cleanHTML.replace(this.getAppTemplatesUrlRegEx(), '')), libs: false};
+	            return {content: this.getPrettyHtml(cleanHTML.replace(this.getAppTemplatesUrlRegEx(), '')), libs: false, montageId: libsobserver.montageId, canvasId: libsobserver.canvasId};
             }
         }
     },
diff --git a/js/document/models/base.js b/js/document/models/base.js
index a3644815..c69c54a9 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -90,6 +90,11 @@ exports.BaseDocumentModel = Montage.create(Component, {
 	views: {
         value: null
     },
+    ////////////////////////////////////////////////////////////////////
+	//
+	libs: {
+        value: {montage: false, canvas: false, montageId: null, canvasId: null}
+    },
     ////////////////////////////////////////////////////////////////////
 	//
 	switchViewTo: {
@@ -167,8 +172,9 @@ exports.BaseDocumentModel = Montage.create(Component, {
         	//
         	if (this.currentView === this.views.design) {
             	//
-        		this.application.ninja.ioMediator.fileSave({
+        		var save = this.application.ninja.ioMediator.fileSave({
         			mode: 'html',
+        			libs: this.libs,
         			file: this.file,
         			webgl: this.webGlHelper.glData,
         			styles: this.getStyleSheets(),
@@ -178,6 +184,17 @@ exports.BaseDocumentModel = Montage.create(Component, {
         			body: this.views.design.iframe.contentWindow.document.body,
         			mjsTemplateCreator: this.views.design.iframe.contentWindow.mjsTemplateCreator
         		}, this.handleSaved.bind({callback: callback, model: this}), libCopyCallback);
+        		//TODO: Improve detection during save routine
+        		if (save) {
+	        		if (save.montageId) {
+		        		this.libs.montageId = save.montageId;
+		        		this.libs.montage = true;
+	        		}
+	        		if (save.canvasId) {
+		        		this.libs.canvasId = save.canvasId;
+		        		this.libs.canvas = true;
+	        		}
+        		}
         	} else {
         		//TODO: Add logic to save code view data
         	}
@@ -196,8 +213,9 @@ exports.BaseDocumentModel = Montage.create(Component, {
         	//
         	if (this.currentView === this.views.design) {
             	//
-        		this.application.ninja.ioMediator.fileSave({
+        		var save = this.application.ninja.ioMediator.fileSave({
         			mode: 'html',
+        			libs: this.libs,
         			file: this.file,
         			webgl: this.webGlHelper.glData,
         			css: this.getStyleSheets(),
@@ -207,6 +225,17 @@ exports.BaseDocumentModel = Montage.create(Component, {
         			body: this.views.design.iframe.contentWindow.document.body,
         			mjsTemplateCreator: this.views.design.iframe.contentWindow.mjsTemplateCreator
         		}, this.handleSaved.bind({callback: callback, model: this}), libCopyCallback);
+        		//TODO: Improve detection during save routine
+        		if (save) {
+	        		if (save.montageId) {
+		        		this.libs.montageId = save.montageId;
+		        		this.libs.montage = true;
+	        		}
+	        		if (save.canvasId) {
+		        		this.libs.canvasId = save.canvasId;
+		        		this.libs.canvas = true;
+	        		}
+        		}
         	} else {
         		//TODO: Add logic to save code view data
         	}
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index c9e10896..c487fef5 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -162,9 +162,9 @@ exports.IoMediator = Montage.create(Component, {
                 case 'html':
                     //Getting content from function to properly handle saving assets (as in external if flagged)
                     if (doc.template && (doc.template.type === 'banner' || doc.template.type === 'animation')) {
-                    	parsedDoc = this.tmplt.parseNinjaTemplateToHtml(doc, true, libCopyCallback);
+                    	parsedDoc = this.tmplt.parseNinjaTemplateToHtml(true, doc, true, libCopyCallback);
                     } else {
-                    	parsedDoc = this.tmplt.parseNinjaTemplateToHtml(doc, false, libCopyCallback);
+                    	parsedDoc = this.tmplt.parseNinjaTemplateToHtml(true, doc, false, libCopyCallback);
                     }
                     break;
                 default:
@@ -176,13 +176,17 @@ exports.IoMediator = Montage.create(Component, {
             	save = this.fio.saveFile({uri: doc.file.uri, contents: parsedDoc.content});
             	//Checking for callback
             	if (callback) callback(save);
+            	//Checking for libraries, making callback if specified
+            	if (!parsedDoc.libs && libCopyCallback) libCopyCallback(true);
             	//
-            	if (!parsedDoc.libs && libCopyCallback) libCopyCallback(true); 
+            	return {montageId: parsedDoc.montageId, canvasId: parsedDoc.canvasId};
             } else {
 	            //Making call to save file
             	save = this.fio.saveFile({uri: doc.file.uri, contents: content});
             	//Checking for callback
             	if (callback) callback(save);
+            	//
+            	return null;
             }
         }
     },
-- 
cgit v1.2.3