maya-umbrella 0.12.1__py2.py3-none-any.whl → 0.13.0__py2.py3-none-any.whl

maya_umbrella/__version__.py

@@ -1 +1 @@
-__version__ = "0.12.1"
+__version__ = "0.13.0"

maya_umbrella/_vendor/atomicwrites/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2015-2016 Markus Unterwaditzer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

maya_umbrella/_vendor/atomicwrites/__init__.py

@@ -0,0 +1,229 @@
+import contextlib
+import io
+import os
+import sys
+import tempfile
+
+try:
+    import fcntl
+except ImportError:
+    fcntl = None
+
+# `fspath` was added in Python 3.6
+try:
+    from os import fspath
+except ImportError:
+    fspath = None
+
+__version__ = '1.4.1'
+
+
+PY2 = sys.version_info[0] == 2
+
+text_type = unicode if PY2 else str  # noqa
+
+
+def _path_to_unicode(x):
+    if not isinstance(x, text_type):
+        return x.decode(sys.getfilesystemencoding())
+    return x
+
+
+DEFAULT_MODE = "wb" if PY2 else "w"
+
+
+_proper_fsync = os.fsync
+
+
+if sys.platform != 'win32':
+    if hasattr(fcntl, 'F_FULLFSYNC'):
+        def _proper_fsync(fd):
+            # https://lists.apple.com/archives/darwin-dev/2005/Feb/msg00072.html
+            # https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man2/fsync.2.html
+            # https://github.com/untitaker/python-atomicwrites/issues/6
+            fcntl.fcntl(fd, fcntl.F_FULLFSYNC)
+
+    def _sync_directory(directory):
+        # Ensure that filenames are written to disk
+        fd = os.open(directory, 0)
+        try:
+            _proper_fsync(fd)
+        finally:
+            os.close(fd)
+
+    def _replace_atomic(src, dst):
+        os.rename(src, dst)
+        _sync_directory(os.path.normpath(os.path.dirname(dst)))
+
+    def _move_atomic(src, dst):
+        os.link(src, dst)
+        os.unlink(src)
+
+        src_dir = os.path.normpath(os.path.dirname(src))
+        dst_dir = os.path.normpath(os.path.dirname(dst))
+        _sync_directory(dst_dir)
+        if src_dir != dst_dir:
+            _sync_directory(src_dir)
+else:
+    from ctypes import windll, WinError
+
+    _MOVEFILE_REPLACE_EXISTING = 0x1
+    _MOVEFILE_WRITE_THROUGH = 0x8
+    _windows_default_flags = _MOVEFILE_WRITE_THROUGH
+
+    def _handle_errors(rv):
+        if not rv:
+            raise WinError()
+
+    def _replace_atomic(src, dst):
+        _handle_errors(windll.kernel32.MoveFileExW(
+            _path_to_unicode(src), _path_to_unicode(dst),
+            _windows_default_flags | _MOVEFILE_REPLACE_EXISTING
+        ))
+
+    def _move_atomic(src, dst):
+        _handle_errors(windll.kernel32.MoveFileExW(
+            _path_to_unicode(src), _path_to_unicode(dst),
+            _windows_default_flags
+        ))
+
+
+def replace_atomic(src, dst):
+    '''
+    Move ``src`` to ``dst``. If ``dst`` exists, it will be silently
+    overwritten.
+
+    Both paths must reside on the same filesystem for the operation to be
+    atomic.
+    '''
+    return _replace_atomic(src, dst)
+
+
+def move_atomic(src, dst):
+    '''
+    Move ``src`` to ``dst``. There might a timewindow where both filesystem
+    entries exist. If ``dst`` already exists, :py:exc:`FileExistsError` will be
+    raised.
+
+    Both paths must reside on the same filesystem for the operation to be
+    atomic.
+    '''
+    return _move_atomic(src, dst)
+
+
+class AtomicWriter(object):
+    '''
+    A helper class for performing atomic writes. Usage::
+
+        with AtomicWriter(path).open() as f:
+            f.write(...)
+
+    :param path: The destination filepath. May or may not exist.
+    :param mode: The filemode for the temporary file. This defaults to `wb` in
+        Python 2 and `w` in Python 3.
+    :param overwrite: If set to false, an error is raised if ``path`` exists.
+        Errors are only raised after the file has been written to.  Either way,
+        the operation is atomic.
+    :param open_kwargs: Keyword-arguments to pass to the underlying
+        :py:func:`open` call. This can be used to set the encoding when opening
+        files in text-mode.
+
+    If you need further control over the exact behavior, you are encouraged to
+    subclass.
+    '''
+
+    def __init__(self, path, mode=DEFAULT_MODE, overwrite=False,
+                 **open_kwargs):
+        if 'a' in mode:
+            raise ValueError(
+                'Appending to an existing file is not supported, because that '
+                'would involve an expensive `copy`-operation to a temporary '
+                'file. Open the file in normal `w`-mode and copy explicitly '
+                'if that\'s what you\'re after.'
+            )
+        if 'x' in mode:
+            raise ValueError('Use the `overwrite`-parameter instead.')
+        if 'w' not in mode:
+            raise ValueError('AtomicWriters can only be written to.')
+
+        # Attempt to convert `path` to `str` or `bytes`
+        if fspath is not None:
+            path = fspath(path)
+
+        self._path = path
+        self._mode = mode
+        self._overwrite = overwrite
+        self._open_kwargs = open_kwargs
+
+    def open(self):
+        '''
+        Open the temporary file.
+        '''
+        return self._open(self.get_fileobject)
+
+    @contextlib.contextmanager
+    def _open(self, get_fileobject):
+        f = None  # make sure f exists even if get_fileobject() fails
+        try:
+            success = False
+            with get_fileobject(**self._open_kwargs) as f:
+                yield f
+                self.sync(f)
+            self.commit(f)
+            success = True
+        finally:
+            if not success:
+                try:
+                    self.rollback(f)
+                except Exception:
+                    pass
+
+    def get_fileobject(self, suffix="", prefix=tempfile.gettempprefix(),
+                       dir=None, **kwargs):
+        '''Return the temporary file to use.'''
+        if dir is None:
+            dir = os.path.normpath(os.path.dirname(self._path))
+        descriptor, name = tempfile.mkstemp(suffix=suffix, prefix=prefix,
+                                            dir=dir)
+        # io.open() will take either the descriptor or the name, but we need
+        # the name later for commit()/replace_atomic() and couldn't find a way
+        # to get the filename from the descriptor.
+        os.close(descriptor)
+        kwargs['mode'] = self._mode
+        kwargs['file'] = name
+        return io.open(**kwargs)
+
+    def sync(self, f):
+        '''responsible for clearing as many file caches as possible before
+        commit'''
+        f.flush()
+        _proper_fsync(f.fileno())
+
+    def commit(self, f):
+        '''Move the temporary file to the target location.'''
+        if self._overwrite:
+            replace_atomic(f.name, self._path)
+        else:
+            move_atomic(f.name, self._path)
+
+    def rollback(self, f):
+        '''Clean up all temporary resources.'''
+        os.unlink(f.name)
+
+
+def atomic_write(path, writer_cls=AtomicWriter, **cls_kwargs):
+    '''
+    Simple atomic writes. This wraps :py:class:`AtomicWriter`::
+
+        with atomic_write(path) as f:
+            f.write(...)
+
+    :param path: The target path to write to.
+    :param writer_cls: The writer class to use. This parameter is useful if you
+        subclassed :py:class:`AtomicWriter` to change some behavior and want to
+        use that new subclass.
+
+    Additional keyword arguments are passed to the writer class. See
+    :py:class:`AtomicWriter`.
+    '''
+    return writer_cls(path, **cls_kwargs).open()

maya_umbrella/_vendor/atomicwrites.pyi

@@ -0,0 +1 @@
+from atomicwrites import *

maya_umbrella/_vendor/vendor.txt

@@ -1 +1,2 @@
 six==1.16.0
+atomicwrites==1.4.1

maya_umbrella/collector.py

@@ -74,7 +74,7 @@ class MayaVirusCollector(object):
     @property
     def maya_install_root(self):
         """Return the Maya installation root directory."""
-        return os.environ["MAYA_LOCATION"]
+        return os.environ.get("MAYA_LOCATION", "")
 
     @property
     def user_script_path(self):

maya_umbrella/filesystem.py

@@ -1,29 +1,35 @@
 # Import built-in modules
-from contextlib import contextmanager
 import glob
 import importlib
 import json
 import logging
 import os
-import random
 import re
 import shutil
-import string
 import tempfile
 
 # Import local modules
 from maya_umbrella._vendor import six
+from maya_umbrella._vendor.atomicwrites import atomic_write
 from maya_umbrella.constants import PACKAGE_NAME
 from maya_umbrella.signatures import FILE_VIRUS_SIGNATURES
 
 
 def this_root():
-    """Return the absolute path of the current file's directory."""
+    """Return the absolute path of the current file's directory.
+
+    Returns:
+        str: The absolute path of the current file's directory.
+    """
     return os.path.abspath(os.path.dirname(__file__))
 
 
 def safe_remove_file(file_path):
-    """Remove the file at the given path without raising an error if the file does not exist."""
+    """Remove the file at the given path without raising an error if the file does not exist.
+
+    Args:
+        file_path (str): Path to the file to remove.
+    """
     try:
         os.remove(file_path)
     except (OSError, IOError):  # noqa: UP024
@@ -31,7 +37,11 @@ def safe_remove_file(file_path):
 
 
 def safe_rmtree(path):
-    """Remove the directory at the given path without raising an error if the directory does not exist."""
+    """Remove the directory at the given path without raising an error if the directory does not exist.
+
+    Args:
+        path (str): Path to the directory to remove.
+    """
     try:
         shutil.rmtree(path)
     except (OSError, IOError):  # noqa: UP024
@@ -54,7 +64,14 @@ def read_file(path):
 
 
 def read_json(path):
-    """Read the content of the file at the given path."""
+    """Read the content of a JSON file at the given path.
+
+    Args:
+        path (str): Path to the JSON file.
+
+    Returns:
+        dict: The content of the JSON file as a dictionary, or an empty dictionary if the file could not be read.
+    """
     options = {"encoding": "utf-8"} if six.PY3 else {}
     with open(path, **options) as file_:
         try:
@@ -65,53 +82,28 @@ def read_json(path):
 
 
 def write_file(path, content):
-    """Write the given content to the file at the given path."""
-    with atomic_writes(path, "wb") as file_:
-        file_.write(six.ensure_binary(content))
-
-
-@contextmanager
-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.
+    """Write the given content to the file at the given path.
 
     Args:
-        src (str): Path to the file to be written.
-        mode (str): Mode in which the file is opened, like 'r', 'w', 'a', etc.
-        **options: Arbitrary keyword arguments that are passed to the built-in open() function.
-
-    Yields:
-        file object: The opened file object.
-
-    Raises:
-        AttributeError: If the os module does not have the 'replace' function (Python 2 compatibility).
+        path (str): Path to the file to write.
+        content (str): Content to write to the file.
     """
-    temp_path = os.path.join(os.path.dirname(src), "._{}".format(id_generator()))
-    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))
+    root = os.path.dirname(path)
+    if not os.path.exists(root):
+        os.makedirs(root)
+    with atomic_write(path, mode="wb", overwrite=True) as file_:
+        file_.write(six.ensure_binary(content))
 
 
-def rename(src):
-    """Rename the file at the given path to a random name and return the new path."""
-    dst = os.path.join(os.path.dirname(src), "._{}".format(id_generator()))
-    try:
-        os.rename(src, dst)
-    except (OSError, IOError):  # noqa: UP024
-        return src
-    return dst
+def load_hook(hook_file):
+    """Load the Python module from the given hook file.
 
+    Args:
+        hook_file (str): Path to the Python file to load.
 
-def load_hook(hook_file):
-    """Load the Python module from the given hook file."""
+    Returns:
+        module: The loaded Python module.
+    """
     hook_name = os.path.basename(hook_file).split(".py")[0]
     if hasattr(importlib, "machinery"):
         # Python 3
@@ -132,7 +124,11 @@ def load_hook(hook_file):
 
 
 def get_hooks():
-    """Return a list of paths to all hook files in the 'hooks' directory."""
+    """Return a list of paths to all hook files in the 'hooks' directory.
+
+    Returns:
+        list: A list of paths to all hook files in the 'hooks' directory.
+    """
     pattern = os.path.join(this_root(), "hooks", "*.py")
     return [hook for hook in glob.glob(pattern) if "__init__" not in hook]
 
@@ -187,6 +183,7 @@ def remove_virus_file_by_signature(file_path, signatures, output_file_path=None,
         fixed_data = replace_content_by_signatures(data, signatures).strip()
         if fixed_data:
             write_file(output_file_path or file_path, fixed_data)
+
         else:
             # Auto remove empty files.
             if auto_remove:
@@ -273,7 +270,14 @@ def get_backup_path(path, root_path=None):
 
 
 def get_maya_install_root(maya_version):
-    """Get the Maya install root path."""
+    """Get the Maya install root path for the specified version.
+
+    Args:
+        maya_version (str): The version of Maya to find the install root for.
+
+    Returns:
+        str: The Maya install root path, or None if not found.
+    """
     logger = logging.getLogger(__name__)
     maya_location = os.getenv("MAYA_LOCATION")
     try:

maya_umbrella/vaccines/vaccine3.py

@@ -71,7 +71,7 @@ class Vaccine(AbstractVaccine):
                 if virus in script_job:
                     self.api.add_infected_script_job(script_job)
 
-    def fix_bad_hik_files(self):
+    def collect_infected_hik_files(self):
         """Fix all bad HIK files related to the virus."""
         pattern = os.path.join(self.api.maya_install_root, "resources/l10n/*/plug-ins/mayaHIK.pres.mel")
         for hik_mel in glob.glob(pattern):
@@ -83,8 +83,8 @@ class Vaccine(AbstractVaccine):
         """Collect all issues related to the virus."""
         self.api.add_malicious_file(os.path.join(os.getenv("APPDATA"), "syssst"))
         self.collect_infected_mel_files()
+        self.collect_infected_hik_files()
         self.collect_infected_nodes()
         # This only works for Maya Gui model.
         if not is_maya_standalone():
             self.collect_script_jobs()
-        self.api.add_additionally_fix_function(self.fix_bad_hik_files)

{maya_umbrella-0.12.1.dist-info → maya_umbrella-0.13.0.dist-info}/METADATA

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

{maya_umbrella-0.12.1.dist-info → maya_umbrella-0.13.0.dist-info}/RECORD

@@ -1,17 +1,20 @@
 maya_umbrella/__init__.py,sha256=rcCnFWmELeJsGoKvLHyzC_GmZu-eT1QXjQCHRGj6HuQ,529
-maya_umbrella/__version__.py,sha256=PAuBI8I6F9Yu_86XjI2yaWn8QmCd9ZvK7tkZLWvEg-Q,23
+maya_umbrella/__version__.py,sha256=DgpLNbv0e1LIEOOe54Db8_390i9pelMEFEnsBsNmyhA,23
 maya_umbrella/_vendor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+maya_umbrella/_vendor/atomicwrites/LICENSE,sha256=h4Mp8L2HitAVEpzovagvSB6G7C6Agx6QnA1nFx2SLnM,1069
+maya_umbrella/_vendor/atomicwrites/__init__.py,sha256=myvxvKRBb7vebPTSUiAopsRrvsm6VojiAvET1xohT-4,6970
+maya_umbrella/_vendor/atomicwrites.pyi,sha256=kofmo9N_ix4812ioT1GEwo8HTtOWvnmarf_FIKY2czg,27
 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/_vendor/vendor.txt,sha256=9yyM8r0ibzfkXqgcAehZId0IsvELLV18YTxi6cwF7KA,32
 maya_umbrella/cleaner.py,sha256=Xj8BU0gohvh3E7RcDwQw_xryCzN5RBYGH9UTPVxiMPA,5045
-maya_umbrella/collector.py,sha256=rAFmvY8Isdle89ezn2-H36hSJd77iBvPBLRPzruCycA,13111
+maya_umbrella/collector.py,sha256=SiC-wpDjer7w6ofsyWTFJmUF8pPz233xDXeANNz-LrY,13119
 maya_umbrella/constants.py,sha256=SuD8OP8e0Kh3a9ohyS5_MXjo5pHNQ8MWEPtJ6puZfIU,130
 maya_umbrella/defender.py,sha256=eT4uK23uOB1V8Y3uiaU1C2Tp-s1SngrGo3TWDbSIVJY,6008
-maya_umbrella/filesystem.py,sha256=B9uhaRnzsj7UFwD9egDWtgR0lgBSV_iPvS0DuqcW-Vg,9537
+maya_umbrella/filesystem.py,sha256=E1bs4WguYI9cKr6JnfyERu2fVE9Ii9qYUv-DcfVZa1k,9194
 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
@@ -29,8 +32,8 @@ 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.12.1.dist-info/LICENSE,sha256=tJf0Pz8q_65AjEkm3872K1cl4jGil28vJO5Ko_LhUqc,1060
-maya_umbrella-0.12.1.dist-info/METADATA,sha256=u17mEb0q-lAj0D0V3GjyUhb9PjCvghyLnHWf3nQU9wM,11722
-maya_umbrella-0.12.1.dist-info/WHEEL,sha256=IrRNNNJ-uuL1ggO5qMvT1GGhQVdQU54d6ZpYqEZfEWo,92
-maya_umbrella-0.12.1.dist-info/RECORD,,
+maya_umbrella/vaccines/vaccine3.py,sha256=f1jO9pyyZ_Ep18HR-fCQfGEi-TnNKXzjdCi9ORSZUx0,3613
+maya_umbrella-0.13.0.dist-info/LICENSE,sha256=tJf0Pz8q_65AjEkm3872K1cl4jGil28vJO5Ko_LhUqc,1060
+maya_umbrella-0.13.0.dist-info/METADATA,sha256=3COg7DKGNx241YmlU6aVJOssLpRmpsKeLXSFa-I2Sx0,11722
+maya_umbrella-0.13.0.dist-info/WHEEL,sha256=IrRNNNJ-uuL1ggO5qMvT1GGhQVdQU54d6ZpYqEZfEWo,92
+maya_umbrella-0.13.0.dist-info/RECORD,,