Refactor Util.stringToSeconds function (web-scrobbler#2523)

Refactor Util.stringToSeconds by using two simple regex matchers.

There is also no longer a need to trim the string, since the expressions only match on the negative sign or groups of two digits.

Author: russellsanborn

src/core/content/util.js

@@ -28,37 +28,20 @@ const Util = {
 	 * @return {Number} Seconds
 	 */
 	stringToSeconds(str) {
-		if (!str) {
+		const timeFormatExpression = /^\s*-?((\d{1,2}:\d\d:\d\d)|(\d{1,2}:\d\d)|(\d{1,2}))\s*$/g;
+		if (!timeFormatExpression.test(str)) {
 			return 0;
 		}
 
-		let s = str.toString().trim();
-		let val = 0;
-		let seconds = 0;
+		const negativeExpression = /-/g;
+		const digitsExpression = /\d{1,2}/g;
 
-		const isNegative = s.startsWith('-');
-		if (isNegative) {
-			s = s.substr(1);
-		}
-
-		for (let i = 0; i < 3; i++) {
-			const idx = s.lastIndexOf(':');
-			if (idx > -1) {
-				val = parseInt(s.substr(idx + 1), 10);
-				seconds += val * Math.pow(60, i);
-				s = s.substr(0, idx);
-			} else {
-				val = parseInt(s, 10);
-				seconds += val * Math.pow(60, i);
-				break;
-			}
-		}
-
-		if (isNegative) {
-			seconds = -seconds;
-		}
+		const seconds = str.match(digitsExpression)
+			.reverse()
+			.map((current) => parseInt(current, 10))
+			.reduce((total, current, i) => total + current * Math.pow(60, i));
 
-		return seconds;
+		return (negativeExpression.test(str)) ? -seconds : seconds;
 	},
 
 	/**

tests/content/util.js

@@ -119,25 +119,41 @@ const ESCAPE_BAD_TIME_VALUES_DATA = [{
  * @type {Array}
  */
 const STRING_TO_SECONDS_DATA = [{
-	description: 'should trim string and parse time',
-	args: ['01:10:30 '],
+	description: 'should parse time that contains leading and trailing whitespace',
+	args: [' 01:10:30 '],
 	expected: 4230,
 }, {
 	description: 'should parse time in hh:mm:ss format',
 	args: ['01:10:30'],
 	expected: 4230,
+}, {
+	description: 'should parse time in h:mm:ss format',
+	args: ['5:20:00'],
+	expected: 19200,
 }, {
 	description: 'should parse negative time',
 	args: ['-01:10'],
 	expected: -70,
+}, {
+	description: 'should parse negative time that contains leading and trailing whitespace',
+	args: [' -01:10 '],
+	expected: -70,
 }, {
 	description: 'should parse time in mm:ss format',
 	args: ['05:20'],
 	expected: 320,
+}, {
+	description: 'should parse time in m:ss format',
+	args: ['5:20'],
+	expected: 320,
 }, {
 	description: 'should parse time in ss format',
 	args: ['20'],
 	expected: 20,
+}, {
+	description: 'should parse time in s format',
+	args: ['2'],
+	expected: 2,
 }, {
 	description: 'should not parse empty string',
 	args: [''],
@@ -150,6 +166,22 @@ const STRING_TO_SECONDS_DATA = [{
 	description: 'should not parse malformed format',
 	args: [NaN],
 	expected: 0,
+}, {
+	description: 'should not parse a format without colons',
+	args: ['01 10 30'],
+	expected: 0,
+}, {
+	description: 'should not parse a format with days',
+	args: ['01:00:00:00'],
+	expected: 0,
+}, {
+	description: 'should not parse mm:s format',
+	args: ['12:4'],
+	expected: 0,
+}, {
+	description: 'should not parse hh:m:s format',
+	args: ['12:3:4'],
+	expected: 0,
 }];
 
 /**