Black | MyPy | PyLint | PyTest Fixes

Author: ModernMAK

src/relic/sga/core/cli.py

@@ -3,7 +3,7 @@
 import argparse
 import os.path
 from argparse import ArgumentParser, Namespace
-from typing import Optional
+from typing import Optional, Callable
 
 import fs.copy
 from fs.base import FS
@@ -14,21 +14,20 @@ class RelicSgaCli(CliPluginGroup):
     GROUP = "relic.cli.sga"
 
     def _create_parser(
-            self, command_group: Optional[_SubParsersAction] = None
+        self, command_group: Optional[_SubParsersAction] = None
     ) -> ArgumentParser:
         if command_group is None:
             return ArgumentParser("sga")
         else:
             return command_group.add_parser("sga")
 
 
-
-def _arg_exists_err( value ):
+def _arg_exists_err(value: str) -> argparse.ArgumentTypeError:
     return argparse.ArgumentTypeError(f"The given path '{value}' does not exist!")
 
 
-def _get_dir_type_validator(exists:bool):
-    def _dir_type(path: str):
+def _get_dir_type_validator(exists: bool) -> Callable[[str], str]:
+    def _dir_type(path: str) -> str:
         if not os.path.exists(path):
             if exists:
                 raise _arg_exists_err(path)
@@ -43,8 +42,8 @@ def _dir_type(path: str):
     return _dir_type
 
 
-def _get_file_type_validator(exists:Optional[bool]):
-    def _file_type(path: str):
+def _get_file_type_validator(exists: Optional[bool]) -> Callable[[str], str]:
+    def _file_type(path: str) -> str:
         if not os.path.exists(path):
             if exists:
                 raise _arg_exists_err(path)
@@ -61,16 +60,24 @@ def _file_type(path: str):
 
 class RelicSgaUnpackCli(CliPlugin):
     def _create_parser(
-            self, command_group: Optional[_SubParsersAction] = None
+        self, command_group: Optional[_SubParsersAction] = None
     ) -> ArgumentParser:
         parser: ArgumentParser
         if command_group is None:
             parser = ArgumentParser("unpack")
         else:
             parser = command_group.add_parser("unpack")
 
-        parser.add_argument("src_sga", type=_get_file_type_validator(exists=True), help="Source SGA File")
-        parser.add_argument("out_dir", type=_get_dir_type_validator(exists=False), help="Output Directory")
+        parser.add_argument(
+            "src_sga",
+            type=_get_file_type_validator(exists=True),
+            help="Source SGA File",
+        )
+        parser.add_argument(
+            "out_dir",
+            type=_get_dir_type_validator(exists=False),
+            help="Output Directory",
+        )
 
         return parser
 
@@ -92,7 +99,7 @@ class RelicSgaPackCli(CliPluginGroup):
     GROUP = "relic.cli.sga.pack"
 
     def _create_parser(
-            self, command_group: Optional[_SubParsersAction] = None
+        self, command_group: Optional[_SubParsersAction] = None
     ) -> ArgumentParser:
         parser: ArgumentParser
         if command_group is None:
@@ -111,14 +118,14 @@ class RelicSgaRepackCli(CliPluginGroup):
     GROUP = "relic.cli.sga.repack"
 
     def _create_parser(
-            self, command_group: Optional[_SubParsersAction] = None
+        self, command_group: Optional[_SubParsersAction] = None
     ) -> ArgumentParser:
         parser: ArgumentParser
         desc = "Debug Command; reads and repacks an SGA archive."
         if command_group is None:
             parser = ArgumentParser("repack", description=desc)
         else:
-            parser = command_group.add_parser("repack", description = desc)
+            parser = command_group.add_parser("repack", description=desc)
 
         # pack further delegates to version plugins
 

src/relic/sga/core/filesystem.py

@@ -240,7 +240,7 @@ def to_info(self, namespaces=None):
 
 
 class _EssenceDriveFS(MemoryFS):
-    def __init__(self, alias: str, name:str) -> None:
+    def __init__(self, alias: str, name: str) -> None:
         super().__init__()
         self.alias = alias
         self.name = name
@@ -290,24 +290,25 @@ def setinfo(self, path: str, info: Mapping[str, Mapping[str, object]]) -> None:
                 resource_entry.essence.clear()
                 resource_entry.essence.update(essence)
 
-
-
             # if LAZY_NAMESPACE in info and not resource_entry.is_dir:
             #     lazy
 
-    def getinfo(self, path, namespaces=None):  # type: (Text, Optional[Collection[Text]]) -> Info
-        info = super().getinfo(path,namespaces)
+    def getinfo(
+        self, path, namespaces=None
+    ):  # type: (Text, Optional[Collection[Text]]) -> Info
+        info = super().getinfo(path, namespaces)
 
         _path = self.validatepath(path)
-        if _path == "/" and (namespaces is not None and ESSENCE_NAMESPACE in namespaces):
+        if _path == "/" and (
+            namespaces is not None and ESSENCE_NAMESPACE in namespaces
+        ):
             raw_info = info.raw
-            raw_info[ESSENCE_NAMESPACE]["alias"] = self.alias
-            raw_info[ESSENCE_NAMESPACE]["name"] = self.name
+            essence_ns = dict(raw_info[ESSENCE_NAMESPACE])
+            essence_ns["alias"] = self.alias
+            essence_ns["name"] = self.name
             info = Info(raw_info)
         return info
 
-
-
     def getessence(self, path: str) -> Info:
         return self.getinfo(path, [ESSENCE_NAMESPACE])
 
@@ -340,10 +341,12 @@ def setmeta(self, meta: Dict[str, Any], namespace: str = "standard") -> None:
     def getessence(self, path: str) -> Info:
         return self.getinfo(path, [ESSENCE_NAMESPACE])
 
-    def create_drive(self, alias: str, name:str) -> _EssenceDriveFS:
+    def create_drive(self, alias: str, name: str) -> _EssenceDriveFS:
         drive = _EssenceDriveFS(alias, name)
         first_drive = len([*self.iterate_fs()]) == 0
-        self.add_fs(alias, drive, write=first_drive) # TODO see if name would work here, using alias because that is what it originally was
+        self.add_fs(
+            alias, drive, write=first_drive
+        )  # TODO see if name would work here, using alias because that is what it originally was
         return drive
 
     def _delegate(self, path):
@@ -356,6 +359,7 @@ def _delegate(self, path):
 
         return super()._delegate(path)
 
+
 __all__ = [
     "ESSENCE_NAMESPACE",
     "EssenceFSHandler",