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

Merge pull request #3465 from skitt/smart-spread-fix 

Fix the smart shuffle spread calculation
This commit is contained in:
H. Lehmann 2019-09-29 12:50:21 +02:00 committed by GitHub
parent 373f31c53e 8d9c292ca1
commit cf367c02af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/de/danoeh/antennapod/core/util/QueueSorter.java
View File

@ -164,7 +164,7 @@ public class QueueSorter {
Collections.sort(feedItems, itemComparator); Collections.sort(feedItems, itemComparator);
if (spread == 0) { if (spread == 0) {
spread = feedItems.size(); spread = feedItems.size();
} else if (feedItems.size() % spread != 0){ } else if (spread % feedItems.size() != 0){
spread *= feedItems.size(); spread *= feedItems.size();
} }
} }
@ -180,6 +180,9 @@ public class QueueSorter {
Map<Long, List<FeedItem>> spreadItems = new HashMap<>(); Map<Long, List<FeedItem>> spreadItems = new HashMap<>();
for (List<FeedItem> feedItems : feeds) { for (List<FeedItem> feedItems : feeds) {
long thisSpread = spread / feedItems.size(); long thisSpread = spread / feedItems.size();
if (thisSpread == 0) {
thisSpread = 1;
}
// Starting from 0 ensures we front-load, so the queue starts with one episode from // Starting from 0 ensures we front-load, so the queue starts with one episode from
// each feed in the queue // each feed in the queue
long itemSpread = 0; long itemSpread = 0;