Merge pull request #6 from kingcos/dev

Compatible with some video players
kingcos · Sep 16, 2017 · 4d02836 · 4d02836
2 parents bdba186 + 0874731
commit 4d02836
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/Sources/WWDCHelper/main.swift b/Sources/WWDCHelper/main.swift
@@ -11,7 +11,7 @@ import CommandLineKit
 import Rainbow
 import WWDCHelperKit
 
-let appVersion = "v0.2.0"
+let appVersion = "v0.3.0"
 let cli = CommandLineKit.CommandLine()
 
 cli.formatOutput = { s, type in

diff --git a/Sources/WWDCWebVTTToSRTHelperKit/WebVTTParsable.swift b/Sources/WWDCWebVTTToSRTHelperKit/WebVTTParsable.swift
@@ -58,11 +58,13 @@ extension RegexWebVTTParsable {
         while i < contentArr.count {
             if contentArr[i].contains("-->") {
                 contentArr.insert("\(n)", at: i)
+                contentArr.insert("", at: i)
                 n += 1
-                i += 1
+                i += 2
             }
             i += 1
         }
+        contentArr.removeFirst()
     }
 
     func dealWithLines(_ contentArr: inout [String]) {

diff --git a/Tests/WWDCWebVTTToSRTHelperKitTests/WWDCWebVTTToSRTHelperKitSpecs.swift b/Tests/WWDCWebVTTToSRTHelperKitTests/WWDCWebVTTToSRTHelperKitSpecs.swift
@@ -70,6 +70,7 @@ public func testWWDCWebVTTToSRTHelperKit() {
                 let expectResult = ["1",
                                     "01:42:58.766 --> 01:43:00.516 A:middle",
                                     "&gt;&gt;  And with that, I hope you have a  &lt;&lt;",
+                                    "",
                                     "2",
                                     "01:43:00.516 --> 01:43:01.546 A:middle",
                                     "<c.magenta>great conference, and I'll see</c>",
@@ -83,6 +84,7 @@ public func testWWDCWebVTTToSRTHelperKit() {
                 let expectResult = ["1",
                                     "01:42:58,766 --> 01:43:00,516",
                                     "&gt;&gt;  And with that, I hope you have a  &lt;&lt;",
+                                    "",
                                     "2",
                                     "01:43:00,516 --> 01:43:01,546",
                                     "great conference, and I'll see",
@@ -96,6 +98,7 @@ public func testWWDCWebVTTToSRTHelperKit() {
                 let expectResult = ["1",
                                     "01:42:58,766 --> 01:43:00,516",
                                     ">>  And with that, I hope you have a  <<",
+                                    "",
                                     "2",
                                     "01:43:00,516 --> 01:43:01,546",
                                     "great conference, and I'll see",
@@ -109,6 +112,7 @@ public func testWWDCWebVTTToSRTHelperKit() {
                 let expectResult = ["1",
                                     "01:42:58,766 --> 01:43:00,516",
                                     ">>  And with that, I hope you have a  <<",
+                                    "",
                                     "2",
                                     "01:43:00,516 --> 01:43:01,546",
                                     "great conference, and I'll see",
@@ -127,7 +131,7 @@ public func testWWDCWebVTTToSRTHelperKit() {
 
                 guard let string = parser.parseToSRT(strArr) else { return }
                 let result = string.components(separatedBy: "\n").count
-                let expectResult = 247
+                let expectResult = 328
 
                 try expect(expectResult) == result
             }