numbers-parser 4.18.3__tar.gz → 4.18.5__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.3/src/numbers_parser.egg-info → numbers_parser-4.18.5}/PKG-INFO +1 -1
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/pyproject.toml +7 -6
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/_csv2numbers.py +1 -1
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/cell.py +77 -31
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/constants.py +59 -46
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/formula.py +1 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/model.py +6 -3
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/xrefs.py +17 -5
- {numbers_parser-4.18.3 → numbers_parser-4.18.5/src/numbers_parser.egg-info}/PKG-INFO +1 -1
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser.egg-info/SOURCES.txt +1 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/tests/test_cat_numbers.py +30 -22
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/tests/test_coverage.py +2 -20
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/tests/test_csv2numbers.py +36 -7
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/tests/test_formatting.py +9 -1
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/tests/test_issues.py +20 -1
- numbers_parser-4.18.5/tests/test_local_docs.py +104 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/tests/test_unpack_numbers.py +25 -10
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/LICENSE.rst +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/README.md +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/setup.cfg +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/__init__.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/_cat_numbers.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/_unpack_numbers.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/bullets.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/containers.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/currencies.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/data/empty.numbers +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/document.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/exceptions.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/experimental.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TNArchives_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TNArchives_sos_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TNCommandArchives_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TNCommandArchives_sos_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TSAArchives_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TSAArchives_sos_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TSACommandArchives_sos_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TSCEArchives_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TSCH3DArchives_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TSCHArchives_Common_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TSCHArchives_GEN_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TSCHArchives_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TSCHArchives_sos_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TSCHCommandArchives_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TSCHPreUFFArchives_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TSCKArchives_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TSCKArchives_sos_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TSDArchives_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TSDArchives_sos_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TSDCommandArchives_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TSKArchives_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TSPArchiveMessages_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TSPDatabaseMessages_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TSPMessages_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TSSArchives_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TSSArchives_sos_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TSTArchives_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TSTArchives_sos_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TSTCommandArchives_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TSTStylePropertyArchiving_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TSWPArchives_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TSWPArchives_sos_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/TSWPCommandArchives_pb2.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/__init__.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/fontmap.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/functionmap.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/generated/mapping.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/iwafile.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/iwork.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/numbers_cache.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/numbers_uuid.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser/roman.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser.egg-info/dependency_links.txt +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser.egg-info/entry_points.txt +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser.egg-info/requires.txt +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/src/numbers_parser.egg-info/top_level.txt +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/tests/test_all_formulas.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/tests/test_api_change.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/tests/test_borders.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/tests/test_bullets.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/tests/test_categories.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/tests/test_create_cells.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/tests/test_currency.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/tests/test_folder.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/tests/test_formulas.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/tests/test_large.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/tests/test_memory_leaks.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/tests/test_merges.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/tests/test_package.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/tests/test_properties.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/tests/test_roman.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/tests/test_save.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/tests/test_slices.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/tests/test_styles.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/tests/test_table_size.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/tests/test_tables.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/tests/test_unsupported.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/tests/test_uuids.py +0 -0
- {numbers_parser-4.18.3 → numbers_parser-4.18.5}/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.5"
|
|
26
26
|
|
|
27
27
|
[project.urls]
|
|
28
28
|
repository = "https://github.com/masaccio/numbers-parser"
|
|
@@ -35,7 +35,7 @@ csv2numbers = "numbers_parser._csv2numbers:main"
|
|
|
35
35
|
|
|
36
36
|
[dependency-groups]
|
|
37
37
|
dev = [
|
|
38
|
-
"gprof2dot
|
|
38
|
+
"gprof2dot>=2022.7.29,<2026.0.0",
|
|
39
39
|
"line-profiler>=5.0.0",
|
|
40
40
|
"mock>=5.1.0",
|
|
41
41
|
"pytest>=7.2.0",
|
|
@@ -43,6 +43,7 @@ dev = [
|
|
|
43
43
|
"pytest-console-scripts<2.0.0,>=1.3.1",
|
|
44
44
|
"pytest-cov>=4.0,>=5.0",
|
|
45
45
|
"pytest-xdist<4.0.0,>=3.3.1",
|
|
46
|
+
"pytest-profiling",
|
|
46
47
|
"ruff",
|
|
47
48
|
"tox<5.0.0,>=4.11.4",
|
|
48
49
|
"python-magic>=0.4",
|
|
@@ -51,14 +52,14 @@ dev = [
|
|
|
51
52
|
"pympler<2.0,>=1.1",
|
|
52
53
|
]
|
|
53
54
|
docs = [
|
|
54
|
-
"sphinx
|
|
55
|
+
"sphinx<9.0,>=7.3",
|
|
55
56
|
"enum-tools>=0.11",
|
|
56
57
|
"sphinx-toolbox>=3.5",
|
|
57
58
|
"sphinx-nefertiti>=0.7",
|
|
58
59
|
"sphinx-markdown-builder>=0.6",
|
|
59
60
|
"sphinx-copybutton>=0.5.2",
|
|
60
61
|
# Security updates
|
|
61
|
-
"urllib3>=2.
|
|
62
|
+
"urllib3>=2.7.0",
|
|
62
63
|
"filelock>=3.20.1"
|
|
63
64
|
]
|
|
64
65
|
bootstrap = [
|
|
@@ -75,7 +76,7 @@ build-backend = "setuptools.build_meta"
|
|
|
75
76
|
[tool.setuptools.packages.find]
|
|
76
77
|
where = ["src"]
|
|
77
78
|
include = ["numbers_parser*"]
|
|
78
|
-
exclude = ["*tests*"]
|
|
79
|
+
exclude = ["*tests*", "numbers_parser.data"]
|
|
79
80
|
namespaces = false # disable scanning PEP 420 namespaces
|
|
80
81
|
|
|
81
82
|
[tool.setuptools.package-data]
|
|
@@ -94,7 +95,7 @@ addopts = "--cov=src/numbers_parser --cov-report=html --cov-report=term-missing:
|
|
|
94
95
|
|
|
95
96
|
[tool.tox]
|
|
96
97
|
requires = ["tox>=4.0"]
|
|
97
|
-
envlist = ["
|
|
98
|
+
envlist = ["py310", "py311", "py312", "py313"]
|
|
98
99
|
|
|
99
100
|
[testenv]
|
|
100
101
|
deps = [
|
|
@@ -393,7 +393,7 @@ def main() -> None:
|
|
|
393
393
|
output_filenames = args.output
|
|
394
394
|
|
|
395
395
|
if len(args.csvfile) != len(output_filenames):
|
|
396
|
-
print("The
|
|
396
|
+
print("The number of input and output file names do not match", file=sys.stderr)
|
|
397
397
|
sys.exit(1)
|
|
398
398
|
|
|
399
399
|
try:
|
|
@@ -52,10 +52,12 @@ from numbers_parser.constants import (
|
|
|
52
52
|
FormatType,
|
|
53
53
|
FractionAccuracy,
|
|
54
54
|
NegativeNumberStyle,
|
|
55
|
+
NumberFormatConditionType,
|
|
55
56
|
PaddingType,
|
|
56
57
|
)
|
|
57
58
|
from numbers_parser.currencies import CURRENCIES, CURRENCY_SYMBOLS
|
|
58
59
|
from numbers_parser.exceptions import UnsupportedError, UnsupportedWarning
|
|
60
|
+
from numbers_parser.generated import TSKArchives_pb2 as TSKArchives
|
|
59
61
|
from numbers_parser.generated import TSPMessages_pb2 as TSPMessages
|
|
60
62
|
from numbers_parser.generated import TSTArchives_pb2 as TSTArchives
|
|
61
63
|
from numbers_parser.generated.TSWPArchives_pb2 import (
|
|
@@ -562,7 +564,6 @@ class CellStorageFlags:
|
|
|
562
564
|
_text_style_id: int = None
|
|
563
565
|
_formula_id: int = None
|
|
564
566
|
_control_id: int = None
|
|
565
|
-
_formula_error_id: int = None
|
|
566
567
|
_suggest_id: int = None
|
|
567
568
|
_num_format_id: int = None
|
|
568
569
|
_currency_format_id: int = None
|
|
@@ -867,19 +868,21 @@ class Cell(CellStorageFlags, Cacheable):
|
|
|
867
868
|
if flags & 0x80:
|
|
868
869
|
# cond_style_id skipped
|
|
869
870
|
offset += 4
|
|
870
|
-
|
|
871
|
+
if flags & 0x100:
|
|
872
|
+
# cond_rule_style_id skipped
|
|
873
|
+
offset += 4
|
|
871
874
|
if flags & 0x200:
|
|
872
875
|
storage_flags._formula_id = unpack("<i", buffer[offset : offset + 4])[0]
|
|
873
876
|
offset += 4
|
|
874
877
|
if flags & 0x400:
|
|
875
878
|
storage_flags._control_id = unpack("<i", buffer[offset : offset + 4])[0]
|
|
876
879
|
offset += 4
|
|
877
|
-
|
|
880
|
+
if flags & 0x800:
|
|
881
|
+
# formula_error_id skipped
|
|
882
|
+
offset += 4
|
|
878
883
|
if flags & 0x1000:
|
|
879
884
|
storage_flags._suggest_id = unpack("<i", buffer[offset : offset + 4])[0]
|
|
880
885
|
offset += 4
|
|
881
|
-
# Skip unused flags
|
|
882
|
-
offset += 4 * bin(flags & 0x900).count("1")
|
|
883
886
|
if flags & 0x2000:
|
|
884
887
|
storage_flags._num_format_id = unpack("<i", buffer[offset : offset + 4])[0]
|
|
885
888
|
offset += 4
|
|
@@ -1197,6 +1200,7 @@ class Cell(CellStorageFlags, Cacheable):
|
|
|
1197
1200
|
custom_format,
|
|
1198
1201
|
self._d128,
|
|
1199
1202
|
format_map[format_uuid].name,
|
|
1203
|
+
format_map[format_uuid].conditions,
|
|
1200
1204
|
)
|
|
1201
1205
|
elif custom_format.format_type == FormatType.DECIMAL:
|
|
1202
1206
|
return _format_decimal(self._d128, custom_format)
|
|
@@ -1205,7 +1209,8 @@ class Cell(CellStorageFlags, Cacheable):
|
|
|
1205
1209
|
elif custom_format.format_type == FormatType.BOOLEAN:
|
|
1206
1210
|
return "TRUE" if self.value else "FALSE"
|
|
1207
1211
|
elif custom_format.format_type == FormatType.PERCENT:
|
|
1208
|
-
|
|
1212
|
+
d128 = self._d128 or 0.0
|
|
1213
|
+
return _format_decimal(d128 * 100, custom_format, percent=True)
|
|
1209
1214
|
elif custom_format.format_type == FormatType.BASE:
|
|
1210
1215
|
return _format_base(self._d128, custom_format)
|
|
1211
1216
|
elif custom_format.format_type == FormatType.FRACTION:
|
|
@@ -1583,7 +1588,6 @@ def _decode_date_format(date_format, value):
|
|
|
1583
1588
|
chars = [*date_format]
|
|
1584
1589
|
index = 0
|
|
1585
1590
|
in_string = False
|
|
1586
|
-
in_field = False
|
|
1587
1591
|
result = ""
|
|
1588
1592
|
field = ""
|
|
1589
1593
|
while index < len(chars):
|
|
@@ -1600,28 +1604,31 @@ def _decode_date_format(date_format, value):
|
|
|
1600
1604
|
index += 1
|
|
1601
1605
|
else:
|
|
1602
1606
|
in_string = True
|
|
1603
|
-
if in_field:
|
|
1604
|
-
result += _decode_date_format_field(field, value)
|
|
1605
|
-
in_field = False
|
|
1606
1607
|
index += 1
|
|
1607
1608
|
elif in_string:
|
|
1608
1609
|
result += current_char
|
|
1609
1610
|
index += 1
|
|
1610
|
-
elif
|
|
1611
|
-
|
|
1612
|
-
|
|
1613
|
-
|
|
1614
|
-
|
|
1615
|
-
|
|
1616
|
-
|
|
1617
|
-
|
|
1618
|
-
|
|
1611
|
+
elif current_char.isalpha():
|
|
1612
|
+
remaining_str = date_format[index:]
|
|
1613
|
+
matched_field = None
|
|
1614
|
+
for field in DATETIME_FIELD_MAP:
|
|
1615
|
+
# Greedily match the longest possible valid field
|
|
1616
|
+
if remaining_str.startswith(field):
|
|
1617
|
+
matched_field = field
|
|
1618
|
+
break
|
|
1619
|
+
|
|
1620
|
+
if matched_field:
|
|
1621
|
+
result += _decode_date_format_field(matched_field, value)
|
|
1622
|
+
index += len(matched_field)
|
|
1623
|
+
else:
|
|
1624
|
+
unknown_field = ""
|
|
1625
|
+
while index < len(chars) and chars[index].isalpha():
|
|
1626
|
+
unknown_field += chars[index]
|
|
1627
|
+
index += 1
|
|
1628
|
+
result += _decode_date_format_field(unknown_field, value)
|
|
1619
1629
|
else:
|
|
1620
|
-
|
|
1621
|
-
field = current_char
|
|
1630
|
+
result += current_char
|
|
1622
1631
|
index += 1
|
|
1623
|
-
if in_field:
|
|
1624
|
-
result += _decode_date_format_field(field, value)
|
|
1625
1632
|
|
|
1626
1633
|
return result
|
|
1627
1634
|
|
|
@@ -1658,9 +1665,48 @@ def _expand_quotes(value: str) -> str:
|
|
|
1658
1665
|
return formatted_value
|
|
1659
1666
|
|
|
1660
1667
|
|
|
1661
|
-
def _decode_number_format(
|
|
1668
|
+
def _decode_number_format( # noqa: PLR0912
|
|
1669
|
+
number_format: TSKArchives.FormatStructArchive,
|
|
1670
|
+
value: float,
|
|
1671
|
+
name: str,
|
|
1672
|
+
conditions: list[TSKArchives.CustomFormatArchive.Condition],
|
|
1673
|
+
):
|
|
1662
1674
|
"""Parse a custom date format string and return a formatted number value."""
|
|
1675
|
+
if value is None:
|
|
1676
|
+
return None
|
|
1677
|
+
|
|
1663
1678
|
custom_format_string = number_format.custom_format_string
|
|
1679
|
+
sign = "-" if value < 0 else ""
|
|
1680
|
+
for condition in conditions:
|
|
1681
|
+
value_sigfig = sigfig(value, sigfigs=MAX_SIGNIFICANT_DIGITS, warn=False)
|
|
1682
|
+
if (
|
|
1683
|
+
(
|
|
1684
|
+
condition.condition_type == NumberFormatConditionType.EQUAL
|
|
1685
|
+
and value_sigfig == condition.condition_value_dbl
|
|
1686
|
+
)
|
|
1687
|
+
or (
|
|
1688
|
+
condition.condition_type == NumberFormatConditionType.LESS_THAN
|
|
1689
|
+
and value_sigfig < condition.condition_value_dbl
|
|
1690
|
+
)
|
|
1691
|
+
or (
|
|
1692
|
+
condition.condition_type == NumberFormatConditionType.LESS_THAN_OR_EQUAL_TO
|
|
1693
|
+
and value_sigfig <= condition.condition_value_dbl
|
|
1694
|
+
)
|
|
1695
|
+
or (
|
|
1696
|
+
condition.condition_type == NumberFormatConditionType.GREATER_THAN
|
|
1697
|
+
and value_sigfig > condition.condition_value_dbl
|
|
1698
|
+
)
|
|
1699
|
+
or (
|
|
1700
|
+
condition.condition_type == NumberFormatConditionType.GREATER_THAN_OR_EQUAL_TO
|
|
1701
|
+
and value_sigfig >= condition.condition_value_dbl
|
|
1702
|
+
)
|
|
1703
|
+
):
|
|
1704
|
+
custom_format_string = condition.condition_format.custom_format_string
|
|
1705
|
+
# Numbers discards sign when rules apply
|
|
1706
|
+
sign = ""
|
|
1707
|
+
break
|
|
1708
|
+
|
|
1709
|
+
value = abs(value)
|
|
1664
1710
|
value *= number_format.scale_factor
|
|
1665
1711
|
if "%" in custom_format_string and number_format.scale_factor == 1.0:
|
|
1666
1712
|
# Per cent scale has 100x but % does not
|
|
@@ -1674,12 +1720,9 @@ def _decode_number_format(number_format, value, name): # noqa: PLR0912
|
|
|
1674
1720
|
)
|
|
1675
1721
|
|
|
1676
1722
|
if (match := re.search(r"([#0.,]+(E[+]\d+)?)", custom_format_string)) is None:
|
|
1677
|
-
|
|
1678
|
-
|
|
1679
|
-
|
|
1680
|
-
stacklevel=1,
|
|
1681
|
-
)
|
|
1682
|
-
return custom_format_string
|
|
1723
|
+
# Value is not part of the format
|
|
1724
|
+
return _expand_quotes(custom_format_string)
|
|
1725
|
+
|
|
1683
1726
|
format_spec = match.group(1)
|
|
1684
1727
|
scientific_spec = match.group(2)
|
|
1685
1728
|
|
|
@@ -1785,7 +1828,7 @@ def _decode_number_format(number_format, value, name): # noqa: PLR0912
|
|
|
1785
1828
|
formatted_value += "." + str(decimal)[2:]
|
|
1786
1829
|
|
|
1787
1830
|
formatted_value = custom_format_string.replace(format_spec, formatted_value)
|
|
1788
|
-
return _expand_quotes(formatted_value)
|
|
1831
|
+
return sign + _expand_quotes(formatted_value)
|
|
1789
1832
|
|
|
1790
1833
|
|
|
1791
1834
|
def _format_decimal(value: float, number_format, percent: bool = False) -> str:
|
|
@@ -1830,6 +1873,9 @@ def _format_decimal(value: float, number_format, percent: bool = False) -> str:
|
|
|
1830
1873
|
|
|
1831
1874
|
|
|
1832
1875
|
def _format_currency(value: float, number_format) -> str:
|
|
1876
|
+
if value is None:
|
|
1877
|
+
return None
|
|
1878
|
+
|
|
1833
1879
|
formatted_value = _format_decimal(value, number_format)
|
|
1834
1880
|
if number_format.currency_code in CURRENCY_SYMBOLS:
|
|
1835
1881
|
symbol = CURRENCY_SYMBOLS[number_format.currency_code]
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
from collections import OrderedDict
|
|
2
1
|
from datetime import datetime
|
|
3
2
|
from enum import IntEnum
|
|
4
3
|
from math import ceil
|
|
@@ -82,6 +81,9 @@ CUSTOM_TEXT_PLACEHOLDER = "\ue421"
|
|
|
82
81
|
|
|
83
82
|
# Supported versions
|
|
84
83
|
SUPPORTED_NUMBERS_VERSIONS = [
|
|
84
|
+
"10.0",
|
|
85
|
+
"10.1",
|
|
86
|
+
"10.2",
|
|
85
87
|
"10.3",
|
|
86
88
|
"11.0",
|
|
87
89
|
"11.1",
|
|
@@ -121,51 +123,53 @@ def _week_of_month(value: datetime) -> int:
|
|
|
121
123
|
return ceil((value.day + value.replace(day=1).weekday()) / 7.0)
|
|
122
124
|
|
|
123
125
|
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
126
|
+
# Cell formats. We reorder so that the keys are in length order to greedily
|
|
127
|
+
# match ss in favour of s, etc.
|
|
128
|
+
_DATETIME_FIELD_MAP = {
|
|
129
|
+
"a": lambda x: x.strftime("%p").lower(),
|
|
130
|
+
"EEEE": "%A",
|
|
131
|
+
"EEE": "%a",
|
|
132
|
+
"yyyy": "%Y",
|
|
133
|
+
"yy": "%y",
|
|
134
|
+
"y": "%Y",
|
|
135
|
+
"MMMM": "%B",
|
|
136
|
+
"MMM": "%b",
|
|
137
|
+
"MM": "%m",
|
|
138
|
+
"M": "%-m",
|
|
139
|
+
"d": "%-d",
|
|
140
|
+
"dd": "%d",
|
|
141
|
+
"DDD": lambda x: str(_day_of_year(x)).zfill(3),
|
|
142
|
+
"DD": lambda x: str(_day_of_year(x)).zfill(2),
|
|
143
|
+
"D": lambda x: str(_day_of_year(x)).zfill(1),
|
|
144
|
+
"HH": "%H",
|
|
145
|
+
"H": "%-H",
|
|
146
|
+
"hh": "%I",
|
|
147
|
+
"h": "%-I",
|
|
148
|
+
"k": lambda x: str(x.hour).replace("0", "24"),
|
|
149
|
+
"kk": lambda x: str(x.hour).replace("0", "24").zfill(2),
|
|
150
|
+
"K": lambda x: str(x.hour % 12),
|
|
151
|
+
"KK": lambda x: str(x.hour % 12).zfill(2),
|
|
152
|
+
"mm": lambda x: str(x.minute).zfill(2),
|
|
153
|
+
"m": lambda x: str(x.minute),
|
|
154
|
+
"ss": "%S",
|
|
155
|
+
"s": lambda x: str(x.second),
|
|
156
|
+
"W": lambda x: str(_week_of_month(x) - 1),
|
|
157
|
+
"ww": "%W",
|
|
158
|
+
"G": "AD", # TODO: support BC
|
|
159
|
+
"F": lambda x: _days_occurred_in_month(x),
|
|
160
|
+
"S": lambda x: str(x.microsecond).zfill(6)[0],
|
|
161
|
+
"SS": lambda x: str(x.microsecond).zfill(6)[0:2],
|
|
162
|
+
"SSS": lambda x: str(x.microsecond).zfill(6)[0:3],
|
|
163
|
+
"SSSS": lambda x: str(x.microsecond).zfill(6)[0:4],
|
|
164
|
+
"SSSSS": lambda x: str(x.microsecond).zfill(6)[0:5],
|
|
165
|
+
# Table category formats
|
|
166
|
+
"QQQ": lambda x: "Q" + str(int(x.month / 3) + 1),
|
|
167
|
+
"LLLL": "%B",
|
|
168
|
+
"w": "%-W",
|
|
169
|
+
}
|
|
170
|
+
DATETIME_FIELD_MAP = {
|
|
171
|
+
x: _DATETIME_FIELD_MAP[x] for x in sorted(_DATETIME_FIELD_MAP, key=len, reverse=True)
|
|
172
|
+
}
|
|
169
173
|
|
|
170
174
|
# From TSCEArchives
|
|
171
175
|
COLON_TRACT_NODE = 67
|
|
@@ -413,6 +417,15 @@ class CellInteractionType(IntEnum):
|
|
|
413
417
|
TOGGLE = 8
|
|
414
418
|
|
|
415
419
|
|
|
420
|
+
class NumberFormatConditionType(IntEnum):
|
|
421
|
+
NONE = -1
|
|
422
|
+
EQUAL = 0
|
|
423
|
+
LESS_THAN = 1
|
|
424
|
+
LESS_THAN_OR_EQUAL_TO = 2
|
|
425
|
+
GREATER_THAN = 3
|
|
426
|
+
GREATER_THAN_OR_EQUAL_TO = 4
|
|
427
|
+
|
|
428
|
+
|
|
416
429
|
class CellValueType(IntEnum):
|
|
417
430
|
NIL_TYPE = 1
|
|
418
431
|
BOOLEAN_TYPE = 2
|
|
@@ -153,7 +153,7 @@ class DataLists(Cacheable):
|
|
|
153
153
|
self._datalists[table_id]["key_index"] = {}
|
|
154
154
|
self._datalists[table_id]["datalist"] = datalist
|
|
155
155
|
self._datalists[table_id]["id"] = datalist_id
|
|
156
|
-
for i, entry in enumerate(datalist.entries):
|
|
156
|
+
for i, entry in enumerate(sorted(datalist.entries, key=lambda x: x.key)):
|
|
157
157
|
if entry.key > max_key:
|
|
158
158
|
max_key = entry.key
|
|
159
159
|
self._datalists[table_id]["by_key"][entry.key] = entry
|
|
@@ -2143,7 +2143,7 @@ class _NumbersModel(Cacheable):
|
|
|
2143
2143
|
# a string with a new bullet character
|
|
2144
2144
|
bds = self.objects[table_id].base_data_store
|
|
2145
2145
|
rich_text_table = self.objects[bds.rich_text_table.identifier]
|
|
2146
|
-
for entry in rich_text_table.entries: # pragma: no branch
|
|
2146
|
+
for entry in rich_text_table.entries: # pragma: no branch
|
|
2147
2147
|
if string_key == entry.key:
|
|
2148
2148
|
payload = self.objects[entry.rich_text_payload.identifier]
|
|
2149
2149
|
payload_storage = self.objects[payload.storage.identifier]
|
|
@@ -2442,7 +2442,10 @@ class _NumbersModel(Cacheable):
|
|
|
2442
2442
|
@cache()
|
|
2443
2443
|
def extract_strokes(self, table_id: int) -> None:
|
|
2444
2444
|
table_obj = self.objects[table_id]
|
|
2445
|
-
|
|
2445
|
+
stroke_sidecar_id = table_obj.stroke_sidecar.identifier
|
|
2446
|
+
if stroke_sidecar_id == 0:
|
|
2447
|
+
return
|
|
2448
|
+
sidecar_obj = self.objects[stroke_sidecar_id]
|
|
2446
2449
|
self.extract_strokes_in_layers(table_id, sidecar_obj.top_row_stroke_layers, "top")
|
|
2447
2450
|
self.extract_strokes_in_layers(table_id, sidecar_obj.left_column_stroke_layers, "left")
|
|
2448
2451
|
self.extract_strokes_in_layers(table_id, sidecar_obj.right_column_stroke_layers, "right")
|
|
@@ -62,13 +62,19 @@ class CellRange:
|
|
|
62
62
|
from_table_id: int = None
|
|
63
63
|
to_table_id: int = None
|
|
64
64
|
range_type: CellRangeType = None
|
|
65
|
+
_ref_error: bool = False
|
|
65
66
|
_do_init: bool = True
|
|
66
67
|
_table_names: list[str] = field(init=False, default=None, repr=False)
|
|
67
68
|
|
|
68
69
|
def __post_init__(self):
|
|
69
|
-
self.
|
|
70
|
-
|
|
71
|
-
|
|
70
|
+
if (self.row_start is not None and self.row_start < 0) or (
|
|
71
|
+
self.col_start is not None and self.col_start < 0
|
|
72
|
+
):
|
|
73
|
+
self._ref_error = True
|
|
74
|
+
else:
|
|
75
|
+
self._initialize_table_data()
|
|
76
|
+
self.model.name_ref_cache.refresh()
|
|
77
|
+
self._set_sheet_ids()
|
|
72
78
|
|
|
73
79
|
def _initialize_table_data(self):
|
|
74
80
|
self._table_names = self.model.table_names()
|
|
@@ -84,6 +90,9 @@ class CellRange:
|
|
|
84
90
|
self.to_sheet_id = self.model.table_id_to_sheet_id(self.to_table_id)
|
|
85
91
|
|
|
86
92
|
def expand_ref(self, ref: str, is_abs: bool = False, no_prefix=False) -> str:
|
|
93
|
+
if self._ref_error:
|
|
94
|
+
return "#REF!"
|
|
95
|
+
|
|
87
96
|
self.model.name_ref_cache.refresh()
|
|
88
97
|
is_document_unique = (
|
|
89
98
|
ref.scope == RefScope.DOCUMENT if isinstance(ref, ScopedNameRef) else False
|
|
@@ -119,6 +128,9 @@ class CellRange:
|
|
|
119
128
|
return f"{sheet_name}::{table_name}::{ref_str}"
|
|
120
129
|
|
|
121
130
|
def __str__(self):
|
|
131
|
+
if self._ref_error:
|
|
132
|
+
return "#REF!"
|
|
133
|
+
|
|
122
134
|
self.model.name_ref_cache.refresh()
|
|
123
135
|
# Handle row-only ranges
|
|
124
136
|
if self.col_start is None:
|
|
@@ -183,13 +195,13 @@ class CellRange:
|
|
|
183
195
|
|
|
184
196
|
def _format_single_column(self, col_start, col_range):
|
|
185
197
|
"""Formats a single column, either numeric or named."""
|
|
186
|
-
if col_range
|
|
198
|
+
if col_range.get(col_start, None) is None:
|
|
187
199
|
return self.expand_ref(xl_col_to_name(col_start, col_abs=self.col_start_is_abs))
|
|
188
200
|
return self.expand_ref(col_range[col_start], self.col_start_is_abs)
|
|
189
201
|
|
|
190
202
|
def _format_column_span(self, col_start, col_end, col_range):
|
|
191
203
|
"""Formats a range of columns."""
|
|
192
|
-
if col_range
|
|
204
|
+
if col_range.get(col_start, None) is None:
|
|
193
205
|
return f"{self.expand_ref(xl_col_to_name(col_start, col_abs=self.col_start_is_abs))}:{self.expand_ref(xl_col_to_name(col_end, col_abs=self.col_end_is_abs), no_prefix=True)}"
|
|
194
206
|
return ":".join(
|
|
195
207
|
[
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
import csv
|
|
2
|
+
import runpy
|
|
3
|
+
import sys
|
|
4
|
+
from unittest.mock import patch
|
|
2
5
|
|
|
3
6
|
import pytest
|
|
4
7
|
import pytest_check as check
|
|
@@ -38,11 +41,11 @@ def test_no_documents(script_runner):
|
|
|
38
41
|
assert ret.stderr == ""
|
|
39
42
|
|
|
40
43
|
|
|
41
|
-
@pytest.mark.script_launch_mode("
|
|
44
|
+
@pytest.mark.script_launch_mode("inprocess")
|
|
42
45
|
def test_version(script_runner):
|
|
43
46
|
ret = script_runner.run(["cat-numbers", "--version"], print_result=False)
|
|
44
47
|
assert ret.success
|
|
45
|
-
assert ret.stdout == __version__ + "\n"
|
|
48
|
+
assert ret.stdout.replace("\r\n", "\n") == __version__ + "\n"
|
|
46
49
|
assert ret.stderr == ""
|
|
47
50
|
|
|
48
51
|
|
|
@@ -97,7 +100,7 @@ def test_brief_contents(script_runner):
|
|
|
97
100
|
assert ret.stderr == ""
|
|
98
101
|
|
|
99
102
|
|
|
100
|
-
@pytest.mark.script_launch_mode("
|
|
103
|
+
@pytest.mark.script_launch_mode("inprocess")
|
|
101
104
|
def test_select_sheet(script_runner):
|
|
102
105
|
ref = ""
|
|
103
106
|
for row in ZZZ_TABLE_1_REF:
|
|
@@ -109,11 +112,11 @@ def test_select_sheet(script_runner):
|
|
|
109
112
|
print_result=False,
|
|
110
113
|
)
|
|
111
114
|
assert ret.success
|
|
112
|
-
assert ret.stdout == ref
|
|
115
|
+
assert ret.stdout.replace("\r\n", "\n") == ref
|
|
113
116
|
assert ret.stderr == ""
|
|
114
117
|
|
|
115
118
|
|
|
116
|
-
@pytest.mark.script_launch_mode("
|
|
119
|
+
@pytest.mark.script_launch_mode("inprocess")
|
|
117
120
|
def test_select_table(script_runner):
|
|
118
121
|
ref = ""
|
|
119
122
|
for row in XXX_TABLE_1_REF:
|
|
@@ -123,11 +126,11 @@ def test_select_table(script_runner):
|
|
|
123
126
|
print_result=False,
|
|
124
127
|
)
|
|
125
128
|
assert ret.success
|
|
126
|
-
assert ret.stdout == ref
|
|
129
|
+
assert ret.stdout.replace("\r\n", "\n") == ref
|
|
127
130
|
assert ret.stderr == ""
|
|
128
131
|
|
|
129
132
|
|
|
130
|
-
@pytest.mark.script_launch_mode("
|
|
133
|
+
@pytest.mark.script_launch_mode("inprocess")
|
|
131
134
|
def test_list_sheets(script_runner):
|
|
132
135
|
ret = script_runner.run(["cat-numbers", "-S", DOCUMENT], print_result=False)
|
|
133
136
|
assert ret.success
|
|
@@ -135,7 +138,7 @@ def test_list_sheets(script_runner):
|
|
|
135
138
|
assert ret.stderr == ""
|
|
136
139
|
|
|
137
140
|
|
|
138
|
-
@pytest.mark.script_launch_mode("
|
|
141
|
+
@pytest.mark.script_launch_mode("inprocess")
|
|
139
142
|
def test_list_tables(script_runner):
|
|
140
143
|
ret = script_runner.run(["cat-numbers", "-T", DOCUMENT], print_result=False)
|
|
141
144
|
assert ret.success
|
|
@@ -202,7 +205,7 @@ def test_with_formulas(script_runner):
|
|
|
202
205
|
]
|
|
203
206
|
|
|
204
207
|
|
|
205
|
-
@pytest.mark.script_launch_mode("
|
|
208
|
+
@pytest.mark.script_launch_mode("inprocess")
|
|
206
209
|
def test_duration_formatting(script_runner):
|
|
207
210
|
ret = script_runner.run(
|
|
208
211
|
["cat-numbers", "-b", "--formatting", "tests/data/duration_112.numbers"],
|
|
@@ -216,7 +219,7 @@ def test_duration_formatting(script_runner):
|
|
|
216
219
|
check.equal(row[6], row[13])
|
|
217
220
|
|
|
218
221
|
|
|
219
|
-
@pytest.mark.script_launch_mode("
|
|
222
|
+
@pytest.mark.script_launch_mode("inprocess")
|
|
220
223
|
def test_date_formatting(script_runner):
|
|
221
224
|
ret = script_runner.run(
|
|
222
225
|
["cat-numbers", "-b", "--formatting", "tests/data/date_formats.numbers"],
|
|
@@ -230,7 +233,7 @@ def test_date_formatting(script_runner):
|
|
|
230
233
|
check.equal(row[6], row[7])
|
|
231
234
|
|
|
232
235
|
|
|
233
|
-
@pytest.mark.script_launch_mode("
|
|
236
|
+
@pytest.mark.script_launch_mode("inprocess")
|
|
234
237
|
def test_debug(script_runner):
|
|
235
238
|
ret = script_runner.run(
|
|
236
239
|
[
|
|
@@ -246,19 +249,24 @@ def test_debug(script_runner):
|
|
|
246
249
|
assert "enabling ExperimentalFeatures.TESTING" in rows[0]
|
|
247
250
|
|
|
248
251
|
|
|
249
|
-
@pytest.mark.
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
assert "Names of sheet" in ret.stdout
|
|
258
|
-
assert ret.stderr == ""
|
|
252
|
+
@pytest.mark.filterwarnings(
|
|
253
|
+
"ignore:'numbers_parser._cat_numbers' found in sys.modules:RuntimeWarning",
|
|
254
|
+
)
|
|
255
|
+
def test_main(capsys):
|
|
256
|
+
with patch.object(sys, "argv", ["_cat_numbers.py", "--help"]):
|
|
257
|
+
with pytest.raises(SystemExit) as excinfo:
|
|
258
|
+
# Use runpy instead of script_runner to ensure coverage
|
|
259
|
+
runpy.run_module("numbers_parser._cat_numbers", run_name="__main__")
|
|
259
260
|
|
|
261
|
+
assert excinfo.value.code == 0
|
|
260
262
|
|
|
261
|
-
|
|
263
|
+
captured = capsys.readouterr()
|
|
264
|
+
assert "List the names of tables" in captured.out
|
|
265
|
+
assert "Names of sheet" in captured.out
|
|
266
|
+
assert captured.err == ""
|
|
267
|
+
|
|
268
|
+
|
|
269
|
+
@pytest.mark.script_launch_mode("inprocess")
|
|
262
270
|
def test_errors(script_runner):
|
|
263
271
|
ret = script_runner.run(["cat-numbers", "tests/data/corrupted.numbers"], print_result=False)
|
|
264
272
|
assert not ret.success
|