drawlib 0.1.4__tar.gz → 0.1.6__tar.gz

{drawlib-0.1.4 → drawlib-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: drawlib
-Version: 0.1.4
+Version: 0.1.6
 Summary: Python drawing library. Illustration as Code.
 Home-page: https://www.drawlib.com
 Author: Yuichi Ito

{drawlib-0.1.4 → drawlib-0.1.6}/drawlib/__init__.py

@@ -24,7 +24,7 @@ subpackages contains latest and old implementations.
 from typing import Final
 
 # please update here when you release new version
-VERSION = "0.1.4"
+VERSION = "0.1.6"
 
 # might not be changed
 LIB_NAME: Final[str] = "drawlib"

{drawlib-0.1.4 → drawlib-0.1.6}/drawlib/v0_1/apis.py

@@ -30,6 +30,7 @@ from drawlib.v0_1.private.core.colors import (
     Colors,
     Colors140,
 )
+
 from drawlib.v0_1.private.core.model import (
     IconStyle,
     ImageStyle,
@@ -39,9 +40,13 @@ from drawlib.v0_1.private.core.model import (
     ShapeTextStyle,
     TextStyle,
 )
+
 from drawlib.v0_1.private.core.fonts import (
+    FontFile,
+    # fonts
     Font,
     FontArabic,
+    FontBrahmic,
     FontChinese,
     FontJapanese,
     FontKorean,
@@ -49,10 +54,10 @@ from drawlib.v0_1.private.core.fonts import (
     FontRoboto,
     FontSanSerif,
     FontSerif,
-    FontThai,
     FontSourceCode,
-    FontFile,
+    FontThai,
 )
+
 from drawlib.v0_1.private.core.dimage import (
     Dimage,
 )
@@ -62,16 +67,12 @@ from drawlib.v0_1.private.core.dimage import (
 ######################
 
 from drawlib.v0_1.private.core_canvas.canvas import (
-    # basics
+    # base
     clear,
     config,
-    save,
     shape,
     # image
     image,
-    # text
-    text,
-    text_vertical,
     # line
     line,
     line_curved,
@@ -79,7 +80,7 @@ from drawlib.v0_1.private.core_canvas.canvas import (
     line_bezier2,
     lines,
     lines_bezier,
-    # patches
+    # shape patches
     arc,
     circle,
     ellipse,
@@ -89,20 +90,25 @@ from drawlib.v0_1.private.core_canvas.canvas import (
     wedge,
     donuts,
     fan,
-    # original
+    # shape original
     arrow,
     rhombus,
     parallelogram,
     trapezoid,
     triangle,
-    bubblespeech,
     star,
     chevron,
+    # text
+    text,
+    text_vertical,
+    # canvas
+    save,
 )
 
 from drawlib.v0_1.private.icons.util import (
     icon,
 )
+
 from drawlib.v0_1.private.icons import (
     phosphor as icon_phosphor,
 )
@@ -112,7 +118,7 @@ from drawlib.v0_1.private.icons import (
 #################
 
 from drawlib.v0_1.private.tools import (
-    dload,
+    dexec,
 )
 from drawlib.v0_1.private import (
     dutil,

{drawlib-0.1.4 → drawlib-0.1.6}/drawlib/v0_1/private/command.py

@@ -23,7 +23,7 @@ import drawlib
 import drawlib.v0_1
 from drawlib.v0_1.private.logging import logger
 from drawlib.v0_1.private.settings import dsettings
-from drawlib.v0_1.private.tools import dload
+from drawlib.v0_1.private.tools import dexec
 
 
 def call() -> None:
@@ -66,7 +66,7 @@ def call() -> None:
         abspath = os.path.abspath(path)
         realpath = os.path.realpath(abspath)
         logger.info(realpath)
-        dload(realpath)
+        dexec(realpath)
 
 
 class DrawlibArgParser:

{drawlib-0.1.4 → drawlib-0.1.6}/drawlib/v0_1/private/core/dimage.py

@@ -19,7 +19,7 @@ This module and its class ``Pimage`` achieves it.
 from __future__ import annotations
 
 import os
-from typing import Union, Tuple, Dict, cast
+from typing import Union, Tuple, Dict, List, cast
 from PIL import (
     Image,
     ImageFilter,
@@ -32,6 +32,85 @@ from drawlib.v0_1.private.util import (
     get_script_relative_path,
 )
 
+list_ = list
+
+
+class DimageCache:
+
+    def __init__(self):
+        self._cache: Dict[str, Dimage] = {}
+
+    def has(self, name: str) -> bool:
+        """check whether having Pimage cache or not.
+
+        Args:
+            name: cache name
+
+        Returns:
+            bool: whether cache exist or not.
+
+        """
+
+        return name in self._cache
+
+    def set(self, name: str, image: Dimage) -> None:
+        """Set **copied** Pimage cache with provided name key.
+
+        This method copies original object and set copied one.
+        It means you can modify original object after caching.
+        It doesn't modify cached object.
+
+        Args:
+            name: cache key.
+            style: Pimage object which you want to cache.
+
+        Returns:
+            None
+
+        """
+
+        self._cache[name] = image.copy()
+
+    def list(self) -> List[str]:
+        return list_(self._cache.keys())
+
+    def get(self, name: str) -> Dimage:
+        """Get **copied** Pimage cache via name(key).
+
+        This method doesn't return original object.
+        But **copied** object.
+        So, you can modify returned Pimage object.
+        It doesn't harm original cached Pimage object.
+
+        Args:
+            name: cache key.
+
+        Returns:
+            Pimage: copy of original cached object.
+
+        """
+
+        if not self.has(name):
+            raise ValueError(f'Dimage "{name}" is not cached.')
+        return self._cache[name].copy()
+
+    def delete(self, name: str) -> None:
+        """Delete Pimage cache
+
+        Delete Pimage cache if exist.
+        If not exist, just ignore deletion request.
+
+        Args:
+            name: cache key.
+
+        Returns:
+            None
+
+        """
+
+        if self.has(name):
+            del self._cache[name]
+
 
 class Dimage:
     """drawlib image class
@@ -43,7 +122,7 @@ class Dimage:
 
     """
 
-    _cache: Dict[str, Dimage] = {}
+    cache = DimageCache()
 
     @error_handler
     def __init__(
@@ -432,79 +511,3 @@ class Dimage:
             return Dimage(new_image)
 
         raise NotImplementedError("Implement later")
-
-    #############
-    ### Cache ###
-    #############
-
-    @classmethod
-    def cache_exist(cls, name: str) -> bool:
-        """check whether having Pimage cache or not.
-
-        Args:
-            name: cache name
-
-        Returns:
-            bool: whether cache exist or not.
-
-        """
-
-        return name in cls._cache
-
-    @classmethod
-    def cache_set(cls, name: str, image: Dimage) -> None:
-        """Set **copied** Pimage cache with provided name key.
-
-        This method copies original object and set copied one.
-        It means you can modify original object after caching.
-        It doesn't modify cached object.
-
-        Args:
-            name: cache key.
-            style: Pimage object which you want to cache.
-
-        Returns:
-            None
-
-        """
-
-        cls._cache[name] = image.copy()
-
-    @classmethod
-    def cache_get(cls, name: str) -> Dimage:
-        """Get **copied** Pimage cache via name(key).
-
-        This method doesn't return original object.
-        But **copied** object.
-        So, you can modify returned Pimage object.
-        It doesn't harm original cached Pimage object.
-
-        Args:
-            name: cache key.
-
-        Returns:
-            Pimage: copy of original cached object.
-
-        """
-
-        if not cls.cache_exist(name):
-            raise ValueError(f'Pimage "{name}" is not cached.')
-        return cls._cache[name].copy()
-
-    @classmethod
-    def cache_delete(cls, name: str) -> None:
-        """Delete Pimage cache
-
-        Delete Pimage cache if exist.
-        If not exist, just ignore deletion request.
-
-        Args:
-            name: cache key.
-
-        Returns:
-            None
-
-        """
-
-        if cls.cache_exist(name):
-            del cls._cache[name]