Fix Windows UTF-8 filename bug (tested)

szTheory · Jul 10, 2020 · b28f57e · b28f57e
1 parent 3553160
commit b28f57e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 79 deletions.
diff --git a/src/common/args_file.ts b/src/common/args_file.ts
diff --git a/src/common/temp_file.ts b/src/common/temp_file.ts
diff --git a/src/renderer/add_files.ts b/src/renderer/add_files.ts
@@ -5,7 +5,6 @@ import {
 } from "./table";
 import exiftool, { ExiftoolProcess } from "node-exiftool";
 import { exiftoolBinPath } from "../common/binaries";
-import { withArgsTempFile } from "../common/args_file";
 
 export async function addFiles({ filePaths }: { filePaths: string[] }) {
 	for (const filePath of filePaths) {
@@ -136,13 +135,9 @@ async function removeExif({
 		.open()
 		// .then((pid) => console.log('Started exiftool process %s', pid))
 		.then(() => {
-			const args = ["-charset filename=UTF8", "overwrite_original"];
+			const args = ["charset filename=UTF8", "overwrite_original"];
 
-			return withArgsTempFile(args, argsTempFilePath => {
-				return ep.writeMetadata(filePath, { all: "" }, [
-					`-@ ${argsTempFilePath}`
-				]);
-			});
+			return ep.writeMetadata(filePath, { all: "" }, args);
 		})
 		.catch(console.error);
 
@@ -162,31 +157,21 @@ async function getExif({
 		.open()
 		// .then((pid) => console.log('Started exiftool process %s', pid))
 		.then(() => {
-			const args = [
-				"-charset filename=UTF8",
-				"-File:all",
-				"-ExifToolVersion",
-				"-x FileSize",
-				"-x SourceFile"
-			];
-
-			return withArgsTempFile(args, argsTempFilePath => {
-				return exiftoolProcess
-					.readMetadata(filePath, [`-@ ${argsTempFilePath}`])
-					.then(
-						exifData => {
-							if (exifData.data === null) {
-								return {};
-							}
-
-							const hash = exifData.data[0];
-							return cleanExifData(hash);
-						},
-						err => {
-							console.error(err);
-						}
-					);
-			});
+			const args = ["charset filename=UTF8", "-File:all", "-ExifToolVersion"];
+
+			return exiftoolProcess.readMetadata(filePath, args).then(
+				exifData => {
+					if (exifData.data === null) {
+						return {};
+					}
+
+					const hash = exifData.data[0];
+					return cleanExifData(hash);
+				},
+				err => {
+					console.error(err);
+				}
+			);
 		})
 		.catch(console.error);