numbers-parser 4.18.0__tar.gz → 4.18.2__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {numbers_parser-4.18.0/src/numbers_parser.egg-info → numbers_parser-4.18.2}/PKG-INFO +1 -1
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/pyproject.toml +8 -5
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/_csv2numbers.py +10 -10
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/_unpack_numbers.py +7 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/constants.py +10 -1
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/document.py +46 -13
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/iwafile.py +29 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/model.py +144 -128
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/xrefs.py +2 -240
- {numbers_parser-4.18.0 → numbers_parser-4.18.2/src/numbers_parser.egg-info}/PKG-INFO +1 -1
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/tests/test_cat_numbers.py +5 -0
- numbers_parser-4.18.2/tests/test_categories.py +391 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/tests/test_coverage.py +54 -3
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/tests/test_unpack_numbers.py +31 -0
- numbers_parser-4.18.0/tests/test_categories.py +0 -712
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/LICENSE.rst +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/README.md +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/setup.cfg +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/__init__.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/_cat_numbers.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/bullets.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/cell.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/containers.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/currencies.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/data/empty.numbers +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/exceptions.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/experimental.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/formula.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TNArchives_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TNArchives_sos_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TNCommandArchives_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TNCommandArchives_sos_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TSAArchives_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TSAArchives_sos_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TSACommandArchives_sos_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TSCEArchives_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TSCH3DArchives_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TSCHArchives_Common_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TSCHArchives_GEN_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TSCHArchives_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TSCHArchives_sos_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TSCHCommandArchives_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TSCHPreUFFArchives_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TSCKArchives_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TSCKArchives_sos_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TSDArchives_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TSDArchives_sos_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TSDCommandArchives_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TSKArchives_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TSPArchiveMessages_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TSPDatabaseMessages_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TSPMessages_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TSSArchives_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TSSArchives_sos_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TSTArchives_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TSTArchives_sos_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TSTCommandArchives_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TSTStylePropertyArchiving_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TSWPArchives_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TSWPArchives_sos_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/TSWPCommandArchives_pb2.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/__init__.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/fontmap.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/functionmap.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/generated/mapping.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/iwork.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/numbers_cache.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/numbers_uuid.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser/roman.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser.egg-info/SOURCES.txt +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser.egg-info/dependency_links.txt +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser.egg-info/entry_points.txt +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser.egg-info/requires.txt +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/src/numbers_parser.egg-info/top_level.txt +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/tests/test_all_formulas.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/tests/test_api_change.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/tests/test_borders.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/tests/test_bullets.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/tests/test_create_cells.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/tests/test_csv2numbers.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/tests/test_currency.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/tests/test_folder.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/tests/test_formatting.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/tests/test_formulas.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/tests/test_issues.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/tests/test_large.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/tests/test_memory_leaks.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/tests/test_merges.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/tests/test_package.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/tests/test_properties.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/tests/test_roman.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/tests/test_save.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/tests/test_slices.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/tests/test_styles.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/tests/test_table_size.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/tests/test_tables.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/tests/test_unsupported.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/tests/test_uuids.py +0 -0
- {numbers_parser-4.18.0 → numbers_parser-4.18.2}/tests/test_version.py +0 -0
|
@@ -22,7 +22,7 @@ classifiers = [
|
|
|
22
22
|
description = "Read and write Apple Numbers spreadsheets"
|
|
23
23
|
name = "numbers-parser"
|
|
24
24
|
readme = "README.md"
|
|
25
|
-
version = "4.18.
|
|
25
|
+
version = "4.18.2"
|
|
26
26
|
|
|
27
27
|
[project.urls]
|
|
28
28
|
repository = "https://github.com/masaccio/numbers-parser"
|
|
@@ -56,7 +56,10 @@ docs = [
|
|
|
56
56
|
"sphinx-toolbox>=3.5",
|
|
57
57
|
"sphinx-nefertiti>=0.7",
|
|
58
58
|
"sphinx-markdown-builder>=0.6",
|
|
59
|
-
"sphinx-copybutton>=0.5",
|
|
59
|
+
"sphinx-copybutton>=0.5.2",
|
|
60
|
+
# Security updates
|
|
61
|
+
"urllib3>=2.6.0",
|
|
62
|
+
"filelock>=3.20.1"
|
|
60
63
|
]
|
|
61
64
|
bootstrap = [
|
|
62
65
|
"rich>=14.0",
|
|
@@ -84,10 +87,10 @@ omit = ["src/numbers_parser/generated/*.py"]
|
|
|
84
87
|
|
|
85
88
|
[tool.coverage.html]
|
|
86
89
|
directory = "coverage_html_report"
|
|
87
|
-
show_contexts =
|
|
90
|
+
show_contexts = false
|
|
88
91
|
|
|
89
92
|
[tool.pytest.ini_options]
|
|
90
|
-
addopts = "--cov=src/numbers_parser --cov-report=html --cov-report=term-missing:skip-covered
|
|
93
|
+
addopts = "--cov=src/numbers_parser --cov-report=html --cov-report=term-missing:skip-covered"
|
|
91
94
|
|
|
92
95
|
[tool.tox]
|
|
93
96
|
requires = ["tox>=4.0"]
|
|
@@ -197,5 +200,5 @@ ban-relative-imports = "all"
|
|
|
197
200
|
"src/build/**" = ["PLR2004", "INP001", "PTH"]
|
|
198
201
|
"src/build/protodump.py" = ["PLR2004", "INP001", "PTH", "S110", "N806"]
|
|
199
202
|
"src/debug/**" = ["INP001"]
|
|
200
|
-
"tests/**" = ["PLR2004", "S101", "D103", "ANN201", "ANN001"]
|
|
203
|
+
"tests/**" = ["PLR2004", "S101", "D103", "ANN201", "ANN001", "DTZ001"]
|
|
201
204
|
|
|
@@ -6,10 +6,10 @@ import argparse
|
|
|
6
6
|
import contextlib
|
|
7
7
|
import csv
|
|
8
8
|
import re
|
|
9
|
+
import sys
|
|
9
10
|
from dataclasses import dataclass
|
|
10
11
|
from datetime import datetime, timezone
|
|
11
12
|
from pathlib import Path
|
|
12
|
-
from sys import exit, stderr
|
|
13
13
|
from typing import NamedTuple
|
|
14
14
|
|
|
15
15
|
from dateutil.parser import parse
|
|
@@ -381,11 +381,11 @@ def main() -> None:
|
|
|
381
381
|
|
|
382
382
|
if args.version:
|
|
383
383
|
print(_get_version())
|
|
384
|
-
exit(0)
|
|
384
|
+
sys.exit(0)
|
|
385
385
|
elif len(args.csvfile) == 0:
|
|
386
|
-
print("At least one CSV file is required", file=stderr)
|
|
387
|
-
parser.print_help(stderr)
|
|
388
|
-
exit(1)
|
|
386
|
+
print("At least one CSV file is required", file=sys.stderr)
|
|
387
|
+
parser.print_help(sys.stderr)
|
|
388
|
+
sys.exit(1)
|
|
389
389
|
|
|
390
390
|
if args.output is None:
|
|
391
391
|
output_filenames = [Path(x).with_suffix(".numbers") for x in args.csvfile]
|
|
@@ -393,8 +393,8 @@ def main() -> None:
|
|
|
393
393
|
output_filenames = args.output
|
|
394
394
|
|
|
395
395
|
if len(args.csvfile) != len(output_filenames):
|
|
396
|
-
print("The numbers of input and output file names do not match", file=
|
|
397
|
-
exit(1)
|
|
396
|
+
print("The numbers of input and output file names do not match", file=sys.tderr)
|
|
397
|
+
sys.exit(1)
|
|
398
398
|
|
|
399
399
|
try:
|
|
400
400
|
for input_filename, output_filename in zip(args.csvfile, output_filenames):
|
|
@@ -414,10 +414,10 @@ def main() -> None:
|
|
|
414
414
|
converter.delete_columns(args.delete)
|
|
415
415
|
converter.save()
|
|
416
416
|
except RuntimeError as e:
|
|
417
|
-
print(e, file=stderr)
|
|
418
|
-
exit(1)
|
|
417
|
+
print(e, file=sys.stderr)
|
|
418
|
+
sys.exit(1)
|
|
419
419
|
|
|
420
420
|
|
|
421
|
-
if __name__ == "__main__":
|
|
421
|
+
if __name__ == "__main__":
|
|
422
422
|
# execute only if run as a script
|
|
423
423
|
main()
|
|
@@ -30,6 +30,7 @@ class NumbersUnpacker(IWorkHandler):
|
|
|
30
30
|
pretty_storage: bool = False
|
|
31
31
|
pretty: bool = False
|
|
32
32
|
compact_json: bool = False
|
|
33
|
+
redact_strings: bool = False
|
|
33
34
|
output_dir: str = None
|
|
34
35
|
|
|
35
36
|
def store_file(self, filename: str, blob: bytes) -> None:
|
|
@@ -41,6 +42,10 @@ class NumbersUnpacker(IWorkHandler):
|
|
|
41
42
|
target_path = target_path.replace(".iwa", "")
|
|
42
43
|
target_path += ".json"
|
|
43
44
|
with open(target_path, "w") as out:
|
|
45
|
+
if self.redact_strings:
|
|
46
|
+
for chunk in blob.chunks:
|
|
47
|
+
for archive in chunk.archives:
|
|
48
|
+
archive.redact_strings()
|
|
44
49
|
data = blob.to_dict()
|
|
45
50
|
if self.hex_uuids or self.pretty:
|
|
46
51
|
self.prettify_uuids(data)
|
|
@@ -123,6 +128,7 @@ def main() -> None:
|
|
|
123
128
|
help="Format JSON compactly as possible",
|
|
124
129
|
)
|
|
125
130
|
parser.add_argument("--pretty", action="store_true", help="Enable all prettifying options")
|
|
131
|
+
parser.add_argument("--redact", action="store_true", help="Redact strings in the output")
|
|
126
132
|
parser.add_argument("--output", "-o", help="directory name to unpack into")
|
|
127
133
|
parser.add_argument("--debug", default=False, action="store_true", help="Enable debug logging")
|
|
128
134
|
args = parser.parse_args()
|
|
@@ -153,6 +159,7 @@ def main() -> None:
|
|
|
153
159
|
pretty=args.pretty,
|
|
154
160
|
pretty_storage=args.pretty_storage,
|
|
155
161
|
compact_json=args.compact_json,
|
|
162
|
+
redact_strings=args.redact,
|
|
156
163
|
output_dir=output_dir,
|
|
157
164
|
),
|
|
158
165
|
)
|
|
@@ -5,7 +5,8 @@ from math import ceil
|
|
|
5
5
|
|
|
6
6
|
import enum_tools.documentation
|
|
7
7
|
|
|
8
|
-
# Path to package
|
|
8
|
+
# Path to package data varies by Python version so we can
|
|
9
|
+
# only ever generate coverage for one
|
|
9
10
|
try:
|
|
10
11
|
from importlib.resources import files
|
|
11
12
|
except ImportError: # pragma: nocover
|
|
@@ -121,6 +122,7 @@ def _week_of_month(value: datetime) -> int:
|
|
|
121
122
|
|
|
122
123
|
DATETIME_FIELD_MAP = OrderedDict(
|
|
123
124
|
[
|
|
125
|
+
# Cell formats
|
|
124
126
|
("a", lambda x: x.strftime("%p").lower()),
|
|
125
127
|
("EEEE", "%A"),
|
|
126
128
|
("EEE", "%a"),
|
|
@@ -157,9 +159,16 @@ DATETIME_FIELD_MAP = OrderedDict(
|
|
|
157
159
|
("SSS", lambda x: str(x.microsecond).zfill(6)[0:3]),
|
|
158
160
|
("SSSS", lambda x: str(x.microsecond).zfill(6)[0:4]),
|
|
159
161
|
("SSSSS", lambda x: str(x.microsecond).zfill(6)[0:5]),
|
|
162
|
+
# Table category formats
|
|
163
|
+
("QQQ", lambda x: "Q" + str(int(x.month / 3) + 1)),
|
|
164
|
+
("LLLL", "%B"),
|
|
165
|
+
("w", "%-W"),
|
|
160
166
|
],
|
|
161
167
|
)
|
|
162
168
|
|
|
169
|
+
# From TSCEArchives
|
|
170
|
+
COLON_TRACT_NODE = 67
|
|
171
|
+
|
|
163
172
|
|
|
164
173
|
class CellType(IntEnum):
|
|
165
174
|
EMPTY = 1
|
|
@@ -756,7 +756,9 @@ class Table(Cacheable):
|
|
|
756
756
|
msg = f"column {col} out of range"
|
|
757
757
|
raise IndexError(msg)
|
|
758
758
|
|
|
759
|
-
|
|
759
|
+
self._model.calculate_table_categories(self._table_id)
|
|
760
|
+
row_mapper = self._model._table_categories_row_mapper[self._table_id]
|
|
761
|
+
if row_mapper is not None:
|
|
760
762
|
return self._data[row_mapper[row]][col]
|
|
761
763
|
return self._data[row][col]
|
|
762
764
|
|
|
@@ -824,7 +826,9 @@ class Table(Cacheable):
|
|
|
824
826
|
raise IndexError(msg)
|
|
825
827
|
|
|
826
828
|
rows = self.rows()
|
|
827
|
-
|
|
829
|
+
self._model.calculate_table_categories(self._table_id)
|
|
830
|
+
row_mapper = self._model._table_categories_row_mapper[self._table_id]
|
|
831
|
+
if row_mapper is not None:
|
|
828
832
|
rows = [rows[row_mapper[row]] for row in range(min_row, max_row + 1)]
|
|
829
833
|
else:
|
|
830
834
|
rows = rows[min_row : max_row + 1]
|
|
@@ -899,7 +903,9 @@ class Table(Cacheable):
|
|
|
899
903
|
raise IndexError(msg)
|
|
900
904
|
|
|
901
905
|
rows = self.rows()
|
|
902
|
-
|
|
906
|
+
self._model.calculate_table_categories(self._table_id)
|
|
907
|
+
row_mapper = self._model._table_categories_row_mapper[self._table_id]
|
|
908
|
+
if row_mapper is not None:
|
|
903
909
|
rows = [rows[row_mapper[row_num]] for row_num in range(min_row, max_row + 1)]
|
|
904
910
|
else:
|
|
905
911
|
rows = rows[min_row : max_row + 1]
|
|
@@ -1011,33 +1017,60 @@ class Table(Cacheable):
|
|
|
1011
1017
|
msg = "style must be a Style object or style name"
|
|
1012
1018
|
raise TypeError(msg)
|
|
1013
1019
|
|
|
1014
|
-
def categorized_data(self) -> dict | None:
|
|
1020
|
+
def categorized_data(self, values_only: bool = False) -> dict | None:
|
|
1015
1021
|
"""
|
|
1016
1022
|
Return the table's data organized into categories, if enabled or ``None``
|
|
1017
1023
|
if the table has not had categories enabled.
|
|
1018
1024
|
|
|
1019
|
-
The data is a
|
|
1020
|
-
|
|
1021
|
-
|
|
1025
|
+
The data is a set of nested dictionaries and lists. Dictionary keys are
|
|
1026
|
+
Category keys and values are either another dictionary in the case of
|
|
1027
|
+
nested categories or a list of rows. Each row is itself a list such that
|
|
1028
|
+
the data is the same as returned by :py:meth:`numbers_parser.Table.rows`.
|
|
1029
|
+
|
|
1030
|
+
Parameters
|
|
1031
|
+
----------
|
|
1032
|
+
values_only:
|
|
1033
|
+
If ``True``, return cell values instead of :class:`Cell` objects
|
|
1034
|
+
|
|
1035
|
+
Returns
|
|
1036
|
+
-------
|
|
1037
|
+
Dict[str, Dict | List]:
|
|
1038
|
+
Nested dictionary of lists of rows or dictionaries of the next group
|
|
1039
|
+
of categories down. Row data is returned as :py:class:`Cell` classes
|
|
1040
|
+
unless ``values_only`` is ``True``.
|
|
1022
1041
|
|
|
1023
1042
|
Example
|
|
1024
1043
|
-------
|
|
1025
1044
|
.. code:: python
|
|
1026
1045
|
|
|
1027
1046
|
"Transport": [
|
|
1028
|
-
{"
|
|
1029
|
-
{"
|
|
1030
|
-
{"
|
|
1047
|
+
{"Airplane", "Air": 5 },
|
|
1048
|
+
{"Helicopter": "Air", 2 },
|
|
1049
|
+
{"Bus": "Road", 10 },
|
|
1031
1050
|
],
|
|
1032
1051
|
"Fruit": [
|
|
1033
|
-
{"
|
|
1034
|
-
{"
|
|
1052
|
+
{"Apple", "Green": 7 },
|
|
1053
|
+
{"Banana", "Yellow", 6 },
|
|
1035
1054
|
],
|
|
1036
1055
|
|
|
1037
1056
|
For tables with multiple categories, the top-level dictionary is nested.
|
|
1038
1057
|
|
|
1039
1058
|
"""
|
|
1040
|
-
|
|
1059
|
+
|
|
1060
|
+
def data_to_values(item):
|
|
1061
|
+
if isinstance(item, dict):
|
|
1062
|
+
return {k: data_to_values(v) for k, v in item.items()}
|
|
1063
|
+
|
|
1064
|
+
if isinstance(item, list):
|
|
1065
|
+
return [data_to_values(v) for v in item]
|
|
1066
|
+
|
|
1067
|
+
return item.value
|
|
1068
|
+
|
|
1069
|
+
self._model.calculate_table_categories(self._table_id)
|
|
1070
|
+
data = self._model._table_categories_data[self._table_id]
|
|
1071
|
+
if values_only:
|
|
1072
|
+
return data_to_values(data)
|
|
1073
|
+
return data
|
|
1041
1074
|
|
|
1042
1075
|
def add_row(
|
|
1043
1076
|
self,
|
|
@@ -228,6 +228,35 @@ class IWAArchiveSegment:
|
|
|
228
228
|
+ [obj.SerializeToString() for obj in self.objects],
|
|
229
229
|
)
|
|
230
230
|
|
|
231
|
+
def redact_strings(self) -> None:
|
|
232
|
+
str_index = 0
|
|
233
|
+
|
|
234
|
+
def redact_message(message):
|
|
235
|
+
nonlocal str_index
|
|
236
|
+
|
|
237
|
+
if isinstance(message, ProtobufPatch):
|
|
238
|
+
message = message.data
|
|
239
|
+
|
|
240
|
+
for field, value in message.ListFields():
|
|
241
|
+
if field.type == field.TYPE_MESSAGE:
|
|
242
|
+
if field.is_repeated:
|
|
243
|
+
for item in value:
|
|
244
|
+
redact_message(item)
|
|
245
|
+
else:
|
|
246
|
+
redact_message(value)
|
|
247
|
+
elif field.type == field.TYPE_STRING:
|
|
248
|
+
if field.is_repeated:
|
|
249
|
+
for i in range(len(value)):
|
|
250
|
+
str_index += 1
|
|
251
|
+
value[i] = f"REDACT-{str_index}"
|
|
252
|
+
else:
|
|
253
|
+
str_index += 1
|
|
254
|
+
setattr(message, field.name, f"REDACT-{str_index}")
|
|
255
|
+
|
|
256
|
+
for obj in self.objects:
|
|
257
|
+
redact_message(obj)
|
|
258
|
+
_ = str_index
|
|
259
|
+
|
|
231
260
|
|
|
232
261
|
def message_to_dict(message):
|
|
233
262
|
if hasattr(message, "to_dict"):
|