0.3.1

Author: hangxingliu

.vscodeignore

@@ -2,7 +2,6 @@
 .json/**
 flowchart/**
 test/**
-**/node_modules/**
 cSpell.json
 jsconfig.json
 TODO.md

CHANGELOG.md

@@ -1,5 +1,13 @@
 ## CHANGELOG
 
+### 0.3.1
+
+0. **fixed the local server severe bug.**
+**(because vscode install extension would not resolve dependencies and I forgot a dependency)**
+1. fixed the wrong coding time record because some feature since VSCode 1.9.0 
+2. fixed could not upload tracking data in non-project context since VSCode 1.9.0
+3. remove some redundant git merge files 
+
 ### 0.3.0
 
 0. **Added local server mode. So you could use this extension easily.**

README.md

@@ -42,14 +42,15 @@ In this situation, the database file are located in `$HOME/.coding-tracker/`
 
 0. Set your vscode configuration `codingTracker.localServerMode` to `false`
 1. Open a terminal/command line
-2. Change path to `%HOME%/.vscode/extensions/hangxingliu.vscode-coding-tracker-0.3.0`
-	- In Windows OS, enter command: `cd %HOME%/.vscode/extensions/hangxingliu.vscode-coding-tracker-0.3.0`
-	- In Linux/Mac OS, enter command: `cd $HOME/.vscode/extensions/hangxingliu.vscode-coding-tracker-0.3.0`
-3. Launch tracker server by using command: `npm start -- -t ${REPLACE_TO_YOUR_TOKEN}`
+2. Change path to `%HOME%/.vscode/extensions/hangxingliu.vscode-coding-tracker-0.3.1`
+	- In Windows OS, enter command: `cd %HOME%/.vscode/extensions/hangxingliu.vscode-coding-tracker-0.3.1`
+	- In Linux/Mac OS, enter command: `cd $HOME/.vscode/extensions/hangxingliu.vscode-coding-tracker-0.3.1`
+3. Execute `npm i`
+4. Launch tracker server by using command: `npm start -- -t ${REPLACE_TO_YOUR_TOKEN}`
 	- Such as `npm start -- -t test_token`, means your upload token is `test_token`
 	- And you can get more configurations and descriptions by using command `npm start -- --help`
 	- Be care! It is necessary to add `--` following to `npm start` to passing following arguments to tracker server
-4. And your tracking data is under `./database` in default.
+5. And your tracking data is under `./database` in default.
 
 #### Remote server
 
@@ -91,6 +92,14 @@ Or, just open browser and enter `http://${YOUR_SERVER_HOST_NAME}:${PORT}/report/
 
 ## Current Version
 
+### 0.3.1
+
+0. **fixed the local server severe bug.**
+**(because vscode install extension would not resolve dependencies and I forgot a dependency)**
+1. fixed the wrong coding time record because some feature since VSCode 1.9.0 
+2. fixed could not upload tracking data in non-project context since VSCode 1.9.0
+3. remove some redundant git merge files 
+
 ### 0.3.0
 
 0. **Added local server mode. So you could use this extension easily.**

TODO.md

@@ -1,8 +1,3 @@
 # TODO
 
-- [x] Modified README.md content
 - [ ] Add lines count and character count tracking.(How many lines you modify and how many characters you modify)
-- [x] Config: `codingTracker.localServerMode` (start a local server)
-- [x] Action: `codingTracker.startLocalServer` (localMode: restart local server)
-- [x] Action: `codingTracker.stopLocalServer` (localMode: stop local server)
-- [x] Action: `codingTracker.showReport` (localMode: show local analyze report)

extension.js

@@ -24,6 +24,17 @@ const CODING_SHORTEST_UNIT_MS = 5 * SECOND_IN_MS,
 //if you have time below not coding(pressing your keyboard), the coding track record will be upload and re-track    
     MAX_CODING_WAIT_TIME = 30 * SECOND_IN_MS;
 
+//If there a event onFileCoding with scheme in here, just ignore this event
+const INVALID_CODING_DOCUMENT_SCHEMES = [
+	//there are will be a `onDidChangeTextDocument` with document scheme `git-index`
+	//be emitted when you switch document, so ignore it
+	'git-index',
+	//when you just look up output channel content, there will be a `onDidChangeTextDocument` be emitted
+	'output',
+	//This is a edit event emit from you debug console input box
+    'input'
+];
+
 var activeDocument,
     uploadObjectGenerator,
     //Tracking data, record document open time, first coding time and last coding time and coding time long
@@ -81,6 +92,7 @@ var EventHandler = {
         }
     },
     onActiveFileChange: (doc) => {
+        log.d('onActiveFileChange: ', doc);
         var now = Date.now();
         // If there is a TextEditor opened before changed, should upload the track data
         if (activeDocument) {
@@ -99,11 +111,12 @@ var EventHandler = {
         trackData.codingLong = trackData.lastCodingTime = trackData.firstCodingTime = 0;  
     },
     onFileCoding: (doc) => {
-        //ignore event emit from vscode `git-index`
-        //  `vscode.workspace.onDidChangeTextDocument`
-        //because it is not a coding action
-        if (!doc || doc.uri.scheme == 'git-index')
-            return;
+        log.d('onFileCoding: ', doc);
+
+		//Ignore the invalid coding file schemes
+		if (!doc || INVALID_CODING_DOCUMENT_SCHEMES.indexOf(doc.uri.scheme) >= 0 )
+    		return; 
+       
         var now = Date.now();
         //If time is too short to calling this function then just ignore it 
         if (now - CODING_SHORTEST_UNIT_MS < trackData.lastCodingTime)

lib/LocalServer.js

@@ -14,13 +14,13 @@ const DEFAULT_PORT = 10345;
 const SILENT_START_SERVER = true;
 
 //som parameters for start local server
-const EXECUTE_CWD = `${__dirname}/..`,
-	EXECUTE_BIN_FILE = 'npm',
-	EXECUTE_PARAMETERS = ['start', '--',
+const EXECUTE_CWD = `${__dirname}/../node_modules/vscode-coding-tracker-server/`,
+	EXECUTE_BIN_FILE = 'node',
+	EXECUTE_PARAMETERS = ['./app',
 		'--local',
 		'--debug',
 		'--public-report',
-		`-o`,`${process.env.HOME}/.coding-tracker/`,
+		`-o`,`${process.env.USERPROFILE||process.env.HOME}/.coding-tracker/`,
 		`--port={0}`,
 		`--token={1}`
 	];

lib/UploadObjectGenerator.js

@@ -15,7 +15,7 @@ var baseUploadObject = {
 
 module.exports = function (projectPath) {
 	var uploadObject = cloneSimpleMapObject(baseUploadObject);
-	uploadObject.proj = projectPath;
+	uploadObject.proj = projectPath || 'unknown';
 
 	this.setComputerId = computerId => uploadObject.pcid = computerId;
 

package.json

@@ -2,7 +2,7 @@
     "name": "vscode-coding-tracker",
     "displayName": "Coding Tracker",
     "description": "A coding activities tracker(time, file, type)",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "license": "GPL-3.0",
     "publisher": "hangxingliu",
     "author": "hangxingliu",
@@ -61,7 +61,6 @@
         "url": "https://github.com/hangxingliu/vscode-coding-tracker"
     },
     "scripts": {
-        "postinstall": "node ./node_modules/vscode/bin/install",
         "install-tsd": "npm install @types/request",
         "start": "./node_modules/.bin/coding-tracker-server"
     },
@@ -74,6 +73,7 @@
     "dependencies": {
         "fs-extra": "*",
         "tree-kill": "*",
-        "vscode-coding-tracker-server": "^0.3.0"
+        "request": "*",
+        "vscode-coding-tracker-server": "^0.3.1"
     }
 }