MainShortcuts2 2.2.3__tar.gz → 2.2.4__tar.gz

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

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

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

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

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

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

{mainshortcuts2-2.2.3 → mainshortcuts2-2.2.4}/src/MainShortcuts2/dir.py

@@ -34,7 +34,7 @@ def create(path: PATH_TYPES, force: bool = False, **kw):
 
 def _list_filter(path: Path, *, exts: Iterable[str], func: Callable[[Path], bool], links: bool, type: str):
   if not exts is None:
-    if not path.ext in exts:
+    if not path.ext.lower() in exts:
       return False
   if not func is None:
     if not func(path):
@@ -50,14 +50,20 @@ def _list_filter(path: Path, *, exts: Iterable[str], func: Callable[[Path], bool
 
 def list(path: PATH_TYPES = ".", *, exts: Iterable[str] = None, func: Callable[[Path], bool] = None, links: bool = None, type: str = None) -> list[Path]:
   """Список содержимого папки"""
-  r = []
   kw = {}
-  kw["exts"] = None if exts is None else builtins.list(exts)
+  path = _check(path)
+  r = []
   kw["func"] = func
   kw["links"] = links
   kw["type"] = type
-  for i in os.listdir(_check(path)):
-    i = Path(_check(path) + "/" + i)
+  if exts is None:
+    kw["exts"] = None
+  else:
+    kw["exts"] = []
+    for i in exts:
+      kw["exts"].append((i if i.startswith(".") else "." + i).lower())
+  for i in os.listdir(path):
+    i = Path(path + "/" + i)
     if _list_filter(i, **kw):
       r.append(i)
   return r

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

@@ -365,6 +365,7 @@ class OnlyOneInstance:
   def __init__(self, name: str = "main", lock_path: str = None):
     import tempfile
     self.name: str = name
+    self.running = False
     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)
@@ -375,7 +376,7 @@ class OnlyOneInstance:
         try:
           if self.lock.exists:
             os.unlink(self.lock.path)
-          self.fd = os.open(self.lockfile, flags)
+          self.fd = os.open(self.lock.path, flags)
         except OSError as err:
           if err.errno == 13:
             raise OnlyOneInstanceError()