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

Merge pull request #1062 from TomHennen/autodl_updates 

Only autodownload queued and new items
This commit is contained in:
Tom Hennen 2015-08-05 18:44:47 -04:00
parent c7d2975039 224832300f
commit f13615d46a
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.danoeh.antennapod"
android:versionCode="1030004"
android:versionName="1.3-RC4">
android:versionCode="1030005"
android:versionName="1.3-RC5">
<!--
Version code schema:
"1.2.3-SNAPSHOT" -> 1020300

7
core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
View File

@ -325,6 +325,11 @@ public class DownloadService extends Service {
cancelNotificationUpdater();
unregisterReceiver(cancelDownloadReceiver);
// TODO: I'm not sure this is actually needed.
// We could just invoke the autodownloadUndownloadeditems method
// and it would get everything it's supposed to. By sending it the
// items in newMediaFiles we're overriding the download algorithm,
// which is not something we should probably do.
if (!newMediaFiles.isEmpty()) {
Log.d(TAG, "newMediaFiles exist, autodownload them");
DBTasks.autodownloadUndownloadedItems(getApplicationContext(),
@ -783,7 +788,7 @@ public class DownloadService extends Service {
if(item.getPubDate() == null) {
Log.d(TAG, item.toString());
}
if (!item.isPlayed() && item.hasMedia() && !item.getMedia().isDownloaded()) {
if (item.isNew() && item.hasMedia() && !item.getMedia().isDownloaded()) {
newMediaFiles.add(item.getMedia().getId());
}
}

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

@ -22,7 +22,7 @@ public class APDownloadAlgorithm implements AutomaticDownloadAlgorithm {
private final APCleanupAlgorithm cleanupAlgorithm = new APCleanupAlgorithm();
/**
* Looks for undownloaded episodes in the queue or list of unread items and request a download if
* Looks for undownloaded episodes in the queue or list of new items and request a download if
* 1. Network is available
* 2. The device is charging or the user allows auto download on battery
* 3. There is free space in the episode cache
@ -57,12 +57,12 @@ public class APDownloadAlgorithm implements AutomaticDownloadAlgorithm {
candidates = DBReader.getFeedItems(context, mediaIds);
} else {
final List<FeedItem> queue = DBReader.getQueue(context);
final List<FeedItem> unreadItems = DBReader.getUnreadItemsList(context);
candidates = new ArrayList<FeedItem>(queue.size() + unreadItems.size());
final List<FeedItem> newItems = DBReader.getNewItemsList(context);
candidates = new ArrayList<FeedItem>(queue.size() + newItems.size());
candidates.addAll(queue);
for(FeedItem unreadItem : unreadItems) {
if(candidates.contains(unreadItem) == false) {
candidates.add(unreadItem);
for(FeedItem newItem : newItems) {
if(candidates.contains(newItem) == false) {
candidates.add(newItem);
}
}
}

4
core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java
View File

@ -1709,9 +1709,9 @@ public class PodDBAdapter {
db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
+ " ADD COLUMN " + PodDBAdapter.KEY_AUTO_DELETE_ACTION + " INTEGER DEFAULT 0");
}
if(oldVersion < 1030002) {
if(oldVersion < 1030005) {
db.execSQL("UPDATE FeedItems SET auto_download=0 WHERE " +
"(read=1 OR id IN (SELECT id FROM FeedMedia WHERE position>0 OR downloaded=1)) " +
"(read=1 OR id IN (SELECT feeditem FROM FeedMedia WHERE position>0 OR downloaded=1)) " +
"AND id NOT IN (SELECT feeditem FROM Queue)");
}
EventBus.getDefault().post(ProgressEvent.end());