Merge pull request #5554 from ByteHamster/no-duplicate-no-log

Reduce duplicate warnings
This commit is contained in:
ByteHamster 2021-11-17 21:07:41 +01:00 committed by GitHub
commit efe66b2004
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -455,12 +455,17 @@ public final class DBTasks {
for (int idx = 0; idx < newFeed.getItems().size(); idx++) {
final FeedItem item = newFeed.getItems().get(idx);
if (item != searchFeedItemGuessDuplicate(newFeed.getItems(), item)) {
FeedItem possibleDuplicate = searchFeedItemGuessDuplicate(newFeed.getItems(), item);
if (possibleDuplicate != null && item != possibleDuplicate) {
// Canonical episode is the first one returned (usually oldest)
DBWriter.addDownloadStatus(new DownloadStatus(savedFeed,
item.getTitle(), DownloadError.ERROR_PARSER_EXCEPTION_DUPLICATE, false,
"The podcast host appears to have added the same episode twice. "
+ "AntennaPod attempted to repair it.", false));
+ "AntennaPod still refreshed the feed and attempted to repair it."
+ "{" + possibleDuplicate.getTitle() + "} with ID "
+ possibleDuplicate.getItemIdentifier()
+ " seems to be the same as {" + item.getTitle() + "} with ID "
+ item.getItemIdentifier(), false));
continue;
}
@ -472,7 +477,8 @@ public final class DBTasks {
DBWriter.addDownloadStatus(new DownloadStatus(savedFeed,
item.getTitle(), DownloadError.ERROR_PARSER_EXCEPTION_DUPLICATE, false,
"The podcast host changed the ID of an existing episode instead of just "
+ "updating the episode itself. AntennaPod attempted to repair it.\n\n"
+ "updating the episode itself. AntennaPod still refreshed the feed and "
+ "attempted to repair it.\n\n"
+ "{" + oldItem.getTitle() + "} with ID " + oldItem.getItemIdentifier()
+ " seems to be the same as {" + item.getTitle() + "} with ID "
+ item.getItemIdentifier(), false));