Skip to content

Double Page (No Cover) now keep opposite flow of Double Page fixing Split Double Spreads #1236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kanjieater wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Double Page (No Cover) now keep opposite flow of Double Page fixing Split Double Spreads #1236

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d32eec5
Double Page (No Cover) now keeps opposite flow of Double Page flow
kanjieater Sep 24, 2023
172404a
Simplified DPNC layout adding it's empty page
kanjieater Sep 24, 2023
9c38bdf
Fixed the additional issue in 803 where last two double spreads could…
kanjieater Sep 24, 2023
e908e05
Merge branch 'gotson:master' into 803-double-page-flow
kanjieater Oct 13, 2023
c0559c9
Merge branch 'master' into 803-double-page-flow
kanjieater Nov 6, 2023
50e5eac
Merge remote-tracking branch 'origin' into 803-double-page-flow
kanjieater Jun 4, 2024
9ea3725
Merge branch 'master' into 803-double-page-flow
kanjieater Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions komga-webui/src/functions/book-spreads.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,40 +9,36 @@ export function buildSpreads(pages: PageDtoWithUrl[], pageLayout: PagedReaderLay
if (pageLayout !== PagedReaderLayout.SINGLE_PAGE) {
const spreads = [] as PageDtoWithUrl[][]
const pagesClone = cloneDeep(pages)
let lastPages = undefined
Copy link
Copy Markdown
Author

@kanjieater kanjieater Sep 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed lastPages, and the chunk handling it below as the loop part of the algorithm handles getting the last image in place

if (pageLayout === PagedReaderLayout.DOUBLE_PAGES) {
const firstPage = pagesClone.shift() as PageDtoWithUrl
if (isPageLandscape(firstPage))
spreads.push([firstPage] as PageDtoWithUrl[])
else
spreads.push([createEmptyPage(firstPage), firstPage] as PageDtoWithUrl[])
if (pagesClone.length > 0) {
const lastPage = pagesClone.pop() as PageDtoWithUrl
if(isPageLandscape(lastPage))
lastPages = [lastPage] as PageDtoWithUrl[]
else
lastPages = [lastPage, createEmptyPage(lastPage)] as PageDtoWithUrl[]
}
}
while (pagesClone.length > 0) {
const p = pagesClone.shift() as PageDtoWithUrl
if (isPageLandscape(p)) {
spreads.push([p])
} else {
if (pagesClone.length > 0) {
const p2 = pagesClone.shift() as PageDtoWithUrl
if (isPageLandscape(p2)) {
spreads.push([p, createEmptyPage(p)])
spreads.push([p2])
const [prevPage] = spreads.length > 0 ? (spreads[spreads.length - 1] as PageDtoWithUrl[]) : []
if (pageLayout === PagedReaderLayout.DOUBLE_NO_COVER && isPageLandscape(prevPage)){
spreads.push([createEmptyPage(p), p])
} else {
spreads.push([p, p2])
const p2 = pagesClone.shift() as PageDtoWithUrl
if (isPageLandscape(p2)) {
spreads.push([p, createEmptyPage(p)])
spreads.push([p2])
} else {
spreads.push([p, p2])
}
Copy link
Copy Markdown
Author

@kanjieater kanjieater Sep 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Basically all the same logic, just if it's DBNC layout, then just push a empty page after the previous page if and only if it was a landscape page. This guarantees the layouts will be opposite if landscape pages existed, which is what throws off the flow.

}
} else {
spreads.push([p, createEmptyPage(p)])
}
}
}
if (lastPages) spreads.push(lastPages)
return spreads
} else {
return pages.map(p => [p])
Expand Down
11 changes: 4 additions & 7 deletions komga-webui/tests/unit/functions/book-spreads.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,23 +95,20 @@ describe('Double Pages', () => {
] as PageDtoWithUrl[]

const spreads = buildSpreads(pages, pageLayout)

expect(spreads.length).toEqual(4)
// Expecting [E, 1], [2, 3], [4, 5]
Copy link
Copy Markdown
Author

@kanjieater kanjieater Sep 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Talked about this in more details with an example in the PR original post

expect(spreads.length).toEqual(3)

expect(spreads[0].length).toEqual(2)
expect(spreads[0][1].number).toEqual(1)
expect(spreads[0][0].number).toEqual(0) // empty page
expect(spreads[0][1].number).toEqual(1)

expect(spreads[1].length).toEqual(2)
expect(spreads[1][0].number).toEqual(2)
expect(spreads[1][1].number).toEqual(3)

expect(spreads[2].length).toEqual(2)
expect(spreads[2][0].number).toEqual(4)

expect(spreads[3].length).toEqual(2)
expect(spreads[3][0].number).toEqual(5)
expect(spreads[3][1].number).toEqual(0) // empty page
expect(spreads[2][1].number).toEqual(5)
})
})

Expand Down