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

Merge pull request #3647 from ByteHamster/fix-downloadservice-notification 

Do not start download service if there is nothing to download
This commit is contained in:
H. Lehmann 2019-11-26 21:02:57 +01:00 committed by GitHub
parent fd1e510106 bbb7cfe7ed
commit f6495232c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
core/src/main/java/de/danoeh/antennapod/core/storage/APDownloadAlgorithm.java
View File

@ -53,19 +53,19 @@ public class APDownloadAlgorithm implements AutomaticDownloadAlgorithm {
final List<FeedItem> newItems = DBReader.getNewItemsList();
candidates = new ArrayList<>(queue.size() + newItems.size());
candidates.addAll(queue);
for(FeedItem newItem : newItems) {
for (FeedItem newItem : newItems) {
FeedPreferences feedPrefs = newItem.getFeed().getPreferences();
FeedFilter feedFilter = feedPrefs.getFilter();
if(!candidates.contains(newItem) && feedFilter.shouldAutoDownload(newItem)) {
if (!candidates.contains(newItem) && feedFilter.shouldAutoDownload(newItem)) {
candidates.add(newItem);
}
}
// filter items that are not auto downloadable
Iterator<FeedItem> it = candidates.iterator();
while(it.hasNext()) {
while (it.hasNext()) {
FeedItem item = it.next();
if(!item.isAutoDownloadable()) {
if (!item.isAutoDownloadable()) {
it.remove();
}
}
@ -74,13 +74,12 @@ public class APDownloadAlgorithm implements AutomaticDownloadAlgorithm {
int downloadedEpisodes = DBReader.getNumberOfDownloadedEpisodes();
int deletedEpisodes = UserPreferences.getEpisodeCleanupAlgorithm()
.makeRoomForEpisodes(context, autoDownloadableEpisodes);
boolean cacheIsUnlimited = UserPreferences.getEpisodeCacheSize() == UserPreferences
.getEpisodeCacheSizeUnlimited();
boolean cacheIsUnlimited =
UserPreferences.getEpisodeCacheSize() == UserPreferences.getEpisodeCacheSizeUnlimited();
int episodeCacheSize = UserPreferences.getEpisodeCacheSize();
int episodeSpaceLeft;
if (cacheIsUnlimited ||
episodeCacheSize >= downloadedEpisodes + autoDownloadableEpisodes) {
if (cacheIsUnlimited || episodeCacheSize >= downloadedEpisodes + autoDownloadableEpisodes) {
episodeSpaceLeft = autoDownloadableEpisodes;
} else {
episodeSpaceLeft = episodeCacheSize - (downloadedEpisodes - deletedEpisodes);
@ -89,14 +88,15 @@ public class APDownloadAlgorithm implements AutomaticDownloadAlgorithm {
FeedItem[] itemsToDownload = candidates.subList(0, episodeSpaceLeft)
.toArray(new FeedItem[episodeSpaceLeft]);
Log.d(TAG, "Enqueueing " + itemsToDownload.length + " items for download");
if (itemsToDownload.length > 0) {
Log.d(TAG, "Enqueueing " + itemsToDownload.length + " items for download");
try {
DownloadRequester.getInstance().downloadMedia(false, context, itemsToDownload);
} catch (DownloadRequestException e) {
e.printStackTrace();
try {
DownloadRequester.getInstance().downloadMedia(false, context, itemsToDownload);
} catch (DownloadRequestException e) {
e.printStackTrace();
}
}
}
};
}

9
core/src/main/java/de/danoeh/antennapod/core/storage/DownloadRequester.java
View File

@ -80,13 +80,14 @@ public class DownloadRequester implements DownloadStateProvider {
* with the same source URL is already stored, this one will be skipped.
* @return True if any of the download request was accepted, false otherwise.
*/
public synchronized boolean download(@NonNull Context context,
DownloadRequest... requests) {
public synchronized boolean download(@NonNull Context context, DownloadRequest... requests) {
return download(context, false, requests);
}
private boolean download(@NonNull Context context, boolean cleanupMedia,
DownloadRequest... requests) {
private boolean download(@NonNull Context context, boolean cleanupMedia, DownloadRequest... requests) {
if (requests.length <= 0) {
return false;
}
boolean result = false;
ArrayList<DownloadRequest> requestsToSend = new ArrayList<>(requests.length);