spreadsheet

commit

b4bd01cb79523107d4cd3a545a8512bce702fe4b

parent

746d6a6ef5c61d0ac1672fe724cecdf6ecf27812

Author

Tobias Bengfort <tobias.bengfort@posteo.de>

Date

2024-07-05 17:33

calculate width/height in dump_csv

not used anywhere else

Diffstat

2 files changed, 5 insertions, 8 deletions

diff --git a/sheet/csv.py b/sheet/csv.py

@@ -31,6 +31,9 @@ def dump_csv(sheet, fh, *, display=False, **kwargs):
   31    31     else:
   32    32         get = sheet.get_raw
   33    33 
   -1    34     width = max(cell[0] for cell in sheet.raw) + 1
   -1    35     height = max(cell[1] for cell in sheet.raw) + 1
   -1    36 
   34    37     w = csv.writer(fh, **kwargs)
   35    -1     for y in range(sheet.height):
   36    -1         w.writerow([get((x, y)) for x in range(sheet.width)])
   -1    38     for y in range(height):
   -1    39         w.writerow([get((x, y)) for x in range(width)])

diff --git a/sheet/sheet.py b/sheet/sheet.py

@@ -35,8 +35,6 @@ class Sheet:
   35    35         self.raw = {}
   36    36         self.parsed = {}
   37    37         self.cache = {}
   38    -1         self.width = 0
   39    -1         self.height = 0
   40    38 
   41    39     def parse(self, raw: str) -> tuple|float|int|str:
   42    40         if raw.startswith('='):
@@ -95,13 +93,9 @@ class Sheet:
   95    93             self.raw[cell] = raw
   96    94             self.parsed[cell] = self.parse(raw)
   97    95             x, y = cell
   98    -1             self.width = max(self.width, x + 1)
   99    -1             self.height = max(self.height, y + 1)
  100    96         elif cell in self.raw:
  101    97             del self.raw[cell]
  102    98             del self.parsed[cell]
  103    -1             self.width = max(cell[0] for cell in self.raw) + 1
  104    -1             self.height = max(cell[1] for cell in self.raw) + 1
  105    99         self.cache = {}
  106   100 
  107   101     def get_raw(self, cell) -> str: