Merge c780464 into 3b51d82

MaslowCNC · Aug 14, 2020 · 6caffd5 · 6caffd5
2 parents 3b51d82 + c780464
commit 6caffd5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/js/githubOauth.js b/src/js/githubOauth.js
@@ -1030,6 +1030,8 @@ export default function GitHubModule(){
      */
     this.loadProject = async function(projectName){
 
+        GlobalVariables.startTime = new Date().getTime()
+
         if(typeof intervalTimer != undefined){
             clearInterval(intervalTimer) //Turn off auto saving
         }
@@ -1064,8 +1066,6 @@ export default function GitHubModule(){
                 GlobalVariables.circleSegmentSize = rawFile.circleSegmentSize
             }
 
-            intervalTimer = setInterval(() => this.saveProject(), 120000) //Save the project regularly
-
             if(rawFile.filetypeVersion == 1){
                 GlobalVariables.topLevelMolecule.deserialize(rawFile)
             }
@@ -1082,6 +1082,7 @@ export default function GitHubModule(){
                 document.getElementById("pull_top").style.display = "none"
             }
         })
+
     }
 
     this.convertFromOldFormat = function(json){
@@ -1119,6 +1120,13 @@ export default function GitHubModule(){
         return projectObject
     }
 
+    /** 
+     * Begins the automatic process of saving the project
+     */
+    this.beginAutosave = function(){
+        intervalTimer = setInterval(() => this.saveProject(), 120000) //Save the project regularly
+    }
+
     /** 
      * Loads a project from github by its github ID.
      */

diff --git a/src/js/molecules/output.js b/src/js/molecules/output.js
@@ -64,6 +64,13 @@ export default class Output extends Atom {
             this.parent.propogate()
             this.parent.processing = false
 
+            if(this.parent.topLevel){
+                const timeToLoad = (new Date().getTime() - GlobalVariables.startTime)/1000
+                console.warn("Loading finished in " + timeToLoad + " seconds")
+
+                GlobalVariables.gitHub.beginAutosave()
+            }
+
             //Remove all the information stored in github molecules with no inputs after they have been computed to save ram
             // if(this.parent.inputs.length == 0 && this.parent.atomType == "GitHubMolecule" && !this.parent.topLevel){
             // this.parent.dumpBuffer(true)