refactor: remove redundant initializers and methods from various classes; add ShadowFormat class for shadow effects

Author: ya7010

src/tppt/pptx/action.py

@@ -0,0 +1,40 @@
+from pptx.action import ActionSetting as _PptxActionSetting
+from pptx.action import Hyperlink as _PptxHyperlink
+from pptx.enum.action import PP_ACTION_TYPE
+
+from tppt.pptx.converter import PptxConvertible
+from tppt.pptx.shape import SubShape
+from tppt.pptx.slide import Slide
+
+
+class Hyperlink(SubShape[_PptxHyperlink]):
+    @property
+    def address(self) -> str | None:
+        return self._pptx.address
+
+    @address.setter
+    def address(self, value: str | None):
+        self._pptx.address = value
+
+
+class ActionSetting(PptxConvertible[_PptxActionSetting]):
+    @property
+    def action(self) -> PP_ACTION_TYPE:
+        return self._pptx.action
+
+    @property
+    def hyperlink(self) -> Hyperlink:
+        return Hyperlink(self._pptx.hyperlink)
+
+    @property
+    def target_slide(self) -> Slide | None:
+        if target_slide := self._pptx.target_slide:
+            return Slide(target_slide)
+        return None
+
+    @target_slide.setter
+    def target_slide(self, value: Slide | None):
+        if value is None:
+            self._pptx.target_slide = None
+        else:
+            self._pptx.target_slide = value._pptx

src/tppt/pptx/dml/effect.py

@@ -0,0 +1,13 @@
+from pptx.dml.effect import ShadowFormat as _PptxShadowFormat
+
+from tppt.pptx.converter import PptxConvertible
+
+
+class ShadowFormat(PptxConvertible[_PptxShadowFormat]):
+    @property
+    def inherit(self) -> bool:
+        return self._pptx.inherit
+
+    @inherit.setter
+    def inherit(self, value: bool) -> None:
+        self._pptx.inherit = value

src/tppt/pptx/presentation.py

@@ -22,10 +22,10 @@
 from .slide import SlideBuilder
 
 if TYPE_CHECKING:
+    from tppt.pptx.shape import BaseShape
     from tppt.pptx.shape.placeholder import MasterPlaceholder
     from tppt.pptx.slide import Slide
-
-    from .slide_master import SlideMaster
+    from tppt.pptx.slide_master import SlideMaster
 
 
 class Presentation(PptxConvertible[_PptxPresentation]):
@@ -40,7 +40,7 @@ def __init__(
             from pptx import Presentation
 
             pptx = Presentation(os.fspath(pptx))
-        self._pptx = pptx
+        super().__init__(pptx)
 
     @property
     def core_properties(self) -> _PptxCorePropertiesPart:
@@ -121,15 +121,6 @@ def save(self, file: FilePath | IO[bytes]) -> None:
             file = os.fspath(file)
         self._pptx.save(file)
 
-    def to_pptx(self) -> _PptxPresentation:
-        """Convert to pptx presentation."""
-        return self._pptx
-
-    @classmethod
-    def from_pptx(cls, pptx_obj: _PptxPresentation) -> Self:
-        """Create from pptx presentation."""
-        return cls(pptx_obj)
-
 
 class PresentationBuilder(Generic[GenericTpptSlideMaster]):
     """Builder for presentations."""
@@ -206,6 +197,13 @@ def placeholders(self) -> "list[MasterPlaceholder]":
             MasterPlaceholder(placeholder) for placeholder in self._pptx.placeholders
         ]
 
+    @property
+    def shapes(self) -> "list[BaseShape]":
+        """Get the shapes."""
+        from tppt.pptx.shape import BaseShape
+
+        return [BaseShape(shape) for shape in self._pptx.shapes]
+
 
 class NotesMaster(_BaseMaster):
     """Notes master."""

src/tppt/pptx/shape/__init__.py

@@ -1,18 +1,24 @@
 """Shape wrapper implementation."""
 
-from typing import TYPE_CHECKING, Self, TypedDict
+from typing import TYPE_CHECKING, 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
 from pptx.shapes.base import BaseShape as PptxBaseShape
+from pptx.util import Length as PptxLength
 from typing_extensions import TypeVar
 
-from tppt.pptx.converter import PptxConvertible
-from tppt.types._length import Length, LiteralLength
+from tppt.pptx.converter import PptxConvertible, to_pptx_length
+from tppt.types._length import Length, LiteralLength, to_length
 
 if TYPE_CHECKING:
+    from pptx.enum.shapes import MSO_AUTO_SHAPE_TYPE, MSO_SHAPE_TYPE
+    from pptx.oxml.shapes import ShapeElement as PptxShapeElement
+    from pptx.parts.slide import BaseSlidePart as PptxBaseSlidePart
+    from pptx.shapes.base import _PlaceholderFormat as PptxPlaceholderFormat
+
+    from tppt.pptx.action import ActionSetting
+    from tppt.pptx.dml.effect import ShadowFormat
     from tppt.pptx.dml.fill import FillFormat
     from tppt.pptx.dml.line import LineFormat
     from tppt.pptx.text.text_frame import TextFrame
@@ -32,15 +38,95 @@
 
 
 class BaseShape(PptxConvertible[GenericPptxBaseShape]):
-    def __init__(self, pptx_shape: GenericPptxBaseShape) -> None:
-        self._pptx: GenericPptxBaseShape = pptx_shape
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, BaseShape):
+            return False
+        return self._pptx is other._pptx
+
+    def __ne__(self, other: object) -> bool:
+        if not isinstance(other, BaseShape):
+            return True
+        return self._pptx is not other._pptx
+
+    @property
+    def click_action(self) -> "ActionSetting":
+        from tppt.pptx.action import ActionSetting
+
+        return ActionSetting(self._pptx.click_action)
+
+    @property
+    def element(self) -> "PptxShapeElement":
+        return self._pptx.element
+
+    @property
+    def height(self) -> Length:
+        return to_length(self._pptx.height)
+
+    @height.setter
+    def height(self, value: Length | LiteralLength | PptxLength) -> None:
+        self._pptx.height = to_pptx_length(value)
+
+    @property
+    def left(self) -> Length:
+        return to_length(self._pptx.left)
+
+    @left.setter
+    def left(self, value: Length | LiteralLength | PptxLength) -> None:
+        self._pptx.left = to_pptx_length(value)
+
+    @property
+    def name(self) -> str:
+        return self._pptx.name
+
+    @name.setter
+    def name(self, value: str) -> None:
+        self._pptx.name = value
+
+    @property
+    def part(self) -> "PptxBaseSlidePart":
+        return self._pptx.part
+
+    @property
+    def placeholder_format(self) -> "PptxPlaceholderFormat":
+        return self._pptx.placeholder_format
+
+    @property
+    def rotation(self) -> float:
+        return self._pptx.rotation
+
+    @rotation.setter
+    def rotation(self, value: float) -> None:
+        self._pptx.rotation = value
+
+    @property
+    def shadow(self) -> "ShadowFormat":
+        from tppt.pptx.dml.effect import ShadowFormat
+
+        return ShadowFormat(self._pptx.shadow)
+
+    @property
+    def shape_id(self) -> int:
+        return self._pptx.shape_id
+
+    @property
+    def shape_type(self) -> "MSO_SHAPE_TYPE":
+        return self._pptx.shape_type
+
+    @property
+    def top(self) -> Length:
+        return to_length(self._pptx.top)
 
-    def to_pptx(self) -> GenericPptxBaseShape:
-        return self._pptx
+    @top.setter
+    def top(self, value: Length | LiteralLength | PptxLength) -> None:
+        self._pptx.top = to_pptx_length(value)
+
+    @property
+    def width(self) -> Length:
+        return to_length(self._pptx.width)
 
-    @classmethod
-    def from_pptx(cls, pptx_obj: GenericPptxBaseShape) -> Self:
-        return cls(pptx_obj)
+    @width.setter
+    def width(self, value: Length | LiteralLength | PptxLength) -> None:
+        self._pptx.width = to_pptx_length(value)
 
 
 class Shape(BaseShape[GenericPptxShape]):
@@ -49,7 +135,7 @@ 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:
+    def auto_shape_type(self) -> "MSO_AUTO_SHAPE_TYPE | None":
         return self._pptx.auto_shape_type
 
     @property
@@ -83,19 +169,7 @@ def text_frame(self) -> "TextFrame":
 
 
 class SubShape(PptxConvertible[_GenericPptxSubshape]):
-    def __init__(self, pptx_shape: _GenericPptxSubshape) -> None:
-        self._pptx: _GenericPptxSubshape = pptx_shape
-
-    @property
-    def part(self) -> XmlPart:
-        return self._pptx.part
-
-    def to_pptx(self) -> _GenericPptxSubshape:
-        return self._pptx
-
-    @classmethod
-    def from_pptx(cls, pptx_obj: _GenericPptxSubshape) -> Self:
-        return cls(pptx_obj)
+    pass
 
 
 class RangeProps(TypedDict):

src/tppt/pptx/shape/background.py

@@ -1,19 +1,7 @@
-from typing import Self
-
 from pptx.slide import _Background as PptxBackground
 
 from tppt.pptx.converter import PptxConvertible
 
 
 class Background(PptxConvertible[PptxBackground]):
     """Background of the slide."""
-
-    def __init__(self, pptx_obj: PptxBackground) -> None:
-        self._pptx = pptx_obj
-
-    def to_pptx(self) -> PptxBackground:
-        return self._pptx
-
-    @classmethod
-    def from_pptx(cls, pptx_obj: PptxBackground) -> Self:
-        return cls(pptx_obj)

src/tppt/pptx/shape/picture.py

@@ -1,4 +1,4 @@
-from typing import IO, Literal, NotRequired, Self, assert_never
+from typing import IO, Literal, NotRequired, assert_never
 
 from pptx.opc.constants import CONTENT_TYPE
 from pptx.shapes.picture import Movie as PptxMovie
@@ -32,15 +32,6 @@ def __init__(
     ) -> None:
         self._pptx = pptx_obj
 
-    def to_pptx(self) -> PptxPicture:
-        """Convert to pptx shape."""
-        return self._pptx
-
-    @classmethod
-    def from_pptx(cls, pptx_obj: PptxPicture) -> Self:
-        """Create from pptx shape."""
-        return cls(pptx_obj)
-
 
 MOVIE_MIME_TYPE = Literal[
     "video/x-ms-asf",
@@ -108,12 +99,3 @@ def __init__(
         /,
     ) -> None:
         self._pptx = pptx_obj
-
-    def to_pptx(self) -> PptxMovie:
-        """Convert to pptx shape."""
-        return self._pptx
-
-    @classmethod
-    def from_pptx(cls, pptx_obj: PptxMovie) -> Self:
-        """Create from pptx shape."""
-        return cls(pptx_obj)

src/tppt/pptx/shape/placeholder.py

@@ -2,48 +2,13 @@
 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
-from tppt.types._length import Length
-
 from . import Shape
 
 
-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)
-
-    @left.setter
-    def left(self, value: Length | None) -> None:
-        self._pptx.left = to_pptx_length(value)
-
-    @property
-    def top(self) -> Length | None:
-        return to_tppt_length(self._pptx.top)
-
-    @top.setter
-    def top(self, value: Length | None) -> None:
-        self._pptx.top = to_pptx_length(value)
+class LayoutPlaceholder(Shape[_PptxLayoutPlaceholder]): ...
 
-    @property
-    def height(self) -> Length | None:
-        return to_tppt_length(self._pptx.height)
 
-    @height.setter
-    def height(self, value: Length | None) -> None:
-        self._pptx.height = to_pptx_length(value)
+class MasterPlaceholder(Shape[_PptxMasterPlaceholder]): ...
 
-    @property
-    def width(self) -> Length | None:
-        return to_tppt_length(self._pptx.width)
 
-    @width.setter
-    def width(self, value: Length | None) -> None:
-        self._pptx.width = to_pptx_length(value)
+class SlidePlaceholder(Shape[_PptxSlidePlaceholder]): ...

src/tppt/pptx/shape/text.py

@@ -1,4 +1,4 @@
-from typing import Literal, NotRequired, Self
+from typing import Literal, NotRequired
 
 from pptx.enum.text import MSO_ANCHOR, MSO_AUTO_SIZE, PP_ALIGN
 from pptx.shapes.autoshape import Shape as PptxShape
@@ -72,12 +72,3 @@ def __init__(self, pptx_obj: PptxShape, data: TextData | None = None, /) -> None
     @property
     def text_frame(self) -> TextFrame:
         return TextFrame(self._pptx.text_frame)
-
-    def to_pptx(self) -> PptxShape:
-        """Convert to pptx shape."""
-        return self._pptx
-
-    @classmethod
-    def from_pptx(cls, pptx_obj: PptxShape) -> Self:
-        """Create from pptx shape."""
-        return cls(pptx_obj)