forked from sim0n00ps/OF-DL
Fix misleading wording in download summary messages
This commit is contained in:
parent
b4aac13bc6
commit
edc3d771d1
@ -627,7 +627,7 @@ public class DownloadOrchestrationService(
|
|||||||
|
|
||||||
int objectCount = getObjectCount(data);
|
int objectCount = getObjectCount(data);
|
||||||
eventHandler.OnContentFound(contentType, mediaCount, objectCount);
|
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;
|
Config config = configService.CurrentConfig;
|
||||||
List<string>? urls = getUrls(data);
|
List<string>? urls = getUrls(data);
|
||||||
@ -641,7 +641,7 @@ public class DownloadOrchestrationService(
|
|||||||
|
|
||||||
eventHandler.OnDownloadComplete(contentType, result);
|
eventHandler.OnDownloadComplete(contentType, result);
|
||||||
Log.Debug(
|
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;
|
return result.TotalCount;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1246,7 +1246,7 @@ public class DownloadService(
|
|||||||
}
|
}
|
||||||
|
|
||||||
Log.Debug(
|
Log.Debug(
|
||||||
$"Highlights Already Downloaded: {oldHighlightsCount} New Highlights Downloaded: {newHighlightsCount}");
|
$"Highlights Media Already Downloaded: {oldHighlightsCount} New Highlights Media Downloaded: {newHighlightsCount}");
|
||||||
|
|
||||||
return new DownloadResult
|
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
|
return new DownloadResult
|
||||||
{
|
{
|
||||||
@ -1401,7 +1402,7 @@ public class DownloadService(
|
|||||||
}
|
}
|
||||||
|
|
||||||
Log.Debug(
|
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
|
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
|
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
|
return new DownloadResult
|
||||||
{
|
{
|
||||||
TotalCount = paidMessageCollection.PaidMessages.Count,
|
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
|
return new DownloadResult
|
||||||
{
|
{
|
||||||
TotalCount = streams.Streams.Count,
|
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
|
return new DownloadResult
|
||||||
{
|
{
|
||||||
TotalCount = posts.Posts.Count,
|
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
|
return new DownloadResult
|
||||||
{
|
{
|
||||||
TotalCount = purchasedPosts.PaidPosts.Count,
|
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
|
return new DownloadResult
|
||||||
{
|
{
|
||||||
TotalCount = purchasedPosts?.PaidPosts.Count ?? 0,
|
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
|
return new DownloadResult
|
||||||
{
|
{
|
||||||
TotalCount = paidMessageCollection.PaidMessages.Count,
|
TotalCount = paidMessageCollection.PaidMessages.Count,
|
||||||
@ -2270,7 +2272,7 @@ public class DownloadService(
|
|||||||
|
|
||||||
int totalCount = singlePaidMessageCollection.PreviewSingleMessages.Count +
|
int totalCount = singlePaidMessageCollection.PreviewSingleMessages.Count +
|
||||||
singlePaidMessageCollection.SingleMessages.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
|
return new DownloadResult
|
||||||
{
|
{
|
||||||
TotalCount = totalCount,
|
TotalCount = totalCount,
|
||||||
|
|||||||
@ -71,7 +71,7 @@ public class SpectreDownloadEventHandler : IDownloadEventHandler
|
|||||||
|
|
||||||
public void OnDownloadComplete(string contentType, DownloadResult result) =>
|
public void OnDownloadComplete(string contentType, DownloadResult result) =>
|
||||||
AnsiConsole.Markup(
|
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) =>
|
public void OnUserStarting(string username) =>
|
||||||
AnsiConsole.Markup($"[red]\nScraping Data for {Markup.Escape(username)}\n[/]");
|
AnsiConsole.Markup($"[red]\nScraping Data for {Markup.Escape(username)}\n[/]");
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user