Merge pull request #40 from nicolassrod/master

Enhance metadata validators
fethica · Apr 3, 2020 · fc3cde5 · fc3cde5
2 parents b47cca8 + 71848c2
commit fc3cde5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/Sources/FRadioPlayer/FRadioAPI.swift b/Sources/FRadioPlayer/FRadioAPI.swift
@@ -62,7 +62,7 @@ internal struct FRadioAPI {
         // Strip off trailing '[???]' characters left there by ShoutCast and Centova Streams
         // It will leave the string alone if the pattern is not there
 
-        let pattern = "(\\[.*?\\]\\w*$)"
+        let pattern = #"(\(.*?\)\w*)|(\[.*?\]\w*)"#
         guard let regex = try? NSRegularExpression(pattern: pattern, options: []) else { return rawValue }
 
         let rawCleaned = NSMutableString(string: rawValue)

diff --git a/Sources/FRadioPlayer/FRadioPlayer.swift b/Sources/FRadioPlayer/FRadioPlayer.swift
@@ -399,7 +399,8 @@ open class FRadioPlayer: NSObject {
     }
 
     private func timedMetadataDidChange(rawValue: String?) {
-        let parts = rawValue?.components(separatedBy: " - ")
+        let metadataCleaned = cleanMetadata(rawValue)
+        let parts = metadataCleaned?.components(separatedBy: " - ")
         delegate?.radioPlayer?(self, metadataDidChange: parts?.first, trackName: parts?.last)
         delegate?.radioPlayer?(self, metadataDidChange: rawValue)
         shouldGetArtwork(for: rawValue, enableArtwork)
@@ -418,7 +419,16 @@ open class FRadioPlayer: NSObject {
             }
         })
     }
-
+
+    private func cleanMetadata(_ rawValue: String?) -> String? {
+        guard let rawValue = rawValue else { return nil }
+        return rawValue.replacingOccurrences(
+            of: #"(\(.*?\)\w*)|(\[.*?\]\w*)"#,
+            with: "",
+            options: .regularExpression
+        )
+    }
+
     private func reloadItem() {
         player?.replaceCurrentItem(with: nil)
         player?.replaceCurrentItem(with: playerItem)