MainShortcuts2 2.4.0__tar.gz → 2.4.2__tar.gz

{mainshortcuts2-2.4.0 → mainshortcuts2-2.4.2}/PKG-INFO

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

{mainshortcuts2-2.4.0 → mainshortcuts2-2.4.2}/pyproject.toml

@@ -1,5 +1,5 @@
 [tool.poetry]
-version = "2.4.0"
+version = "2.4.2"
 name = "MainShortcuts2"
 description = "Сокращение и улучшение функций + консольные утилиты"
 authors = [ "MainPlay TG <xbox.roman6666666666@gmail.com>",]

{mainshortcuts2-2.4.0 → mainshortcuts2-2.4.2}/src/MainShortcuts2/__main__.py

@@ -16,21 +16,21 @@ def nano_json():
   import subprocess
   argp = argparse.ArgumentParser("nano-json", description="форматирование JSON файлов и редактирование в GNU NANO")
   argp.add_argument("files", nargs="+", help="пути к файлам JSON")
-  argp.add_argument("--encoding", default="utf-8", help="кодировка файлов"
+  argp.add_argument("--encoding", default="utf-8", help="кодировка файлов")
   argp.add_argument("--nano-help", action="store_true", help="показать помощь nano")
   argp.add_argument("--no-escape", action="store_false", help="не использовать Unicode Escape")
   argp.add_argument("-f", "--rcfile", help="использовать только этот файл для настройки nano")
   argp.add_argument("-m", "--mode", choices=ms.json.MODES, default="p", help="режим сохранения редактирования")
-  args=argp.parse_args()
+  args = argp.parse_args()
   if args.nano_help:
     return subprocess.call(["nano", "--help"])
-  nano_args=["nano"]
+  nano_args = ["nano"]
   if args.rcfile:
     nano_args += ["--rcfile", args.rcfile]
   nano_args += args.files
   for i in args.files:
     try:
-      data=ms.json.read(i, encoding=args.encoding)
+      data = ms.json.read(i, encoding=args.encoding)
       ms.json.write(i + ms.file.TMP_SUFFIX, data, encoding=args.encoding, ensure_ascii=False, mode="p")
       ms.file.delete(i)
       ms.file.move(i + ms.file.TMP_SUFFIX, i)
@@ -39,7 +39,7 @@ def nano_json():
   subprocess.call(nano_args)
   for i in args.files:
     try:
-      data=ms.json.read(i, encoding=args.encoding)
+      data = ms.json.read(i, encoding=args.encoding)
       ms.json.write(i + ms.file.TMP_SUFFIX, data, encoding=args.encoding, ensure_ascii=args.no_escape, mode=args.mode)
       ms.file.delete(i)
       ms.file.move(i + ms.file.TMP_SUFFIX, i)
@@ -50,7 +50,7 @@ def nano_json():
 def _check_nginx() -> int:
   import subprocess
   with subprocess.Popen(["nginx", "-t"], stderr=subprocess.PIPE) as p:
-    code=p.wait()
+    code = p.wait()
     if code != 0:
       sys.stderr.buffer.write(p.stderr.read())
   return code
@@ -59,9 +59,9 @@ def _check_nginx() -> int:
 def nginx_reload():
   ms.utils.check_programs("nginx")
   import subprocess
-  argp=argparse.ArgumentParser("nginx-reload", description="проверка конфига и перезагрузка Nginx")
+  argp = argparse.ArgumentParser("nginx-reload", description="проверка конфига и перезагрузка Nginx")
   argp.parse_args()
-  code=_check_nginx()
+  code = _check_nginx()
   if code != 0:
     sys.exit(code)
   sys.exit(subprocess.call(["nginx", "-s", "reload"]))
@@ -70,9 +70,9 @@ def nginx_reload():
 def nginx_restart():
   ms.utils.check_programs("nginx", "systemctl")
   import subprocess
-  argp=argparse.ArgumentParser("nginx-reload", description="проверка конфига и перезапуск Nginx через systemctl")
+  argp = argparse.ArgumentParser("nginx-reload", description="проверка конфига и перезапуск Nginx через systemctl")
   argp.parse_args()
-  code=_check_nginx()
+  code = _check_nginx()
   if code != 0:
     sys.exit(code)
   sys.exit(subprocess.call(["systemctl", "restart", "nginx"]))
@@ -81,36 +81,36 @@ def nginx_restart():
 def hash_gen():
   import os
   import hashlib
-  argp=argparse.ArgumentParser("ms2-hash-gen", description="создание контрольной суммы для файла")
+  argp = argparse.ArgumentParser("ms2-hash-gen", description="создание контрольной суммы для файла")
   argp.add_argument("files", nargs="+", help="пути к файлам")
   argp.add_argument("-b", "--bar", action="store_true", help="показывать прогрессбар (нужен модуль progressbar2)")
   argp.add_argument("-t", "--type", choices=HASH_TYPES, default="sha512", help="тип контрольной суммы")
-  args=argp.parse_args()
+  args = argp.parse_args()
   if args.bar:
     import progressbar
-    pbar_w=[
-      progressbar.Percentage(),
-      progressbar.GranularBar(left="(", right=")"),
-      progressbar.FileTransferSpeed(),
-      progressbar.ETA(format="%(eta)8s", format_finished="%(elapsed)8s", format_na="     N/A", format_not_started="--:--:--", format_zero="00:00:00"),
+    pbar_w = [
+        progressbar.Percentage(),
+        progressbar.GranularBar(left="(", right=")"),
+        progressbar.FileTransferSpeed(),
+        progressbar.ETA(format="%(eta)8s", format_finished="%(elapsed)8s", format_na="     N/A", format_not_started="--:--:--", format_zero="00:00:00"),
     ]
-  data={}
-  data["format"]="MainShortcuts2_hash_v1"
-  data["file"]={}
-  data["hash"]={}
-  data["hash"]["type"]=args.type
-  Hash=getattr(hashlib, args.type)
+  data = {}
+  data["format"] = "MainShortcuts2_hash_v1"
+  data["file"] = {}
+  data["hash"] = {}
+  data["hash"]["type"] = args.type
+  Hash = getattr(hashlib, args.type)
   for file in args.files:
-    hash=Hash()
-    data["file"]["size"]=os.path.getsize(file)
+    hash = Hash()
+    data["file"]["size"] = os.path.getsize(file)
     if args.bar:
-      pbar=progressbar.ProgressBar(
-        max_error=False,
-        max_value=data["file"]["size"],
-        min_value=0,
-        widgets=[ms.path.Path(file).full_name] + pbar_w,
+      pbar = progressbar.ProgressBar(
+          max_error=False,
+          max_value=data["file"]["size"],
+          min_value=0,
+          widgets=[ms.path.Path(file).full_name] + pbar_w,
       )
-      c=0
+      c = 0
       pbar.start()
     with open(file, "rb") as f:
       for chunk in f:
@@ -120,43 +120,45 @@ def hash_gen():
           pbar.update(c)
     if args.bar:
       pbar.finish(dirty=True)
-    data["hash"]["hex"]=hash.hexdigest()
+    data["hash"]["hex"] = hash.hexdigest()
     ms.json.write(file + HASH_SUFFIX, data)
+
+
 def hash_check():
   import hashlib
   import os
   import shlex
-  argp=argparse.ArgumentParser("ms2-hash-check", description="проверка размера и контрольной суммы файла")
+  argp = argparse.ArgumentParser("ms2-hash-check", description="проверка размера и контрольной суммы файла")
   argp.add_argument("-b", "--bar", action="store_true", help="показывать прогрессбар (нужен модуль progressbar2)")
   argp.add_argument("files", nargs="+", help="пути к файлам")
-  args=argp.parse_args()
+  args = argp.parse_args()
   if args.bar:
     import progressbar
-    pbar_w=[
-      progressbar.Percentage(),
-      progressbar.GranularBar(left="(", right=")"),
-      progressbar.FileTransferSpeed(),
-      progressbar.ETA(format="%(eta)8s", format_finished="%(elapsed)8s", format_na="     N/A", format_not_started="--:--:--", format_zero="00:00:00"),
+    pbar_w = [
+        progressbar.Percentage(),
+        progressbar.GranularBar(left="(", right=")"),
+        progressbar.FileTransferSpeed(),
+        progressbar.ETA(format="%(eta)8s", format_finished="%(elapsed)8s", format_na="     N/A", format_not_started="--:--:--", format_zero="00:00:00"),
     ]
   for file in args.files:
     if file.lower().endswith(HASH_SUFFIX.lower()):
-      file=file[:0 - len(HASH_SUFFIX)]
+      file = file[:0 - len(HASH_SUFFIX)]
     if not os.path.exists(file + HASH_SUFFIX):
       print("Ошибка: не найден файл " + shlex.quote(file + HASH_SUFFIX), file=sys.stderr)
       continue
-    data=ms.json.read(file + HASH_SUFFIX)
+    data = ms.json.read(file + HASH_SUFFIX)
     if data["file"]["size"] != os.path.getsize(file):
       print("Ошибка: размер файла " + shlex.quote(file) + " не совпадает")
       continue
-    hash=getattr(hashlib, data["hash"]["type"])()
+    hash = getattr(hashlib, data["hash"]["type"])()
     if args.bar:
-      pbar=progressbar.ProgressBar(
-        max_error=False,
-        max_value=data["file"]["size"],
-        min_value=0,
-        widgets=[ms.path.Path(file).full_name] + pbar_w,
+      pbar = progressbar.ProgressBar(
+          max_error=False,
+          max_value=data["file"]["size"],
+          min_value=0,
+          widgets=[ms.path.Path(file).full_name] + pbar_w,
       )
-      c=0
+      c = 0
       pbar.start()
     with open(file, "rb") as f:
       for chunk in f:

{mainshortcuts2-2.4.0 → mainshortcuts2-2.4.2}/src/MainShortcuts2/_module_info.py

@@ -1,2 +1,2 @@
 name = "MainShortcuts2"
-version = "2.4.0"
+version = "2.4.2"

{mainshortcuts2-2.4.0 → mainshortcuts2-2.4.2}/src/MainShortcuts2/advanced.py

@@ -18,16 +18,22 @@ class MultiLang:
     self.files: dict[str, Path] = {}
     self.langs: dict[Union[None, str], dict[str, dict[str, Any]]] = {}
 
-    def cb_lines(text: list[str]) -> str:
+    @self.add_cache_builder("lines")
+    def _(text: list[str]) -> str:
       return "\n".join(text)
 
-    def cb_normal(text: str) -> str:
+    @self.add_cache_builder("normal")
+    def _(text: str) -> str:
       assert type(text) == str
       return text
-    self.cache_builders["lines"] = cb_lines
-    self.cache_builders["normal"] = cb_normal
     self.add_lang(None, default_lang, load=True)
 
+  def add_cache_builder(self, name: str):
+    def deco(func):
+      self.cache_builders[name] = func
+      return func
+    return deco
+
   def add_langs(self, langs: dict[str, Union[dict, Path, str]], check_count: bool = True, load: bool = True):
     """Добавить языки (`dict`) или пути к языковым файлам (`str`, `ms.path.Path`)"""
     if check_count:
@@ -252,3 +258,104 @@ class PermissionSystem:
             del user["perms"][k]
           else:
             user["perms"][k] = v
+
+
+class DictScriptAction:
+  def __init__(self, name: str, args: list = None, kwargs: dict = None, save_to: str = None, comment: str = None):
+    self.__getitem__ = self.__getattr__
+    self.args: list = args
+    self.comment: str = comment
+    self.kwargs: dict = kwargs
+    self.name: str = name
+    self.save_to: str = save_to
+
+  @classmethod
+  def from_dict(cls, data: dict):
+    kw = {}
+    for k in ["args", "comment", "kwargs", "name", "save_to"]:
+      kw[k] = data.get(k)
+    return cls(**kw)
+
+  def to_dict(self) -> dict:
+    result = {}
+    for k in ["args", "comment", "kwargs", "name", "save_to"]:
+      v = getattr(self, k)
+      if not v is None:
+        result[k] = v
+    return result
+
+
+class DictScriptVariable:
+  def __init__(self, name: str):
+    self.name: str = name
+
+
+@ms.any2json.reg_decoder(DictScriptVariable)
+def _(obj):
+  return DictScriptVariable(obj)
+
+
+@ms.any2json.reg_encoder(DictScriptVariable)
+def _(obj: DictScriptVariable):
+  if isinstance(obj, DictScriptVariable):
+    return obj.name
+
+
+class DictScriptRunner:
+  VERSION = 1
+
+  def __init__(self, functions: dict = None, add_default_functions: bool = True):
+    self.globals = {}
+    if add_default_functions:
+      import time
+      for i in [bool, bytes, dict, float, int, list, str, tuple]:
+        self.reg_class()(i)
+      self.reg_function("sleep")(time.sleep)
+      self.reg_function("sum")(sum)
+      self.reg_function("time.sleep")(time.sleep)
+      self.reg_function("time.time")(time.time)
+    if not functions is None:
+      for name, func in functions.items():
+        self.reg_function(name)(func)
+
+  def reg_class(self, name: str = None, overwrite: bool = False):
+    def deco(cls: type):
+      if name is None:  # type: ignore
+        name = cls.__module__ + "." + cls.__name__
+      if callable(cls):
+        self.reg_function(name, overwrite=overwrite)(cls)  # type: ignore
+      for k in dir(cls):
+        v = getattr(cls, k)
+        if callable(v):
+          self.reg_function(name + "." + k, overwrite=overwrite)  # type: ignore
+      return cls
+    return deco
+
+  def reg_function(self, name: str, overwrite: bool = False):
+    if not overwrite:
+      if name in self.globals:
+        raise ValueError("The %r function already exists. Perhaps you wanted to overwrite it?" % name)
+
+    def deco(func):
+      if not callable(func):
+        raise TypeError("Function %r is not callable" % name)
+      self.globals[name] = func
+      return func
+    return deco
+
+  def run_script(self, script: list[dict]) -> dict:
+    """Выполнить скрипт (список действий)"""
+    for act in script:
+      if not act["name"] in self.globals:
+        raise KeyError("Function %r not exists" % act["name"])
+    locals = self.globals.copy()
+    for act in script:
+      if act["name"] == "exit":
+        break
+      args = act["args"] if "args" in act else []
+      func = locals[act["name"]]
+      kwargs = act["kwargs"] if "kwargs" in act else {}
+      result = func(*args, **kwargs)
+      if "save_to" in act:
+        locals[act["save_to"]] = result
+    return locals

{mainshortcuts2-2.4.0 → mainshortcuts2-2.4.2}/src/MainShortcuts2/file.py

@@ -114,6 +114,38 @@ def rename(path: PATH_TYPES, name: PATH_TYPES, **kw):
   return ms.path.rename(**kw)
 
 
+def compare(path1: PATH_TYPES, path2: PATH_TYPES, method: str = "binary") -> bool:
+  """Одинаковые ли файлы"""
+  p1 = _check(path1)
+  p2 = _check(path2)
+  if os.path.getsize(p1) != os.path.getsize(p2):
+    return False
+  if method == "binary":  # Сравнение по байтам
+    with open(p1, "rb") as f1:
+      with open(p2, "rb") as f2:
+        while True:
+          b1 = f1.read(1024)
+          l = len(b1)
+          if l == 0:
+            return True
+          if b1 != f2.read(l):
+            return False
+  from .__main__ import HASH_TYPES
+  if method in HASH_TYPES:  # Сравнение контрольной суммы
+    import hashlib
+    Hash = getattr(hashlib, method)
+    with open(p1, "rb") as f1:
+      hash1 = Hash()
+      for chunk in f1:
+        hash1.update(chunk)
+    with open(p2, "rb") as f2:
+      hash2 = Hash()
+      for chunk in f2:
+        hash2.update(chunk)
+    return hash1.digest() == hash2.digest()
+  raise ValueError("Unknown method: " + repr(method))
+
+
 cp = copy
 ln = link
 mv = move