From f8836be147d16cdf993f07bd98a994b24d02af34 Mon Sep 17 00:00:00 2001 From: ronaldheft Date: Thu, 8 Sep 2022 20:09:35 -0400 Subject: [PATCH] fix: Debug logging level does not persist to disk --- ios/App/Shared/player/AudioPlayer.swift | 38 +++++++++++----------- ios/App/Shared/player/PlayerProgress.swift | 18 +++++----- ios/App/Shared/util/Logger.swift | 8 ++--- 3 files changed, 30 insertions(+), 34 deletions(-) diff --git a/ios/App/Shared/player/AudioPlayer.swift b/ios/App/Shared/player/AudioPlayer.swift index 505fd358..91ae336a 100644 --- a/ios/App/Shared/player/AudioPlayer.swift +++ b/ios/App/Shared/player/AudioPlayer.swift @@ -87,10 +87,10 @@ class AudioPlayer: NSObject { } self.currentTrackIndex = getItemIndexForTime(time: playbackSession.currentTime) - logger.debug("Starting track index \(self.currentTrackIndex) for start time \(playbackSession.currentTime)") + logger.log("Starting track index \(self.currentTrackIndex) for start time \(playbackSession.currentTime)") let playerItems = self.allPlayerItems[self.currentTrackIndex.. 0.0 && rate != self.tmpRate && !(observed && rate == 1) if self.audioPlayer.rate != rate { - logger.debug("setPlaybakRate rate changed from \(self.audioPlayer.rate) to \(rate)") + logger.log("setPlaybakRate rate changed from \(self.audioPlayer.rate) to \(rate)") self.audioPlayer.rate = rate } @@ -481,7 +481,7 @@ class AudioPlayer: NSObject { } else if (playbackSession.playMethod == PlayMethod.local.rawValue) { guard let localFile = track.getLocalFile() else { // Worst case we can stream the file - logger.debug("Unable to play local file. Resulting to streaming \(track.localFileId ?? "Unknown")") + logger.log("Unable to play local file. Resulting to streaming \(track.localFileId ?? "Unknown")") let filename = track.metadata?.filename ?? "" let filenameEncoded = filename.addingPercentEncoding(withAllowedCharacters: NSCharacterSet.urlQueryAllowed) let urlstr = "\(Store.serverConfig!.address)/s/item/\(itemId)/\(filenameEncoded ?? "")?token=\(Store.serverConfig!.token)" @@ -641,11 +641,11 @@ class AudioPlayer: NSObject { public override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) { if context == &playerContext { if keyPath == #keyPath(AVPlayer.rate) { - logger.debug("playerContext observer player rate") + logger.log("playerContext observer player rate") self.setPlaybackRate(change?[.newKey] as? Float ?? 1.0, observed: true) } else if keyPath == #keyPath(AVPlayer.currentItem) { NotificationCenter.default.post(name: NSNotification.Name(PlayerEvents.update.rawValue), object: nil) - logger.debug("WARNING: Item ended") + logger.log("WARNING: Item ended") } } else { super.observeValue(forKeyPath: keyPath, of: object, change: change, context: context) diff --git a/ios/App/Shared/player/PlayerProgress.swift b/ios/App/Shared/player/PlayerProgress.swift index 9f4834c9..0cad0c81 100644 --- a/ios/App/Shared/player/PlayerProgress.swift +++ b/ios/App/Shared/player/PlayerProgress.swift @@ -98,7 +98,7 @@ class PlayerProgress { try localMediaProgress.updateFromPlaybackSession(session) - logger.debug("Local progress saved to the database") + logger.log("Local progress saved to the database") // Send the local progress back to front-end NotificationCenter.default.post(name: NSNotification.Name(PlayerEvents.localProgress.rawValue), object: nil) @@ -143,7 +143,7 @@ class PlayerProgress { session = session.freeze() guard safeToSync else { return } - logger.debug("Sending sessionId(\(session.id)) to server with currentTime(\(session.currentTime))") + logger.log("Sending sessionId(\(session.id)) to server with currentTime(\(session.currentTime))") var success = false if session.isLocal { @@ -163,25 +163,25 @@ class PlayerProgress { } private func updateLocalSessionFromServerMediaProgress() async throws { - logger.debug("updateLocalSessionFromServerMediaProgress: Checking if local media progress was updated on server") + logger.log("updateLocalSessionFromServerMediaProgress: Checking if local media progress was updated on server") guard let session = try await Realm().objects(PlaybackSession.self).last(where: { $0.isActiveSession == true && $0.serverConnectionConfigId == Store.serverConfig?.id })?.freeze() else { - logger.debug("updateLocalSessionFromServerMediaProgress: Failed to get session") + logger.log("updateLocalSessionFromServerMediaProgress: Failed to get session") return } // Fetch the current progress let progress = await ApiClient.getMediaProgress(libraryItemId: session.libraryItemId!, episodeId: session.episodeId) guard let progress = progress else { - logger.debug("updateLocalSessionFromServerMediaProgress: No progress object") + logger.log("updateLocalSessionFromServerMediaProgress: No progress object") return } // Determine which session is newer let serverLastUpdate = progress.lastUpdate guard let localLastUpdate = session.updatedAt else { - logger.debug("updateLocalSessionFromServerMediaProgress: No local session updatedAt") + logger.log("updateLocalSessionFromServerMediaProgress: No local session updatedAt") return } let serverCurrentTime = progress.currentTime @@ -192,16 +192,16 @@ class PlayerProgress { // Update the session, if needed if serverIsNewerThanLocal && currentTimeIsDifferent { - logger.debug("updateLocalSessionFromServerMediaProgress: Server has newer time than local serverLastUpdate=\(serverLastUpdate) localLastUpdate=\(localLastUpdate)") + logger.log("updateLocalSessionFromServerMediaProgress: Server has newer time than local serverLastUpdate=\(serverLastUpdate) localLastUpdate=\(localLastUpdate)") guard let session = session.thaw() else { return } try session.update { session.currentTime = serverCurrentTime session.updatedAt = serverLastUpdate } - logger.debug("updateLocalSessionFromServerMediaProgress: Updated session currentTime newCurrentTime=\(serverCurrentTime) previousCurrentTime=\(localCurrentTime)") + logger.log("updateLocalSessionFromServerMediaProgress: Updated session currentTime newCurrentTime=\(serverCurrentTime) previousCurrentTime=\(localCurrentTime)") PlayerHandler.seek(amount: session.currentTime) } else { - logger.debug("updateLocalSessionFromServerMediaProgress: Local session does not need updating; local has latest progress") + logger.log("updateLocalSessionFromServerMediaProgress: Local session does not need updating; local has latest progress") } } diff --git a/ios/App/Shared/util/Logger.swift b/ios/App/Shared/util/Logger.swift index d06b1755..99dccdae 100644 --- a/ios/App/Shared/util/Logger.swift +++ b/ios/App/Shared/util/Logger.swift @@ -52,16 +52,12 @@ public extension AppLogger { func log(_ information: String, isPrivate: Bool = Defaults.isPrivate) { if isPrivate { - logger.debug("\(information, privacy: .private)") + logger.log("\(information, privacy: .private)") } else { - logger.debug("\(information, privacy: .public)") + logger.log("\(information, privacy: .public)") } } - func debug(_ information: String, isPrivate: Bool = Defaults.isPrivate) { - self.log(information, isPrivate: isPrivate) - } - func error(_ information: String, isPrivate: Bool = Defaults.isPrivate) { if isPrivate { logger.error("\(information, privacy: .private)")