refactor: remove redundant constructors in ColorFormat and FillFormat classes; add LineFormat class for line formatting

Author: ya7010

src/tppt/pptx/dml/color.py

@@ -79,9 +79,6 @@ def to_pptx_theme_color(
 
 
 class ColorFormat(PptxConvertible[PptxColorFormat]):
-    def __init__(self, pptx_obj: PptxColorFormat, /) -> None:
-        super().__init__(pptx_obj)
-
     @property
     def brightness(self) -> float:
         """

src/tppt/pptx/dml/fill.py

@@ -19,9 +19,6 @@
 class FillFormat(PptxConvertible[PptxFillFormat]):
     """Fill format."""
 
-    def __init__(self, pptx_obj: PptxFillFormat, /) -> None:
-        super().__init__(pptx_obj)
-
     @property
     def fore_color(self) -> ColorFormat:
         """Fore color."""
@@ -90,9 +87,6 @@ def gradient_stops(self) -> "GradientStops":
 class NoFill(Fill[PptxNoFill]):
     """No fill."""
 
-    def __init__(self, pptx_obj: PptxNoFill) -> None:
-        super().__init__(pptx_obj)
-
 
 class PattFill(Fill[PptxPattFill]):
     """Pattern fill."""

src/tppt/pptx/dml/line.py

@@ -0,0 +1,39 @@
+from pptx.dml.line import LineFormat as _PptxLineFormat
+from pptx.enum.dml import MSO_LINE_DASH_STYLE
+from pptx.util import Emu as _PptxEmu
+
+from tppt.pptx.converter import PptxConvertible
+from tppt.pptx.dml.color import ColorFormat
+from tppt.pptx.dml.fill import FillFormat
+from tppt.pptx.enum.dml import LiteralLineDashStyle, to_pptx_line_dash_style
+from tppt.types._length import EnglishMetricUnits, to_english_metric_units
+
+
+class LineFormat(PptxConvertible[_PptxLineFormat]):
+    """Line format."""
+
+    @property
+    def color(self) -> ColorFormat:
+        return ColorFormat(self._pptx.color)
+
+    @property
+    def dash_style(self) -> MSO_LINE_DASH_STYLE | None:
+        return self._pptx.dash_style
+
+    @dash_style.setter
+    def dash_style(
+        self, value: MSO_LINE_DASH_STYLE | LiteralLineDashStyle | None
+    ) -> None:
+        self._pptx.dash_style = to_pptx_line_dash_style(value)
+
+    @property
+    def fill(self) -> FillFormat:
+        return FillFormat(self._pptx.fill)
+
+    @property
+    def width(self) -> EnglishMetricUnits | None:
+        return EnglishMetricUnits(self._pptx.width)
+
+    @width.setter
+    def width(self, value: EnglishMetricUnits | _PptxEmu) -> None:
+        self._pptx.width = to_english_metric_units(value)

src/tppt/pptx/enum/dml.py

@@ -1,6 +1,18 @@
-from typing import Literal, assert_never
+from typing import Literal, assert_never, overload
 
-from pptx.enum.dml import MSO_PATTERN_TYPE
+from pptx.enum.dml import MSO_LINE_DASH_STYLE, MSO_PATTERN_TYPE
+
+LiteralLineDashStyle = Literal[
+    "dash",
+    "dash_dot",
+    "dash_dot_dot",
+    "long_dash",
+    "long_dash_dot",
+    "round_dot",
+    "solid",
+    "square_dot",
+    "mixed",
+]
 
 LiteralPatternType = Literal[
     "cross",
@@ -60,6 +72,48 @@
 ]
 
 
+@overload
+def to_pptx_line_dash_style(
+    dash_style: LiteralLineDashStyle | MSO_LINE_DASH_STYLE,
+) -> MSO_LINE_DASH_STYLE: ...
+
+
+@overload
+def to_pptx_line_dash_style(
+    dash_style: LiteralLineDashStyle | MSO_LINE_DASH_STYLE | None,
+) -> MSO_LINE_DASH_STYLE | None: ...
+
+
+def to_pptx_line_dash_style(
+    dash_style: LiteralLineDashStyle | MSO_LINE_DASH_STYLE | None,
+) -> MSO_LINE_DASH_STYLE | None:
+    match dash_style:
+        case None:
+            return None
+        case MSO_LINE_DASH_STYLE():
+            return dash_style
+        case "dash":
+            return MSO_LINE_DASH_STYLE.DASH
+        case "dash_dot":
+            return MSO_LINE_DASH_STYLE.DASH_DOT
+        case "dash_dot_dot":
+            return MSO_LINE_DASH_STYLE.DASH_DOT_DOT
+        case "long_dash":
+            return MSO_LINE_DASH_STYLE.LONG_DASH
+        case "long_dash_dot":
+            return MSO_LINE_DASH_STYLE.LONG_DASH_DOT
+        case "round_dot":
+            return MSO_LINE_DASH_STYLE.ROUND_DOT
+        case "solid":
+            return MSO_LINE_DASH_STYLE.SOLID
+        case "square_dot":
+            return MSO_LINE_DASH_STYLE.SQUARE_DOT
+        case "mixed":
+            return MSO_LINE_DASH_STYLE.DASH_STYLE_MIXED
+        case _:
+            assert_never(dash_style)
+
+
 def to_pptx_pattern_type(
     pattern_type: LiteralPatternType | MSO_PATTERN_TYPE,
 ) -> MSO_PATTERN_TYPE:

src/tppt/pptx/presentation.py

@@ -3,7 +3,10 @@
 import os
 from typing import IO, TYPE_CHECKING, Any, Callable, Generic, Self, cast, overload
 
-from pptx.presentation import Presentation as PptxPresentation
+from pptx.parts.coreprops import CorePropertiesPart as _PptxCorePropertiesPart
+from pptx.presentation import Presentation as _PptxPresentation
+from pptx.slide import NotesMaster as _PptxNotesMaster
+from pptx.slide import _BaseMaster as _PptxBaseMaster
 
 from tppt.pptx.tree import ppt2tree
 from tppt.template.default import DefaultSlideMaster
@@ -17,18 +20,20 @@
 
 from .converter import PptxConvertible, to_pptx_length, to_tppt_length
 from .slide import SlideBuilder
-from .slide_master import SlideMaster
 
 if TYPE_CHECKING:
+    from tppt.pptx.shape.placeholder import MasterPlaceholder
     from tppt.pptx.slide import Slide
 
+    from .slide_master import SlideMaster
 
-class Presentation(PptxConvertible[PptxPresentation]):
+
+class Presentation(PptxConvertible[_PptxPresentation]):
     """Presentation wrapper with type safety."""
 
     def __init__(
         self,
-        pptx: PptxPresentation | FilePath,
+        pptx: _PptxPresentation | FilePath,
     ) -> None:
         """Initialize presentation."""
         if isinstance(pptx, (os.PathLike, str)):
@@ -37,6 +42,16 @@ def __init__(
             pptx = Presentation(os.fspath(pptx))
         self._pptx = pptx
 
+    @property
+    def core_properties(self) -> _PptxCorePropertiesPart:
+        """Get the core properties."""
+        return self._pptx.core_properties
+
+    @property
+    def notes_master(self) -> "NotesMaster":
+        """Get the notes master."""
+        return NotesMaster.from_pptx(self._pptx.notes_master)
+
     @property
     def slides(self) -> "list[Slide]":
         """Get the slides."""
@@ -45,12 +60,14 @@ def slides(self) -> "list[Slide]":
         return [Slide.from_pptx(slide) for slide in self._pptx.slides]
 
     @property
-    def slide_master(self) -> SlideMaster:
+    def slide_master(self) -> "SlideMaster":
         """
         Get the slide master.
 
         This tool supports only one slide master.
         """
+        from .slide_master import SlideMaster
+
         return SlideMaster.from_pptx(self._pptx.slide_masters[0])
 
     @property
@@ -104,12 +121,12 @@ def save(self, file: FilePath | IO[bytes]) -> None:
             file = os.fspath(file)
         self._pptx.save(file)
 
-    def to_pptx(self) -> PptxPresentation:
+    def to_pptx(self) -> _PptxPresentation:
         """Convert to pptx presentation."""
         return self._pptx
 
     @classmethod
-    def from_pptx(cls, pptx_obj: PptxPresentation) -> Self:
+    def from_pptx(cls, pptx_obj: _PptxPresentation) -> Self:
         """Create from pptx presentation."""
         return cls(pptx_obj)
 
@@ -177,3 +194,22 @@ def build(self) -> Presentation:
     def save(self, file: FilePath | IO[bytes]) -> None:
         """Save the presentation to a file."""
         self.build().save(file)
+
+
+class _BaseMaster(PptxConvertible[_PptxBaseMaster]):
+    @property
+    def placeholders(self) -> "list[MasterPlaceholder]":
+        """Get the placeholders."""
+        from tppt.pptx.shape.placeholder import MasterPlaceholder
+
+        return [
+            MasterPlaceholder(placeholder) for placeholder in self._pptx.placeholders
+        ]
+
+
+class NotesMaster(_BaseMaster):
+    """Notes master."""
+
+    def __init__(self, pptx_obj: _PptxNotesMaster) -> None:
+        """Initialize the notes master."""
+        super().__init__(pptx_obj)

src/tppt/pptx/shape/__init__.py

@@ -2,6 +2,7 @@
 
 from typing import TYPE_CHECKING, Self, TypedDict
 
+from pptx.enum.shapes import MSO_AUTO_SHAPE_TYPE
 from pptx.opc.package import XmlPart
 from pptx.shapes import Subshape as PptxSubshape
 from pptx.shapes.autoshape import Shape as PptxShape
@@ -12,7 +13,10 @@
 from tppt.types._length import Length, LiteralLength
 
 if TYPE_CHECKING:
-    from ..text.text_frame import TextFrame
+    from tppt.pptx.dml.fill import FillFormat
+    from tppt.pptx.dml.line import LineFormat
+    from tppt.pptx.text.text_frame import TextFrame
+
 
 GenericPptxBaseShape = TypeVar(
     "GenericPptxBaseShape",
@@ -40,8 +44,25 @@ def from_pptx(cls, pptx_obj: GenericPptxBaseShape) -> Self:
 
 
 class Shape(BaseShape[GenericPptxShape]):
-    def __init__(self, pptx_shape: GenericPptxShape) -> None:
-        self._pptx: GenericPptxShape = pptx_shape
+    @property
+    def adjustments(self) -> list[float]:
+        return [self._pptx.adjustments[i] for i in range(len(self._pptx.adjustments))]
+
+    @property
+    def auto_shape_type(self) -> MSO_AUTO_SHAPE_TYPE | None:
+        return self._pptx.auto_shape_type
+
+    @property
+    def fill(self) -> "FillFormat":
+        from tppt.pptx.dml.fill import FillFormat
+
+        return FillFormat(self._pptx.fill)
+
+    @property
+    def line(self) -> "LineFormat":
+        from tppt.pptx.dml.line import LineFormat
+
+        return LineFormat(self._pptx.line)
 
     @property
     def text(self) -> str:
@@ -53,7 +74,7 @@ def text(self, text: str) -> None:
 
     @property
     def text_frame(self) -> "TextFrame":
-        from ..text.text_frame import TextFrame
+        from tppt.pptx.text.text_frame import TextFrame
 
         return TextFrame(self._pptx.text_frame)
 

src/tppt/pptx/shape/placeholder.py

@@ -1,7 +1,6 @@
-from typing import Self
-
-from pptx.shapes.placeholder import LayoutPlaceholder as PptxLayoutPlaceholder
-from pptx.shapes.placeholder import SlidePlaceholder as PptxSlidePlaceholder
+from pptx.shapes.placeholder import LayoutPlaceholder as _PptxLayoutPlaceholder
+from pptx.shapes.placeholder import MasterPlaceholder as _PptxMasterPlaceholder
+from pptx.shapes.placeholder import SlidePlaceholder as _PptxSlidePlaceholder
 
 from tppt.pptx.converter import to_pptx_length, to_tppt_length
 from tppt.pptx.presentation import PptxConvertible
@@ -10,10 +9,13 @@
 from . import Shape
 
 
-class SlidePlaceholder(Shape[PptxSlidePlaceholder]):
-    def __init__(self, pptx_obj: PptxSlidePlaceholder) -> None:
-        self._pptx = pptx_obj
+class LayoutPlaceholder(PptxConvertible[_PptxLayoutPlaceholder]): ...
+
+
+class MasterPlaceholder(PptxConvertible[_PptxMasterPlaceholder]): ...
 
+
+class SlidePlaceholder(Shape[_PptxSlidePlaceholder]):
     @property
     def left(self) -> Length | None:
         return to_tppt_length(self._pptx.left)
@@ -45,22 +47,3 @@ def width(self) -> Length | None:
     @width.setter
     def width(self, value: Length | None) -> None:
         self._pptx.width = to_pptx_length(value)
-
-    def to_pptx(self) -> PptxSlidePlaceholder:
-        return self._pptx
-
-    @classmethod
-    def from_pptx(cls, pptx_obj: PptxSlidePlaceholder) -> Self:
-        return cls(pptx_obj)
-
-
-class LayoutPlaceholder(PptxConvertible[PptxLayoutPlaceholder]):
-    def __init__(self, pptx_obj: PptxLayoutPlaceholder) -> None:
-        self._pptx = pptx_obj
-
-    def to_pptx(self) -> PptxLayoutPlaceholder:
-        return self._pptx
-
-    @classmethod
-    def from_pptx(cls, pptx_obj: PptxLayoutPlaceholder) -> Self:
-        return cls(pptx_obj)