file_query_text 0.1.1__py3-none-any.whl → 0.1.2__py3-none-any.whl

file_query_text/cli.py

@@ -4,7 +4,7 @@ import sys
 import argparse
 from pathlib import Path
 # Fix imports to work when installed as a package
-from file_query_text.main import parse_query, QueryVisitor, execute_query
+from file_query_text.main import parse_query, QueryVisitor, execute_query, get_file_attributes
 
 def main():
     parser = argparse.ArgumentParser(description="SQL-like queries for your filesystem")
@@ -15,6 +15,16 @@ def main():
         action="store_true",
         help="Display content of the matching files"
     )
+    parser.add_argument(
+        "--debug", "-d",
+        action="store_true",
+        help="Debug mode: print all file attributes regardless of query"
+    )
+    parser.add_argument(
+        "--no-gitignore", "-g",
+        action="store_true",
+        help="Don't respect .gitignore files (show ignored files)"
+    )
     args = parser.parse_args()
 
     # Get current working directory for the query
@@ -40,7 +50,12 @@ def main():
     if parsed:
         visitor = QueryVisitor()
         visitor.visit(parsed)
-        results = execute_query(visitor.select, visitor.from_dirs, visitor.where)
+        results = execute_query(
+            visitor.select,
+            visitor.from_dirs,
+            visitor.where,
+            respect_gitignore=not args.no_gitignore
+        )
 
         # Display results
         if not results:
@@ -48,8 +63,20 @@ def main():
             return
 
         print(f"Found {len(results)} matching files:")
+
+        # In debug mode, print headers
+        if args.debug:
+            print(f"{'EXTENSION':<15} {'NAME':<30} {'SIZE':<10} {'PATH'}")
+            print(f"{'-'*15} {'-'*30} {'-'*10} {'-'*30}")
+
         for file_path in results:
-            print(file_path)
+            if args.debug:
+                # Print all attributes in debug mode
+                attrs = get_file_attributes(file_path)
+                print(f"{attrs['extension']:<15} {attrs['name']:<30} {attrs['size']:<10} {attrs['relative_path']}")
+            else:
+                # Standard output
+                print(file_path)
 
             # Optionally display file contents
             if args.show_content:

file_query_text/grammar.py

@@ -17,15 +17,16 @@ from pyparsing import (
     c_style_comment,
     nums,
     pyparsing_common,
+    CaselessKeyword,
 )
 
 # Define keywords
-SELECT = Suppress(Word("SELECT"))
-FROM = Suppress(Word("FROM"))
-WHERE = Suppress(Word("WHERE"))
-AND = Literal("AND")
-OR = Literal("OR")
-NOT = Literal("NOT")
+SELECT = Suppress(CaselessKeyword("SELECT"))
+FROM = Suppress(CaselessKeyword("FROM"))
+WHERE = Suppress(CaselessKeyword("WHERE"))
+AND = CaselessKeyword("AND")
+OR = CaselessKeyword("OR")
+NOT = CaselessKeyword("NOT")
 
 # Define identifiers and literals
 IDENTIFIER = Word(alphas + "_")
@@ -35,7 +36,7 @@ NUMERIC_LITERAL = pyparsing_common.integer
 DIRECTORY_LIST = Group(delimitedList(STRING_LITERAL))
 
 # Define comparison operators
-COMPARISON_OP = oneOf("== != < <= > >=")
+COMPARISON_OP = oneOf("= == != <> < <= > >=")
 ATTRIBUTE = IDENTIFIER + Suppress("=") + STRING_LITERAL
 
 # Define basic condition with support for both string and numeric literals

file_query_text/main.py

@@ -1,6 +1,8 @@
 import os
 import sys
 from file_query_text.grammar import query  # Import the fixed grammar
+import gitignore_parser
+import os.path
 
 
 def parse_query(query_str):
@@ -29,14 +31,51 @@ class QueryVisitor:
         self.from_dirs = parsed_query.get("from_dirs", [])
         self.where = parsed_query.get("where", None)
 
-def execute_query(select, from_dirs, where_conditions):
+def execute_query(select, from_dirs, where_conditions, respect_gitignore=True):
     matched_files = []
+
+    # Set up gitignore matching if requested
+    gitignore_matchers = {}
+
     for directory in from_dirs:
         if not os.path.exists(directory):
             continue
+
+        # Initialize gitignore matcher for this directory
+        if respect_gitignore:
+            # Find the repository root (where .git directory is)
+            repo_root = directory
+            while repo_root != os.path.dirname(repo_root):  # Stop at filesystem root
+                if os.path.exists(os.path.join(repo_root, '.git')):
+                    break
+                repo_root = os.path.dirname(repo_root)
+
+            # If we found a git repo, check for .gitignore
+            gitignore_path = os.path.join(repo_root, '.gitignore')
+            if os.path.exists(gitignore_path):
+                if repo_root not in gitignore_matchers:
+                    try:
+                        gitignore_matchers[repo_root] = gitignore_parser.parse_gitignore(gitignore_path)
+                    except Exception as e:
+                        print(f"Warning: Error parsing .gitignore at {gitignore_path}: {e}")
+
         for root, _, files in os.walk(directory):
             for filename in files:
                 file_path = os.path.join(root, filename)
+
+                # Check if file is ignored by gitignore rules
+                if respect_gitignore:
+                    # Find which repo this file belongs to
+                    file_repo_root = None
+                    for repo_root in gitignore_matchers:
+                        if file_path.startswith(repo_root):
+                            file_repo_root = repo_root
+                            break
+
+                    # Skip if file is ignored by gitignore
+                    if file_repo_root and gitignore_matchers[file_repo_root](file_path):
+                        continue
+
                 if evaluate_conditions(file_path, where_conditions):
                     matched_files.append(file_path)
     return matched_files
@@ -52,6 +91,8 @@ def evaluate_conditions(file_path, condition):
             return os.path.basename(file_path)
         if attr_name == "size":
             return os.path.getsize(file_path)
+        if attr_name == "path":
+            return file_path
         # Add more attributes as needed
         return None
 
@@ -69,8 +110,8 @@ def evaluate_conditions(file_path, condition):
                 op = expr[1]
                 val = expr[2].strip("'") if isinstance(expr[2], str) else expr[2]  # Remove quotes if string
 
-                if op == "==": return str(attr_val) == val
-                if op == "!=": return str(attr_val) != val
+                if op == "=" or op == "==": return str(attr_val) == val
+                if op == "!=" or op == "<>": return str(attr_val) != val
                 if op == "<": return attr_val is not None and int(attr_val) < int(val)
                 if op == "<=": return attr_val is not None and int(attr_val) <= int(val)
                 if op == ">": return attr_val is not None and int(attr_val) > int(val)
@@ -90,6 +131,26 @@ def evaluate_conditions(file_path, condition):
 
     return eval_expr(condition.asList())
 
+# Function to get all attributes for a file
+def get_file_attributes(file_path):
+    """Get all available attributes for a file."""
+    cwd = os.getcwd()
+    try:
+        # Make path relative to current directory
+        rel_path = os.path.relpath(file_path, cwd)
+    except ValueError:
+        # Handle case when on different drives (Windows)
+        rel_path = file_path
+
+    attributes = {
+        "extension": os.path.splitext(file_path)[1][1:],
+        "name": os.path.basename(file_path),
+        "size": os.path.getsize(file_path),
+        "path": file_path,
+        "relative_path": rel_path,
+    }
+    return attributes
+
 # Example usage
 if __name__ == "__main__":
     # Get project root directory for demonstration

{file_query_text-0.1.1.dist-info → file_query_text-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: file_query_text
-Version: 0.1.1
+Version: 0.1.2
 Summary: SQL-like interface for querying files in your filesystem
 Author-email: nik <42a11b@nikdav.is>
 License-Expression: MIT
@@ -90,6 +90,7 @@ SELECT * FROM 'directory_path' WHERE condition
 - `extension`: File extension (without the dot)
 - `name`: Filename with extension
 - `size`: File size in bytes
+- `path`: Full file path
 
 ### Operators
 
@@ -107,4 +108,7 @@ fq "NOT name == 'main.py'"
 
 # Find all large image files
 fq "SELECT * FROM '.' WHERE (extension == 'jpg' OR extension == 'png') AND size > 500000"
+
+# Find files with 'config' in their path
+fq "path == '.*config.*'"
 ```

file_query_text-0.1.2.dist-info/RECORD

@@ -0,0 +1,9 @@
+file_query_text/__init__.py,sha256=WXdvguZ706HG7MXS13Yb8e7VC5UFYyBzuExXbwBOTak,87
+file_query_text/cli.py,sha256=z1e16emuXsgsJP298UKbezhtIVMx9NZQ6v7FNHAahoo,3306
+file_query_text/grammar.py,sha256=XanSi9VCKuIQNlOMXRBZbeWxaJj2UhMJPDIYKgw4lEQ,1655
+file_query_text/main.py,sha256=PVUQ6BZsvN2eEUhORjWr2aNh761evNieOaXTs_RDlB4,6377
+file_query_text-0.1.2.dist-info/METADATA,sha256=AYCc9743EJ0bwqpBKy5qfhDX0uR_htYHFh5fQL6wylY,2440
+file_query_text-0.1.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+file_query_text-0.1.2.dist-info/entry_points.txt,sha256=rNFYWzvcIsUZkGNsc_E_B5HyYRnqqdj_u8_IeQpw1wo,48
+file_query_text-0.1.2.dist-info/top_level.txt,sha256=o1FzSvLa6kSV61b7RLHWRhEezc96m05YwIKqjuWUSxU,16
+file_query_text-0.1.2.dist-info/RECORD,,

file_query_text-0.1.1.dist-info/RECORD

@@ -1,9 +0,0 @@
-file_query_text/__init__.py,sha256=WXdvguZ706HG7MXS13Yb8e7VC5UFYyBzuExXbwBOTak,87
-file_query_text/cli.py,sha256=_0ahAdVoDCRBhAcIkcgKM6ZqA0YlqmAyF9i-s2GQRjk,2365
-file_query_text/grammar.py,sha256=lhw2pUq83IMga2cppA0r9RbebioPB7a65Az5f4Lheso,1572
-file_query_text/main.py,sha256=qMuY5YZ2TXrAUyfXaQfPkQOJZawpRE86NIre5Pz88Tk,4011
-file_query_text-0.1.1.dist-info/METADATA,sha256=0VTvghCuE7IIixRJdPVw1Y0Y5ijX8YerDMVpUlf_5UE,2347
-file_query_text-0.1.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-file_query_text-0.1.1.dist-info/entry_points.txt,sha256=rNFYWzvcIsUZkGNsc_E_B5HyYRnqqdj_u8_IeQpw1wo,48
-file_query_text-0.1.1.dist-info/top_level.txt,sha256=o1FzSvLa6kSV61b7RLHWRhEezc96m05YwIKqjuWUSxU,16
-file_query_text-0.1.1.dist-info/RECORD,,