refactor: Improve PDF generation and progress monitoring

- Update stage names in PDFCreater
- Adjust progress monitoring in PDF creation process
- Minor refinements to stage tracking and progress reporting

babeldoc/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.8"
+__version__ = "0.1.9"

babeldoc/document_il/backend/pdf_creater.py

@@ -12,9 +12,12 @@
 
 logger = logging.getLogger(__name__)
 
+SUBSET_FONT_STAGE_NAME = "Subset font"
+SAVE_PDF_STAGE_NAME = "Save PDF"
+
 
 class PDFCreater:
-    stage_name = "Create PDF file"
+    stage_name = "Generate drawing instructions"
 
     def __init__(
         self,
@@ -249,7 +252,7 @@ def write(self, translation_config: TranslationConfig) -> TranslateResult:
         self.font_mapper.add_font(pdf, self.docs)
         with self.translation_config.progress_monitor.stage_start(
             self.stage_name,
-            len(self.docs.page) + 2,
+            len(self.docs.page),
         ) as pbar:
             for page in self.docs.page:
                 translation_config.raise_if_cancelled()
@@ -346,9 +349,18 @@ def write(self, translation_config: TranslationConfig) -> TranslateResult:
                 pdf.update_stream(op_container, draw_op.tobytes())
                 pdf[page.page_number].set_contents(op_container)
                 pbar.advance()
-            translation_config.raise_if_cancelled()
+        translation_config.raise_if_cancelled()
+        with self.translation_config.progress_monitor.stage_start(
+            SUBSET_FONT_STAGE_NAME,
+            1,
+        ) as pbar:
             if not translation_config.skip_clean:
                 pdf.subset_fonts(fallback=False)
+            pbar.advance()
+        with self.translation_config.progress_monitor.stage_start(
+            SAVE_PDF_STAGE_NAME,
+            2,
+        ) as pbar:
             if not translation_config.no_mono:
                 if translation_config.debug:
                     translation_config.raise_if_cancelled()

babeldoc/high_level.py

@@ -20,6 +20,8 @@
 from babeldoc.const import CACHE_FOLDER
 from babeldoc.const import get_cache_file_path
 from babeldoc.converter import TranslateConverter
+from babeldoc.document_il.backend.pdf_creater import SAVE_PDF_STAGE_NAME
+from babeldoc.document_il.backend.pdf_creater import SUBSET_FONT_STAGE_NAME
 from babeldoc.document_il.backend.pdf_creater import PDFCreater
 from babeldoc.document_il.frontend.il_creater import ILCreater
 from babeldoc.document_il.midend.add_debug_information import AddDebugInformation
@@ -48,6 +50,8 @@
     Typesetting.stage_name,
     FontMapper.stage_name,
     PDFCreater.stage_name,
+    SUBSET_FONT_STAGE_NAME,
+    SAVE_PDF_STAGE_NAME,
 ]
 
 resfont_map = {

babeldoc/main.py

@@ -20,7 +20,7 @@
 from babeldoc.translation_config import TranslationConfig
 
 logger = logging.getLogger(__name__)
-__version__ = "0.1.8"
+__version__ = "0.1.9"
 
 
 def create_parser():

babeldoc/progress_monitor.py

@@ -111,7 +111,7 @@ def calculate_current_progress(self, stage=None):
     def stage_update(self, stage, n: int):
         with self.lock:
             report_time_delta = time.time() - self.last_report_time
-            if report_time_delta < self.report_interval:
+            if report_time_delta < self.report_interval and stage.total > 3:
                 return
             if self.progress_change_callback:
                 self.progress_change_callback(

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "BabelDOC"
-version = "0.1.8"
+version = "0.1.9"
 description = "Yet Another Document Translator"
 license = "AGPL-3.0"
 readme = "README.md"
@@ -117,7 +117,7 @@ dev = [
 ]
 
 [bumpver]
-current_version = "0.1.8"
+current_version = "0.1.9"
 version_pattern = "MAJOR.MINOR.PATCH[.PYTAGNUM]"
 
 [bumpver.file_patterns]