Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5358 from ByteHamster/duplicate-same-day 

Allow duplicate items to have a different publication date
This commit is contained in:
ByteHamster 2021-08-27 23:09:20 +02:00 committed by GitHub
parent d85e754f31 29e17bb506
commit 542832805c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java
View File

@ -354,16 +354,23 @@ public final class DBTasks {
&& TextUtils.equals(item.getMedia().getStreamUrl(), searchItem.getMedia().getStreamUrl())) {
Log.d(TAG, "Removing duplicate episode stream url " + item.getMedia().getStreamUrl());
isDuplicate = true;
} else if (TextUtils.equals(item.getTitle(), searchItem.getTitle())
&& item.getPubDate().equals(searchItem.getPubDate())) {
Log.d(TAG, "Removing duplicate episode title + pubDate " + item.getTitle() + " " + item.getPubDate());
isDuplicate = true;
} else if (TextUtils.equals(item.getTitle(), searchItem.getTitle())) {
Log.d(TAG, "Found same title. Checking pubdate: " + item.getTitle());
long dateOriginal = item.getPubDate().getTime();
long dateNew = searchItem.getPubDate() == null ? 0 : searchItem.getPubDate().getTime();
if (Math.abs(dateOriginal - dateNew) < 24L * 3600L * 1000L) { // Same day
Log.d(TAG, "Same pubDate. Removing. " + item.getPubDate() + ", " + searchItem.getPubDate());
isDuplicate = true;
}
}
if (isDuplicate) {
DBWriter.addDownloadStatus(new DownloadStatus(feed,
searchItem.getTitle(), DownloadError.ERROR_PARSER_EXCEPTION, false,
"The podcast host changed the ID of an existing episode instead of just "
+ "updating the episode itself. AntennaPod attempted to repair it.", false));
+ "updating the episode itself. AntennaPod attempted to repair it.\n\n"
+ "{" + item.getTitle() + "} with ID " + item.getItemIdentifier()
+ " seems to be the same as {" + searchItem.getTitle() + "} with ID "
+ searchItem.getItemIdentifier(), false));
item.setItemIdentifier(searchItem.getItemIdentifier());
if (item.isPlayed() && item.getMedia() != null) {