vim-eof-comment 0.3.19__py3-none-any.whl → 0.3.21__py3-none-any.whl

vim_eof_comment/eof.py

@@ -77,7 +77,7 @@ def eof_comment_search(
         if last_line != comment_map[ext] or (newline and not had_nwl):
             verbose_print(f"{_BRIGHT}{_RED}CHANGED", verbose=verbose)
             result[path] = EOFCommentSearch(
-                state=IOWrapperBool(file=open(path, "r", encoding="utf8"), had_nwl=had_nwl),
+                state=IOWrapperBool(file=open(path, "rb"), had_nwl=had_nwl),
                 lang=ext,
                 match=matches(last_line, verbose)
             )

vim_eof_comment/file.py

@@ -15,6 +15,64 @@ from typing import Dict, List
 from .types import BatchPairDict, BatchPathDict, LineBool
 from .util import die, error
 
+EXCLUDED_DIRS: List[str] = [
+    ".git",
+    ".mypy_cache",
+    ".ropeproject",
+    ".venv",
+    "build",
+    "venv",
+]
+
+
+def try_open(fpath: str) -> bool:
+    """
+    Try to open a file, unless a ``UnicodeDecodeError`` triggers.
+
+    Parameters
+    ----------
+    fpath : str
+        The file path to try and open.
+
+    Returns
+    -------
+    bool
+        Whether the file triggers a ``UnicodeDecodeError`` or not.
+    """
+    file = open(fpath, "rb")
+    success: bool = True
+    try:
+        file.read().decode(encoding="utf8")
+    except UnicodeDecodeError:
+        success = False
+    except Exception:
+        die("Something went wrong in `try_open()`!", code=2)
+
+    file.close()
+    return success
+
+
+def has_excluded(dir: str) -> bool:
+    """
+    Check whether a directory list contains any excluded directories.
+
+    Parameters
+    ----------
+    dir : str
+        The directory to check.
+
+    Returns
+    -------
+    bool
+        Whether an excluded directory was found.
+    """
+    dir = dir.rstrip("/")
+    for excluded in EXCLUDED_DIRS:
+        if dir.endswith(excluded):
+            return True
+
+    return False
+
 
 def bootstrap_paths(paths: List[str], exts: List[str]) -> List[BatchPairDict]:
     """
@@ -34,11 +92,22 @@ def bootstrap_paths(paths: List[str], exts: List[str]) -> List[BatchPairDict]:
     """
     result = list()
     for path in paths:
-        if not isdir(path):
+        if not isdir(path) or has_excluded(path):
             continue
 
-        file: str
+        root: str
+        dirs: List[str]
+        files: List[str]
         for root, dirs, files in walk(path):
+            excluded = False
+            for dir in dirs:
+                if has_excluded(dir):
+                    excluded = True
+                    break
+
+            if excluded:
+                continue
+
             for file in files:
                 for ext in exts:
                     if not file.endswith(ext):
@@ -66,8 +135,11 @@ def open_batch_paths(paths: List[BatchPairDict]) -> Dict[str, BatchPathDict]:
     result = dict()
     for path in paths:
         fpath, ext = path["fpath"], path["ft_ext"]
+        if not try_open(fpath):
+            continue
+
         try:
-            result[fpath] = {"file": open(fpath, "r"), "ft_ext": ext}
+            result[fpath] = {"file": open(fpath, "rb"), "ft_ext": ext}
         except KeyboardInterrupt:
             die("\nProgram interrupted!", code=1)  # Kills the program
         except FileNotFoundError:
@@ -101,7 +173,8 @@ def modify_file(file: TextIOWrapper, comments: Dict[str, str], ext: str, **kwarg
     matching: bool = kwargs.get("matching", False)
     newline: bool = kwargs.get("newline", False)
 
-    data: List[str] = file.read().split("\n")
+    bdata: str = file.read().decode(encoding="utf8")
+    data: List[str] = bdata.split("\n")
     file.close()
 
     data_len = len(data)
@@ -143,7 +216,8 @@ def get_last_line(file: TextIOWrapper) -> LineBool:
     LineBool
         An object containing both the last line in a string and a boolean indicating a newline.
     """
-    data: List[str] = file.read().split("\n")
+    bdata: str = file.read().decode(encoding="utf8")
+    data: List[str] = bdata.split("\n")
     file.close()
 
     had_newline, line = False, ""

vim_eof_comment/version.py

@@ -226,6 +226,8 @@ version_info = VersionInfo([
     (0, 3, 17),
     (0, 3, 18),
     (0, 3, 19),
+    (0, 3, 20),
+    (0, 3, 21),
 ])
 
 __version__: str = str(version_info)

{vim_eof_comment-0.3.19.dist-info → vim_eof_comment-0.3.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vim-eof-comment
-Version: 0.3.19
+Version: 0.3.21
 Summary: Adds Vim EOF modeline comments for given filetypes in given directories
 Author-email: Guennadi Maximov C <g.maxc.fox@protonmail.com>
 Maintainer-email: Guennadi Maximov C <g.maxc.fox@protonmail.com>

{vim_eof_comment-0.3.19.dist-info → vim_eof_comment-0.3.21.dist-info}/RECORD

@@ -7,9 +7,9 @@ docs/source/installation.rst,sha256=PkiS3E_ujNTWeKXicZ7aBPch2l1R0TsRRL6pFj_oMJI,
 vim_eof_comment/__init__.py,sha256=ESbmhca9mTst3TYMer8zFw73IRsJvn5EESci_RpfLbQ,487
 vim_eof_comment/__init__.pyi,sha256=Eh8FQwE_F9TrQEiT7CR1mdGHBT6fHUzfV6VP8uSN33g,478
 vim_eof_comment/__main__.py,sha256=0AFVSkz8RuxSuPbJJWycyxs6u5Yypl8FKUMR3ZVLJbk,343
-vim_eof_comment/eof.py,sha256=Y9LMj8zx7_vhfLJe0txhmeZctaQyYhLOeKTGUKlgKr8,5176
+vim_eof_comment/eof.py,sha256=JpU5v_V_4fIaWt0BJfPvgp-0ZjzhDdyj_otpusIa7a8,5160
 vim_eof_comment/eof.pyi,sha256=BTw9brhrHBTX12fYuwfO8_D-Gyrf0387ErmgrcTdvh0,1786
-vim_eof_comment/file.py,sha256=kvSON13PrqElilnx7MTD0YFvnm83vZOdTe1aFaIlPt4,4182
+vim_eof_comment/file.py,sha256=eIsaB8r20awtBDcUFt2oL8SD_gvpxhiCjaldK_Zh4Xs,5742
 vim_eof_comment/file.pyi,sha256=BWBtHbFkAdiNSRfe9SQBJvxtH3WHZfIgz03kFsIWX4w,1950
 vim_eof_comment/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vim_eof_comment/regex.py,sha256=rGfFIBMbfWlIxAScXqvgBlB-tMJBUxQwTVjEkoxDZ3o,1007
@@ -18,7 +18,7 @@ vim_eof_comment/types.py,sha256=ofo6X9sbNG1ONsofMFganJPlYYsCZmriMWuZHj7dukg,3832
 vim_eof_comment/types.pyi,sha256=dJcnOLxqVShYHSyafbNZEQJ4D3MC42A-oDtlJArApRE,3562
 vim_eof_comment/util.py,sha256=0-SUdHqpgMdwHauZawaY3KL5FkIfe1u2zA1AHb80ez8,4125
 vim_eof_comment/util.pyi,sha256=5RQukLgpVZTwbALhBOtd1NqFkiqC-V6JEWeT1_B9-2k,2675
-vim_eof_comment/version.py,sha256=hwDm3DDkIJwEgBXOgrV1nIl9M5Rzc9IbngNP7RS6X5c,5766
+vim_eof_comment/version.py,sha256=GYzQ9G8yuBoWKkLgu5qA3-swNe3XjWMtBh4AMVGXHrs,5798
 vim_eof_comment/version.pyi,sha256=suF5VwVtpA0rVOuKpa6cvJ8TNocXgtJiI51DRrpzOTs,3692
 vim_eof_comment/args/__init__.py,sha256=Hyqun15456NVFLAJ3cpdtuNEz5XaFH93vfVlbC-aeuc,318
 vim_eof_comment/args/__init__.pyi,sha256=cXK7nEpYBveD4kxtVTe2x8oUxT9mhENS5r3wK3AAX2U,151
@@ -31,9 +31,9 @@ vim_eof_comment/comments/__init__.pyi,sha256=cecbbrShh0If8btwJ8zKYpBt9dIsMwrDXbd
 vim_eof_comment/comments/filetypes.json,sha256=JpSrnBNO2AivLYi-C5--8yVocyBwye3IkMesNIz1uHA,2973
 vim_eof_comment/comments/generator.py,sha256=Mi3Yi0j-8aXQnVUsXqI1VE1yW71tWemooWgO9smSilI,7731
 vim_eof_comment/comments/generator.pyi,sha256=Nj33jwria5FWUuydUD_uZSH__PxSZ3yPxOPYF1_TIpM,3272
-vim_eof_comment-0.3.19.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-vim_eof_comment-0.3.19.dist-info/METADATA,sha256=nPiG0NzURTDcOrBS_blRrkfZGLyz_4jDqXRdsrz-pQE,2763
-vim_eof_comment-0.3.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-vim_eof_comment-0.3.19.dist-info/entry_points.txt,sha256=vm47g4hoUbow4elcHr9yylYfj6IvAs10wSFKqwqTu6E,61
-vim_eof_comment-0.3.19.dist-info/top_level.txt,sha256=TkaQ5vuhVzXaJnfUdcLJCQ81ILK2V6OtvX5-hIMZAc0,21
-vim_eof_comment-0.3.19.dist-info/RECORD,,
+vim_eof_comment-0.3.21.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+vim_eof_comment-0.3.21.dist-info/METADATA,sha256=SrFvzlchrAr0eJFaCWzFnrocDgrmDUhDszAMZn8eSH0,2763
+vim_eof_comment-0.3.21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+vim_eof_comment-0.3.21.dist-info/entry_points.txt,sha256=vm47g4hoUbow4elcHr9yylYfj6IvAs10wSFKqwqTu6E,61
+vim_eof_comment-0.3.21.dist-info/top_level.txt,sha256=TkaQ5vuhVzXaJnfUdcLJCQ81ILK2V6OtvX5-hIMZAc0,21
+vim_eof_comment-0.3.21.dist-info/RECORD,,