Skip to content

Replace JSON_minify dependency with inline regex comment stripping #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cryptomilk wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Replace JSON_minify dependency with inline regex comment stripping #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ authors = [
dependencies = [
"argparse",
"cryptography",
"JSON_minify~=0.3.0",
"pytimeparse~=1.1.8",
"ntplib~=0.4.0",
"haversine~=2.9.0",
Expand Down
11 changes: 9 additions & 2 deletions src/carconnectivity/carconnectivity_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
import logging
import tempfile
import json
import re
import threading

from json_minify import json_minify

from carconnectivity import carconnectivity, errors, util
from carconnectivity._version import __version__ as __carconnectivity_version__
Expand All @@ -25,6 +25,13 @@
LOG: logging.Logger = logging.getLogger("carconnectivity")


def strip_json_comments(text: str) -> str:
"""Remove C-style comments (// and /* */) from a JSON string."""
text = re.sub(r'/\*.*?\*/', '', text, flags=re.DOTALL)
text = re.sub(r'//.*?$', '', text, flags=re.MULTILINE)
return text


class CLI(): # pylint: disable=too-few-public-methods
"""
Class containing the commandline interface for the carconnectivity package.
Expand Down Expand Up @@ -91,7 +98,7 @@ def main(self) -> None: # noqa: C901
try:
with open(file=args.config, mode='r', encoding='utf-8') as config_file:
try:
config_dict = json.loads(json_minify(config_file.read(), strip_space=False))
config_dict = json.loads(strip_json_comments(config_file.read()))
car_connectivity = carconnectivity.CarConnectivity(config=config_dict, tokenstore_file=args.tokenfile, cache_file=args.cachefile)
car_connectivity.startup()

Expand Down