Skip to content

Commit fb85d9c

Browse files
committed
Fix file watcher bug on windows. closes kriskbx#3
1 parent 2ab5fda commit fb85d9c

File tree

5 files changed

+36
-11
lines changed

5 files changed

+36
-11
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@
9494
"electron-log": "^2.2.14",
9595
"gitlab-time-tracker": "^1.7.7",
9696
"moment": "^2.20.1",
97+
"raven": "^2.6.2",
9798
"write-yaml": "^1.0.0"
9899
},
99100
"devDependencies": {

resources/assets/stylus/app.styl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ body, html
3535
display: none
3636
&.bottom
3737
transform: rotate(180deg)
38+
filter: drop-shadow(0 -3px 2px rgba(0,0,0,0.5))
3839
&.mac, &.linux
3940
& > .triangle.top
4041
display: block

src/build/app.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -589,6 +589,8 @@ html {
589589
#app div.triangle.bottom {
590590
-webkit-transform: rotate(180deg);
591591
transform: rotate(180deg);
592+
-webkit-filter: drop-shadow(0 -3px 2px rgba(0,0,0,0.5));
593+
filter: drop-shadow(0 -3px 2px rgba(0,0,0,0.5));
592594
}
593595
#app.mac > .triangle.top,
594596
#app.linux > .triangle.top {

src/index.js

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ let gtt = new events.EventEmitter(),
2525
gtt._app = app;
2626
gtt._version = '0.2.1';
2727
gtt._config = new Config(__dirname);
28+
29+
if (gtt._config.get('error-reporting')) {
30+
var Raven = require('raven');
31+
Raven.config('https://[email protected]/1218774').install();
32+
}
33+
2834
gtt._api = new Base(gtt._config);
2935
gtt._tasks = new Tasks(gtt._config);
3036
gtt._paused = false;
@@ -206,10 +212,7 @@ gtt.setTray = () => {
206212

207213
if (gtt._platform == 'linux') {
208214
let contextMenu = Menu.buildFromTemplate([
209-
{label: 'Open GTT', click: (d1, d2, d3) => {
210-
console.log(d1,d2,d3);
211-
gtt.toggleTrayWindow
212-
}},
215+
{label: 'Open GTT', click: gtt.toggleTrayWindow},
213216
{label: 'Quit', click: app.quit}
214217
]);
215218
trayIcon.setContextMenu(contextMenu);
@@ -390,6 +393,9 @@ gtt._dump = (msg) => {
390393
};
391394

392395
gtt._send = (key, val) => {
396+
if(debug) {
397+
gtt._dump(`ipc main send: ${key}, ${val}`);
398+
}
393399
trayWindow.webContents.send(key, val);
394400
};
395401

@@ -416,11 +422,12 @@ gtt._watchers.frames = {
416422
gtt._dump('Added frames watcher');
417423
this.watcher = chokidar
418424
.watch(path.join(gtt._config.frameDir, '*.json'), {ignoreInitial: true})
419-
.on('all', () => {
425+
.on('raw', (event, path) => {
426+
gtt._dump(`"${path}" changed.`);
420427
if (this.timeout) clearTimeout(this.timeout);
421428
this.timeout = setTimeout(() => {
422429
gtt.log().then(data => gtt._send('gtt-log', data));
423-
gtt.status().then(status => gtt._send('gtt-status', status))
430+
gtt.status().then(status => gtt._send('gtt-status', status));
424431
}, 100);
425432
});
426433
},

yarn.lock

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8436,6 +8436,16 @@ range-parser@^1.0.3, range-parser@~1.2.0:
84368436
version "1.2.0"
84378437
resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
84388438

8439+
raven@^2.6.2:
8440+
version "2.6.2"
8441+
resolved "https://registry.yarnpkg.com/raven/-/raven-2.6.2.tgz#c92f30890e2dfcd15258d184e43e39326e58032e"
8442+
dependencies:
8443+
cookie "0.3.1"
8444+
md5 "^2.2.1"
8445+
stack-trace "0.0.10"
8446+
timed-out "4.0.1"
8447+
uuid "3.0.0"
8448+
84398449
84408450
version "2.3.2"
84418451
resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89"
@@ -9593,7 +9603,7 @@ stable@~0.1.6:
95939603
version "0.1.8"
95949604
resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
95959605

9596-
9606+
95979607
version "0.0.10"
95989608
resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
95999609

@@ -10065,14 +10075,14 @@ time-stamp@^2.0.0:
1006510075
version "2.0.0"
1006610076
resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-2.0.0.tgz#95c6a44530e15ba8d6f4a3ecb8c3a3fac46da357"
1006710077

10078+
[email protected], timed-out@^4.0.0, timed-out@^4.0.1:
10079+
version "4.0.1"
10080+
resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
10081+
1006810082
timed-out@^3.0.0:
1006910083
version "3.1.3"
1007010084
resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-3.1.3.tgz#95860bfcc5c76c277f8f8326fd0f5b2e20eba217"
1007110085

10072-
timed-out@^4.0.0, timed-out@^4.0.1:
10073-
version "4.0.1"
10074-
resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
10075-
1007610086
timers-browserify@^2.0.4:
1007710087
version "2.0.10"
1007810088
resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
@@ -10532,6 +10542,10 @@ [email protected], utils-merge@~1.0.0:
1053210542
version "1.0.1"
1053310543
resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
1053410544

10545+
10546+
version "3.0.0"
10547+
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.0.tgz#6728fc0459c450d796a99c31837569bdf672d728"
10548+
1053510549
1053610550
version "3.1.0"
1053710551
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"

0 commit comments

Comments
 (0)