MainShortcuts2 2.2.4__tar.gz → 2.3.1__tar.gz

{mainshortcuts2-2.2.4 → mainshortcuts2-2.3.1}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: MainShortcuts2
-Version: 2.2.4
-Summary: Сокращение и улучшение функций
+Version: 2.3.1
+Summary: Сокращение и улучшение функций + консольные утилиты
 Home-page: https://github.com/MainPlay-TG/MainShortcuts2.py
 Author: MainPlay TG
 Author-email: xbox.roman6666666666@gmail.com

{mainshortcuts2-2.2.4 → mainshortcuts2-2.3.1}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
-version = "2.2.4"
+version = "2.3.1"
 name = "MainShortcuts2"
-description = "Сокращение и улучшение функций"
+description = "Сокращение и улучшение функций + консольные утилиты"
 authors = [ "MainPlay TG <xbox.roman6666666666@gmail.com>",]
 readme = "README.md"
 repository = "https://github.com/MainPlay-TG/MainShortcuts2.py"
@@ -11,6 +11,9 @@ packages = [
 
 [tool.poetry.scripts]
 ms2-import_example = "MainShortcuts2.__main__:import_example"
+nano-json = "MainShortcuts2.__main__:nano_json"
+nginx-reload = "MainShortcuts2.__main__:nginx_reload"
+nginx-restart = "MainShortcuts2.__main__:nginx_restart"
 
 [tool.poetry.dependencies]
 python = "^3.6"

mainshortcuts2-2.3.1/src/MainShortcuts2/__main__.py

@@ -0,0 +1,74 @@
+import argparse
+import sys
+from MainShortcuts2 import ms
+
+
+def import_example():
+  argp = argparse.ArgumentParser("ms2-import_example", description="код для импорта MainShortcuts2")
+  argp.parse_args()
+  print("from MainShortcuts2 import ms")
+
+
+def nano_json():
+  ms.utils.check_programs("nano")
+  import subprocess
+  argp = argparse.ArgumentParser("nano-json", description="форматирование JSON файлов и редактирование в GNU NANO")
+  argp.add_argument("files", nargs="+", help="пути к файлам JSON")
+  argp.add_argument("--nano-help", action="store_true", help="показать помощь nano")
+  argp.add_argument("-f", "--rcfile", help="использовать только этот файл для настройки nano")
+  argp.add_argument("-m", "--mode", choices=ms.json.MODES, default="p", help="режим сохранения редактирования")
+  args = argp.parse_args()
+  if args.nano_help:
+    return subprocess.call(["nano", "--help"])
+  nano_args = ["nano"]
+  if nano_args.rcfile:
+    nano_args += ["--rcfile", args.rcfile]
+  nano_args += args.files
+  for i in args.files:
+    try:
+      data = ms.json.read(i)
+      ms.json.write(i + ms.file.TMP_SUFFIX, data, ensure_ascii=False, mode="p")
+      ms.file.delete(i)
+      ms.file.move(i + ms.file.TMP_SUFFIX, i)
+    except Exception as err:
+      print(err, file=sys.stderr)
+  subprocess.call(nano_args)
+  for i in args.files:
+    try:
+      data = ms.json.read(i)
+      ms.json.write(i + ms.file.TMP_SUFFIX, data, mode=args.mode)
+      ms.file.delete(i)
+      ms.file.move(i + ms.file.TMP_SUFFIX, i)
+    except Exception as err:
+      print(err, file=sys.stderr)
+
+
+def _check_nginx() -> int:
+  import subprocess
+  with subprocess.Popen(["nginx", "-t"], stderr=subprocess.PIPE) as p:
+    code = p.wait()
+    if code != 0:
+      sys.stderr.buffer.write(p.stderr.read())
+  return code
+
+
+def nginx_reload():
+  ms.utils.check_programs("nginx")
+  import subprocess
+  argp = argparse.ArgumentParser("nginx-reload", description="проверка конфига и перезагрузка Nginx")
+  argp.parse_args()
+  code = _check_nginx()
+  if code != 0:
+    sys.exit(code)
+  sys.exit(subprocess.call(["nginx", "-s", "reload"]))
+
+
+def nginx_restart():
+  ms.utils.check_programs("nginx", "systemctl")
+  import subprocess
+  argp = argparse.ArgumentParser("nginx-reload", description="проверка конфига и перезапуск Nginx через systemctl")
+  argp.parse_args()
+  code = _check_nginx()
+  if code != 0:
+    sys.exit(code)
+  sys.exit(subprocess.call(["systemctl", "restart", "nginx"]))

{mainshortcuts2-2.2.4 → mainshortcuts2-2.3.1}/src/MainShortcuts2/_module_info.py

@@ -1,2 +1,2 @@
 name = "MainShortcuts2"
-version = "2.2.4"
+version = "2.3.1"

mainshortcuts2-2.3.1/src/MainShortcuts2/api/base.py

@@ -0,0 +1,35 @@
+import requests
+
+
+class Base:
+  def __init__(self, session: requests.Session = None):
+    self._headers = {}
+    self._http = requests.Session() if session is None else session
+    self._params = {}
+    self._url_data = {}
+    self._url = "https://example.com/api/{method}"
+
+  @property
+  def http(self) -> requests.Session:
+    return self._http
+
+  def _request(self, http_method: str, api_method: str, *, headers: dict[str, str] = None, params: dict[str, str] = None, raise_for_status: bool = True, url_data: dict[str, str] = None, **kw):
+    _headers = self._headers.copy()
+    _params = self._params.copy()
+    _url_data = self._url_data.copy()
+    _url_data["method"] = api_method
+    _headers.update({} if headers is None else headers)
+    _params.update({} if params is None else params)
+    _url_data.update({} if url_data is None else url_data)
+    kw["headers"] = _headers
+    kw["method"] = http_method
+    kw["params"] = _params
+    kw["url"] = self._url.format(**_url_data)
+    result = self.http.request(**kw)
+    if raise_for_status:
+      result.raise_for_status()
+    return result
+
+  def request(self, *args, **kwargs) -> requests.Response:
+    """Отправить запрос к API"""
+    return self._request(*args, **kwargs)

mainshortcuts2-2.3.1/src/MainShortcuts2/api/gigachat.py

@@ -0,0 +1,65 @@
+import os
+from .base import Base, requests
+from datetime import timedelta
+from time import time
+CERT_PATH = os.path.dirname(__file__) + "/russian_trusted_root_ca_pem.crt"
+
+
+class GigaChat(Base):
+  def __init__(self, auth_data: str, client_id: str, *,
+               cert_path: str = None,
+               **kw):
+    Base.__init__(self, **kw)
+    self._access_token = {"expire_at": 0, "kw": None, "token": None}
+    self._auth_data: str = auth_data
+    self._client_id: str = client_id
+    self._url = "https://gigachat.devices.sberbank.ru/api/v1/{method}"
+    self.http.verify = CERT_PATH if cert_path is None else cert_path
+
+  @property
+  def access_token(self) -> str:
+    if True:  # TODO Сделать проверку истёк ли токен доступа. Пока что каждый раз новый токен
+      if self._access_token["kw"] is None:  # Если изменились данные для авторизации
+        kw = {}
+        kw["data"] = {}
+        kw["headers"] = {}
+        kw["stream"] = False
+        kw["url"] = "https://ngw.devices.sberbank.ru:9443/api/v2/oauth"
+        kw["data"]["scope"] = "GIGACHAT_API_PERS"
+        kw["headers"]["Authorization"] = "Basic: " + self.auth_data
+        kw["headers"]["Content-Type"] = "application/x-www-form-urlencoded"
+        kw["headers"]["RqUID"] = self.client_id
+        self._access_token["kw"] = kw
+      else:
+        kw = self._access_token["kw"]
+      with self.http.post(**kw) as resp:  # Получить новый токен
+        resp.raise_for_status()
+        json = resp.json()
+        self._access_token["expire_at"] = json["expires_at"] / 1000
+        self._access_token["token"] = json["access_token"]
+    return self._access_token["token"]
+
+  @property
+  def auth_data(self) -> str:
+    return self._auth_data
+
+  @auth_data.setter
+  def auth_data(self, v: str):
+    self._access_token["kw"] = None
+    self._auth_data = v
+
+  @property
+  def client_id(self) -> str:
+    return self._client_id
+
+  @client_id.setter
+  def client_id(self, v: str):
+    self._access_token["kw"] = None
+    self._client_id = v
+
+  def request(self, http_method: str, api_method: str, **kw):
+    self._headers["Authorization"] = "Bearer " + self.access_token
+    kw["api_method"] = api_method
+    kw["http_method"] = http_method
+    return self._request(**kw).json()
+  # TODO Добавить методы

mainshortcuts2-2.3.1/src/MainShortcuts2/api/russian_trusted_root_ca_pem.crt

@@ -0,0 +1,33 @@
+-----BEGIN CERTIFICATE-----
+MIIFwjCCA6qgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwcDELMAkGA1UEBhMCUlUx
+PzA9BgNVBAoMNlRoZSBNaW5pc3RyeSBvZiBEaWdpdGFsIERldmVsb3BtZW50IGFu
+ZCBDb21tdW5pY2F0aW9uczEgMB4GA1UEAwwXUnVzc2lhbiBUcnVzdGVkIFJvb3Qg
+Q0EwHhcNMjIwMzAxMjEwNDE1WhcNMzIwMjI3MjEwNDE1WjBwMQswCQYDVQQGEwJS
+VTE/MD0GA1UECgw2VGhlIE1pbmlzdHJ5IG9mIERpZ2l0YWwgRGV2ZWxvcG1lbnQg
+YW5kIENvbW11bmljYXRpb25zMSAwHgYDVQQDDBdSdXNzaWFuIFRydXN0ZWQgUm9v
+dCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMfFOZ8pUAL3+r2n
+qqE0Zp52selXsKGFYoG0GM5bwz1bSFtCt+AZQMhkWQheI3poZAToYJu69pHLKS6Q
+XBiwBC1cvzYmUYKMYZC7jE5YhEU2bSL0mX7NaMxMDmH2/NwuOVRj8OImVa5s1F4U
+zn4Kv3PFlDBjjSjXKVY9kmjUBsXQrIHeaqmUIsPIlNWUnimXS0I0abExqkbdrXbX
+YwCOXhOO2pDUx3ckmJlCMUGacUTnylyQW2VsJIyIGA8V0xzdaeUXg0VZ6ZmNUr5Y
+Ber/EAOLPb8NYpsAhJe2mXjMB/J9HNsoFMBFJ0lLOT/+dQvjbdRZoOT8eqJpWnVD
+U+QL/qEZnz57N88OWM3rabJkRNdU/Z7x5SFIM9FrqtN8xewsiBWBI0K6XFuOBOTD
+4V08o4TzJ8+Ccq5XlCUW2L48pZNCYuBDfBh7FxkB7qDgGDiaftEkZZfApRg2E+M9
+G8wkNKTPLDc4wH0FDTijhgxR3Y4PiS1HL2Zhw7bD3CbslmEGgfnnZojNkJtcLeBH
+BLa52/dSwNU4WWLubaYSiAmA9IUMX1/RpfpxOxd4Ykmhz97oFbUaDJFipIggx5sX
+ePAlkTdWnv+RWBxlJwMQ25oEHmRguNYf4Zr/Rxr9cS93Y+mdXIZaBEE0KS2iLRqa
+OiWBki9IMQU4phqPOBAaG7A+eP8PAgMBAAGjZjBkMB0GA1UdDgQWBBTh0YHlzlpf
+BKrS6badZrHF+qwshzAfBgNVHSMEGDAWgBTh0YHlzlpfBKrS6badZrHF+qwshzAS
+BgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsF
+AAOCAgEAALIY1wkilt/urfEVM5vKzr6utOeDWCUczmWX/RX4ljpRdgF+5fAIS4vH
+tmXkqpSCOVeWUrJV9QvZn6L227ZwuE15cWi8DCDal3Ue90WgAJJZMfTshN4OI8cq
+W9E4EG9wglbEtMnObHlms8F3CHmrw3k6KmUkWGoa+/ENmcVl68u/cMRl1JbW2bM+
+/3A+SAg2c6iPDlehczKx2oa95QW0SkPPWGuNA/CE8CpyANIhu9XFrj3RQ3EqeRcS
+AQQod1RNuHpfETLU/A2gMmvn/w/sx7TB3W5BPs6rprOA37tutPq9u6FTZOcG1Oqj
+C/B7yTqgI7rbyvox7DEXoX7rIiEqyNNUguTk/u3SZ4VXE2kmxdmSh3TQvybfbnXV
+4JbCZVaqiZraqc7oZMnRoWrXRG3ztbnbes/9qhRGI7PqXqeKJBztxRTEVj8ONs1d
+WN5szTwaPIvhkhO3CO5ErU2rVdUr89wKpNXbBODFKRtgxUT70YpmJ46VVaqdAhOZ
+D9EUUn4YaeLaS8AjSF/h7UkjOibNc4qVDiPP+rkehFWM66PVnP1Msh93tc+taIfC
+EYVMxjh8zNbFuoc7fzvvrFILLe7ifvEIUqSVIC/AzplM/Jxw7buXFeGP1qVCBEHq
+391d/9RAfaZ12zkwFsl+IKwE/OZxW8AHa9i1p4GO0YSNuczzEm4=
+-----END CERTIFICATE-----

mainshortcuts2-2.3.1/src/MainShortcuts2/api/russian_trusted_sub_ca_pem.crt

@@ -0,0 +1,41 @@
+-----BEGIN CERTIFICATE-----
+MIIHQjCCBSqgAwIBAgICEAIwDQYJKoZIhvcNAQELBQAwcDELMAkGA1UEBhMCUlUx
+PzA9BgNVBAoMNlRoZSBNaW5pc3RyeSBvZiBEaWdpdGFsIERldmVsb3BtZW50IGFu
+ZCBDb21tdW5pY2F0aW9uczEgMB4GA1UEAwwXUnVzc2lhbiBUcnVzdGVkIFJvb3Qg
+Q0EwHhcNMjIwMzAyMTEyNTE5WhcNMjcwMzA2MTEyNTE5WjBvMQswCQYDVQQGEwJS
+VTE/MD0GA1UECgw2VGhlIE1pbmlzdHJ5IG9mIERpZ2l0YWwgRGV2ZWxvcG1lbnQg
+YW5kIENvbW11bmljYXRpb25zMR8wHQYDVQQDDBZSdXNzaWFuIFRydXN0ZWQgU3Vi
+IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA9YPqBKOk19NFymrE
+wehzrhBEgT2atLezpduB24mQ7CiOa/HVpFCDRZzdxqlh8drku408/tTmWzlNH/br
+HuQhZ/miWKOf35lpKzjyBd6TPM23uAfJvEOQ2/dnKGGJbsUo1/udKSvxQwVHpVv3
+S80OlluKfhWPDEXQpgyFqIzPoxIQTLZ0deirZwMVHarZ5u8HqHetRuAtmO2ZDGQn
+vVOJYAjls+Hiueq7Lj7Oce7CQsTwVZeP+XQx28PAaEZ3y6sQEt6rL06ddpSdoTMp
+BnCqTbxW+eWMyjkIn6t9GBtUV45yB1EkHNnj2Ex4GwCiN9T84QQjKSr+8f0psGrZ
+vPbCbQAwNFJjisLixnjlGPLKa5vOmNwIh/LAyUW5DjpkCx004LPDuqPpFsKXNKpa
+L2Dm6uc0x4Jo5m+gUTVORB6hOSzWnWDj2GWfomLzzyjG81DRGFBpco/O93zecsIN
+3SL2Ysjpq1zdoS01CMYxie//9zWvYwzI25/OZigtnpCIrcd2j1Y6dMUFQAzAtHE+
+qsXflSL8HIS+IJEFIQobLlYhHkoE3avgNx5jlu+OLYe0dF0Ykx1PGNjbwqvTX37R
+Cn32NMjlotW2QcGEZhDKj+3urZizp5xdTPZitA+aEjZM/Ni71VOdiOP0igbw6asZ
+2fxdozZ1TnSSYNYvNATwthNmZysCAwEAAaOCAeUwggHhMBIGA1UdEwEB/wQIMAYB
+Af8CAQAwDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTR4XENCy2BTm6KSo9MI7NM
+XqtpCzAfBgNVHSMEGDAWgBTh0YHlzlpfBKrS6badZrHF+qwshzCBxwYIKwYBBQUH
+AQEEgbowgbcwOwYIKwYBBQUHMAKGL2h0dHA6Ly9yb3N0ZWxlY29tLnJ1L2NkcC9y
+b290Y2Ffc3NsX3JzYTIwMjIuY3J0MDsGCCsGAQUFBzAChi9odHRwOi8vY29tcGFu
+eS5ydC5ydS9jZHAvcm9vdGNhX3NzbF9yc2EyMDIyLmNydDA7BggrBgEFBQcwAoYv
+aHR0cDovL3JlZXN0ci1wa2kucnUvY2RwL3Jvb3RjYV9zc2xfcnNhMjAyMi5jcnQw
+gbAGA1UdHwSBqDCBpTA1oDOgMYYvaHR0cDovL3Jvc3RlbGVjb20ucnUvY2RwL3Jv
+b3RjYV9zc2xfcnNhMjAyMi5jcmwwNaAzoDGGL2h0dHA6Ly9jb21wYW55LnJ0LnJ1
+L2NkcC9yb290Y2Ffc3NsX3JzYTIwMjIuY3JsMDWgM6Axhi9odHRwOi8vcmVlc3Ry
+LXBraS5ydS9jZHAvcm9vdGNhX3NzbF9yc2EyMDIyLmNybDANBgkqhkiG9w0BAQsF
+AAOCAgEARBVzZls79AdiSCpar15dA5Hr/rrT4WbrOfzlpI+xrLeRPrUG6eUWIW4v
+Sui1yx3iqGLCjPcKb+HOTwoRMbI6ytP/ndp3TlYua2advYBEhSvjs+4vDZNwXr/D
+anbwIWdurZmViQRBDFebpkvnIvru/RpWud/5r624Wp8voZMRtj/cm6aI9LtvBfT9
+cfzhOaexI/99c14dyiuk1+6QhdwKaCRTc1mdfNQmnfWNRbfWhWBlK3h4GGE9JK33
+Gk8ZS8DMrkdAh0xby4xAQ/mSWAfWrBmfzlOqGyoB1U47WTOeqNbWkkoAP2ys94+s
+Jg4NTkiDVtXRF6nr6fYi0bSOvOFg0IQrMXO2Y8gyg9ARdPJwKtvWX8VPADCYMiWH
+h4n8bZokIrImVKLDQKHY4jCsND2HHdJfnrdL2YJw1qFskNO4cSNmZydw0Wkgjv9k
+F+KxqrDKlB8MZu2Hclph6v/CZ0fQ9YuE8/lsHZ0Qc2HyiSMnvjgK5fDc3TD4fa8F
+E8gMNurM+kV8PT8LNIM+4Zs+LKEV8nqRWBaxkIVJGekkVKO8xDBOG/aN62AZKHOe
+GcyIdu7yNMMRihGVZCYr8rYiJoKiOzDqOkPkLOPdhtVlgnhowzHDxMHND/E2WA5p
+ZHuNM/m0TXt2wTTPL7JH2YC0gPz/BvvSzjksgzU5rLbRyUKQkgU=
+-----END CERTIFICATE-----

{mainshortcuts2-2.2.4 → mainshortcuts2-2.3.1}/src/MainShortcuts2/core.py

@@ -58,6 +58,7 @@ class MS2:
     self.prog_dir: Union[None, str] = None
     self.prog_file: Union[None, str] = __file__
     self.prog_name: Union[None, str] = __name__
+    self.use_tmp_file: bool = False
     self.reload()
 
   def reload(self):

{mainshortcuts2-2.2.4 → mainshortcuts2-2.3.1}/src/MainShortcuts2/file.py

@@ -5,6 +5,7 @@ from .core import ms
 from .path import PATH_TYPES, path2str
 from .types import NotAFileError
 from typing import *
+TMP_SUFFIX = ".MS2_TMP"
 
 
 def _check(path, **kw) -> str:
@@ -25,15 +26,24 @@ def read(path: PATH_TYPES, encoding: str = None, **kw) -> str:
     return f.read()
 
 
-def write(path: PATH_TYPES, data: str, encoding: str = None, mkdir: bool = False, **kw) -> int:
+def write(path: PATH_TYPES, data: str, encoding: str = None, mkdir: bool = False, use_tmp_file: bool = None, **kw) -> int:
   """Записать текст в файл"""
+  file = _check(path)
+  if use_tmp_file is None:
+    use_tmp_file = ms.use_tmp_file
   kw["encoding"] = ms.encoding if encoding is None else encoding
-  kw["file"] = _check(path)
+  kw["file"] = file
   kw["mode"] = "w"
   if mkdir:
     ms.dir.create(os.path.dirname(kw["file"]))
+  if use_tmp_file:
+    kw["file"] += TMP_SUFFIX
   with builtins.open(**kw) as f:
-    return f.write(data)
+    result = f.write(data)
+  if use_tmp_file:
+    delete(file)
+    move(kw["file"], file)
+  return result
 
 
 def load(path: PATH_TYPES, **kw) -> bytes:
@@ -44,14 +54,23 @@ def load(path: PATH_TYPES, **kw) -> bytes:
     return f.read()
 
 
-def save(path: PATH_TYPES, data: bytes, mkdir: bool = False, **kw) -> int:
+def save(path: PATH_TYPES, data: bytes, mkdir: bool = False, use_tmp_file: bool = None, **kw) -> int:
   """Записать байты в файл"""
-  kw["file"] = _check(path)
+  file = _check(path)
+  if use_tmp_file is None:
+    use_tmp_file = ms.use_tmp_file
+  kw["file"] = file
   kw["mode"] = "wb"
   if mkdir:
     ms.dir.create(os.path.dirname(kw["file"]))
+  if use_tmp_file:
+    kw["file"] += TMP_SUFFIX
   with builtins.open(**kw) as f:
-    return f.write(data)
+    result = f.write(data)
+  if use_tmp_file:
+    delete(file)
+    move(kw["file"], file)
+  return result
 
 
 def copy(path: PATH_TYPES, dest: PATH_TYPES, **kw):

{mainshortcuts2-2.2.4 → mainshortcuts2-2.3.1}/src/MainShortcuts2/json.py

@@ -1,6 +1,7 @@
 """Работа с JSON"""
-import json
+import atexit
 import builtins
+import json
 from .core import ms
 from .path import PATH_TYPES
 from typing import *
@@ -9,6 +10,7 @@ try:
 except Exception:
   json5 = None
 JSON_TYPES = Union[bool, dict, float, int, list, None, str]
+MODES = ["c", "compress", "mainplay_tg", "mainplay", "max", "min", "mp_tg", "mp", "p", "pretty", "print", "zip"]
 
 
 def decode(text: str, *, like_json5: bool = False, **kw) -> JSON_TYPES:
@@ -26,18 +28,21 @@ def encode(data: JSON_TYPES, mode: str = "c", **kw):
   mode = mode.lower()
   if "force" in kw:
     del kw["force"]
+    import warnings
+    warnings.warn("The argument 'force' is no longer used", DeprecationWarning)
   if "sort" in kw:
     kw["sort_keys"] = kw.pop("sort")
   if mode in ["c", "compress", "min", "zip"]:  # Сжатый
-    kw["indent"] = None
-    kw["separators"] = [",", ":"]
+    kw.setdefault("indent", None)
+    kw.setdefault("separators", [",", ":"])
   if mode in ["p", "pretty", "max", "print"]:  # Развёрнутый
-    if not "indent" in kw:
-      kw["indent"] = 2
-    kw["separators"] = None
+    kw.setdefault("indent", 2)
+    kw.setdefault("separators", [",", ": "])
+    if mode == "print":
+      kw.setdefault("ensure_ascii", False)
   if mode in ["mp", "mp_tg", "mainplay", "mainplay_tg"]:  # Стиль MainPlay TG
-    kw["indent"] = 2
-    kw["separators"] = [",", ":"]
+    kw.setdefault("indent", 2)
+    kw.setdefault("separators", [",", ":"])
   return json.dumps(**kw)
 
 
@@ -48,11 +53,7 @@ def print(data: JSON_TYPES, **kw):
     if i in kw:
       pr_kw[i] = kw.pop(i)
   kw["data"] = data
-  kw["mode"] = mode
-  if not "ensure_ascii" in kw:
-    kw["ensure_ascii"] = False
-  if not "mode" in kw:
-    kw["mode"] = "p"
+  kw.setdefault("mode", "print")
   builtins.print(encode(**kw), **pr_kw)
 
 
@@ -93,9 +94,73 @@ def write(path: PATH_TYPES, data: JSON_TYPES, **kw) -> int:
   """Прочитать JSON файл"""
   f_kw = {}
   kw["data"] = data
-  for i in ["encoding", "force"]:
+  for i in ["encoding", "force", "use_tmp_file"]:
     if i in kw:
       f_kw[i] = kw.pop(i)
   f_kw["path"] = path
   f_kw["data"] = encode(**kw)
   return ms.file.write(**f_kw)
+
+
+class JsonFile:
+  def __init__(self, path: str, autoload: bool = True, save_at_exit: bool = False, **kw):
+    atexit.register(self.__exit__)
+    self._data = None
+    self._loaded = False
+    self._path = None
+    self.load_kw = {}
+    self.save_kw = kw
+    self.path = ms.path.Path(path)
+    self.save_at_exit = save_at_exit
+    if "like_json5" in self.save_kw:
+      self.load_kw["like_json5"] = self.save_kw.pop("like_json5")
+    if autoload:
+      self.load()
+
+  def __contains__(self, k) -> bool:
+    return k in self.data
+
+  def __delitem__(self, k):
+    del self.data[k]
+
+  def __enter__(self):
+    return self
+
+  def __exit__(self, *a):
+    if self.save_at_exit:
+      self.save()
+
+  def __getitem__(self, k):
+    return self.data[k]
+
+  def __setitem__(self, k, v):
+    self.data[k] = v
+
+  @property
+  def path(self) -> ms.path.Path:
+    return self._path
+
+  @path.setter
+  def path(self, v):
+    self._path = ms.path.Path(v)
+    self.load_kw["path"] = self._path.path
+    self.save_kw["path"] = self._path.path
+
+  @property
+  def data(self):
+    if not self._loaded:
+      self.load()
+    return self._data
+
+  @data.setter
+  def data(self, v):
+    self._data = v
+    self._loaded = True
+
+  def load(self):
+    self._data = read(**self.load_kw)
+    self._loaded = True
+
+  def save(self):
+    self.save_kw["data"] = self.data
+    return write(**self.save_kw)

{mainshortcuts2-2.2.4 → mainshortcuts2-2.3.1}/src/MainShortcuts2/path.py

@@ -55,6 +55,9 @@ class Path:
     self.rn = self.rename
     self.use_cache = use_cache
 
+  def __fspath__(self) -> str:
+    return self.path
+
   def reload(self, full: bool = False):
     """Удаление кешированной информации"""
     if full:

{mainshortcuts2-2.2.4 → mainshortcuts2-2.3.1}/src/MainShortcuts2/term.py

@@ -115,4 +115,10 @@ def clear():
   _clear()
 
 
+def set_title(title: str):
+  """Установить заголовок окна"""
+  # Не работает на bpython: AssertionError
+  print("\u001b]2;" + title + "\u0007", end="")
+
+
 cls = clear

{mainshortcuts2-2.2.4 → mainshortcuts2-2.3.1}/src/MainShortcuts2/utils.py

@@ -374,7 +374,7 @@ class OnlyOneInstance:
 
       def _enter():
         try:
-          if self.lock.exists:
+          if os.path.exists(self.lock.path):
             os.unlink(self.lock.path)
           self.fd = os.open(self.lock.path, flags)
         except OSError as err:
@@ -399,8 +399,8 @@ class OnlyOneInstance:
 
       def _exit():
         fcntl.lockf(self.fp, fcntl.LOCK_UN)
-        os.close(self.fp)
-        if self.lock.exists:
+        self.fp.close()
+        if os.path.exists(self.lock.path):
           os.unlink(self.lock.path)
     self._enter = _enter
     self._exit = _exit
@@ -430,5 +430,42 @@ class OnlyOneInstance:
     pass
 
 
+def multi_and(*values: bool) -> bool:
+  for i in values:
+    if not i:
+      return False
+  return True
+
+
+def multi_or(*values: bool) -> bool:
+  for i in values:
+    if i:
+      return True
+  return False
+
+
+def is_int(value: float) -> bool:
+  return value == int(value)
+
+
+def get_self_module(__name__: str):
+  return sys.modules[__name__]
+
+
+def check_programs(*progs: str, raise_error: bool = True) -> list[str]:
+  """Проверить наличие программ в `$PATH` | `shutil`"""
+  from shutil import which
+  failed = []
+  for i in progs:
+    if which(i) is None:
+      if not i in failed:
+        failed.append(i)
+  failed.sort()
+  if raise_error:
+    if len(failed) > 0:
+      raise OSError("Failed to find programs " + (", ".join(failed)) + " in $PATH")
+  return failed
+
+
 download_file = sync_download_file
 request = sync_request

mainshortcuts2-2.2.4/src/MainShortcuts2/__main__.py

@@ -1,3 +0,0 @@
-def import_example():
-  print("from MainShortcuts2 import ms")
-  print("exec(ms.import_code)")