T12248237: iOS - Renamed File name not appearing inside Audio player (Fix Intermitten Scenario 1)

Author: af-mega

MEGAUnitTests/AudioPlayer/UseCases/Domain/AudioPlayerItemTests.swift

@@ -5,22 +5,22 @@ import XCTest
 
 final class AudioPlayerItemTests: XCTestCase {
 
-    func testPreferredName_whenCalled_mustUseNodeNameInsteadOfItemName() {
+    func testName_whenCalled_mustUseNodeNameInsteadOfItemName() {
         let originalTrackName = "original-track-name"
         let nodeName = "node-name"
         let node = MockNode(handle: 1, name: nodeName)
         let sut = makeSUT(name: originalTrackName, node: node)
 
-        let result = sut.preferredName
+        let result = sut.name
 
         XCTAssertEqual(result, nodeName)
     }
 
-    func testPreferredName_whenCalled_mustUseTrackNameWhenNodeIsNil() {
+    func testName_whenCalled_mustUseTrackNameWhenNodeIsNil() {
         let originalTrackName = originalTrackName()
         let sut = makeSUT(name: originalTrackName)
 
-        let result = sut.preferredName
+        let result = sut.name
 
         XCTAssertEqual(result, originalTrackName)
     }

iMEGA/AudioPlayer/AudioPlayer/AudioPlayer+RemoteCommand.swift

@@ -28,7 +28,7 @@ extension AudioPlayer {
 
         var nowPlayingInfo = [String: Any]()
 
-        nowPlayingInfo[MPMediaItemPropertyTitle] = item.preferredName
+        nowPlayingInfo[MPMediaItemPropertyTitle] = item.name
         nowPlayingInfo[MPMediaItemPropertyArtist] = item.artist
         nowPlayingInfo[MPNowPlayingInfoPropertyElapsedPlaybackTime] = item.currentTime().seconds
         nowPlayingInfo[MPMediaItemPropertyPlaybackDuration] = item.asset.duration.seconds

iMEGA/AudioPlayer/AudioPlayer/AudioPlayer.swift

@@ -58,7 +58,7 @@ final class AudioPlayer: NSObject {
     }
 
     var currentName: String? {
-        currentItem()?.preferredName
+        currentItem()?.name
     }
 
     var currentArtist: String? {

iMEGA/AudioPlayer/Scenes/AudioPlayerScene/AudioPlayerViewModel.swift

@@ -199,7 +199,7 @@ final class AudioPlayerViewModel: ViewModelType {
             updateTracksActionStatus(enabled: tracks.count > 1)
             isSingleTrackPlayer = tracks.count == 1
         case .fileLink:
-            invokeCommand?(.configureFileLinkPlayer(title: currentTrack.preferredName, subtitle: Strings.Localizable.fileLink))
+            invokeCommand?(.configureFileLinkPlayer(title: currentTrack.name, subtitle: Strings.Localizable.fileLink))
         }
     }
 

iMEGA/AudioPlayer/Scenes/MiniPlayerScene/Cells/MiniPlayerItemCollectionViewCell.swift

@@ -25,7 +25,7 @@ final class MiniPlayerItemCollectionViewCell: UICollectionViewCell {
 
         self.item = item
 
-        titleLabel.text = item?.preferredName
+        titleLabel.text = item?.name
         subtitleLabel.text = item?.artist
     }
 }

iMEGA/AudioPlayer/UseCases/Domain/AudioPlayerItem.swift

@@ -23,7 +23,7 @@ final class AudioPlayerItem: AVPlayerItem {
     }()
 
     init(name: String, url: URL, node: MEGANode?, hasThumbnail: Bool = false) {
-        self.name = name
+        self.name = node?.name ?? name
         self.url = url
         self.node = node
         self.nodeHasThumbnail = hasThumbnail
@@ -34,7 +34,10 @@ final class AudioPlayerItem: AVPlayerItem {
     func loadMetadata(completion: @escaping () -> Void) {
         asset.loadMetadata { [weak self] title, artist, albumName, artworkData in
             guard let `self` = self else { return }
-            if let title = title {
+            
+            if let nodeName = node?.name {
+                self.name = nodeName
+            } else if let title {
                 self.name = title
             }
 
@@ -79,9 +82,3 @@ extension AudioPlayerItem {
         return lhsNode == rhsNode
     }
 }
-
-extension AudioPlayerItem {
-    var preferredName: String {
-        node?.name ?? name
-    }
-}