From 6c72c8ceec8931cb9889d42e83911b584395653d Mon Sep 17 00:00:00 2001 From: kriskbx Date: Thu, 31 Jan 2019 16:18:07 +0100 Subject: [PATCH 1/5] upgrade gtt --- yarn.lock | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/yarn.lock b/yarn.lock index 5c0dacc..8c1461d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2073,11 +2073,7 @@ commander@2.8.x, commander@~2.8.1: dependencies: graceful-readlink ">= 1.0.0" -commander@^2.14.1, commander@^2.2.0: - version "2.19.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" - -"commander@github:kriskbx/commander.js": +commander@^2.14.1, commander@^2.2.0, "commander@github:kriskbx/commander.js": version "2.19.0" resolved "https://codeload.github.com/kriskbx/commander.js/tar.gz/2275da95973c27e40e13a4195768947aa39672d0" From c6a38e09f579c3b4fd65f48ab632fc502d4f7927 Mon Sep 17 00:00:00 2001 From: kriskbx Date: Thu, 31 Jan 2019 16:28:48 +0100 Subject: [PATCH 2/5] add cache invalidation. fix #29 --- package.json | 2 +- src/index.js | 10 ++++++++-- yarn.lock | 6 +++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 91c1fa0..e0c6b4a 100644 --- a/package.json +++ b/package.json @@ -125,7 +125,7 @@ "electron-compile": "^6.4.2", "electron-log": "^2.2.14", "electron-squirrel-startup": "^1.0.0", - "gitlab-time-tracker": "^1.7.25", + "gitlab-time-tracker": "^1.7.37", "moment": "^2.20.1", "raven": "^2.6.2", "write-yaml": "^1.0.0" diff --git a/src/index.js b/src/index.js index e978a5e..881f70e 100644 --- a/src/index.js +++ b/src/index.js @@ -442,8 +442,9 @@ gtt.writeConfig = (config) => { * Cache wrapper. */ gtt.cache = { + delete: (key) => gtt._config.cache.delete(key), get: (key) => gtt._config.cache.get(key), - set: (key, value) => gtt._config.cache.set(key, value) + set: (key, value) => gtt._config.cache.set(key, value), }; /** @@ -630,7 +631,12 @@ ipcMain.on('context-menu', () => { gtt.openContextMenu(); }); ipcMain.on('cache-get', (event, key) => { - event.returnValue = gtt.cache.get(key); + try { + event.returnValue = gtt.cache.get(key); + } catch(e) { + gtt.cache.delete(key); + event.returnValue = null; + } }); ipcMain.on('cache-set', (event, {key, data}) => { gtt.cache.set(key, data); diff --git a/yarn.lock b/yarn.lock index 8c1461d..13cb439 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4705,9 +4705,9 @@ gifsicle@^3.0.0: bin-wrapper "^3.0.0" logalot "^2.0.0" -gitlab-time-tracker@^1.7.25: - version "1.7.35" - resolved "https://registry.yarnpkg.com/gitlab-time-tracker/-/gitlab-time-tracker-1.7.35.tgz#c267d20df1ebdd74fd075bfa68e7cbab0980f9ae" +gitlab-time-tracker@^1.7.37: + version "1.7.37" + resolved "https://registry.yarnpkg.com/gitlab-time-tracker/-/gitlab-time-tracker-1.7.37.tgz#3d06e8a25ab311ac0d733b0b48fe5dcc4060ccfa" dependencies: app-module-path "^2.2.0" async "^2.6.1" From 6a3293acd9f42b5e04da6116c82a2e986c2e63b7 Mon Sep 17 00:00:00 2001 From: kriskbx Date: Thu, 31 Jan 2019 16:37:33 +0100 Subject: [PATCH 3/5] upgrade electron-log --- package.json | 2 +- src/index.js | 4 ++-- yarn.lock | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index e0c6b4a..cc4feab 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,7 @@ "chokidar": "^2.0.0", "electron": "2.0.8", "electron-compile": "^6.4.2", - "electron-log": "^2.2.14", + "electron-log": "^3.0.0", "electron-squirrel-startup": "^1.0.0", "gitlab-time-tracker": "^1.7.37", "moment": "^2.20.1", diff --git a/src/index.js b/src/index.js index 881f70e..9bd69ef 100644 --- a/src/index.js +++ b/src/index.js @@ -18,8 +18,6 @@ const moment = require('moment'); const log = require('electron-log'); const pjson = require('../package.json'); -log.transports.file.appName = 'gtt-taskbar'; - let gtt = new events.EventEmitter(), trayIcon = null, trayWindow = null, @@ -643,6 +641,8 @@ ipcMain.on('cache-set', (event, {key, data}) => { }); process.on('uncaughtException', function (e) { + log.warn("error: " + JSON.stringify(e)); + if (dialog.showMessageBox(null, { type: "error", title: "Error", diff --git a/yarn.lock b/yarn.lock index 13cb439..f9c1eee 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2073,7 +2073,7 @@ commander@2.8.x, commander@~2.8.1: dependencies: graceful-readlink ">= 1.0.0" -commander@^2.14.1, commander@^2.2.0, "commander@github:kriskbx/commander.js": +commander@^2.14.1, commander@^2.2.0, commander@kriskbx/commander.js: version "2.19.0" resolved "https://codeload.github.com/kriskbx/commander.js/tar.gz/2275da95973c27e40e13a4195768947aa39672d0" @@ -3357,9 +3357,9 @@ electron-installer-snap@^2.0.0: which "^1.3.0" yargs "^11.0.0" -electron-log@^2.2.14: - version "2.2.16" - resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-2.2.16.tgz#c44ffdea51ae90cbe851d25e7cd1bab56fdb328f" +electron-log@^3.0.0: + version "3.0.0-beta4" + resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-3.0.0-beta4.tgz#140ebc58ff4559a33ceb827cbfc6f869b5c100f9" electron-osx-sign@^0.4.1: version "0.4.10" From 9d5e043ae8e9444ded7b62deea968eca87b308c3 Mon Sep 17 00:00:00 2001 From: kriskbx Date: Thu, 31 Jan 2019 16:38:02 +0100 Subject: [PATCH 4/5] release v0.3.10 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cc4feab..e1cabed 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "author": "Kris Siepert", "private": true, "license": "GPL-2.0", - "version": "0.3.9", + "version": "0.3.10", "main": "src/index.js", "scripts": { "start": "electron-forge start", From 5d487e2ff7831eaf9c3c3c41ffc1c82172f7a626 Mon Sep 17 00:00:00 2001 From: kriskbx Date: Thu, 31 Jan 2019 16:46:13 +0100 Subject: [PATCH 5/5] fix electron-log version --- package.json | 2 +- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e1cabed..2a76ea3 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,7 @@ "chokidar": "^2.0.0", "electron": "2.0.8", "electron-compile": "^6.4.2", - "electron-log": "^3.0.0", + "electron-log": "^3.0.0-beta4", "electron-squirrel-startup": "^1.0.0", "gitlab-time-tracker": "^1.7.37", "moment": "^2.20.1", diff --git a/yarn.lock b/yarn.lock index f9c1eee..b9b4571 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3357,7 +3357,7 @@ electron-installer-snap@^2.0.0: which "^1.3.0" yargs "^11.0.0" -electron-log@^3.0.0: +electron-log@^3.0.0-beta4: version "3.0.0-beta4" resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-3.0.0-beta4.tgz#140ebc58ff4559a33ceb827cbfc6f869b5c100f9"