numbers-parser 4.10.2__py3-none-any.whl → 4.10.3__py3-none-any.whl

numbers_parser/cell.py

@@ -7,6 +7,7 @@ from datetime import datetime as builtin_datetime
 from datetime import timedelta as builtin_timedelta
 from enum import IntEnum
 from fractions import Fraction
+from hashlib import sha1
 from os.path import basename
 from struct import pack, unpack
 from typing import Any, List, Tuple, Union
@@ -1139,6 +1140,7 @@ class Cell(CellStorageFlags, Cacheable):
         preferred_filename = [x.preferred_file_name for x in datas if x.identifier == image_id][0]
         all_paths = self._model.objects.file_store.keys()
         image_pathnames = [x for x in all_paths if x == f"Data/{stored_filename}"]
+
         if len(image_pathnames) == 0:
             warn(
                 f"Cannot find file '{preferred_filename}' in Numbers archive",
@@ -1146,7 +1148,12 @@ class Cell(CellStorageFlags, Cacheable):
                 stacklevel=3,
             )
         else:
-            return (self._model.objects.file_store[image_pathnames[0]], preferred_filename)
+            image_data = self._model.objects.file_store[image_pathnames[0]]
+            digest = sha1(image_data).digest()
+            if digest not in self._model._images:
+                self._model._images[digest] = image_id
+
+            return (image_data, preferred_filename)
 
     def _custom_format(self) -> str:  # noqa: PLR0911
         if self._text_format_id is not None and self._type == CellType.TEXT:

numbers_parser/model.py

@@ -215,6 +215,7 @@ class _NumbersModel(Cacheable):
         self._control_specs = DataLists(self, "control_cell_spec_table", "cell_spec")
         self._table_data = {}
         self._styles = None
+        self._images = {}
         self._custom_formats = None
         self._custom_format_archives = None
         self._custom_format_ids = None
@@ -1539,17 +1540,22 @@ class _NumbersModel(Cacheable):
 
     def add_cell_style(self, style: Style) -> int:
         if style.bg_image is not None:
-            datas = self.objects[PACKAGE_ID].datas
-            image_id = self.next_image_identifier()
-            datas.append(
-                TSPArchiveMessages.DataInfo(
-                    identifier=image_id,
-                    digest=sha1(style.bg_image.data).digest(),
-                    preferred_file_name=style.bg_image.filename,
-                    file_name=style.bg_image.filename,
-                    materialized_length=len(style.bg_image.data),
+            digest = sha1(style.bg_image.data).digest()
+            if digest in self._images:
+                image_id = self._images[digest]
+            else:
+                datas = self.objects[PACKAGE_ID].datas
+                image_id = self.next_image_identifier()
+                datas.append(
+                    TSPArchiveMessages.DataInfo(
+                        identifier=image_id,
+                        digest=digest,
+                        preferred_file_name=style.bg_image.filename,
+                        file_name=style.bg_image.filename,
+                        materialized_length=len(style.bg_image.data),
+                    )
                 )
-            )
+                self._images[digest] = image_id
             color_attrs = {
                 "cell_fill": {
                     "image": {

{numbers_parser-4.10.2.dist-info → numbers_parser-4.10.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: numbers-parser
-Version: 4.10.2
+Version: 4.10.3
 Summary: Read and write Apple Numbers spreadsheets
 Home-page: https://github.com/masaccio/numbers-parser
 License: MIT
@@ -37,7 +37,7 @@ Description-Content-Type: text/markdown
 generated by Numbers version 10.3, and up with the latest tested version being 13.2
 (current as of September 2023).
 
-It supports and is tested against Python versions from 3.8 onwards. It is not compatible
+It supports and is tested against Python versions from 3.9 onwards. It is not compatible
 with earlier versions of Python.
 
 ## Installation

{numbers_parser-4.10.2.dist-info → numbers_parser-4.10.3.dist-info}/RECORD

@@ -2,7 +2,7 @@ numbers_parser/__init__.py,sha256=w0ZhMcFpVol1VwjyYHjvqBmshvsMDfLIyFX-GmpOpMQ,14
 numbers_parser/_cat_numbers.py,sha256=-HboBJT11Vjcr8sjLZl7Z6qAapnPEc_kFYq6PTqON20,4619
 numbers_parser/_unpack_numbers.py,sha256=U5SL16uNNe0BvYtUtIYJT-t3RN36Q8U-8UTr7lnOylw,7040
 numbers_parser/bullets.py,sha256=OnVVMPjhTDrC-ncw52Gb00UEXNmn2Rvd3xi7lfqW3hk,2616
-numbers_parser/cell.py,sha256=tUjSwhYPGIoaLYstk7Wwztimb6g4cToV0bB-hPlCIgU,75296
+numbers_parser/cell.py,sha256=q8gDmrncUpZTNx-XGfTRDToDVFudSkOMhDLMOEJU5ss,75511
 numbers_parser/constants.py,sha256=gROxeu8wDj-a96rWy2bR_c8CoF0RagqWI3V4SE6SN4M,9908
 numbers_parser/containers.py,sha256=EnHcsmHIFLsRiZsjhqMcJL20k6sHMsd5neVDFNUDuwc,4751
 numbers_parser/currencies.py,sha256=8k4a3WKmDoHeurkDICymHX13N7ManHSTaka_JNXCZYA,3767
@@ -49,11 +49,11 @@ numbers_parser/generated/functionmap.py,sha256=VdZo0ERMYONcrnJFwABcSCHb8pjA4wY2o
 numbers_parser/iwafile.py,sha256=xHDBZWd5EEaPHonlAAl4OYmmaXg_Nw4H0OmItt91URg,11861
 numbers_parser/iwork.py,sha256=U0Irxt-3v3vFP_feCuYMDxWUgqeq_YHMCfw1tsDpUcM,8947
 numbers_parser/mapping.py,sha256=in8W3S8DmTcPefFaxnATLw0FQ4YnFsnAE-cl5dljzJE,32215
-numbers_parser/model.py,sha256=0RUceXndYNEWETd70HQp7J_6avy3CWzpgb_7EygxuT8,96807
+numbers_parser/model.py,sha256=0DKFurS9DSLwdIvij4Zz5CjDDvlYC4ZlN2DnoxW4nIU,97058
 numbers_parser/numbers_cache.py,sha256=1ghEBghQAYFpPiEeOtb74i016mXc039v1pOubbqvaLs,1141
 numbers_parser/numbers_uuid.py,sha256=-LeAj_ULC0va57pEmyegGY0xXqkNNjyuLukCaiQJhOk,2642
-numbers_parser-4.10.2.dist-info/LICENSE.rst,sha256=8vTa1-5KSdHrTpU9rlheO5005EWReEPMpjV7BjSaMc4,1050
-numbers_parser-4.10.2.dist-info/METADATA,sha256=HWtEJcYfqR_BCf2nrAL2s7ceSQjaVjlCp-QNsi5sQfo,16267
-numbers_parser-4.10.2.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-numbers_parser-4.10.2.dist-info/entry_points.txt,sha256=V91uB9vBPxf3eCY1h-0syv21imYCT0MJfMxf87DmwIk,115
-numbers_parser-4.10.2.dist-info/RECORD,,
+numbers_parser-4.10.3.dist-info/LICENSE.rst,sha256=8vTa1-5KSdHrTpU9rlheO5005EWReEPMpjV7BjSaMc4,1050
+numbers_parser-4.10.3.dist-info/METADATA,sha256=CNp5aHpYLS0CehOLWXXE-vE4hl3w6qVsaEEZagB6RCE,16267
+numbers_parser-4.10.3.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+numbers_parser-4.10.3.dist-info/entry_points.txt,sha256=V91uB9vBPxf3eCY1h-0syv21imYCT0MJfMxf87DmwIk,115
+numbers_parser-4.10.3.dist-info/RECORD,,