calkit-python 0.3.1__tar.gz → 0.3.2__tar.gz

{calkit_python-0.3.1 → calkit_python-0.3.2}/PKG-INFO

@@ -1,11 +1,10 @@
 Metadata-Version: 2.3
 Name: calkit-python
-Version: 0.3.1
+Version: 0.3.2
 Summary: Reproducibility simplified.
 Project-URL: Homepage, https://github.com/calkit/calkit
 Project-URL: Issues, https://github.com/calkit/calkit/issues
 Author-email: Pete Bachant <petebachant@gmail.com>
-License-File: LICENSE
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3

{calkit_python-0.3.1 → calkit_python-0.3.2}/calkit/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.3.1"
+__version__ = "0.3.2"
 
 from .core import *
 from . import git

{calkit_python-0.3.1 → calkit_python-0.3.2}/calkit/cli/office.py

@@ -15,12 +15,14 @@ office_app = typer.Typer(no_args_is_help=True)
 
 
 @office_app.command(
-    name="excel-chart-to-png",
-    help="Extract a chart from Excel and save to PNG.",
+    name="excel-chart-to-image",
+    help="Extract a chart from Excel and save to image.",
 )
-def excel_chart_to_png(
+def excel_chart_to_image(
     input_fpath: Annotated[str, typer.Argument(help="Input Excel file path.")],
-    output_fpath: Annotated[str, typer.Argument(help="Output PNG file path.")],
+    output_fpath: Annotated[
+        str, typer.Argument(help="Output image file path.")
+    ],
     sheet: Annotated[
         int, typer.Option("--sheet", help="Sheet in workbook.")
     ] = 1,
@@ -34,7 +36,7 @@ def excel_chart_to_png(
         f"Exporting chart at index {chart_index} from sheet {sheet} "
         f"in {input_fpath} to {output_fpath}"
     )
-    calkit.office.excel_chart_to_png(
+    calkit.office.excel_chart_to_image(
         input_fpath=input_fpath,
         output_fpath=output_fpath,
         sheet=sheet,

{calkit_python-0.3.1 → calkit_python-0.3.2}/calkit/office.py

@@ -5,13 +5,13 @@ import os
 from PIL import ImageGrab
 
 
-def excel_chart_to_png(
+def excel_chart_to_image(
     input_fpath: str,
     output_fpath: str,
     sheet: int = 1,
     chart_index: int = 0,
 ):
-    """Export a chart from an Excel sheet to PNG."""
+    """Export a chart from an Excel sheet to image."""
     import win32com.client
 
     # Open the excel application using win32com
@@ -21,22 +21,23 @@ def excel_chart_to_png(
     excel.DisplayAlerts = 0
     # Open workbook
     wb = excel.Workbooks.Open(os.path.abspath(input_fpath))
-    factor = 1.0
     # Extract sheet
     # TODO: Close workbook if something fails
     sheet = excel.Sheets(sheet)
     shape = sheet.Shapes[chart_index]
     shape.Copy()
     image = ImageGrab.grabclipboard()
-    length_x, width_y = image.size
-    size = int(factor * length_x), int(factor * width_y)
-    image_resize = image.resize(size)
-    # Save the image into the existing png file, overwriting if exists
+    # Check if we need to change the mode of the image
+    _, ext = os.path.splitext(output_fpath)
+    if (
+        ext in [".jpg", ".eps", ".tiff", ".gif", ".bmp"]
+        and image.mode != "RGB"
+    ):
+        image = image.convert("RGB")
+    # Save the image, overwriting if exists
     dirname = os.path.dirname(output_fpath)
     if dirname and not os.path.isdir(dirname):
         os.makedirs(dirname)
-    image_resize.save(
-        os.path.abspath(output_fpath), "png", quality=95, dpi=(300, 300)
-    )
+    image.save(os.path.abspath(output_fpath), quality=95, dpi=(300, 300))
     wb.Close(True)
     excel.Quit()