pseek 2.2.1__tar.gz → 2.3.2__tar.gz

{pseek-2.2.1 → pseek-2.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pseek
-Version: 2.2.1
+Version: 2.3.2
 Summary: Pseek is a Python library to search files, folders, and text
 Author-email: Arian <ariannasiri86@gmail.com>
 License-Expression: MIT
@@ -90,6 +90,7 @@ pseek "error\d+" --regex
 | `--re-include`, `--re-exclude` | Limit search results to specific directories or files with regex                                                                                                                                                                                                                              |
 | `--word`                       | Match the whole word only (except when --expr is enabled, in which case you can make it match whole word by putting w before term: w"foo")                                                                                                                                                    |
 | `--expr`                       | Enable to write conditions in the query. Example: r"foo.*bar" and ("bar" or "baz") and not "qux" (To use regex, word, and case-sensitive features, you can use the prefixes r, w, and c before terms. Allowed modes: r, w, c, wc, cw, rc, cr. Examples: r"foo.*bar", wc"Foo", cr".*Foo", ...) |
+| `--timeout`                    | To stop the search after a specified period of time (Seconds)                                                                                                                                                                                                                                 |
 | `--max-size`, `--min-size`     | Specify maximum and minimum sizes for files and directories                                                                                                                                                                                                                                   |
 | `--full-path`                  | Display full path of files and directories                                                                                                                                                                                                                                                    |
 | `--no-content`                 | Only display files path for content search                                                                                                                                                                                                                                                    |

{pseek-2.2.1 → pseek-2.3.2}/README.md

@@ -76,6 +76,7 @@ pseek "error\d+" --regex
 | `--re-include`, `--re-exclude` | Limit search results to specific directories or files with regex                                                                                                                                                                                                                              |
 | `--word`                       | Match the whole word only (except when --expr is enabled, in which case you can make it match whole word by putting w before term: w"foo")                                                                                                                                                    |
 | `--expr`                       | Enable to write conditions in the query. Example: r"foo.*bar" and ("bar" or "baz") and not "qux" (To use regex, word, and case-sensitive features, you can use the prefixes r, w, and c before terms. Allowed modes: r, w, c, wc, cw, rc, cr. Examples: r"foo.*bar", wc"Foo", cr".*Foo", ...) |
+| `--timeout`                    | To stop the search after a specified period of time (Seconds)                                                                                                                                                                                                                                 |
 | `--max-size`, `--min-size`     | Specify maximum and minimum sizes for files and directories                                                                                                                                                                                                                                   |
 | `--full-path`                  | Display full path of files and directories                                                                                                                                                                                                                                                    |
 | `--no-content`                 | Only display files path for content search                                                                                                                                                                                                                                                    |

{pseek-2.2.1 → pseek-2.3.2}/pseek/cli.py

@@ -1,5 +1,26 @@
 import click
 from .searcher import Search
+from multiprocessing import Process
+
+
+def run_search_process(file, directory, content, ext, exclude_ext, search_instance):
+    """Performs the basic search operation"""
+    total_results = 0
+
+    # Search for files if requested.
+    if file:
+        total_results += search_instance.search('file').echo('Files', 'file')
+    # Search for directories if requested and extension filters are not active.
+    if directory and not (ext or exclude_ext):
+        total_results += search_instance.search('directory').echo('Directories', 'directory')
+    # Search for content inside files if requested.
+    if content:
+        total_results += search_instance.search('content').echo('Contents', 'content')
+
+    # Display final summary message.
+    message = f'\nTotal results: {total_results}' if total_results else 'No results found'
+    click.echo(click.style(message, fg='red'))
+
 
 
 @click.command()
@@ -28,6 +49,8 @@ from .searcher import Search
                    '(To use regex, word, and case-sensitive features, '
                    'you can use the prefixes r, w, and c before terms. Allowed modes: r, w, c, wc, cw, rc, cr. '
                    'Examples: r"foo.*bar", wc"Foo", cr".*Foo", ...)')
+@click.option('--timeout', type=click.INT,
+              help='To stop the search after a specified period of time (Seconds)')
 # Extension filters
 @click.option('--ext', multiple=True, type=click.STRING,
               help='Include files with these extensions. Example: --ext py --ext js')
@@ -49,7 +72,7 @@ from .searcher import Search
 @click.option('--full-path', is_flag=True, help='Display full paths for results.')
 @click.option('--no-content', is_flag=True, help='Only display files path for content search.')
 def search(query, path, file, directory, content, case_sensitive, ext, exclude_ext, regex, include, exclude,
-           re_include, re_exclude, word, expr, max_size, min_size, full_path, no_content):
+           re_include, re_exclude, word, expr, timeout, max_size, min_size, full_path, no_content):
     """Search for files, directories, and file content based on the query."""
     # If no search type is specified, search in all types.
     if not any((file, directory, content)):
@@ -75,21 +98,21 @@ def search(query, path, file, directory, content, case_sensitive, ext, exclude_e
         no_content=no_content
     )
 
-    total_results = 0
-
-    # Search for files if requested.
-    if file:
-        total_results += search_instance.search('file').echo('Files', 'file')
-    # Search for directories if requested and extension filters are not active.
-    if directory and not (ext or exclude_ext):
-        total_results += search_instance.search('directory').echo('Directories', 'directory')
-    # Search for content inside files if requested.
-    if content:
-        total_results += search_instance.search('content').echo('Contents', 'content')
+    # Stop search if it exceeds timeout with multiprocessing
+    if timeout:
+        p = Process(
+            target=run_search_process,
+            args=(file, directory, content, ext, exclude_ext, search_instance)
+        )
+        p.start()
+        p.join(timeout)
 
-    # Display final summary message.
-    message = f'\nTotal results: {total_results}' if total_results else 'No results found'
-    click.echo(click.style(message, fg='red'))
+        if p.is_alive():
+            p.terminate()
+            p.join()
+            click.echo(click.style(f"\nTimeout! Search exceeded {timeout} seconds and was stopped.", fg="red"))
+    else:
+        run_search_process(file, directory, content, ext, exclude_ext, search_instance)
 
 
 if __name__ == "__main__":

{pseek-2.2.1 → pseek-2.3.2}/pseek/searcher.py

@@ -126,14 +126,14 @@ class Search:
                                 except UnicodeDecodeError:
                                     return
 
-                                if not pattern.evaluate(content):
+                                if not pattern.evaluate(content) and not self.expr:
                                     return
 
                             # Choose the file path format based on the full_path setting
                             file_label = str(file_path.resolve()) if self.full_path else str(file_path)
 
                             # Avoid searching through the entire file content if the fast-content flag is True
-                            if self.no_content:
+                            if self.no_content and not self.expr:
                                 matches.add(click.style(file_label, fg='cyan'))
                                 return
 
@@ -151,6 +151,9 @@ class Search:
 
                                 # If the pattern matches in the decoded line
                                 if pattern.evaluate(line_decoded):
+                                    if self.no_content and self.expr:
+                                        matches.add(click.style(file_label, fg='cyan'))
+                                        return
                                     count = pattern.count_matches(line_decoded) if isinstance(pattern, TermNode) else 0
                                     # Highlight the matching parts in green
                                     highlighted = highlight_text_safe(pattern, line_decoded)

{pseek-2.2.1 → pseek-2.3.2}/pseek.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pseek
-Version: 2.2.1
+Version: 2.3.2
 Summary: Pseek is a Python library to search files, folders, and text
 Author-email: Arian <ariannasiri86@gmail.com>
 License-Expression: MIT
@@ -90,6 +90,7 @@ pseek "error\d+" --regex
 | `--re-include`, `--re-exclude` | Limit search results to specific directories or files with regex                                                                                                                                                                                                                              |
 | `--word`                       | Match the whole word only (except when --expr is enabled, in which case you can make it match whole word by putting w before term: w"foo")                                                                                                                                                    |
 | `--expr`                       | Enable to write conditions in the query. Example: r"foo.*bar" and ("bar" or "baz") and not "qux" (To use regex, word, and case-sensitive features, you can use the prefixes r, w, and c before terms. Allowed modes: r, w, c, wc, cw, rc, cr. Examples: r"foo.*bar", wc"Foo", cr".*Foo", ...) |
+| `--timeout`                    | To stop the search after a specified period of time (Seconds)                                                                                                                                                                                                                                 |
 | `--max-size`, `--min-size`     | Specify maximum and minimum sizes for files and directories                                                                                                                                                                                                                                   |
 | `--full-path`                  | Display full path of files and directories                                                                                                                                                                                                                                                    |
 | `--no-content`                 | Only display files path for content search                                                                                                                                                                                                                                                    |

{pseek-2.2.1 → pseek-2.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pseek"
-version = "2.2.1"
+version = "2.3.2"
 description = "Pseek is a Python library to search files, folders, and text"
 readme = "README.md"
 license = "MIT"