Skip to content
Merged

Fixes #155

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ bin/
codegen/.generated/
codegen/debug*.json
obj/
.mypy_cache/
7 changes: 6 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@ format: format-black

.PHONY: format-black
format-black:
python -m black --line-length=120 --exclude submodules -v .
python -m black --line-length=120 --extend-exclude submodules -v .

# Type check our own scripts, SDKs in submodules have their own checks
.PHONY: mypy
mypy:
python -m mypy --config-file $(CURDIR)/mypy.ini .

.PHONY: update
update:
Expand Down
16 changes: 10 additions & 6 deletions codegen/Tools/split-cs-file.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@
import errno
import os
import re
import typing

SPLIT_RE = re.compile(
r'//\s+[-]+\n//\s+<copyright company="Aspose" file="(?P<file>.+?\.cs)">',
re.MULTILINE,
)


def main(src_file, dst_dir):
def main(src_file: typing.IO[str], dst_dir: str) -> None:
remaining = src_file.read()
try:
os.makedirs(dst_dir)
Expand All @@ -20,7 +21,10 @@ def main(src_file, dst_dir):
if e.errno != errno.EEXIST:
raise

for match in reversed(list(SPLIT_RE.finditer(remaining))[1:]):
found = list(reversed(list(SPLIT_RE.finditer(remaining))[1:]))
if not found:
raise SystemExit("No parts matching regex '%s' found in %s" % (SPLIT_RE.pattern, src_file.name))
for match in found:
start_pos = match.span()[0]

with open(os.path.join(dst_dir, match.groupdict()["file"]), "wt") as out_f:
Expand All @@ -34,14 +38,14 @@ def main(src_file, dst_dir):
src_file.close()


def parse_args():
def parse_args() -> argparse.Namespace:
parser = argparse.ArgumentParser()
parser.add_argument("src_file", type=argparse.FileType("rt+"))
parser.add_argument("dst_dir", type=str)
args = parser.parse_args()

return vars(args)
return parser.parse_args()


if __name__ == "__main__":
main(**parse_args())
parsed_args = parse_args()
main(parsed_args.src_file, parsed_args.dst_dir)
16 changes: 10 additions & 6 deletions codegen/Tools/split-java-file.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@
import errno
import os
import re
import typing

SPLIT_RE = re.compile(
r'//\s+[-]+\n//\s+<copyright company="Aspose" file="(?P<file>.+?\.java)">',
re.MULTILINE,
)


def main(src_file, dst_dir):
def main(src_file: typing.IO[str], dst_dir: str) -> None:
remaining = src_file.read()
try:
os.makedirs(dst_dir)
Expand All @@ -20,7 +21,10 @@ def main(src_file, dst_dir):
if e.errno != errno.EEXIST:
raise

for match in reversed(list(SPLIT_RE.finditer(remaining))[1:]):
found = list(reversed(list(SPLIT_RE.finditer(remaining))[1:]))
if not found:
raise SystemExit("No parts matching regex '%s' found in %s" % (SPLIT_RE.pattern, src_file.name))
for match in found:
start_pos = match.span()[0]

with open(os.path.join(dst_dir, match.groupdict()["file"]), "wt") as out_f:
Expand All @@ -34,14 +38,14 @@ def main(src_file, dst_dir):
src_file.close()


def parse_args():
def parse_args() -> argparse.Namespace:
parser = argparse.ArgumentParser()
parser.add_argument("src_file", type=argparse.FileType("rt+"))
parser.add_argument("dst_dir", type=str)
args = parser.parse_args()

return vars(args)
return parser.parse_args()


if __name__ == "__main__":
main(**parse_args())
parsed_args = parse_args()
main(parsed_args.src_file, parsed_args.dst_dir)
14 changes: 8 additions & 6 deletions codegen/Tools/split-php-file.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@
import errno
import os
import re
import typing

SPLIT_RE = re.compile(
r'/[\*]+\s*\n\s\*\s+[-]+\n\s*\*\s+<copyright company="Aspose" file="(?P<file>.+?\.php)">',
re.MULTILINE,
)


def main(src_file, dst_dir):
def main(src_file: typing.IO[str], dst_dir: str) -> None:
remaining = src_file.read()
try:
os.makedirs(dst_dir)
Expand All @@ -21,7 +22,8 @@ def main(src_file, dst_dir):
raise

found = list(reversed(list(SPLIT_RE.finditer(remaining))[1:]))
assert found, "No parts matching regex '%s' found" % SPLIT_RE.pattern
if not found:
raise SystemExit("No parts matching regex '%s' found in %s" % (SPLIT_RE.pattern, src_file.name))
for match in found:
filename = match.groupdict()["file"]
classname = os.path.splitext(filename)[0]
Expand All @@ -44,14 +46,14 @@ def main(src_file, dst_dir):
src_file.close()


def parse_args():
def parse_args() -> argparse.Namespace:
parser = argparse.ArgumentParser()
parser.add_argument("src_file", type=argparse.FileType("rt+"))
parser.add_argument("dst_dir", type=str)
args = parser.parse_args()

return vars(args)
return parser.parse_args()


if __name__ == "__main__":
main(**parse_args())
parsed_args = parse_args()
main(parsed_args.src_file, parsed_args.dst_dir)
5 changes: 5 additions & 0 deletions mypy.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[mypy]
python_version = 3.12
strict = True
# SDKs are generated code with their own type checks in their own repos
exclude = (^|/)submodules/
Loading