diff --git a/OF DL.Core/Services/DownloadOrchestrationService.cs b/OF DL.Core/Services/DownloadOrchestrationService.cs index 2c4b9c5..0549825 100644 --- a/OF DL.Core/Services/DownloadOrchestrationService.cs +++ b/OF DL.Core/Services/DownloadOrchestrationService.cs @@ -627,7 +627,7 @@ public class DownloadOrchestrationService( int objectCount = getObjectCount(data); eventHandler.OnContentFound(contentType, mediaCount, objectCount); - Log.Debug($"Found {mediaCount} Media from {objectCount} {contentType}"); + Log.Debug("Found {MediaCount} Media from {ObjectCount} {ContentType}", mediaCount, objectCount, contentType); Config config = configService.CurrentConfig; List? urls = getUrls(data); @@ -641,7 +641,7 @@ public class DownloadOrchestrationService( eventHandler.OnDownloadComplete(contentType, result); Log.Debug( - $"{contentType} Already Downloaded: {result.ExistingDownloads} New {contentType} Downloaded: {result.NewDownloads}"); + $"{contentType} Media Already Downloaded: {result.ExistingDownloads} New {contentType} Media Downloaded: {result.NewDownloads}"); return result.TotalCount; } diff --git a/OF DL.Core/Services/DownloadService.cs b/OF DL.Core/Services/DownloadService.cs index 235c287..60a6fbb 100644 --- a/OF DL.Core/Services/DownloadService.cs +++ b/OF DL.Core/Services/DownloadService.cs @@ -1246,7 +1246,7 @@ public class DownloadService( } Log.Debug( - $"Highlights Already Downloaded: {oldHighlightsCount} New Highlights Downloaded: {newHighlightsCount}"); + $"Highlights Media Already Downloaded: {oldHighlightsCount} New Highlights Media Downloaded: {newHighlightsCount}"); return new DownloadResult { @@ -1307,7 +1307,8 @@ public class DownloadService( } } - Log.Debug($"Stories Already Downloaded: {oldStoriesCount} New Stories Downloaded: {newStoriesCount}"); + Log.Debug( + $"Stories Media Already Downloaded: {oldStoriesCount} New Stories Media Downloaded: {newStoriesCount}"); return new DownloadResult { @@ -1401,7 +1402,7 @@ public class DownloadService( } Log.Debug( - $"Archived Posts Already Downloaded: {oldArchivedCount} New Archived Posts Downloaded: {newArchivedCount}"); + $"Archived Posts Media Already Downloaded: {oldArchivedCount} New Archived Posts Media Downloaded: {newArchivedCount}"); return new DownloadResult { @@ -1495,7 +1496,8 @@ public class DownloadService( } } - Log.Debug($"Messages Already Downloaded: {oldMessagesCount} New Messages Downloaded: {newMessagesCount}"); + Log.Debug( + $"Messages Media Already Downloaded: {oldMessagesCount} New Messages Media Downloaded: {newMessagesCount}"); return new DownloadResult { @@ -1592,7 +1594,7 @@ public class DownloadService( } } - Log.Debug($"Paid Messages Already Downloaded: {oldCount} New Paid Messages Downloaded: {newCount}"); + Log.Debug($"Paid Messages Media Already Downloaded: {oldCount} New Paid Messages Media Downloaded: {newCount}"); return new DownloadResult { TotalCount = paidMessageCollection.PaidMessages.Count, @@ -1685,7 +1687,7 @@ public class DownloadService( } } - Log.Debug($"Streams Already Downloaded: {oldCount} New Streams Downloaded: {newCount}"); + Log.Debug($"Streams Media Already Downloaded: {oldCount} New Streams Media Downloaded: {newCount}"); return new DownloadResult { TotalCount = streams.Streams.Count, @@ -1778,7 +1780,7 @@ public class DownloadService( } } - Log.Debug($"Posts Already Downloaded: {oldCount} New Posts Downloaded: {newCount}"); + Log.Debug($"Posts Media Already Downloaded: {oldCount} New Posts Media Downloaded: {newCount}"); return new DownloadResult { TotalCount = posts.Posts.Count, @@ -1872,7 +1874,7 @@ public class DownloadService( } } - Log.Debug($"Paid Posts Already Downloaded: {oldCount} New Paid Posts Downloaded: {newCount}"); + Log.Debug($"Paid Posts Media Already Downloaded: {oldCount} New Paid Posts Media Downloaded: {newCount}"); return new DownloadResult { TotalCount = purchasedPosts.PaidPosts.Count, @@ -1957,7 +1959,7 @@ public class DownloadService( } } - Log.Debug($"Paid Posts Already Downloaded: {oldCount} New Paid Posts Downloaded: {newCount}"); + Log.Debug($"Paid Posts Media Already Downloaded: {oldCount} New Paid Posts Media Downloaded: {newCount}"); return new DownloadResult { TotalCount = purchasedPosts?.PaidPosts.Count ?? 0, @@ -2041,7 +2043,7 @@ public class DownloadService( } } - Log.Debug($"Paid Messages Already Downloaded: {oldCount} New Paid Messages Downloaded: {newCount}"); + Log.Debug($"Paid Messages Media Already Downloaded: {oldCount} New Paid Messages Media Downloaded: {newCount}"); return new DownloadResult { TotalCount = paidMessageCollection.PaidMessages.Count, @@ -2270,7 +2272,7 @@ public class DownloadService( int totalCount = singlePaidMessageCollection.PreviewSingleMessages.Count + singlePaidMessageCollection.SingleMessages.Count; - Log.Debug($"Paid Messages Already Downloaded: {totalOld} New Paid Messages Downloaded: {totalNew}"); + Log.Debug($"Paid Messages Media Already Downloaded: {totalOld} New Paid Messages Media Downloaded: {totalNew}"); return new DownloadResult { TotalCount = totalCount, diff --git a/OF DL/CLI/SpectreDownloadEventHandler.cs b/OF DL/CLI/SpectreDownloadEventHandler.cs index 245bf0a..8d14c7a 100644 --- a/OF DL/CLI/SpectreDownloadEventHandler.cs +++ b/OF DL/CLI/SpectreDownloadEventHandler.cs @@ -71,7 +71,7 @@ public class SpectreDownloadEventHandler : IDownloadEventHandler public void OnDownloadComplete(string contentType, DownloadResult result) => AnsiConsole.Markup( - $"[red]{Markup.Escape(contentType)} Already Downloaded: {result.ExistingDownloads} New {Markup.Escape(contentType)} Downloaded: {result.NewDownloads}[/]\n"); + $"[red]{Markup.Escape(contentType)} Media Already Downloaded: {result.ExistingDownloads} New {Markup.Escape(contentType)} Media Downloaded: {result.NewDownloads}[/]\n"); public void OnUserStarting(string username) => AnsiConsole.Markup($"[red]\nScraping Data for {Markup.Escape(username)}\n[/]");