Correct new files manager

Author: SamyPesse

addons/aceeditor/addon-built.js

@@ -8,7 +8,7 @@ define([
     var commands = codebox.require("core/commands");
     var tabs = codebox.require("utils/tabs");
     var settings = codebox.require("utils/settings");
-    var files = codebox.require("utils/files");
+    var files = codebox.require("core/files");
     var config = codebox.require("config");
 
     // Configure ace

addons/aceeditor/client.js

@@ -1,7 +1,7 @@
 define([
     "views/editor",
     "less!stylesheets/file.less"
-], function(FilesBaseView, EditorView) {
+], function(EditorView) {
     var _ = codebox.require("underscore");
     var $ = codebox.require("jQuery");
     var hr = codebox.require("hr/hr");

addons/aceeditor/views/file.js

@@ -1,7 +1,7 @@
 define([
     "views/explorer"
 ], function(ExplorerView) {
-    var files = codebox.require("utils/files");
+    var files = codebox.require("core/files");
 
     files.addHandler("explorer", {
         name: "Explorer",

addons/aceeditor/views/tab.js

@@ -0,0 +1,102 @@
+define([
+    'q',
+    'underscore',
+    'hr/hr',
+    'models/file',
+    'core/box',
+    'utils/settings',
+    'utils/dialogs',
+    'utils/tabs',
+    'views/tabs/file',
+    'views/files/base'
+], function(Q, _, hr, File, box, settings, dialogs, tabs, FileTab) {
+    var logging = hr.Logger.addNamespace("files");
+
+    // Settings for files manager
+    var settings = settings.add({
+        'namespace': "files",
+        'title': "Files",
+        'fields': {}
+    });
+
+    // Files handlers map
+    var handlers = {};
+
+    // Add handler
+    var addHandler = function(handlerId, handler) {
+        if (!handler
+        || !handlerId
+        || !handler.name
+        || !handler.valid
+        || (!handler.View && !handler.open)) {
+            throw "Invalid files handler format";
+        }
+
+        if (handler.View) {
+            handler.open = function(file) {
+                var path = file.path();
+                var manager = tabs.manager();
+
+                var tab = manager.getActiveTabByType("directory");
+                if (tab != null && !manager.checkTabExists(path)) {
+                    // Change current tab to open the file
+                    tab.view.load(path);
+                } else {
+                    // Add new tab
+                    tabs.open(FileTab, {
+                        "model": file,
+                        "handler": handler
+                    }, {
+                        "uniqueId": path,
+                        "type": "file",
+                    });
+                }
+            };
+        }
+
+        // Add settings
+        settings.setField(handlerId, {
+            'label': handler.name,
+            'type': "checkbox",
+            'default': true
+        });
+
+        // Register handler
+        handlers[handlerId] = handler;
+    };
+
+    // Get handler for a file
+    var getHandlers = function(file, defaultHandler) {
+        return _.filter(handlers, function(handler) {
+            return handler.valid(file);
+        });
+    };
+
+    // Open a file
+    var openFile = function(file) {
+        if (_.isString(file)) {
+            var nfile = new File({
+                'codebox': box
+            });
+            return nfile.getByPath(file).then(function() {
+                return openFile(nfile);
+            });
+        }
+
+        var handlers = getHandlers(file);
+        if (_.size(handlers) == 0) {
+            dialogs.alert("No handler for this file", "Sorry, No handler has been found to open this file. Try to find and install an addon to manage this file.");
+            return Q.reject(new Error("No handler for this file"));
+        }
+
+        // todo: dialog to choose the handler
+        var handler = _.first(handlers);
+        return Q(handler.open(file));
+    };
+
+    return {
+        'addHandler': addHandler,
+        'getHandlers': getHandlers,
+        'open': openFile
+    };
+});

addons/explorer/addon-built.js

@@ -6,11 +6,7 @@ define([
     "core/api",
 
     // addons dependencies
-    "core/globals",
-    "utils/themes",
-    "utils/tabs",
-    "utils/settings",
-    "utils/files"
+    "core/globals"
 ], function(Q, _, $, hr, api) {
     var logging = hr.Logger.addNamespace("addon");
 

addons/explorer/client.js

@@ -3,12 +3,11 @@ define([
     "underscore",
     "hr/hr",
     "core/api",
-    "core/commands",
     "utils/url",
     "utils/languages",
     "utils/filesync",
     "utils/uploader"
-], function(Q, _, hr, api, commands, Url, Languages, FileSync, Uploader) {
+], function(Q, _, hr, api, Url, Languages, FileSync, Uploader) {
     var logging = hr.Logger.addNamespace("files");
 
     if (typeof String.prototype.endsWith !== 'function') {
@@ -72,10 +71,8 @@ define([
          *  Open the tab for this file
          */
         open: function(path) {
-            commands.run("files.open", {
-                'path': this.path(path)
-            });
-            return this;
+            var files = require("core/files");
+            return files.open(path ? path : this);
         },
 
         /*