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

Added more calls of auto-cleanup and auto-download

This commit is contained in:
daniel oeh 2013-03-09 20:50:53 +01:00
parent 72ee91e582
commit 485f8905c4
1 changed files with 62 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
src/de/danoeh/antennapod/feed/FeedManager.java
View File

@ -627,57 +627,51 @@ public class FeedManager {
Log.d(TAG, "Performing auto-dl of undownloaded episodes"); Log.d(TAG, "Performing auto-dl of undownloaded episodes");
if (NetworkUtils.autodownloadNetworkAvailable(context)) { if (NetworkUtils.autodownloadNetworkAvailable(context)) {
int undownloadedEpisodes = getNumberOfUndownloadedEpisodes(); int undownloadedEpisodes = getNumberOfUndownloadedEpisodes();
if (undownloadedEpisodes > 0) { int downloadedEpisodes = getNumberOfDownloadedEpisodes();
int downloadedEpisodes = getNumberOfDownloadedEpisodes(); int deletedEpisodes = performAutoCleanup(context,
int deletedEpisodes = performAutoCleanup(context, getPerformAutoCleanupArgs(undownloadedEpisodes));
getPerformAutoCleanupArgs(undownloadedEpisodes)); int episodeSpaceLeft = undownloadedEpisodes;
int episodeSpaceLeft = undownloadedEpisodes; if (UserPreferences.getEpisodeCacheSize() < downloadedEpisodes
if (UserPreferences.getEpisodeCacheSize() < downloadedEpisodes + undownloadedEpisodes) {
+ undownloadedEpisodes) { episodeSpaceLeft = UserPreferences.getEpisodeCacheSize()
episodeSpaceLeft = UserPreferences.getEpisodeCacheSize() - (downloadedEpisodes - deletedEpisodes);
- (downloadedEpisodes - deletedEpisodes); }
}
List<FeedItem> itemsToDownload = new ArrayList<FeedItem>(); List<FeedItem> itemsToDownload = new ArrayList<FeedItem>();
if (episodeSpaceLeft > 0 && undownloadedEpisodes > 0) { if (episodeSpaceLeft > 0 && undownloadedEpisodes > 0) {
for (FeedItem item : queue) { for (FeedItem item : queue) {
if (item.hasMedia() && !item.getMedia().isDownloaded()) { if (item.hasMedia() && !item.getMedia().isDownloaded()) {
itemsToDownload.add(item); itemsToDownload.add(item);
episodeSpaceLeft--; episodeSpaceLeft--;
undownloadedEpisodes--; undownloadedEpisodes--;
if (episodeSpaceLeft == 0 if (episodeSpaceLeft == 0 || undownloadedEpisodes == 0) {
|| undownloadedEpisodes == 0) { break;
break;
}
} }
} }
} }
if (episodeSpaceLeft > 0 && undownloadedEpisodes > 0) { }
for (FeedItem item : unreadItems) { if (episodeSpaceLeft > 0 && undownloadedEpisodes > 0) {
if (item.hasMedia() && !item.getMedia().isDownloaded()) { for (FeedItem item : unreadItems) {
itemsToDownload.add(item); if (item.hasMedia() && !item.getMedia().isDownloaded()) {
episodeSpaceLeft--; itemsToDownload.add(item);
undownloadedEpisodes--; episodeSpaceLeft--;
if (episodeSpaceLeft == 0 undownloadedEpisodes--;
|| undownloadedEpisodes == 0) { if (episodeSpaceLeft == 0 || undownloadedEpisodes == 0) {
break; break;
}
} }
} }
} }
if (AppConfig.DEBUG) }
Log.d(TAG, "Enqueueing " + itemsToDownload.size() if (AppConfig.DEBUG)
+ " items for download"); Log.d(TAG, "Enqueueing " + itemsToDownload.size()
+ " items for download");
try {
downloadFeedItem(false, context,
itemsToDownload
.toArray(new FeedItem[itemsToDownload
.size()]));
} catch (DownloadRequestException e) {
e.printStackTrace();
}
try {
downloadFeedItem(false, context,
itemsToDownload.toArray(new FeedItem[itemsToDownload
.size()]));
} catch (DownloadRequestException e) {
e.printStackTrace();
} }
} }
@ -818,6 +812,12 @@ public class FeedManager {
adapter.close(); adapter.close();
} }
}); });
new Thread() {
@Override
public void run() {
autodownloadUndownloadedItems(context);
}
}.start();
} }
}); });
@ -852,6 +852,12 @@ public class FeedManager {
adapter.close(); adapter.close();
} }
}); });
new Thread() {
@Override
public void run() {
autodownloadUndownloadedItems(context);
}
}.start();
} }
}); });
} }
@ -897,7 +903,6 @@ public class FeedManager {
if (removed) { if (removed) {
adapter.setQueue(queue); adapter.setQueue(queue);
} }
} }
/** Removes a FeedItem from the queue. */ /** Removes a FeedItem from the queue. */
@ -916,6 +921,12 @@ public class FeedManager {
}); });
} }
new Thread() {
@Override
public void run() {
autodownloadUndownloadedItems(context);
}
}.start();
eventDist.sendQueueUpdateBroadcast(); eventDist.sendQueueUpdateBroadcast();
} }
@ -991,7 +1002,7 @@ public class FeedManager {
* *
* @return The saved Feed with a database ID * @return The saved Feed with a database ID
*/ */
public Feed updateFeed(Context context, final Feed newFeed) { public Feed updateFeed(final Context context, final Feed newFeed) {
// Look up feed in the feedslist // Look up feed in the feedslist
final Feed savedFeed = searchFeedByIdentifyingValue(newFeed final Feed savedFeed = searchFeedByIdentifyingValue(newFeed
.getIdentifyingValue()); .getIdentifyingValue());
@ -1038,6 +1049,12 @@ public class FeedManager {
savedFeed.setLastUpdate(newFeed.getLastUpdate()); savedFeed.setLastUpdate(newFeed.getLastUpdate());
savedFeed.setType(newFeed.getType()); savedFeed.setType(newFeed.getType());
setCompleteFeed(context, savedFeed); setCompleteFeed(context, savedFeed);
new Thread() {
@Override
public void run() {
autodownloadUndownloadedItems(context);
}
}.start();
return savedFeed; return savedFeed;
} }