remove encoding detection

joaomoreno · joaomoreno · commit eb494b4c63d4 · 2016-11-29T10:02:34.000+01:00
diff --git a/extensions/git/package.json b/extensions/git/package.json
@@ -91,7 +91,6 @@
     ]
   },
   "dependencies": {
-    "autodetect-decoder-stream": "^1.0.0",
     "denodeify": "^1.2.1",
     "lodash": "^4.17.2",
     "mime": "^1.3.4",
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
@@ -15,7 +15,6 @@ import * as _ from 'lodash';
 import { EventEmitter, Event } from 'vscode';
 import * as nls from 'vscode-nls';
 import * as mime from 'mime';
-import * as AutoDetectDecoderStream from 'autodetect-decoder-stream';
 
 const localize = nls.loadMessageBundle(__filename);
 const readdir = denodeify(fs.readdir);
@@ -177,23 +176,20 @@ export async function exec(child: cp.ChildProcess, defaultEncoding = 'utf8'): Pr
 		disposables.push(toDisposable(() => ee.removeListener(name, fn)));
 	};
 
-	const stdoutStream = child.stdout.pipe(new AutoDetectDecoderStream({ defaultEncoding }));
-	const stderrStream = child.stderr.pipe(new AutoDetectDecoderStream({ defaultEncoding }));
-
 	const [exitCode, stdout, stderr] = await Promise.all<any>([
 		new Promise<number>((c, e) => {
 			once(child, 'error', e);
 			once(child, 'exit', c);
 		}),
 		new Promise<string>(c => {
-			let buffers: string[] = [];
-			on(stdoutStream, 'data', b => buffers.push(b));
-			once(stdoutStream, 'close', () => c(buffers.join()));
+			const buffers: string[] = [];
+			on(child.stdout, 'data', b => buffers.push(b));
+			once(child.stdout, 'close', () => c(buffers.join()));
 		}),
 		new Promise<string>(c => {
-			let buffers: string[] = [];
-			on(stderrStream, 'data', b => buffers.push(b));
-			once(stderrStream, 'close', () => c(buffers.join()));
+			const buffers: string[] = [];
+			on(child.stderr, 'data', b => buffers.push(b));
+			once(child.stderr, 'close', () => c(buffers.join()));
 		})
 	]);
 
@@ -457,6 +453,7 @@ export class Repository {
 
 		return await this.doBuffer(object);
 
+		// TODO@joao
 		// return new Promise((c, e) => {
 		// detectMimesFromStream(child.stdout, null, (err, result) => {
 		// 	if (err) {
diff --git a/extensions/git/src/typings/globals/autodetect-decoder-stream/index.d.ts b/extensions/git/src/typings/globals/autodetect-decoder-stream/index.d.ts

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,6 @@`
`91`	`91`	`]`
`92`	`92`	`},`
`93`	`93`	`"dependencies": {`
`94`		`- "autodetect-decoder-stream": "^1.0.0",`
`95`	`94`	`"denodeify": "^1.2.1",`
`96`	`95`	`"lodash": "^4.17.2",`
`97`	`96`	`"mime": "^1.3.4",`