From 2112074199fb1b0520d4477981f56b461c270918 Mon Sep 17 00:00:00 2001 From: Daniele Scasciafratte Date: Wed, 24 Feb 2021 19:47:41 +0100 Subject: [PATCH 1/8] More stuff --- src/util/classes.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/util/classes.ts b/src/util/classes.ts index 3c0c511c..56dfd26a 100644 --- a/src/util/classes.ts +++ b/src/util/classes.ts @@ -28,7 +28,7 @@ export const defaultCategories: Category[] = [ }, { name: ['Work', 'Programming'], - rule: { type: 'regex', regex: 'GitHub|Stack Overflow|BitBucket|Gitlab|vim|Spyder|kate' }, + rule: { type: 'regex', regex: 'GitHub|Stack Overflow|BitBucket|Gitlab|vim|Spyder|kate|Ghidra|Scite' }, }, { name: ['Work', 'Programming', 'ActivityWatch'], @@ -40,14 +40,15 @@ export const defaultCategories: Category[] = [ data: { color: '#0FF' }, }, { name: ['Media', 'Video'], rule: { type: 'regex', regex: 'YouTube|Plex|VLC' } }, + { name: ['Media', 'Image'], rule: { type: 'regex', regex: 'Gimp|Inkscape' } }, { name: ['Media', 'Social Media'], rule: { type: 'regex', regex: 'reddit|Facebook|Twitter|Instagram|devRant', ignore_case: true }, }, - { name: ['Media', 'Music'], rule: { type: 'regex', regex: 'Spotify|Deezer', ignore_case: true } }, + { name: ['Media', 'Music'], rule: { type: 'regex', regex: 'Spotify|Deezer|Audacity', ignore_case: true } }, { name: ['Comms', 'IM'], - rule: { type: 'regex', regex: 'Messenger|Telegram|Signal|WhatsApp|Rambox|Slack|Riot|Discord' }, + rule: { type: 'regex', regex: 'Messenger|Telegram|Signal|WhatsApp|Rambox|Slack|Riot|Discord|Nheko' }, }, { name: ['Comms', 'Email'], rule: { type: 'regex', regex: 'Gmail|Thunderbird|mutt|alpine' } }, { name: ['Uncategorized'], rule: { type: null }, data: { color: '#ccc' } }, From ee3dc26e3f5e26acca05aa51e3da565efd2ea014 Mon Sep 17 00:00:00 2001 From: Daniele Scasciafratte Date: Wed, 24 Feb 2021 19:52:54 +0100 Subject: [PATCH 2/8] linting --- src/util/classes.ts | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/src/util/classes.ts b/src/util/classes.ts index 56dfd26a..2067d438 100644 --- a/src/util/classes.ts +++ b/src/util/classes.ts @@ -28,7 +28,10 @@ export const defaultCategories: Category[] = [ }, { name: ['Work', 'Programming'], - rule: { type: 'regex', regex: 'GitHub|Stack Overflow|BitBucket|Gitlab|vim|Spyder|kate|Ghidra|Scite' }, + rule: { + type: 'regex', + regex: 'GitHub|Stack Overflow|BitBucket|Gitlab|vim|Spyder|kate|Ghidra|Scite' + }, }, { name: ['Work', 'Programming', 'ActivityWatch'], @@ -43,12 +46,26 @@ export const defaultCategories: Category[] = [ { name: ['Media', 'Image'], rule: { type: 'regex', regex: 'Gimp|Inkscape' } }, { name: ['Media', 'Social Media'], - rule: { type: 'regex', regex: 'reddit|Facebook|Twitter|Instagram|devRant', ignore_case: true }, + rule: { + type: 'regex', + regex: 'reddit|Facebook|Twitter|Instagram|devRant', + ignore_case: true + }, + }, + { + name: ['Media', 'Music'], + rule: { + type: 'regex', + regex: 'Spotify|Deezer|Audacity', + ignore_case: true + } }, - { name: ['Media', 'Music'], rule: { type: 'regex', regex: 'Spotify|Deezer|Audacity', ignore_case: true } }, { name: ['Comms', 'IM'], - rule: { type: 'regex', regex: 'Messenger|Telegram|Signal|WhatsApp|Rambox|Slack|Riot|Discord|Nheko' }, + rule: { + type: 'regex', + regex: 'Messenger|Telegram|Signal|WhatsApp|Rambox|Slack|Riot|Discord|Nheko' + }, }, { name: ['Comms', 'Email'], rule: { type: 'regex', regex: 'Gmail|Thunderbird|mutt|alpine' } }, { name: ['Uncategorized'], rule: { type: null }, data: { color: '#ccc' } }, From aafaf7c87be2b0b3834702a446cfa47308a190d9 Mon Sep 17 00:00:00 2001 From: Daniele Scasciafratte Date: Wed, 24 Feb 2021 19:54:27 +0100 Subject: [PATCH 3/8] fix linting --- src/util/classes.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/classes.ts b/src/util/classes.ts index 2067d438..efe5599b 100644 --- a/src/util/classes.ts +++ b/src/util/classes.ts @@ -28,7 +28,7 @@ export const defaultCategories: Category[] = [ }, { name: ['Work', 'Programming'], - rule: { + rule: { type: 'regex', regex: 'GitHub|Stack Overflow|BitBucket|Gitlab|vim|Spyder|kate|Ghidra|Scite' }, @@ -46,7 +46,7 @@ export const defaultCategories: Category[] = [ { name: ['Media', 'Image'], rule: { type: 'regex', regex: 'Gimp|Inkscape' } }, { name: ['Media', 'Social Media'], - rule: { + rule: { type: 'regex', regex: 'reddit|Facebook|Twitter|Instagram|devRant', ignore_case: true @@ -54,7 +54,7 @@ export const defaultCategories: Category[] = [ }, { name: ['Media', 'Music'], - rule: { + rule: { type: 'regex', regex: 'Spotify|Deezer|Audacity', ignore_case: true From a390810deae63e29cb0a2dca68cc6db670b49dbd Mon Sep 17 00:00:00 2001 From: Daniele Scasciafratte Date: Wed, 24 Feb 2021 19:55:41 +0100 Subject: [PATCH 4/8] removed trailing whitespaces --- src/util/classes.ts | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/util/classes.ts b/src/util/classes.ts index efe5599b..e483913a 100644 --- a/src/util/classes.ts +++ b/src/util/classes.ts @@ -29,8 +29,8 @@ export const defaultCategories: Category[] = [ { name: ['Work', 'Programming'], rule: { - type: 'regex', - regex: 'GitHub|Stack Overflow|BitBucket|Gitlab|vim|Spyder|kate|Ghidra|Scite' + type: 'regex', + regex: 'GitHub|Stack Overflow|BitBucket|Gitlab|vim|Spyder|kate|Ghidra|Scite' }, }, { @@ -47,24 +47,24 @@ export const defaultCategories: Category[] = [ { name: ['Media', 'Social Media'], rule: { - type: 'regex', - regex: 'reddit|Facebook|Twitter|Instagram|devRant', - ignore_case: true + type: 'regex', + regex: 'reddit|Facebook|Twitter|Instagram|devRant', + ignore_case: true }, }, { name: ['Media', 'Music'], rule: { - type: 'regex', - regex: 'Spotify|Deezer|Audacity', - ignore_case: true + type: 'regex', + regex: 'Spotify|Deezer|Audacity', + ignore_case: true } }, { name: ['Comms', 'IM'], - rule: { - type: 'regex', - regex: 'Messenger|Telegram|Signal|WhatsApp|Rambox|Slack|Riot|Discord|Nheko' + rule: { + type: 'regex', + regex: 'Messenger|Telegram|Signal|WhatsApp|Rambox|Slack|Riot|Discord|Nheko' }, }, { name: ['Comms', 'Email'], rule: { type: 'regex', regex: 'Gmail|Thunderbird|mutt|alpine' } }, From 371fbcb6fc7e2fdaa4e10a97a9bbf79c14521116 Mon Sep 17 00:00:00 2001 From: Daniele Scasciafratte Date: Wed, 24 Feb 2021 19:57:40 +0100 Subject: [PATCH 5/8] added comma --- src/util/classes.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/classes.ts b/src/util/classes.ts index e483913a..00a182d9 100644 --- a/src/util/classes.ts +++ b/src/util/classes.ts @@ -30,7 +30,7 @@ export const defaultCategories: Category[] = [ name: ['Work', 'Programming'], rule: { type: 'regex', - regex: 'GitHub|Stack Overflow|BitBucket|Gitlab|vim|Spyder|kate|Ghidra|Scite' + regex: 'GitHub|Stack Overflow|BitBucket|Gitlab|vim|Spyder|kate|Ghidra|Scite', }, }, { @@ -49,7 +49,7 @@ export const defaultCategories: Category[] = [ rule: { type: 'regex', regex: 'reddit|Facebook|Twitter|Instagram|devRant', - ignore_case: true + ignore_case: true, }, }, { @@ -57,14 +57,14 @@ export const defaultCategories: Category[] = [ rule: { type: 'regex', regex: 'Spotify|Deezer|Audacity', - ignore_case: true + ignore_case: true, } }, { name: ['Comms', 'IM'], rule: { type: 'regex', - regex: 'Messenger|Telegram|Signal|WhatsApp|Rambox|Slack|Riot|Discord|Nheko' + regex: 'Messenger|Telegram|Signal|WhatsApp|Rambox|Slack|Riot|Discord|Nheko', }, }, { name: ['Comms', 'Email'], rule: { type: 'regex', regex: 'Gmail|Thunderbird|mutt|alpine' } }, From eaa93ccf0ac6b9a14f478be5a4ceab149e2f3bc1 Mon Sep 17 00:00:00 2001 From: Daniele Scasciafratte Date: Wed, 24 Feb 2021 19:59:56 +0100 Subject: [PATCH 6/8] last linting --- src/util/classes.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/classes.ts b/src/util/classes.ts index 00a182d9..90dd0fbf 100644 --- a/src/util/classes.ts +++ b/src/util/classes.ts @@ -52,13 +52,13 @@ export const defaultCategories: Category[] = [ ignore_case: true, }, }, - { - name: ['Media', 'Music'], + { + name: ['Media', 'Music'], rule: { type: 'regex', regex: 'Spotify|Deezer|Audacity', ignore_case: true, - } + }, }, { name: ['Comms', 'IM'], From 7fd16c008f0e621c6b43d805d5ac3e44d67fffa9 Mon Sep 17 00:00:00 2001 From: Daniele Scasciafratte Date: Wed, 5 May 2021 17:24:40 +0200 Subject: [PATCH 7/8] moved image as image editing --- src/util/classes.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/classes.ts b/src/util/classes.ts index 90dd0fbf..56014d20 100644 --- a/src/util/classes.ts +++ b/src/util/classes.ts @@ -37,13 +37,14 @@ export const defaultCategories: Category[] = [ name: ['Work', 'Programming', 'ActivityWatch'], rule: { type: 'regex', regex: 'ActivityWatch|aw-', ignore_case: true }, }, + { name: ['Work', 'Image Editing'], rule: { type: 'regex', regex: 'Gimp|Inkscape' } }, + { name: ['Work', 'Video Editing'], rule: { type: 'regex', regex: 'Kdenlive' } }, { name: ['Media', 'Games'], rule: { type: 'regex', regex: 'Minecraft|RimWorld' }, data: { color: '#0FF' }, }, { name: ['Media', 'Video'], rule: { type: 'regex', regex: 'YouTube|Plex|VLC' } }, - { name: ['Media', 'Image'], rule: { type: 'regex', regex: 'Gimp|Inkscape' } }, { name: ['Media', 'Social Media'], rule: { From 53cab56e7d274c232c485065a07c34498c45753a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bj=C3=A4reholt?= Date: Wed, 26 May 2021 13:25:59 +0200 Subject: [PATCH 8/8] Apply suggestions from code review --- src/util/classes.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/util/classes.ts b/src/util/classes.ts index 56014d20..3a767727 100644 --- a/src/util/classes.ts +++ b/src/util/classes.ts @@ -37,8 +37,10 @@ export const defaultCategories: Category[] = [ name: ['Work', 'Programming', 'ActivityWatch'], rule: { type: 'regex', regex: 'ActivityWatch|aw-', ignore_case: true }, }, - { name: ['Work', 'Image Editing'], rule: { type: 'regex', regex: 'Gimp|Inkscape' } }, - { name: ['Work', 'Video Editing'], rule: { type: 'regex', regex: 'Kdenlive' } }, + { name: ['Work', 'Image'], rule: { type: 'regex', regex: 'Gimp|Inkscape' } }, + { name: ['Work', 'Video'], rule: { type: 'regex', regex: 'Kdenlive' } }, + { name: ['Work', 'Audio'], rule: { type: 'regex', regex: 'Audacity' } }, + { name: ['Work', '3D'], rule: { type: 'regex', regex: 'Blender' } }, { name: ['Media', 'Games'], rule: { type: 'regex', regex: 'Minecraft|RimWorld' }, @@ -57,7 +59,7 @@ export const defaultCategories: Category[] = [ name: ['Media', 'Music'], rule: { type: 'regex', - regex: 'Spotify|Deezer|Audacity', + regex: 'Spotify|Deezer', ignore_case: true, }, },