handle lrc format error

DIYgod · DIYgod · commit 9080b73297b9 · 2015-12-12T22:34:09.000+08:00
diff --git a/README.md b/README.md
@@ -79,9 +79,16 @@ ap.init();
 
 ### With lrc
 
-Using [LRC format](https://en.wikipedia.org/wiki/LRC_(file_format))
+#### LRC format:
 
-HTML:
+```
+[mm:ss.xx]lyric
+[mm:ss.xx]lyric
+[mm:ss.xx]lyric
+...
+```
+
+#### HTML:
 
 ```HTML
 <link rel="stylesheet" href="APlayer.min.css">
@@ -107,7 +114,7 @@ HTML:
 <script src="APlayer.min.js"></script>
 ```
 
-JS:
+#### JS:
 
 Option: `showlrc: false`
 
diff --git a/dist/APlayer.min.js b/dist/APlayer.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aplayer",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "Wow, such a beautiful html5 music player",
   "main": "APlayer.js",
   "scripts": {
diff --git a/src/APlayer.js b/src/APlayer.js
@@ -41,13 +41,18 @@ APlayer.prototype.init = function () {
         var lines = lrcs.split(/\n/);
         var timeExp = /\[(\d{2}):(\d{2})\.(\d{2})]/;
         var lrcExp = /](.*)$/;
+        var notLrcLineExp = /\[[A-Za-z]+:/;
         for (var i = 0; i < lines.length; i++) {
+            lines[i] = lines[i].replace(/^\s+|\s+$/g, '');
             var oneTime = timeExp.exec(lines[i]);
             var oneLrc = lrcExp.exec(lines[i]);
-            if (oneTime && oneLrc) {
+            if (oneTime && oneLrc && !lrcExp.exec(oneLrc[1])) {
                 this.lrcTime.push(parseInt(oneTime[1]) * 60 + parseInt(oneTime[2]) + parseInt(oneTime[3]) / 100);
                 this.lrcLine.push(oneLrc[1]);
             }
+            else if (lines[i] && !notLrcLineExp.exec(lines[i])) {
+                throw 'APlayer Error: lrc format error : should be like `[mm:ss.xx]lyric` : ' + lines[i];
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "aplayer",`
`3`		`- "version": "1.2.2",`
	`3`	`+ "version": "1.2.3",`
`4`	`4`	`"description": "Wow, such a beautiful html5 music player",`
`5`	`5`	`"main": "APlayer.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -41,13 +41,18 @@ APlayer.prototype.init = function () {`
`41`	`41`	`var lines = lrcs.split(/\n/);`
`42`	`42`	`var timeExp = /\[(\d{2}):(\d{2})\.(\d{2})]/;`
`43`	`43`	`var lrcExp = /](.*)$/;`
	`44`	`+ var notLrcLineExp = /\[[A-Za-z]+:/;`
`44`	`45`	`for (var i = 0; i < lines.length; i++) {`
	`46`	`+ lines[i] = lines[i].replace(/^\s+\|\s+$/g, '');`
`45`	`47`	`var oneTime = timeExp.exec(lines[i]);`
`46`	`48`	`var oneLrc = lrcExp.exec(lines[i]);`
`47`		`- if (oneTime && oneLrc) {`
	`49`	`+ if (oneTime && oneLrc && !lrcExp.exec(oneLrc[1])) {`
`48`	`50`	`this.lrcTime.push(parseInt(oneTime[1]) * 60 + parseInt(oneTime[2]) + parseInt(oneTime[3]) / 100);`
`49`	`51`	`this.lrcLine.push(oneLrc[1]);`
`50`	`52`	`}`
	`53`	`+ else if (lines[i] && !notLrcLineExp.exec(lines[i])) {`
	`54`	+ throw 'APlayer Error: lrc format error : should be like `[mm:ss.xx]lyric` : ' + lines[i];
	`55`	`+ }`
`51`	`56`	`}`
`52`	`57`	`}`
`53`	`58`