Including unextracted scenes in date determination.
This commit is contained in:
@@ -66,10 +66,10 @@ async function filterUniqueReleases(releases) {
|
||||
return { uniqueReleases, duplicateReleases };
|
||||
}
|
||||
|
||||
function needNextPage(pageReleases, accReleases, isUpcoming, unextracted = 0) {
|
||||
function needNextPage(pageReleases, accReleases, isUpcoming, unextracted = []) {
|
||||
const { localUniqueReleases: uniquePageReleases } = filterLocalUniqueReleases(pageReleases, accReleases);
|
||||
|
||||
if (uniquePageReleases.length + unextracted === 0) {
|
||||
if (uniquePageReleases.length + unextracted.length === 0) {
|
||||
// page is empty, or only contains scenes from previous page
|
||||
return false;
|
||||
}
|
||||
@@ -78,17 +78,18 @@ function needNextPage(pageReleases, accReleases, isUpcoming, unextracted = 0) {
|
||||
return uniquePageReleases.length > 0 && argv.paginateUpcoming;
|
||||
}
|
||||
|
||||
if (uniquePageReleases.length + unextracted > 0) {
|
||||
if (uniquePageReleases.length + unextracted.length > 0) {
|
||||
if (argv.last) {
|
||||
return accReleases.length + pageReleases.length < argv.last;
|
||||
}
|
||||
|
||||
if (!pageReleases.every(release => !!release.date)) { // some scenes don't have dates
|
||||
if (!pageReleases.concat(unextracted).every(release => !!release.date)) { // some scenes don't have dates
|
||||
return accReleases.length + pageReleases.length < argv.missingDateLimit;
|
||||
}
|
||||
|
||||
if (argv.after) {
|
||||
const oldestReleaseOnPage = pageReleases
|
||||
.concat(unextracted)
|
||||
.sort((releaseA, releaseB) => releaseB.date - releaseA.date)
|
||||
.slice(-1)[0];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user