diff --git a/meteor/client/lib/metrics.js b/meteor/client/lib/metrics.js index 2934c20933..410d4a8f62 100644 --- a/meteor/client/lib/metrics.js +++ b/meteor/client/lib/metrics.js @@ -1,34 +1,65 @@ var remote = require('remote'); var app = remote.require('app'); var crypto = require('crypto'); -var getmac = require('getmac'); var uuid = require('node-uuid'); +var level = require('levelup'); +var path = require('path'); +var db = level(path.join(process.env[(process.platform === 'win32') ? 'USERPROFILE' : 'HOME'], 'Library/Application Support/Kitematic/data', 'db')); Metrics = {}; +Metrics.enable = function () { + db.put('metrics.enabled', true); +}; + +Metrics.disable = function () { + db.put('metrics.enabled', false); +}; + +Metrics.enabled = function (callback) { + db.get('metrics.enabled', function (err, value) { + if (err) { + callback(false); + } else { + callback(value); + } + }); +}; + Metrics.trackEvent = function (name) { if (!name) { return; } - var uuid = localStorage.getItem('metrics.uuid'); - if (localStorage.getItem('metrics.enabled') && uuid) { - mixpanel.track('docker_gui ' + name, { - distinct_id: uuid, - version: app.getVersion() + db.get('metrics.enabled', function (err, value) { + if (err || !value) { + return; + } + db.get('metrics.uuid', function (err, uuid) { + if (err) { + return; + } + mixpanel.track('docker_gui ' + name, { + distinct_id: uuid, + version: app.getVersion() + }); }); - } + }); }; Metrics.prepareTracking = function () { - if (localStorage.getItem('metrics.enabled') === null) { - var settings = Settings.findOne(); - if (settings && settings.tracking) { - localStorage.setItem('metrics.enabled', !!settings.tracking); - } else { - localStorage.setItem('metrics.enabled', true); + db.get('metrics.enabled', function (err, value) { + if (err && err.notFound) { + var settings = Settings.findOne(); + if (settings && settings.tracking) { + db.put('metrics.enabled', !!settings.tracking); + } else { + db.put('metrics.enabled', true); + } } - } - if (!localStorage.getItem('metrics.uuid')) { - localStorage.setItem('metrics.uuid', uuid.v4()); - } + db.get('metrics.uuid', function (err, value) { + if (err && err.notFound) { + db.put('metrics.uuid', uuid.v4()); + } + }); + }); }; diff --git a/meteor/client/lib/util.js b/meteor/client/lib/util.js index 9973e812d4..c55302344c 100755 --- a/meteor/client/lib/util.js +++ b/meteor/client/lib/util.js @@ -21,6 +21,10 @@ Util.getResourceDir = function () { return path.join(Util.getHomePath(), 'Library/Application Support/Kitematic/Resources'); }; +Util.getDataDir = function () { + return path.join(Util.getHomePath(), 'Library/Application Support/Kitematic/data'); +}; + Util.KITE_PATH = path.join(Util.getHomePath(), 'Kitematic'); Util.KITE_TAR_PATH = path.join(Util.KITE_PATH, '.tar'); Util.KITE_IMAGES_PATH = path.join(Util.KITE_PATH, '.images'); diff --git a/meteor/client/views/dashboard/settings/dashboard-settings.js b/meteor/client/views/dashboard/settings/dashboard-settings.js index c4366f3b75..4b4cb88910 100644 --- a/meteor/client/views/dashboard/settings/dashboard-settings.js +++ b/meteor/client/views/dashboard/settings/dashboard-settings.js @@ -3,11 +3,11 @@ var dialog = remote.require('dialog'); Template.dashboardSettings.events({ 'click .btn-usage-analytics-on': function () { - localStorage.setItem('metrics.enabled', true); + Metrics.enable(); Session.set('metrics.enabled', true); }, 'click .btn-usage-analytics-off': function () { - localStorage.setItem('metrics.enabled', false); + Metrics.disable(); Session.set('metrics.enabled', false); } }); @@ -15,7 +15,9 @@ Template.dashboardSettings.events({ Template.dashboardSettings.helpers({ metricsEnabled: function () { if (Session.get('metrics.enabled') === undefined) { - Session.set('metrics.enabled', localStorage.getItem('metrics.enabled')); + Metrics.enabled(function (value) { + Session.set('metrics.enabled', value); + }); } return Session.get('metrics.enabled'); }, diff --git a/package.json b/package.json index 9c494709f2..4f65cc6e98 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,8 @@ "request": "2.42.0", "request-progress": "0.3.1", "tar": "0.1.20", - "node-uuid": "1.4.1" + "node-uuid": "1.4.1", + "leveldown": "^1.0.0", + "levelup": "git+https://github.com/kitematic/node-levelup.git" } } diff --git a/script/setup.sh b/script/setup.sh index e551d46bda..c9cf1e70fa 100755 --- a/script/setup.sh +++ b/script/setup.sh @@ -56,7 +56,7 @@ cd $BASE # Build NPM modules NPM="$BASE/cache/node/bin/npm" export npm_config_disturl=https://gh-contractor-zcbenz.s3.amazonaws.com/atom-shell/dist -export npm_config_target=ATOM_SHELL_VERSION -export npm_config_arch=ia32 +export npm_config_target=$ATOM_SHELL_VERSION +export npm_config_arch=ia64 HOME=~/.atom-shell-gyp $NPM install