Merge pull request #3465 from skitt/smart-spread-fix
Fix the smart shuffle spread calculation
This commit is contained in:
commit
cf367c02af
|
@ -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;
|
||||||
|
|
Loading…
Reference in New Issue