MainShortcuts2 2.2.1__tar.gz → 2.2.3__tar.gz

{mainshortcuts2-2.2.1 → mainshortcuts2-2.2.3}/PKG-INFO

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

{mainshortcuts2-2.2.1 → mainshortcuts2-2.2.3}/pyproject.toml

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

{mainshortcuts2-2.2.1 → mainshortcuts2-2.2.3}/src/MainShortcuts2/_module_info.py

@@ -1,2 +1,2 @@
 name = "MainShortcuts2"
-version = "2.2.1"
+version = "2.2.3"

{mainshortcuts2-2.2.1 → mainshortcuts2-2.2.3}/src/MainShortcuts2/cfg.py

@@ -19,7 +19,8 @@ def _check_type(path: str, type: Union[str, None]):
     if not type in types:
       raise Exception("Type %r not supported" % type)
     return type
-  _, ext = os.path.splitext(path).lower()
+  _, ext = os.path.splitext(path)
+  ext = ext[1:].lower()
   if ext in ext2type:
     return ext2type[ext]
   raise Exception("Cannot determine type by extension %r" % ext)

{mainshortcuts2-2.2.1 → mainshortcuts2-2.2.3}/src/MainShortcuts2/core.py

@@ -54,7 +54,7 @@ class MS2:
     self.import_code: str = "from MainShortcuts2 import ms\nms.prog_file,ms.prog_name=__file__,__name__\nms.reload()"
     self.log: Logger = NoLogger("MainShortcuts2") if logger is None else logger
     self.MAIN_FILE: Union[None, str] = _get_main_file()
-    self.MAIN_DIR: Union[None, str] = None if self.MAIN_FILE is None else os.path.abspath(self.MAIN_FILE)
+    self.MAIN_DIR: Union[None, str] = None if self.MAIN_FILE is None else os.path.dirname(self.MAIN_FILE)
     self.prog_dir: Union[None, str] = None
     self.prog_file: Union[None, str] = __file__
     self.prog_name: Union[None, str] = __name__

{mainshortcuts2-2.2.1 → mainshortcuts2-2.2.3}/src/MainShortcuts2/path.py

@@ -45,13 +45,15 @@ def cwd(set_to: PATH_TYPES = None) -> str:
 class Path:
   """Информация и действия с объектом файловой системы"""
 
-  def __init__(self, path: PATH_TYPES):
+  def __init__(self, path: PATH_TYPES, use_cache: bool = True):
+    self._path = path2str(path, to_abs=True)
     self.cp = self.copy
     self.ln = self.link
     self.mv = self.move
-    self.path = path2str(path, to_abs=True)
+    self.reload(full=True)
     self.rm = self.delete
     self.rn = self.rename
+    self.use_cache = use_cache
 
   def reload(self, full: bool = False):
     """Удаление кешированной информации"""
@@ -81,7 +83,7 @@ class Path:
   def path(self, v):
     """Абсолютный путь к объекту"""
     self._path = path2str(v, to_abs=True)
-    self.reload(True)
+    self.reload(full=True)
 
   @property
   def base_name(self) -> str:
@@ -93,14 +95,14 @@ class Path:
   @property
   def created_at(self) -> float:
     """timestamp создания объекта"""
-    if self._created_at is None:
+    if self._created_at is None or (not self.use_cache):
       self._created_at = os.path.getctime(self.path)
     return self._created_at
 
   @property
   def exists(self) -> bool:
     """Существует ли объект"""
-    if self._exists is None:
+    if self._exists is None or (not self.use_cache):
       self._exists = os.path.exists(self.path)
 
   @property
@@ -120,7 +122,7 @@ class Path:
   @property
   def is_dir(self) -> bool:
     """Является ли объект папкой"""
-    if self._is_dir is None:
+    if self._is_dir is None or (not self.use_cache):
       self._is_dir = os.path.isdir(self.path)
       if self._is_dir:
         self._type = "dir"
@@ -129,7 +131,7 @@ class Path:
   @property
   def is_file(self) -> bool:
     """Является ли объект файлом"""
-    if self._is_file is None:
+    if self._is_file is None or (not self.use_cache):
       self._is_file = os.path.isfile(self.path)
       if self._is_file:
         self._type = "file"
@@ -138,14 +140,14 @@ class Path:
   @property
   def is_link(self) -> bool:
     """Является ли объект ссылкой на другой объект"""
-    if self._is_link is None:
+    if self._is_link is None or (not self.use_cache):
       self._is_link = os.path.islink(self.path)
     return self._is_link
 
   @property
   def modified_at(self) -> float:
     """timestamp изменения объекта"""
-    if self._modified_at is None:
+    if self._modified_at is None or (not self.use_cache):
       self._modified_at = os.path.getmtime(self.path)
     return self._modified_at
 
@@ -159,7 +161,7 @@ class Path:
   @property
   def realpath(self) -> str:
     """Настоящий путь к объекту, если это ссылка (может быть неправильным)"""
-    if self._realpath is None:
+    if self._realpath is None or (not self.use_cache):
       if self.is_link:
         self._realpath = os.readlink(self.path)
       else:
@@ -169,7 +171,7 @@ class Path:
   @property
   def size(self) -> int:
     """Размер объекта в байтах"""
-    if self._size is None:
+    if self._size is None or (not self.use_cache):
       self._size = os.path.getsize(self.path)
     return self._size
 
@@ -183,7 +185,7 @@ class Path:
   @property
   def type(self) -> str:
     """Тип объекта (`dir` | `file`)"""
-    if self._type is None:
+    if self._type is None or (not self.use_cache):
       if self.is_dir:
         self._type = "dir"
       if self.is_file:
@@ -195,7 +197,7 @@ class Path:
   @property
   def used_at(self) -> float:
     """timestamp последнего использования объекта"""
-    if self._used_at is None:
+    if self._used_at is None or (not self.use_cache):
       self._used_at = os.path.getatime(self.path)
     return self._used_at
 

mainshortcuts2-2.2.3/src/MainShortcuts2/types.py

@@ -0,0 +1,147 @@
+"""Различные объекты и исключения"""
+from typing import Union
+
+
+class Base:
+  def __init__(self, *args, **kwargs):
+    self.args = args
+    self.kwargs = kwargs
+    self.type = type(self)
+
+
+class UserError(Exception):
+  pass
+  """Ошибка, которую допустил пользователь. Например неправильно указал входные данные"""
+
+
+class AccessDeniedError(UserError):
+  pass
+  """Ошибка доступа"""
+
+
+class Empty(Base):
+  pass
+  """Пустота (не равно `None`)"""
+
+
+class Infinity(Base):
+  pass
+  """Бесконечное число"""
+
+
+class NotAFileError(Exception):
+  pass
+  """Ошибка 'это не файл'"""
+
+
+class NotANumber(Base):
+  pass
+  """Не число"""
+
+
+class NotFound(Base):
+  pass
+  """Не найдено"""
+
+
+class NotFoundError(Exception):
+  pass
+  """Ошибка 'не найдено'"""
+
+
+class Action:
+  def __init__(self, func, *args, **kwargs):
+    self._closed = False
+    self._completed = False
+    self._error = None
+    self._launched = False
+    self._result = None
+    self.args: tuple = args
+    self.func = func
+    self.kwargs: dict = kwargs
+
+  def __enter__(self):
+    return self
+
+  def __exit__(self, a, b, c):
+    self.close()
+
+  def _check(self, launched: bool = None, completed: bool = None, closed: bool = None):
+    if not launched is None:
+      if launched:
+        if not self.launched:
+          raise RuntimeError("The action has not yet been launched")
+      else:
+        if self.launched:
+          raise RuntimeError("The action has already been launched")
+    if not completed is None:
+      if completed:
+        if not self.completed:
+          raise RuntimeError("The action has not yet been completed")
+      else:
+        if self.completed:
+          raise RuntimeError("The action has already been completed")
+    if not closed is None:
+      if closed:
+        if not self.closed:
+          raise RuntimeError("The action has not yet been closed")
+      else:
+        if self.closed:
+          raise RuntimeError("The action has already been closed")
+
+  def close(self):
+    self._closed = True
+    self._error = None
+    self._result = None
+    self.args = None
+    self.func = None
+    self.kwargs = None
+
+  @property
+  def launched(self) -> bool:
+    return self._launched
+
+  @property
+  def completed(self) -> bool:
+    return self._completed
+
+  @property
+  def exception(self) -> Union[None, Exception]:
+    self._check(launched=True, completed=True, closed=False)
+    return self._error
+
+  @property
+  def result(self):
+    self._check(launched=True, completed=True, closed=False)
+    if not self._error is None:
+      raise self._error  # type: ignore
+    return self._result
+
+  @property
+  def closed(self) -> bool:
+    return self._closed
+
+  def run(self):
+    self._check(launched=False, completed=False, closed=False)
+    self._launched = True
+    try:
+      self._result = self.func(*self.args, **self.kwargs)  # type: ignore
+    except Exception as err:
+      self._error = err
+    self._completed = True
+
+
+class OnlyOneInstanceError(BaseException):
+  """Ошибка для `.utils.OnlyOneInstance`"""
+
+  def __init__(self, *args):
+    if len(args) == 0:
+      args = ("Another instance is already running",)
+    BaseException.__init__(self, *args)
+
+
+Error401 = AccessDeniedError
+Error403 = AccessDeniedError
+Error404 = NotFoundError
+Inf = Infinity
+NaN = NotANumber

{mainshortcuts2-2.2.1 → mainshortcuts2-2.2.3}/src/MainShortcuts2/utils.py

@@ -4,6 +4,7 @@ import sys
 from .core import ms
 from functools import wraps
 from typing import *
+cache = {}
 
 
 class MiddlewareBase:
@@ -345,5 +346,88 @@ def shebang_file(path: str, *, exe_name: Union[None, str] = None, exe_path: Unio
   return ms.file.write(path, result)
 
 
+def remove_ANSI(text: str) -> str:
+  """Убрать ANSI коды из текста | `re`"""
+  cache_id = "remove_ANSI", 0
+  if not cache_id in cache:
+    import re
+    cache[cache_id] = re.compile(r"\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])")
+  return cache[cache_id].sub("", text)
+
+
+OnlyOneInstanceError = ms.types.OnlyOneInstanceError
+
+
+class OnlyOneInstance:
+  """Запретить запуск одной программы несколько раз | `tempfile`, `fcntl`"""
+  _win = sys.platform == "win32"
+
+  def __init__(self, name: str = "main", lock_path: str = None):
+    import tempfile
+    self.name: str = name
+    if lock_path is None:
+      lock_path = tempfile.gettempdir() + "/" + ms.MAIN_FILE.replace(":", "").replace("/", "_") + "." + name + ".lock"
+    self.lock = ms.path.Path(lock_path, use_cache=False)
+    if self._win:
+      flags = os.O_CREAT | os.O_EXCL | os.O_RDWR
+
+      def _enter():
+        try:
+          if self.lock.exists:
+            os.unlink(self.lock.path)
+          self.fd = os.open(self.lockfile, flags)
+        except OSError as err:
+          if err.errno == 13:
+            raise OnlyOneInstanceError()
+          raise
+
+      def _exit():
+        os.close(self.fd)
+        os.unlink(self.lock.path)
+    else:
+      import fcntl
+      flags = fcntl.LOCK_EX | fcntl.LOCK_NB
+
+      def _enter():
+        self.fp = open(self.lock.path, "w")
+        self.fp.flush()
+        try:
+          fcntl.lockf(self.fp, flags)
+        except IOError:
+          raise OnlyOneInstanceError()
+
+      def _exit():
+        fcntl.lockf(self.fp, fcntl.LOCK_UN)
+        os.close(self.fp)
+        if self.lock.exists:
+          os.unlink(self.lock.path)
+    self._enter = _enter
+    self._exit = _exit
+
+  def __enter__(self):
+    if self.running:
+      raise OnlyOneInstanceError()
+    self._enter()
+    self.running = True
+    try:
+      self.on_enter()
+    except Exception:
+      pass
+    return self
+
+  def __exit__(self, a, b, c):
+    if not self.running:
+      return
+    self._exit()
+    self.running = False
+    self.on_exit()
+
+  def on_enter(self):
+    pass
+
+  def on_exit(self):
+    pass
+
+
 download_file = sync_download_file
 request = sync_request

mainshortcuts2-2.2.1/src/MainShortcuts2/types.py

@@ -1,55 +0,0 @@
-"""Различные объекты, которые не имеют функционала"""
-
-
-class Base:
-  def __init__(self, *args, **kwargs):
-    self.args = args
-    self.kwargs = kwargs
-    self.type = type(self)
-
-
-class UserError(Exception):
-  pass
-  """Ошибка, которую допустил пользователь. Например неправильно указал входные данные"""
-
-
-class AccessDeniedError(UserError):
-  pass
-  """Ошибка доступа"""
-
-
-class Empty(Base):
-  pass
-  """Пустота (не равно `None`)"""
-
-
-class Infinity(Base):
-  pass
-  """Бесконечное число"""
-
-
-class NotAFileError(Exception):
-  pass
-  """Ошибка 'это не файл'"""
-
-
-class NotANumber(Base):
-  pass
-  """Не число"""
-
-
-class NotFound(Base):
-  pass
-  """Не найдено"""
-
-
-class NotFoundError(Exception):
-  pass
-  """Ошибка 'не найдено'"""
-
-
-Error401 = AccessDeniedError
-Error403 = AccessDeniedError
-Error404 = NotFoundError
-Inf = Infinity
-NaN = NotANumber