fix(video): fix filename fix in ensureAllClipsAreDecoded

dride · Apr 1, 2018 · 250ae10 · 250ae10
1 parent 9913b3b
commit 250ae10
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 58 deletions.
diff --git a/config.json b/config.json
@@ -1,6 +1,6 @@
 {
 	"name": "drideOS",
-	"version": "0.10.2",
+	"version": "0.10.3",
 	"settings": {
 		"debug": false,
 		"videoRecord": true,

diff --git a/modules/video/helpers/ensureAllClipsAreDecoded.js b/modules/video/helpers/ensureAllClipsAreDecoded.js
@@ -21,45 +21,49 @@ var isAppConnected = record.isAppOnline();
 
 var settings = settingsHelper.getSettings();
 if (isAppConnected && !isAppConnectedObj.connected) {
-	fs.readdir(dirTmpClip, (err, files) => {
-		if (err) {
-			console.error('Could not list the directory.', err);
-			process.exit(0);
-		}
-		let fielDetails = null;
-		//files.forEach((file, index) => {
-		for (var index = 0; index < files.length; index++) {
-			file = files[index];
-			fileDetails = fs.statSync(dirTmpClip + '/' + file);
+  fs.readdir(dirTmpClip, (err, files) => {
+    if (err) {
+      console.error('Could not list the directory.', err);
+      process.exit(0);
+    }
+    let fielDetails = null;
+    //files.forEach((file, index) => {
+    for (var index = 0; index < files.length; index++) {
+      file = files[index];
+      fileDetails = fs.statSync(dirTmpClip + '/' + file);
 
-			var fileName = file.split('.').shift();
+      //skip empty files
+      if (!fileDetails.size) {
+        continue;
+      }
+      var fileName = file.split('.').shift();
 
-			//if the file is from the last minute ignore it
-			if (Math.abs(new Date().getTime() - fileDetails.birthtimeMs) > 1000 * 120) {
-				//repack h264 to mp4 container
-				execSync(
-					'avconv -framerate ' +
-						(settings.resolution == '1080' ? 30 : 30) +
-						' -i /dride/tmp_clip/' +
-						fileName +
-						'.h264 -c copy /dride/clip/' +
-						fileDetails.birthtimeMs +
-						'.mp4 -y'
-				);
+      //if the file is from the last minute ignore it
+      if (Math.abs(new Date().getTime() - Math.floor(fileDetails.birthtimeMs)) > 1000 * 120) {
+        //repack h264 to mp4 container
+        execSync(
+          'avconv -framerate ' +
+          (settings.resolution == '1080' ? 30 : 30) +
+          ' -i /dride/tmp_clip/' +
+          fileName +
+          '.h264 -c copy /dride/clip/' +
+          Math.floor(fileDetails.birthtimeMs) +
+          '.mp4 -y'
+        );
 
-				//remove tmp file
-				if (fs.existsSync(dir + 'tmp_clip/' + fileName + '.h264')) {
-					try {
-						fs.unlinkSync(dir + 'tmp_clip/' + fileName + '.h264');
-					} catch (err) {
-						//throw err
-						console.error(error);
-					}
-				}
-				// Manual encoding will add .m to the file name, this will allow us to avoid conflict with button press events
-				record.saveThumbNail(fileDetails.birthtimeMs);
-				break;
-			}
-		}
-	});
+        //remove tmp file
+        if (fs.existsSync(dir + 'tmp_clip/' + fileName + '.h264')) {
+          try {
+            fs.unlinkSync(dir + 'tmp_clip/' + fileName + '.h264');
+          } catch (err) {
+            //throw err
+            console.error(error);
+          }
+        }
+        // Manual encoding will add .m to the file name, this will allow us to avoid conflict with button press events
+        record.saveThumbNail(Math.floor(fileDetails.birthtimeMs));
+        break;
+      }
+    }
+  });
 }
diff --git a/modules/video/helpers/record.js b/modules/video/helpers/record.js
@@ -143,7 +143,7 @@ var encodeAndAddThumb = (fileName, resolution, birthtimeMs) => {
 			' -i /dride/tmp_clip/' +
 			fileName +
 			'.h264 -c copy /dride/clip/' +
-			fileDetails.birthtimeMs +
+			Math.floor(fileDetails.birthtimeMs) +
 			'.mp4 -y'
 	);
 	//remove tmp file
@@ -155,7 +155,7 @@ var encodeAndAddThumb = (fileName, resolution, birthtimeMs) => {
 			console.error(error);
 		}
 	}
-	saveThumbNail(fileDetails.birthtimeMs);
+	saveThumbNail(Math.floor(fileDetails.birthtimeMs));
 };
 
 module.exports = {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "dride-core",
-	"version": "0.10.2",
+	"version": "0.10.3",
 	"description": "Open source dashcam for RaspberryPi ",
 	"scripts": {
 		"build": "node scripts/build.js",
@@ -13,9 +13,7 @@
 		"type": "git",
 		"url": "https://github.com/dride/dride-core.git"
 	},
-	"keywords": [
-		"dride"
-	],
+	"keywords": ["dride"],
 	"author": "Dride, Inc.",
 	"license": "MIT",
 	"bugs": {
@@ -43,17 +41,10 @@
 		"generateNotes": {
 			"preset": "angular",
 			"parserOpts": {
-				"noteKeywords": [
-					"BREAKING CHANGE",
-					"BREAKING CHANGES",
-					"BREAKING"
-				]
+				"noteKeywords": ["BREAKING CHANGE", "BREAKING CHANGES", "BREAKING"]
 			},
 			"writerOpts": {
-				"commitsSort": [
-					"subject",
-					"scope"
-				]
+				"commitsSort": ["subject", "scope"]
 			}
 		},
 		"prepare": [
@@ -63,8 +54,6 @@
 			},
 			"@semantic-release/git"
 		],
-		"publish": [
-			"@semantic-release/github"
-		]
+		"publish": ["@semantic-release/github"]
 	}
 }
diff --git a/state/config.backup.json b/state/config.backup.json
@@ -1,6 +1,6 @@
 {
 	"name": "drideOS",
-	"version": "0.10.2",
+	"version": "0.10.3",
 	"settings": {
 		"debug": false,
 		"videoRecord": true,