Merge pull request #10 from OpenframeProject/frame-update

Remove plugin install/init on frame update for now

Author: jmwohl

src/controller.js

@@ -345,28 +345,41 @@ fc.updateFrame = function() {
     // fetch the latest frame state, and update as needed
     frame.fetch()
         .then(function(new_state) {
-            pm.installPlugins(new_state.plugins)
-                .then(function() {
-                    debug('-----> plugins installed');
-                    pm.initPlugins(frame.state.plugins, fc.pluginApi)
-                        .then(function() {
-                            // once we're done updating/initializing the frame plugins, call change artwork
-                            // TODO: we could add logic here to only update necessary items...
-                            // For now, changeArtwork should exit if old and new artwork are the same
-                            // TODO: DRY with else below
-                            if (frame.state._current_artwork) {
-                                fc.changeArtwork()
-                                    .then(function() {
-                                        // success changing artwork
-                                    })
-                                    .catch(function() {
-                                        // error changing artwork, reset frame.state._current_artwork to true current
-                                        frame.state._current_artwork = fc.current_artwork;
-                                    });
-                            }
-                        });
-                })
-                .catch(debug);
+            if (frame.state._current_artwork) {
+                fc.changeArtwork()
+                    .then(function() {
+                        // success changing artwork
+                    })
+                    .catch(function() {
+                        // error changing artwork, reset frame.state._current_artwork to true current
+                        frame.state._current_artwork = fc.current_artwork;
+                    });
+            }
+            // Until we get the base extension module ready, which will handle init status,
+            // don't install/init plugins on frame update
+            //
+            // pm.installPlugins(new_state.plugins)
+            //     .then(function() {
+            //         debug('-----> plugins installed');
+            //         pm.initPlugins(frame.state.plugins, fc.pluginApi)
+            //             .then(function() {
+            //                 // once we're done updating/initializing the frame plugins, call change artwork
+            //                 // TODO: we could add logic here to only update necessary items...
+            //                 // For now, changeArtwork should exit if old and new artwork are the same
+            //                 // TODO: DRY with else below
+            //                 if (frame.state._current_artwork) {
+            //                     fc.changeArtwork()
+            //                         .then(function() {
+            //                             // success changing artwork
+            //                         })
+            //                         .catch(function() {
+            //                             // error changing artwork, reset frame.state._current_artwork to true current
+            //                             frame.state._current_artwork = fc.current_artwork;
+            //                         });
+            //                 }
+            //             });
+            //     })
+            //     .catch(debug);
         });
 };
 

src/plugin-manager.js

@@ -34,7 +34,7 @@ pm.installPlugins = function(plugins, force) {
         key,
         _force = force === true ? true : false;
 
-    // add each plugin to package.json
+    // install each plugin
     for (key in plugins) {
         if (plugins.hasOwnProperty(key)) {
             promises.push(_installPlugin(key, plugins[key], _force));