Move app creation to coderlib.

Author: plietar

coder-apps/common/coder/app/app.js

@@ -22,7 +22,6 @@ var mustache = require('mustache');
 var util = require('util');
 var fs = require('fs');
 var spawn = require('child_process').spawn;
-var ncp = require('ncp').ncp;
 
 //hack to make fs.existsSync work between different node versions
 if ( !fs.existsSync ) {
@@ -78,22 +77,6 @@ var getAvailableNewAppID = function( newappid ) {
     return newappid;
 };
 
-var createLinks = function(name, cb) {
-    var apppath = "../../apps/" + name + "/";
-    var viewpath = process.cwd() + "/views/apps/" + name;
-    var staticpath = process.cwd() + "/static/apps/" + name;
-
-    fs.symlink(apppath + "views", viewpath, function(err) {
-        if (err) {
-            cb(err);
-            return;
-        }
-
-        fs.symlink(apppath + "static", staticpath, function(err) {
-            cb(err);
-        });
-    });
-}
 
 exports.api_app_create_handler = function( app, req, res ) {
 
@@ -120,9 +103,7 @@ exports.api_app_create_handler = function( app, req, res ) {
 
     newappid = getAvailableNewAppID( newappid );
 
-    var path = process.cwd() + "/apps/";
-
-    ncp(path + "boilerplate", path + newappid, function(err) {
+    coderlib.createApp("boilerplate", newappid, function(err, app) {
         if (err) {
             res.json({
                 status: 'error',
@@ -131,49 +112,29 @@ exports.api_app_create_handler = function( app, req, res ) {
             return;
         }
 
-        createLinks(newappid, function(err) {
+        app.metadata = {
+            created: getDateString( new Date() ),
+            modified: getDateString( new Date() ),
+            color: appcolor,
+            author: coderlib.device.owner,
+            name: apptitle,
+            hidden: false,
+            public: false
+        };
+
+        app.save(function(err) {
             if (err) {
                 res.json({
                     status: 'error',
                     error: err
                 });
-                return;
             }
-
-            coderlib.app(newappid, function(err, app) {
-                if (err) {
-                    res.json({
-                        status: 'error',
-                        error: err
-                    });
-                    return;
-                }
-
-                app.metadata = {
-                    created: getDateString( new Date() ),
-                    modified: getDateString( new Date() ),
-                    color: appcolor,
-                    author: coderlib.device.owner,
-                    name: apptitle,
-                    hidden: false,
-                    public: false
-                };
-
-                app.save(function(err) {
-                    if (err) {
-                        res.json({
-                            status: 'error',
-                            error: err
-                        });
-                    }
-                    else {
-                        res.json({
-                            status: 'success',
-                            appname: newappid
-                        });
-                    }
+            else {
+                res.json({
+                    status: 'success',
+                    appname: newappid
                 });
-            });
+            }
         });
     });
 };

coder-apps/common/coder/static/js/index.js

@@ -334,31 +334,26 @@ var buildAppList = function(apps){
     };
 
 
-
     //Sort the apps by more recently modified
-    var sortedapps = [];
-    for ( var k in apps ) {
-        sortedapps.push( apps[k] );
-    }
-    sortedapps.sort( function(a,b) {
-        if ( a.ctime < b.ctime ) {
+    apps.sort( function(a, b) {
+        if ( a.metadata.ctime < b.metadata.ctime ) {
             return 1;
-        } else if ( b.ctime < a.ctime ) {
+        } else if ( b.metadata.ctime < a.metadata.ctime ) {
             return -1;
         } else {
             return 0;
         }
     });
 
-    for ( var x=0; x<sortedapps.length; x++ ) {
-        var app = sortedapps[x];
+    for ( var x=0; x<apps.length; x++ ) {
+        var app = apps[x];
 
         var $a = $apptmpl.clone();
-        $a.find('.appname').text( app.appname );
+        $a.find('.appname').text( app.name );
         if ( app.name && app.name !== "" ) {
-            $a.find('.appname').text( app.name );
+            $a.find('.appname').text( app.metadata.name );
         }
-        $a.css('background-color', app.color);
+        $a.css('background-color', app.metadata.color);
 
         $a.hover(
             function() {
@@ -369,11 +364,10 @@ var buildAppList = function(apps){
             }
         );
 
-        $a.click( launchApp( app.appname ) );
-        $a.find('.editbutton').click( editApp( app.appname ) );
+        $a.click( launchApp( app.name ) );
+        $a.find('.editbutton').click( editApp( app.name ) );
 
         $('#applist').append( $a );
-        
     }
 };
 

coder-apps/common/coderlib/app/app.js

@@ -22,6 +22,8 @@ var mustache = require('mustache');
 var util = require('util');
 var fs = require('fs');
 var async = require('async');
+var ncp = require('ncp').ncp;
+var path = require('path');
 
 exports.get_routes = [
     { path: '/api/app/list', handler: 'api_app_list_handler' },
@@ -65,8 +67,9 @@ exports.app = function(name, callback) {
     var viewpath = "apps/" + name + "/";
 
     var userapp = {
+        name: name,
+
         metadata: {
-          appname: name,
           created: getDateString( new Date() ),
           modified: getDateString( new Date() ),
           color: "#1abc9c",
@@ -173,6 +176,44 @@ exports.listApps = function(callback, hidden) {
   });
 }
 
+var createLinks = function(name, cb) {
+    var apppath = "../../apps/" + name + "/";
+    var viewpath = process.cwd() + "/views/apps/" + name;
+    var staticpath = process.cwd() + "/static/apps/" + name;
+
+    fs.symlink(apppath + "views", viewpath, function(err) {
+        if (err) {
+            cb(err);
+            return;
+        }
+
+        fs.symlink(apppath + "static", staticpath, function(err) {
+            cb(err);
+        });
+    });
+}
+
+exports.createApp = function(template, name, callback) {
+    var appPath = process.cwd() + "/apps/" + name;
+    var templatePath = path.resolve("apps/", template);
+
+    ncp(templatePath, appPath, function(err) {
+        if (err) {
+            callback(err, null);
+            return;
+        }
+
+        createLinks(name, function(err) {
+            if (err) {
+                callback(err, null);
+                return;
+            }
+
+            coderlib.app(name, callback);
+        });
+    });
+}
+
 exports.device = function() {
     var devicefile = process.cwd() + "/device.json";
 
@@ -220,14 +261,8 @@ exports.api_app_list_handler = function( app, req, res ) {
         res.send(500);
       }
       else {
-        var apps = {}
-        for(var i in results)
-        {
-          var m = results[i].metadata;
-          apps[m.appname] = m;
-        }
         res.json({
-          apps: apps
+            apps: results
         });
       }
     });