Make searching filenames for matches optional

pywhat/identifier.py

@@ -38,7 +38,8 @@ def identify(
         dist: Distribution = None,
         key: Optional[Callable] = None,
         reverse: Optional[bool] = None,
-        boundaryless: Optional[Filter] = None
+        boundaryless: Optional[Filter] = None,
+        include_filenames=False,
     ) -> dict:
         if dist is None:
             dist = self.distribution
@@ -68,7 +69,10 @@ def identify(
 
                 magic_numbers = self._file_sig.open_binary_scan_magic_nums(string)
                 contents = self._file_sig.open_file_loc(string)
-                contents.append(os.path.basename(string))
+
+                if include_filenames:
+                    contents.append(os.path.basename(string))
+
                 regex = self._regex_id.check(contents, dist)
 
                 if not magic_numbers:

pywhat/what.py

@@ -69,7 +69,7 @@ def create_filter(rarity, include, exclude):
     default="0.1:1",
 )
 @click.option("-i", "--include", help="Only show matches with these tags.")
-@click.option("-e", "--exclude", help="Disclude matches with these tags.")
+@click.option("-e", "--exclude", help="Exclude matches with these tags.")
 @click.option("-o", "--only-text", is_flag=True, help="Do not scan files or folders.")
 @click.option("-k", "--key", help="Sort by the specified key.")
 @click.option("--reverse", is_flag=True, help="Sort in reverse order.")
@@ -89,6 +89,12 @@ def create_filter(rarity, include, exclude):
     "-db", "--disable-boundaryless", is_flag=True, help="Disable boundaryless mode."
 )
 @click.option("--json", is_flag=True, help="Return results in json format.")
+@click.option(
+    "-if",
+    "--include-filenames",
+    is_flag=True,
+    help="Search filenames for possible matches."
+)
 def main(**kwargs):
     """
     pyWhat - Identify what something is.
@@ -199,7 +205,12 @@ def main(**kwargs):
             print("Invalid key")
             sys.exit(1)
     identified_output = what_obj.what_is_this(
-        kwargs["text_input"], kwargs["only_text"], key, kwargs["reverse"], boundaryless
+        kwargs["text_input"],
+        kwargs["only_text"],
+        key,
+        kwargs["reverse"],
+        boundaryless,
+        kwargs["include_filenames"],
     )
 
     p = printer.Printing()
@@ -216,7 +227,13 @@ def __init__(self, distribution):
         self.id = identifier.Identifier(dist=distribution)
 
     def what_is_this(
-        self, text: str, only_text: bool, key, reverse: bool, boundaryless: Filter
+        self,
+        text: str,
+        only_text: bool,
+        key,
+        reverse: bool,
+        boundaryless: Filter,
+        include_filenames: bool,
     ) -> dict:
         """
         Returns a Python dictionary of everything that has been identified
@@ -227,6 +244,7 @@ def what_is_this(
             key=key,
             reverse=reverse,
             boundaryless=boundaryless,
+            include_filenames=include_filenames
         )