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

numbers_parser/constants.py

@@ -147,6 +147,8 @@ class CellType(IntEnum):
     DURATION = 6
     ERROR = 7
     RICH_TEXT = 8
+    CURRENCY = 101
+    MERGED = 102
 
 
 class CellPadding(IntEnum):
@@ -214,6 +216,12 @@ class ControlFormattingType(IntEnum):
     SCIENTIFIC = 7
 
 
+class OwnerKind(IntEnum):
+    TABLE_MODEL = 1
+    MERGE_OWNER = 5
+    HAUNTED_OWNER = 35
+
+
 FORMATTING_ALLOWED_CELLS = {
     "base": ["NumberCell"],
     "currency": ["NumberCell"],

numbers_parser/containers.py

@@ -10,7 +10,7 @@ from numbers_parser.iwork import IWork, IWorkHandler
 class ItemsList:
     def __init__(self, model, refs, item_class):
         self._item_name = item_class.__name__.lower()
-        self._items = [item_class(model, _) for _ in refs]
+        self._items = [item_class(model, id) for id in refs]
 
     def __getitem__(self, key: int):
         if isinstance(key, int):

numbers_parser/document.py

@@ -20,7 +20,6 @@ from numbers_parser.cell import (
     xl_cell_to_rowcol,
     xl_range,
 )
-from numbers_parser.cell_storage import CellStorage
 from numbers_parser.constants import (
     CUSTOM_FORMATTING_ALLOWED_CELLS,
     DEFAULT_COLUMN_COUNT,
@@ -109,6 +108,11 @@ class Document:
         """List[:class:`Sheet`]: A list of sheets in the document."""
         return self._sheets
 
+    @property
+    def default_table(self) -> Table:
+        """Table: return the first table of the first sheet in the document."""
+        return self.sheets[0].tables[0]
+
     @property
     def styles(self) -> Dict[str, Style]:
         """Dict[str, :class:`Style`]: A dict mapping style names to to the corresponding style."""
@@ -432,14 +436,14 @@ class Table(Cacheable):  # noqa: F811
         for row in range(self.num_rows):
             self._data.append([])
             for col in range(self.num_cols):
-                cell_storage = model.table_cell_decode(table_id, row, col)
-                if cell_storage is None:
-                    if merge_cells.is_merge_reference((row, col)):
-                        cell = Cell.merged_cell(table_id, row, col, model)
-                    else:
-                        cell = Cell.empty_cell(table_id, row, col, model)
+                if merge_cells.is_merge_reference((row, col)):
+                    cell = Cell._merged_cell(table_id, row, col, model)
                 else:
-                    cell = Cell.from_storage(cell_storage)
+                    buffer = self._model.storage_buffer(table_id, row, col)
+                    if buffer is None:
+                        cell = Cell._empty_cell(table_id, row, col, model)
+                    else:
+                        cell = Cell._from_storage(table_id, row, col, buffer, model)
                 self._data[row].append(cell)
 
     @property
@@ -873,10 +877,8 @@ class Table(Cacheable):  # noqa: F811
         """
         # TODO: write needs to retain/init the border
         (row, col, value) = self._validate_cell_coords(*args)
-        self._data[row][col] = Cell.from_value(row, col, value)
-        storage = CellStorage(self._model, self._table_id, None, row, col)
-        storage.update_value(value, self._data[row][col])
-        self._data[row][col].update_storage(storage)
+        self._data[row][col] = Cell._from_value(row, col, value)
+        self._data[row][col]._update_value(value, self._data[row][col])
 
         merge_cells = self._model.merge_cells(self._table_id)
         self._data[row][col]._table_id = self._table_id
@@ -940,7 +942,7 @@ class Table(Cacheable):  # noqa: F811
         self._model.number_of_rows(self._table_id, self.num_rows)
 
         row = [
-            Cell.empty_cell(self._table_id, self.num_rows - 1, col, self._model)
+            Cell._empty_cell(self._table_id, self.num_rows - 1, col, self._model)
             for col in range(self.num_cols)
         ]
         rows = [row.copy() for _ in range(num_rows)]
@@ -995,7 +997,7 @@ class Table(Cacheable):  # noqa: F811
 
         for row in range(self.num_rows):
             cols = [
-                Cell.empty_cell(self._table_id, row, col, self._model) for col in range(num_cols)
+                Cell._empty_cell(self._table_id, row, col, self._model) for col in range(num_cols)
             ]
             self._data[row][start_col:start_col] = cols
 
@@ -1109,7 +1111,7 @@ class Table(Cacheable):  # noqa: F811
             merge_cells.add_anchor(row_start, col_start, (num_rows, num_cols))
             for row in range(row_start + 1, row_end + 1):
                 for col in range(col_start + 1, col_end + 1):
-                    self._data[row][col] = MergedCell(row, col)
+                    self._data[row][col] = Cell._merged_cell(self._table_id, row, col, self._model)
                     merge_cells.add_reference(row, col, (row_start, col_start, row_end, col_end))
 
             for row, cells in enumerate(self._data):