Fix crash

Author: Mx-Iris

Sources/LyricsService/Parser/KugouKrcParser.swift

@@ -11,16 +11,15 @@ import Foundation
 import LyricsCore
 
 extension Lyrics {
-    
     convenience init?(kugouKrcContent content: String) {
         var idTags: [IDTagKey: String] = [:]
         var languageHeader: KugouKrcHeaderFieldLanguage?
-        id3TagRegex.matches(in: content).forEach { match in
+        for match in id3TagRegex.matches(in: content) {
             guard let key = match[1]?.content.trimmingCharacters(in: .whitespaces),
-                let value = match[2]?.content.trimmingCharacters(in: .whitespaces),
-                !key.isEmpty,
-                !value.isEmpty else {
-                    return
+                  let value = match[2]?.content.trimmingCharacters(in: .whitespaces),
+                  !key.isEmpty,
+                  !value.isEmpty else {
+                continue
             }
             if key == "language" {
                 if let data = Data(base64Encoded: value) {
@@ -31,17 +30,17 @@ extension Lyrics {
                 idTags[.init(key)] = value
             }
         }
-        
+
         var lines: [LyricsLine] = krcLineRegex.matches(in: content).map { match in
             let timeTagStr = match[1]!.content
             let timeTag = TimeInterval(timeTagStr)! / 1000
-            
+
             let durationStr = match[2]!.content
             let duration = TimeInterval(durationStr)! / 1000
-            
+
             var lineContent = ""
             var attachment = LyricsLine.Attachments.InlineTimeTag(tags: [.init(index: 0, time: 0)], duration: duration)
-            kugouInlineTagRegex.matches(in: content, range: match[3]!.range).forEach { m in
+            for m in kugouInlineTagRegex.matches(in: content, range: match[3]!.range) {
                 let t1 = Int(m[1]!.content)!
                 let t2 = Int(m[2]!.content)!
                 let t = TimeInterval(t1 + t2) / 1000
@@ -52,15 +51,15 @@ extension Lyrics {
                     attachment.tags.append(.init(index: lineContent.count, time: t))
                 }
             }
-            
+
             let att = LyricsLine.Attachments(attachments: [.timetag: attachment])
             return LyricsLine(content: lineContent, position: timeTag, attachments: att)
         }
         guard !lines.isEmpty else {
             return nil
         }
         self.init(lines: lines, idTags: idTags)
-        
+
         // TODO: multiple translation
         if let transContent = languageHeader?.content.first?.lyricContent {
             transContent.prefix(lines.count).enumerated().forEach { index, item in
@@ -72,49 +71,3 @@ extension Lyrics {
         }
     }
 }
-
-
-extension Lyrics {
-    
-    convenience init?(qqmusicQrcContent content: String) {
-        var idTags: [IDTagKey: String] = [:]
-        id3TagRegex.matches(in: content).forEach { match in
-            guard let key = match[1]?.content.trimmingCharacters(in: .whitespaces),
-                let value = match[2]?.content.trimmingCharacters(in: .whitespaces),
-                !key.isEmpty,
-                !value.isEmpty else {
-                    return
-            }
-            idTags[.init(key)] = value
-        }
-        
-        let lines: [LyricsLine] = qrcLineRegex.matches(in: content).map { match in
-            let timeTagStr = match[1]!.content
-            let timeTag = TimeInterval(timeTagStr)! / 1000
-            
-            let durationStr = match[2]!.content
-            let duration = TimeInterval(durationStr)! / 1000
-            
-            var lineContent = ""
-            var attachment = LyricsLine.Attachments.InlineTimeTag(tags: [.init(index: 0, time: 0)], duration: duration)
-            qqmusicInlineTagRegex.matches(in: content, range: match[3]!.range).forEach { m in
-                let t1 = Int(m[2]!.content)! - Int(timeTagStr)!
-                let t2 = Int(m[3]!.content)!
-                let t = TimeInterval(t1 + t2) / 1000
-                let fragment = m[1]!.content
-                let prevCount = lineContent.count
-                lineContent += fragment
-                if lineContent.count > prevCount {
-                    attachment.tags.append(.init(index: lineContent.count, time: t))
-                }
-            }
-            
-            let att = LyricsLine.Attachments(attachments: [.timetag: attachment])
-            return LyricsLine(content: lineContent, position: timeTag, attachments: att)
-        }
-        guard !lines.isEmpty else {
-            return nil
-        }
-        self.init(lines: lines, idTags: idTags)
-    }
-}

Sources/LyricsService/Parser/QQMusicQrcDecrypter.swift

@@ -34,6 +34,7 @@ class QrcDecoder {
 
     enum DecodeError: Error {
         case convertStringError
+        case dataEmpty
     }
 
     static func decode(_ hex: String) throws -> String {
@@ -44,8 +45,13 @@ class QrcDecoder {
         try des(&data, KEY2, dataLen)
         try ddes(&data, KEY3, dataLen)
         var byteData = Data(data)
+        
+        guard !byteData.isEmpty else {
+            throw DecodeError.dataEmpty
+        }
+        
         byteData.removeFirst(2)
-
+        
         let decompressedData = try (byteData as NSData).decompressed(using: .zlib)
         guard let result = String(data: decompressedData as Data, encoding: .utf8)
         else {

Sources/LyricsService/Parser/QQMusicQrcParser.swift

@@ -0,0 +1,46 @@
+import Foundation
+import LyricsCore
+
+extension Lyrics {
+    convenience init?(qqmusicQrcContent content: String) {
+        var idTags: [IDTagKey: String] = [:]
+        for match in id3TagRegex.matches(in: content) {
+            guard let key = match[1]?.content.trimmingCharacters(in: .whitespaces),
+                  let value = match[2]?.content.trimmingCharacters(in: .whitespaces),
+                  !key.isEmpty,
+                  !value.isEmpty else {
+                continue
+            }
+            idTags[.init(key)] = value
+        }
+
+        let lines: [LyricsLine] = qrcLineRegex.matches(in: content).map { match in
+            let timeTagStr = match[1]!.content
+            let timeTag = TimeInterval(timeTagStr)! / 1000
+
+            let durationStr = match[2]!.content
+            let duration = TimeInterval(durationStr)! / 1000
+
+            var lineContent = ""
+            var attachment = LyricsLine.Attachments.InlineTimeTag(tags: [.init(index: 0, time: 0)], duration: duration)
+            for m in qqmusicInlineTagRegex.matches(in: content, range: match[3]!.range) {
+                let t1 = Int(m[2]!.content)! - Int(timeTagStr)!
+                let t2 = Int(m[3]!.content)!
+                let t = TimeInterval(t1 + t2) / 1000
+                let fragment = m[1]!.content
+                let prevCount = lineContent.count
+                lineContent += fragment
+                if lineContent.count > prevCount {
+                    attachment.tags.append(.init(index: lineContent.count, time: t))
+                }
+            }
+
+            let att = LyricsLine.Attachments(attachments: [.timetag: attachment])
+            return LyricsLine(content: lineContent, position: timeTag, attachments: att)
+        }
+        guard !lines.isEmpty else {
+            return nil
+        }
+        self.init(lines: lines, idTags: idTags)
+    }
+}