From ff435c438ce9271e704bd2d46e67bf82b94fd87c Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Wed, 23 Aug 2023 14:59:13 +0300 Subject: [PATCH] Revert "Revert "Reduced room summary provider logging"" This reverts commit 2e357c9d3983fc44bb215589e6293be0e0dc9ce3. --- .../HomeScreen/HomeScreenViewModel.swift | 4 +-- .../MessageForwardingScreenViewModel.swift | 4 +-- .../RoomSummary/RoomSummaryProvider.swift | 26 +++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift b/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift index 7bf53a55f..c65044bf0 100644 --- a/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift +++ b/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift @@ -240,7 +240,7 @@ class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol return } - MXLog.info("Updating rooms") + MXLog.verbose("Updating rooms") var rooms = [HomeScreenRoom]() @@ -259,7 +259,7 @@ class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol state.rooms = rooms - MXLog.info("Finished updating rooms") + MXLog.verbose("Finished updating rooms") } private func buildRoom(with details: RoomSummaryDetails, invalidated: Bool) -> HomeScreenRoom { diff --git a/ElementX/Sources/Screens/MessageForwardingScreen/MessageForwardingScreenViewModel.swift b/ElementX/Sources/Screens/MessageForwardingScreen/MessageForwardingScreenViewModel.swift index f81db4cc1..36d35f728 100644 --- a/ElementX/Sources/Screens/MessageForwardingScreen/MessageForwardingScreenViewModel.swift +++ b/ElementX/Sources/Screens/MessageForwardingScreen/MessageForwardingScreenViewModel.swift @@ -69,7 +69,7 @@ class MessageForwardingScreenViewModel: MessageForwardingScreenViewModelType, Me return } - MXLog.info("Updating rooms") + MXLog.verbose("Updating rooms") var rooms = [MessageForwardingRoom]() @@ -89,6 +89,6 @@ class MessageForwardingScreenViewModel: MessageForwardingScreenViewModelType, Me state.rooms = rooms - MXLog.info("Finished updating rooms") + MXLog.verbose("Finished updating rooms") } } diff --git a/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift b/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift index 95363309f..de49a5c92 100644 --- a/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift +++ b/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift @@ -82,7 +82,7 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol { do { listUpdatesSubscriptionResult = roomList.entriesWithDynamicFilter(listener: RoomListEntriesListenerProxy { [weak self] updates in guard let self else { return } - MXLog.info("\(name): Received list update") + MXLog.verbose("\(name): Received list update") diffsPublisher.send(updates) }) @@ -131,7 +131,7 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol { span.exit() } - MXLog.info("\(name): Received \(diffs.count) diffs, current room list \(rooms.compactMap { $0.id ?? "Empty" })") + MXLog.verbose("\(name): Received \(diffs.count) diffs, current room list \(rooms.compactMap { $0.id ?? "Empty" })") for diff in diffs { // Special case resets in order to prevent large updates from blocking the UI @@ -147,7 +147,7 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol { detectDuplicatesInRoomList(rooms) - MXLog.info("\(name): Finished applying \(diffs.count) diffs, new room list \(rooms.compactMap { $0.id ?? "Empty" })") + MXLog.verbose("\(name): Finished applying \(diffs.count) diffs, new room list \(rooms.compactMap { $0.id ?? "Empty" })") } private func processDiff(_ diff: RoomListEntriesUpdate) { @@ -248,36 +248,36 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol { switch diff { case .pushFront(let value): - MXLog.info("\(name): Push Front \(value.debugIdentifier)") + MXLog.verbose("\(name): Push Front \(value.debugIdentifier)") let summary = buildSummaryForRoomListEntry(value) changes.append(.insert(offset: 0, element: summary, associatedWith: nil)) case .pushBack(let value): - MXLog.info("\(name): Push Back \(value.debugIdentifier)") + MXLog.verbose("\(name): Push Back \(value.debugIdentifier)") let summary = buildSummaryForRoomListEntry(value) changes.append(.insert(offset: rooms.count, element: summary, associatedWith: nil)) case .append(values: let values): let debugIdentifiers = values.map(\.debugIdentifier) - MXLog.info("\(name): Append \(debugIdentifiers)") + MXLog.verbose("\(name): Append \(debugIdentifiers)") for (index, value) in values.enumerated() { let summary = buildSummaryForRoomListEntry(value) changes.append(.insert(offset: rooms.count + index, element: summary, associatedWith: nil)) } case .set(let index, let value): - MXLog.info("\(name): Update \(value.debugIdentifier) at \(index)") + MXLog.verbose("\(name): Update \(value.debugIdentifier) at \(index)") let summary = buildSummaryForRoomListEntry(value) changes.append(.remove(offset: Int(index), element: summary, associatedWith: nil)) changes.append(.insert(offset: Int(index), element: summary, associatedWith: nil)) case .insert(let index, let value): - MXLog.info("\(name): Insert at \(value.debugIdentifier) at \(index)") + MXLog.verbose("\(name): Insert at \(value.debugIdentifier) at \(index)") let summary = buildSummaryForRoomListEntry(value) changes.append(.insert(offset: Int(index), element: summary, associatedWith: nil)) case .remove(let index): let summary = rooms[Int(index)] - MXLog.info("\(name): Remove \(summary.id ?? "") from \(index)") + MXLog.verbose("\(name): Remove \(summary.id ?? "") from \(index)") changes.append(.remove(offset: Int(index), element: summary, associatedWith: nil)) case .reset(let values): let debugIdentifiers = values.map(\.debugIdentifier) - MXLog.info("\(name): Replace all items with \(debugIdentifiers)") + MXLog.verbose("\(name): Replace all items with \(debugIdentifiers)") for (index, summary) in rooms.enumerated() { changes.append(.remove(offset: index, element: summary, associatedWith: nil)) } @@ -286,16 +286,16 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol { changes.append(.insert(offset: index, element: buildSummaryForRoomListEntry(value), associatedWith: nil)) } case .clear: - MXLog.info("\(name): Clear all items") + MXLog.verbose("\(name): Clear all items") for (index, value) in rooms.enumerated() { changes.append(.remove(offset: index, element: value, associatedWith: nil)) } case .popFront: - MXLog.info("\(name): Pop Front") + MXLog.verbose("\(name): Pop Front") let summary = rooms[0] changes.append(.remove(offset: 0, element: summary, associatedWith: nil)) case .popBack: - MXLog.info("\(name): Pop Back") + MXLog.verbose("\(name): Pop Back") guard let value = rooms.last else { fatalError() }