fix missing images in paras
This commit is contained in:
@@ -13,9 +13,11 @@ from pathlib import Path
|
||||
|
||||
from .ereader_layout import RenderingPosition, ChapterNavigator, ChapterInfo
|
||||
from .page_buffer import BufferedPageRenderer
|
||||
from pyWebLayout.abstract.block import Block, HeadingLevel
|
||||
from pyWebLayout.abstract.block import Block, HeadingLevel, Image, BlockType
|
||||
from pyWebLayout.concrete.page import Page
|
||||
from pyWebLayout.concrete.image import RenderableImage
|
||||
from pyWebLayout.style.page_style import PageStyle
|
||||
from pyWebLayout.layout.document_layouter import image_layouter
|
||||
|
||||
|
||||
class BookmarkManager:
|
||||
@@ -194,6 +196,10 @@ class EreaderLayoutManager:
|
||||
self.current_position = RenderingPosition()
|
||||
self.font_scale = 1.0
|
||||
|
||||
# Cover page handling
|
||||
self._has_cover = self._detect_cover()
|
||||
self._on_cover_page = self._has_cover # Start on cover if one exists
|
||||
|
||||
# Page position history for fast backward navigation
|
||||
# List of (position, font_scale) tuples representing the start of each page visited
|
||||
self._page_history: List[Tuple[RenderingPosition, float]] = []
|
||||
@@ -203,6 +209,7 @@ class EreaderLayoutManager:
|
||||
saved_position = self.bookmark_manager.load_reading_position()
|
||||
if saved_position:
|
||||
self.current_position = saved_position
|
||||
self._on_cover_page = False # If we have a saved position, we're past the cover
|
||||
|
||||
# Callbacks for UI updates
|
||||
self.position_changed_callback: Optional[Callable[[
|
||||
@@ -220,6 +227,69 @@ class EreaderLayoutManager:
|
||||
"""Set callback for chapter changes"""
|
||||
self.chapter_changed_callback = callback
|
||||
|
||||
def _detect_cover(self) -> bool:
|
||||
"""
|
||||
Detect if the document has a cover page.
|
||||
|
||||
A cover is detected if:
|
||||
1. The first block is an Image block, OR
|
||||
2. The document has cover metadata (future enhancement)
|
||||
|
||||
Returns:
|
||||
True if a cover page should be rendered
|
||||
"""
|
||||
if not self.blocks:
|
||||
return False
|
||||
|
||||
# Check if first block is an image - treat it as a cover
|
||||
first_block = self.blocks[0]
|
||||
if isinstance(first_block, Image):
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
def _render_cover_page(self) -> Page:
|
||||
"""
|
||||
Render a dedicated cover page.
|
||||
|
||||
The cover page displays the first image block (if it exists)
|
||||
using the standard image layouter with maximum dimensions to fill the page.
|
||||
|
||||
Returns:
|
||||
Rendered cover page
|
||||
"""
|
||||
# Create a new page for the cover
|
||||
page = Page(self.page_size, self.page_style)
|
||||
|
||||
if not self.blocks or not isinstance(self.blocks[0], Image):
|
||||
# No cover image, return blank page
|
||||
return page
|
||||
|
||||
cover_image_block = self.blocks[0]
|
||||
|
||||
# Use the image layouter to render the cover image
|
||||
# Use full page dimensions (minus borders/padding) for cover
|
||||
try:
|
||||
max_width = self.page_size[0] - 2 * self.page_style.border_width
|
||||
max_height = self.page_size[1] - 2 * self.page_style.border_width
|
||||
|
||||
# Layout the image on the page
|
||||
success = image_layouter(
|
||||
image=cover_image_block,
|
||||
page=page,
|
||||
max_width=max_width,
|
||||
max_height=max_height
|
||||
)
|
||||
|
||||
if not success:
|
||||
print("Warning: Failed to layout cover image")
|
||||
|
||||
except Exception as e:
|
||||
# If image loading fails, just return the blank page
|
||||
print(f"Warning: Failed to load cover image: {e}")
|
||||
|
||||
return page
|
||||
|
||||
def _notify_position_changed(self):
|
||||
"""Notify UI of position change"""
|
||||
if self.position_changed_callback:
|
||||
@@ -238,9 +308,16 @@ class EreaderLayoutManager:
|
||||
"""
|
||||
Get the page at the current reading position.
|
||||
|
||||
If on the cover page, returns the rendered cover.
|
||||
Otherwise, returns the regular content page.
|
||||
|
||||
Returns:
|
||||
Rendered page
|
||||
"""
|
||||
# Check if we're on the cover page
|
||||
if self._on_cover_page and self._has_cover:
|
||||
return self._render_cover_page()
|
||||
|
||||
page, _ = self.renderer.render_page(self.current_position, self.font_scale)
|
||||
return page
|
||||
|
||||
@@ -248,9 +325,23 @@ class EreaderLayoutManager:
|
||||
"""
|
||||
Advance to the next page.
|
||||
|
||||
If currently on the cover page, advances to the first content page.
|
||||
Otherwise, advances to the next content page.
|
||||
|
||||
Returns:
|
||||
Next page or None if at end of document
|
||||
"""
|
||||
# Special case: transitioning from cover to first content page
|
||||
if self._on_cover_page and self._has_cover:
|
||||
self._on_cover_page = False
|
||||
# If first block is an image (the cover), skip it and start from block 1
|
||||
if self.blocks and isinstance(self.blocks[0], Image):
|
||||
self.current_position = RenderingPosition(chapter_index=0, block_index=1)
|
||||
else:
|
||||
self.current_position = RenderingPosition()
|
||||
self._notify_position_changed()
|
||||
return self.get_current_page()
|
||||
|
||||
# Save current position to history before moving forward
|
||||
self._add_to_history(self.current_position, self.font_scale)
|
||||
|
||||
@@ -271,10 +362,21 @@ class EreaderLayoutManager:
|
||||
|
||||
Uses cached page history for instant navigation when available,
|
||||
falls back to iterative refinement algorithm when needed.
|
||||
Can navigate back to the cover page if it exists.
|
||||
|
||||
Returns:
|
||||
Previous page or None if at beginning of document
|
||||
Previous page or None if at beginning of document (or on cover)
|
||||
"""
|
||||
# Special case: if at the beginning of content and there's a cover, go back to it
|
||||
if self._has_cover and self._is_at_beginning() and not self._on_cover_page:
|
||||
self._on_cover_page = True
|
||||
self._notify_position_changed()
|
||||
return self.get_current_page()
|
||||
|
||||
# Can't go before the cover
|
||||
if self._on_cover_page:
|
||||
return None
|
||||
|
||||
if self._is_at_beginning():
|
||||
return None
|
||||
|
||||
@@ -303,9 +405,17 @@ class EreaderLayoutManager:
|
||||
return None # At beginning of document
|
||||
|
||||
def _is_at_beginning(self) -> bool:
|
||||
"""Check if we're at the beginning of the document"""
|
||||
"""
|
||||
Check if we're at the beginning of the document content.
|
||||
|
||||
If a cover exists (first block is an Image), the beginning of content
|
||||
is at block_index=1. Otherwise, it's at block_index=0.
|
||||
"""
|
||||
# Determine the first content block index
|
||||
first_content_block = 1 if (self._has_cover and self.blocks and isinstance(self.blocks[0], Image)) else 0
|
||||
|
||||
return (self.current_position.chapter_index == 0 and
|
||||
self.current_position.block_index == 0 and
|
||||
self.current_position.block_index == first_content_block and
|
||||
self.current_position.word_index == 0)
|
||||
|
||||
def jump_to_position(self, position: RenderingPosition) -> Page:
|
||||
@@ -319,6 +429,7 @@ class EreaderLayoutManager:
|
||||
Page at the new position
|
||||
"""
|
||||
self.current_position = position
|
||||
self._on_cover_page = False # Jumping to a position means we're past the cover
|
||||
self._notify_position_changed()
|
||||
return self.get_current_page()
|
||||
|
||||
@@ -636,6 +747,38 @@ class EreaderLayoutManager:
|
||||
|
||||
return current_block / max(1, total_blocks - 1)
|
||||
|
||||
def has_cover(self) -> bool:
|
||||
"""
|
||||
Check if the document has a cover page.
|
||||
|
||||
Returns:
|
||||
True if a cover page is available
|
||||
"""
|
||||
return self._has_cover
|
||||
|
||||
def is_on_cover(self) -> bool:
|
||||
"""
|
||||
Check if currently viewing the cover page.
|
||||
|
||||
Returns:
|
||||
True if on the cover page
|
||||
"""
|
||||
return self._on_cover_page
|
||||
|
||||
def jump_to_cover(self) -> Optional[Page]:
|
||||
"""
|
||||
Jump to the cover page if one exists.
|
||||
|
||||
Returns:
|
||||
Cover page or None if no cover exists
|
||||
"""
|
||||
if not self._has_cover:
|
||||
return None
|
||||
|
||||
self._on_cover_page = True
|
||||
self._notify_position_changed()
|
||||
return self.get_current_page()
|
||||
|
||||
def get_position_info(self) -> Dict[str, Any]:
|
||||
"""
|
||||
Get detailed information about the current position.
|
||||
@@ -647,6 +790,8 @@ class EreaderLayoutManager:
|
||||
|
||||
return {
|
||||
'position': self.current_position.to_dict(),
|
||||
'on_cover': self._on_cover_page,
|
||||
'has_cover': self._has_cover,
|
||||
'chapter': {
|
||||
'title': current_chapter.title if current_chapter else None,
|
||||
'level': current_chapter.level if current_chapter else None,
|
||||
|
||||
Reference in New Issue
Block a user