maya-umbrella 0.10.0__py2.py3-none-any.whl → 0.11.0__py2.py3-none-any.whl

maya_umbrella/_vendor/vendor.txt

@@ -0,0 +1 @@
+six==1.16.0

maya_umbrella/cleaner.py

@@ -5,13 +5,13 @@ import os
 import re
 
 # Import local modules
-from maya_umbrella.constants import FILE_VIRUS_SIGNATURES
 from maya_umbrella.filesystem import remove_virus_file_by_signature
 from maya_umbrella.filesystem import safe_remove_file
 from maya_umbrella.filesystem import safe_rmtree
 from maya_umbrella.i18n import Translator
 from maya_umbrella.maya_funs import check_reference_node_exists
 from maya_umbrella.maya_funs import cmds
+from maya_umbrella.signatures import FILE_VIRUS_SIGNATURES
 
 
 class MayaVirusCleaner(object):

maya_umbrella/constants.py

@@ -3,20 +3,3 @@ PACKAGE_NAME = "maya_umbrella"
 LOG_FORMAT = "%(asctime)s [%(levelname)s] %(name)s: %(message)s"
 
 LOG_MAX_BYTES = 1024 * 1024 * 5
-
-FILE_VIRUS_SIGNATURES = [
-    "import vaccine",
-    "cmds.evalDeferred.*leukocyte.+",
-    # https://regex101.com/r/0MNzF7/1
-    "python(.*);.+exec.+(pyCode).+;",
-]
-
-JOB_SCRIPTS_VIRUS_SIGNATURES = [
-    "petri_dish_path.+cmds.internalVar.+",
-    "userSetup",
-    "fuckVirus",
-    # https://regex101.com/r/0MNzF7/1
-    "python(.*);.+exec.+(pyCode).+;",
-    # https://regex101.com/r/2D14UA/1
-    r"^\['.+']",
-]

maya_umbrella/filesystem.py

@@ -1,5 +1,4 @@
 # Import built-in modules
-import codecs
 from contextlib import contextmanager
 import glob
 import importlib
@@ -10,16 +9,12 @@ import random
 import re
 import shutil
 import string
-import sys
 import tempfile
 
 # Import local modules
-from maya_umbrella.constants import FILE_VIRUS_SIGNATURES
+from maya_umbrella._vendor import six
 from maya_umbrella.constants import PACKAGE_NAME
-
-
-PY2 = sys.version_info[0] == 2
-PY3 = sys.version_info[0] == 3
+from maya_umbrella.signatures import FILE_VIRUS_SIGNATURES
 
 
 def this_root():
@@ -43,37 +38,24 @@ def safe_rmtree(path):
         pass
 
 
-def _codes_open(path, encoding="utf-8"):
-    """Open and read the content of a file using the specified encoding.
+def read_file(path):
+    """Read the file content.
 
     Args:
-        path (str): Path to the file.
-        encoding (str, optional): The encoding to use when reading the file. Defaults to "utf-8".
+        path (str): File path of source.
 
     Returns:
-        str: The content of the file, or an empty string if the file could not be read.
-    """
-    try:
-        with codecs.open(path, "r", encoding) as file_:
-            return file_.read()
-    except (OSError, IOError):  # noqa: UP024
-        return ""
+         str: The contents of the file path.
 
-def read_file(path):
-    """Read the content of the file at the given path."""
-    options = {"encoding": "utf-8"} if PY3 else {}
-    with open(path, **options) as file_:
-        try:
-            content = file_.read()
-        # maya-2022 UnicodeDecodeError from `plug-ins/mayaHIK.pres.mel`
-        except UnicodeDecodeError:
-            return ""
+    """
+    with open(path, "rb") as file_stream:
+        content = file_stream.read()
     return content
 
 
 def read_json(path):
     """Read the content of the file at the given path."""
-    options = {"encoding": "utf-8"} if PY3 else {}
+    options = {"encoding": "utf-8"} if six.PY3 else {}
     with open(path, **options) as file_:
         try:
             content = json.load(file_)
@@ -84,13 +66,12 @@ def read_json(path):
 
 def write_file(path, content):
     """Write the given content to the file at the given path."""
-    options = {"encoding": "utf-8"} if PY3 else {}
-    with atomic_writes(path, "w", **options) as file_:
-        file_.write(content)
+    with atomic_writes(path, "wb") as file_:
+        file_.write(six.ensure_binary(content))
 
 
 @contextmanager
-def atomic_writes(src, mode, **options):
+def atomic_writes(src, mode):
     """Context manager for atomic writes to a file.
 
     This context manager ensures that the file is only written to disk if the write operation completes without errors.
@@ -107,15 +88,13 @@ def atomic_writes(src, mode, **options):
         AttributeError: If the os module does not have the 'replace' function (Python 2 compatibility).
     """
     temp_path = os.path.join(os.path.dirname(src), "._{}".format(id_generator()))
-    open_func = open if PY3 else codecs.open
-    with open_func(temp_path, mode, **options) as f:
+    with open(temp_path, mode) as f:
         yield f
     try:
         os.replace(temp_path, src)
     except AttributeError:
         shutil.move(temp_path, src)
 
-
 def id_generator(size=6, chars=string.ascii_uppercase + string.digits):
     """Generate a random string of the given size using the given characters."""
     return "".join(random.choice(chars) for _ in range(size))
@@ -203,12 +182,7 @@ def remove_virus_file_by_signature(file_path, signatures, output_file_path=None,
         auto_remove: If True, remove the input file if the output file is empty.
 
     """
-    try:
-        data = read_file(file_path)
-    except (OSError, IOError):  # noqa: UP024
-        return False
-    except UnicodeDecodeError:
-        data = _codes_open(file_path)
+    data = read_file(file_path)
     if check_virus_by_signature(data, signatures):
         fixed_data = replace_content_by_signatures(data, signatures).strip()
         if fixed_data:
@@ -230,7 +204,7 @@ def replace_content_by_signatures(content, signatures):
         str: The cleaned content.
     """
     for signature in signatures:
-        content = re.sub(signature, "", content)
+        content = re.sub(*map(six.ensure_binary, [signature, "", content]))
     return content
 
 
@@ -250,7 +224,7 @@ def check_virus_file_by_signature(file_path, signatures=None):
     except (OSError, IOError):  # noqa: UP024
         return False
     except UnicodeDecodeError:
-        data = _codes_open(file_path)
+        data = ""
     return check_virus_by_signature(data, signatures)
 
 
@@ -266,7 +240,7 @@ def check_virus_by_signature(content, signatures=None):
     """
     signatures = signatures or FILE_VIRUS_SIGNATURES
     for signature in signatures:
-        if re.search(signature, content):
+        if re.search(*map(six.ensure_binary, [signature, content])):
             return True
     return False
 

maya_umbrella/scanner.py

@@ -6,6 +6,7 @@ import shutil
 
 # Import local modules
 from maya_umbrella import maya_funs
+from maya_umbrella._vendor.six import PY2
 from maya_umbrella.defender import context_defender
 from maya_umbrella.filesystem import get_backup_path
 from maya_umbrella.filesystem import read_file
@@ -45,14 +46,23 @@ class MayaVirusScanner(object):
             "MAYA_COLOR_MANAGEMENT_SYNCOLOR": "1"
         }
 
-    def scan_files_from_pattern(self, pattern):
+    def scan_files_from_pattern(self, pattern, glob_options=None):
         """Scan and fix Maya files matching a given pattern.
 
         Args:
             pattern (str): The file pattern to match.
+            glob_options (dict): Optional keyword arguments for the glob module.
+                if py3, we can pass a dict with the keyword arguments. {"recursive": True}
+
+        Raises:
+            ValueError: If py2, recursive is not supported.
+
         """
+        glob_options = glob_options or {}
+        if "recursive" in glob_options and PY2:
+            raise ValueError("recursive is not supported in python2")
         os.environ.update(self._env)
-        return self.scan_files_from_list(glob.iglob(pattern))
+        return self.scan_files_from_list(glob.iglob(pattern, **glob_options))
 
     def scan_files_from_list(self, files):
         """Scan and fix Maya files from a given list.

maya_umbrella/signatures.py

@@ -8,3 +8,17 @@ VirusSignature = namedtuple("VirusSignature", ["name", "signature"])
 virus20240430_sig1 = VirusSignature("virus20240430", "python(.*);.+exec.+(pyCode).+;")
 # https://regex101.com/r/2D14UA/1
 virus20240430_sig2 = VirusSignature("virus20240430", r"^\['.+']")
+
+JOB_SCRIPTS_VIRUS_SIGNATURES = [
+    "petri_dish_path.+cmds.internalVar.+",
+    "userSetup",
+    "fuckVirus",
+    virus20240430_sig1.signature,
+    virus20240430_sig2.signature,
+]
+
+FILE_VIRUS_SIGNATURES = [
+    "import vaccine",
+    "cmds.evalDeferred.*leukocyte.+",
+    virus20240430_sig1.signature,
+]

maya_umbrella/vaccines/vaccine2.py

@@ -2,12 +2,12 @@
 import os
 
 # Import local modules
-from maya_umbrella.constants import JOB_SCRIPTS_VIRUS_SIGNATURES
 from maya_umbrella.filesystem import check_virus_by_signature
 from maya_umbrella.filesystem import check_virus_file_by_signature
 from maya_umbrella.maya_funs import check_reference_node_exists
 from maya_umbrella.maya_funs import cmds
 from maya_umbrella.maya_funs import get_attr_value
+from maya_umbrella.signatures import JOB_SCRIPTS_VIRUS_SIGNATURES
 from maya_umbrella.vaccine import AbstractVaccine
 
 

maya_umbrella/vaccines/vaccine3.py

@@ -3,13 +3,13 @@ import glob
 import os
 
 # Import local modules
-from maya_umbrella.constants import JOB_SCRIPTS_VIRUS_SIGNATURES
 from maya_umbrella.filesystem import check_virus_by_signature
 from maya_umbrella.filesystem import check_virus_file_by_signature
 from maya_umbrella.maya_funs import cmds
 from maya_umbrella.maya_funs import get_attr_value
 from maya_umbrella.maya_funs import get_reference_file_by_node
 from maya_umbrella.maya_funs import is_maya_standalone
+from maya_umbrella.signatures import JOB_SCRIPTS_VIRUS_SIGNATURES
 from maya_umbrella.vaccine import AbstractVaccine
 
 

{maya_umbrella-0.10.0.dist-info → maya_umbrella-0.11.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: maya_umbrella
-Version: 0.10.0
+Version: 0.11.0
 Summary: Check and fix maya virus.
 Home-page: https://github.com/loonghao/maya_umbrella
 License: MIT

maya_umbrella-0.11.0.dist-info/RECORD

@@ -0,0 +1,35 @@
+maya_umbrella/__init__.py,sha256=rcCnFWmELeJsGoKvLHyzC_GmZu-eT1QXjQCHRGj6HuQ,529
+maya_umbrella/__version__.py,sha256=raMu9XA9JEjvdoTmFqcOw7qhJX24rYDP7XmS59TAO-Q,23
+maya_umbrella/_vendor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+maya_umbrella/_vendor/six/__init__.pyi,sha256=tU6T1qIa_1HEM5lYdk7qw9E3GdDokvpzy5D06PhlMfA,18
+maya_umbrella/_vendor/six/moves/__init__.pyi,sha256=jVS195D1cetBSWcwZ61-NYkaaI-EKlXjoF1o0I_pG9I,24
+maya_umbrella/_vendor/six/moves/configparser.pyi,sha256=OOloYod0yM3pPe0YlqnFSkiWejxtFwN-Gs0YPYHY1Nc,37
+maya_umbrella/_vendor/six.LICENSE,sha256=i7hQxWWqOJ_cFvOkaWWtI9gq3_YPI5P8J2K2MYXo5sk,1066
+maya_umbrella/_vendor/six.py,sha256=TOOfQi7nFGfMrIvtdr6wX4wyHH8M7aknmuLfo2cBBrM,34549
+maya_umbrella/_vendor/vendor.txt,sha256=DaF4-6IabevawSU5v0lD3Cyskkkzge3-659bvqihS34,12
+maya_umbrella/cleaner.py,sha256=Xj8BU0gohvh3E7RcDwQw_xryCzN5RBYGH9UTPVxiMPA,5045
+maya_umbrella/collector.py,sha256=rAFmvY8Isdle89ezn2-H36hSJd77iBvPBLRPzruCycA,13111
+maya_umbrella/constants.py,sha256=SuD8OP8e0Kh3a9ohyS5_MXjo5pHNQ8MWEPtJ6puZfIU,130
+maya_umbrella/defender.py,sha256=eT4uK23uOB1V8Y3uiaU1C2Tp-s1SngrGo3TWDbSIVJY,6008
+maya_umbrella/filesystem.py,sha256=fB7UNXzorC-878LgPd3CvQQuLxbjicnOR2y7AjAldeA,9535
+maya_umbrella/hooks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+maya_umbrella/hooks/delete_turtle.py,sha256=OPFRFH1iwonHvETndrP87MZQlJLhxpe564AJE3KyJY8,761
+maya_umbrella/hooks/delete_unknown_plugin_node.py,sha256=5YXaOem-t9Em1sr3wmBqWk5He1Lm8CsOMQsSQ3ixLfs,1293
+maya_umbrella/hooks/fix_model_panel.py,sha256=dLuMOz5uQ1nqAboNWMCx-Bi_gHM3FQNTlGxPG5wRYEs,556
+maya_umbrella/hooks/fix_on_model_change_3dc.py,sha256=o4WEQPcHNzaTMXdNnHZWWNCYlHfLxcSFYXR4YW0ZLwk,484
+maya_umbrella/i18n.py,sha256=aWaIncHh5Zq02hErMbHHLoQm_8Fu-YfBWQ15sUgsBJk,2642
+maya_umbrella/locales/en_US.json,sha256=LW2gPgO2YJIYR5UfcIBuxW_DS7rf4gkjeVuADqs1V5s,962
+maya_umbrella/locales/zh_CN.json,sha256=UsuRN2yaxxc9LE-7NQkbMqrkjXjNhNegS0QRkQLSTiE,1006
+maya_umbrella/log.py,sha256=8CY_sCPOmxDOY2oHLZel2QjZiY4HsXKwVu9vNWmScTc,1379
+maya_umbrella/maya_funs.py,sha256=_4LaMO4cRTCcbgNj2ei7UtSLAnCRY_ylHiLGKgvM4sE,3652
+maya_umbrella/scanner.py,sha256=2z9ugJbwr4-4_aXCozkgzb4htBPa8PVPnw_S12S-isE,4419
+maya_umbrella/signatures.py,sha256=GmsqpGa98WLg1ZeixxVEcTypveM0kc5dA5kb56y9kVI,658
+maya_umbrella/vaccine.py,sha256=aBW6pdT4tD4OMBPZ-d3E4_n16Rylz-2gb7JWzMZVPK0,1022
+maya_umbrella/vaccines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+maya_umbrella/vaccines/vaccine1.py,sha256=WLo1uJElTLSjVCf5CBtRNU4HKs63my5mkHiGqTfnNEE,489
+maya_umbrella/vaccines/vaccine2.py,sha256=qYiI_-BSojgN7j4esYCGBDLeyBSneDOGUwZhKHccxh8,2170
+maya_umbrella/vaccines/vaccine3.py,sha256=AgYxpflStURawobBQX0F0N_4uDwyV1IWCvZ6QLMmKpA,3633
+maya_umbrella-0.11.0.dist-info/LICENSE,sha256=tJf0Pz8q_65AjEkm3872K1cl4jGil28vJO5Ko_LhUqc,1060
+maya_umbrella-0.11.0.dist-info/METADATA,sha256=b0Yc0GlH7LrTX-ugh1xASQawXTZvbx3bUUINerUv3l0,11722
+maya_umbrella-0.11.0.dist-info/WHEEL,sha256=IrRNNNJ-uuL1ggO5qMvT1GGhQVdQU54d6ZpYqEZfEWo,92
+maya_umbrella-0.11.0.dist-info/RECORD,,

maya_umbrella-0.10.0.dist-info/RECORD

@@ -1,28 +0,0 @@
-maya_umbrella/__init__.py,sha256=rcCnFWmELeJsGoKvLHyzC_GmZu-eT1QXjQCHRGj6HuQ,529
-maya_umbrella/__version__.py,sha256=v4zmKjsKOPZbp6BrWoz7iK4ST0sdZdUh9bQSJmluZ5o,23
-maya_umbrella/cleaner.py,sha256=5EC3w4qRkIsr9AIZneEV8ljhxaOw385Gj2C2KTrzyJg,5044
-maya_umbrella/collector.py,sha256=rAFmvY8Isdle89ezn2-H36hSJd77iBvPBLRPzruCycA,13111
-maya_umbrella/constants.py,sha256=2sl0dL0U82mwu-Msda9B8-USxr89Wu2yu6SYiuaaJZk,539
-maya_umbrella/defender.py,sha256=eT4uK23uOB1V8Y3uiaU1C2Tp-s1SngrGo3TWDbSIVJY,6008
-maya_umbrella/filesystem.py,sha256=AnKUDw6N1xU0YO4YaTiLzl88Ju7MYezetcyn87Te1iY,10442
-maya_umbrella/hooks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-maya_umbrella/hooks/delete_turtle.py,sha256=OPFRFH1iwonHvETndrP87MZQlJLhxpe564AJE3KyJY8,761
-maya_umbrella/hooks/delete_unknown_plugin_node.py,sha256=5YXaOem-t9Em1sr3wmBqWk5He1Lm8CsOMQsSQ3ixLfs,1293
-maya_umbrella/hooks/fix_model_panel.py,sha256=dLuMOz5uQ1nqAboNWMCx-Bi_gHM3FQNTlGxPG5wRYEs,556
-maya_umbrella/hooks/fix_on_model_change_3dc.py,sha256=o4WEQPcHNzaTMXdNnHZWWNCYlHfLxcSFYXR4YW0ZLwk,484
-maya_umbrella/i18n.py,sha256=aWaIncHh5Zq02hErMbHHLoQm_8Fu-YfBWQ15sUgsBJk,2642
-maya_umbrella/locales/en_US.json,sha256=LW2gPgO2YJIYR5UfcIBuxW_DS7rf4gkjeVuADqs1V5s,962
-maya_umbrella/locales/zh_CN.json,sha256=UsuRN2yaxxc9LE-7NQkbMqrkjXjNhNegS0QRkQLSTiE,1006
-maya_umbrella/log.py,sha256=8CY_sCPOmxDOY2oHLZel2QjZiY4HsXKwVu9vNWmScTc,1379
-maya_umbrella/maya_funs.py,sha256=_4LaMO4cRTCcbgNj2ei7UtSLAnCRY_ylHiLGKgvM4sE,3652
-maya_umbrella/scanner.py,sha256=pDU6RKez19kaaO_7HE4jG4h53XoloPCwiuVV8ajr2mo,3932
-maya_umbrella/signatures.py,sha256=RkEXChch7tdqA9Yq6YQ8AMnK2ra6ih0dfnpeZy5FkYs,354
-maya_umbrella/vaccine.py,sha256=aBW6pdT4tD4OMBPZ-d3E4_n16Rylz-2gb7JWzMZVPK0,1022
-maya_umbrella/vaccines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-maya_umbrella/vaccines/vaccine1.py,sha256=WLo1uJElTLSjVCf5CBtRNU4HKs63my5mkHiGqTfnNEE,489
-maya_umbrella/vaccines/vaccine2.py,sha256=b2OmYjLCZRFIeeVr-EvQRrmYIGmTX4J9l9DtINAmo7E,2169
-maya_umbrella/vaccines/vaccine3.py,sha256=LAP5QfDIlbiUM_A7O2Vnw4aFhDtojd2kAo2CFcHOKVE,3632
-maya_umbrella-0.10.0.dist-info/LICENSE,sha256=tJf0Pz8q_65AjEkm3872K1cl4jGil28vJO5Ko_LhUqc,1060
-maya_umbrella-0.10.0.dist-info/METADATA,sha256=Tzf4ZBeqxgfvzer_rRMO1cZWgapHoeF0vFVgqonoZsI,11722
-maya_umbrella-0.10.0.dist-info/WHEEL,sha256=IrRNNNJ-uuL1ggO5qMvT1GGhQVdQU54d6ZpYqEZfEWo,92
-maya_umbrella-0.10.0.dist-info/RECORD,,