file_query_text 0.1.8__tar.gz → 0.1.10__tar.gz

{file_query_text-0.1.8 → file_query_text-0.1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: file_query_text
-Version: 0.1.8
+Version: 0.1.10
 Summary: SQL-like interface for querying files in your filesystem
 Author-email: nik <42a11b@nikdav.is>
 License-Expression: MIT
@@ -128,3 +128,15 @@ Find all markdown files in a specific year's folder:
 ```
 fq "path LIKE '%/2023/%' AND extension == 'md'"
 ```
+
+### Excluding files with NOT LIKE
+
+Find all JavaScript files in src directory except those in lib folders:
+```
+fq "path LIKE 'src%' AND path NOT LIKE '%lib%' AND extension == 'js'"
+```
+
+Find all Python files that don't have "test" in their name:
+```
+fq "extension == 'py' AND name NOT LIKE '%test%'"
+```

{file_query_text-0.1.8 → file_query_text-0.1.10}/README.md

@@ -112,3 +112,15 @@ Find all markdown files in a specific year's folder:
 ```
 fq "path LIKE '%/2023/%' AND extension == 'md'"
 ```
+
+### Excluding files with NOT LIKE
+
+Find all JavaScript files in src directory except those in lib folders:
+```
+fq "path LIKE 'src%' AND path NOT LIKE '%lib%' AND extension == 'js'"
+```
+
+Find all Python files that don't have "test" in their name:
+```
+fq "extension == 'py' AND name NOT LIKE '%test%'"
+```

{file_query_text-0.1.8 → file_query_text-0.1.10}/file_query_text/__init__.py

@@ -2,4 +2,4 @@
 SQL-like interface for querying files in your filesystem.
 """
 
-__version__ = "0.1.8"
+__version__ = "0.1.10"

{file_query_text-0.1.8 → file_query_text-0.1.10}/file_query_text/grammar.py

@@ -46,8 +46,15 @@ basic_condition = Group(IDENTIFIER + COMPARISON_OP + VALUE)
 
 # Define logical expressions using infixNotation for better handling of AND and OR
 condition_expr = Forward()
+
+# Define a new pattern for the NOT LIKE operator
+not_like_condition = Group(IDENTIFIER + NOT + LIKE + VALUE)
+
+# Include both basic conditions and NOT LIKE conditions
+basic_expr = basic_condition | not_like_condition
+
 condition_expr <<= infixNotation(
-    basic_condition,
+    basic_expr,
     [
         (NOT, 1, opAssoc.RIGHT),
         (AND, 2, opAssoc.LEFT),

{file_query_text-0.1.8 → file_query_text-0.1.10}/file_query_text/main.py

@@ -97,6 +97,14 @@ def evaluate_conditions(file_path, condition):
     if not condition:
         return True
 
+    # Get the relative path for comparison
+    cwd = os.getcwd()
+    try:
+        relative_path = os.path.relpath(file_path, cwd)
+    except ValueError:
+        # Handle case when on different drives (Windows)
+        relative_path = file_path
+
     def get_file_attr(attr_name):
         if attr_name == "extension":
             return os.path.splitext(file_path)[1][1:]
@@ -105,7 +113,7 @@ def evaluate_conditions(file_path, condition):
         if attr_name == "size":
             return os.path.getsize(file_path)
         if attr_name == "path":
-            return file_path
+            return relative_path  # Use relative path instead of absolute
         # Add more attributes as needed
         return None
 
@@ -119,7 +127,8 @@ def evaluate_conditions(file_path, condition):
 
             # 1. Basic condition: [attr, op, value]
             if isinstance(expr[0], str) and isinstance(expr[1], str):
-                attr_val = get_file_attr(expr[0])
+                attr_name = expr[0]
+                attr_val = get_file_attr(attr_name)
                 op = expr[1]
                 val = expr[2].strip("'") if isinstance(expr[2], str) else expr[2]  # Remove quotes if string
 
@@ -130,14 +139,7 @@ def evaluate_conditions(file_path, condition):
                 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.upper() == "LIKE":
-                    if attr_val is None:
-                        return False
-                    # Convert SQL LIKE pattern (with % wildcards) to regex pattern
-                    # Escape any regex special characters in the pattern except %
-                    pattern = re.escape(val).replace('\\%', '%')  # Unescape % after escaping everything else
-                    pattern = pattern.replace("%", ".*")
-                    pattern = f"^{pattern}$"  # Anchor pattern to match whole string
-                    return bool(re.search(pattern, str(attr_val), re.IGNORECASE))
+                    return check_like_condition(attr_val, val)
 
             # 2. Logical operations from infixNotation: [left, op, right]
             elif expr[1] == "AND":
@@ -149,8 +151,30 @@ def evaluate_conditions(file_path, condition):
         elif len(expr) == 2 and expr[0] == "NOT":
             return not eval_expr(expr[1])
 
+        # 4. Special case for NOT LIKE: [attr, 'NOT', 'LIKE', value]
+        elif len(expr) == 4 and expr[1] == "NOT" and expr[2] == "LIKE":
+            attr_name = expr[0]
+            attr_val = get_file_attr(attr_name)
+            val = expr[3].strip("'") if isinstance(expr[3], str) else expr[3]
+
+            if attr_val is None:
+                return True  # If attribute doesn't exist, NOT LIKE is True
+
+            return not check_like_condition(attr_val, val)
+
         return False
 
+    # Helper function to check LIKE conditions with proper pattern matching
+    def check_like_condition(attr_val, val):
+        if attr_val is None:
+            return False
+        # Convert SQL LIKE pattern (with % wildcards) to regex pattern
+        # Escape any regex special characters in the pattern except %
+        pattern = re.escape(val).replace('\\%', '%')  # Unescape % after escaping everything else
+        pattern = pattern.replace("%", ".*")
+        pattern = f"^{pattern}$"  # Anchor pattern to match whole string
+        return bool(re.search(pattern, str(attr_val), re.IGNORECASE))
+
     return eval_expr(condition.asList())
 
 # Function to get all attributes for a file
@@ -168,8 +192,8 @@ def get_file_attributes(file_path):
         "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,
+        "path": rel_path,  # Use relative path for consistency
+        "absolute_path": file_path,  # Keep the absolute path as well
     }
     return attributes
 

{file_query_text-0.1.8 → file_query_text-0.1.10}/file_query_text.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: file_query_text
-Version: 0.1.8
+Version: 0.1.10
 Summary: SQL-like interface for querying files in your filesystem
 Author-email: nik <42a11b@nikdav.is>
 License-Expression: MIT
@@ -128,3 +128,15 @@ Find all markdown files in a specific year's folder:
 ```
 fq "path LIKE '%/2023/%' AND extension == 'md'"
 ```
+
+### Excluding files with NOT LIKE
+
+Find all JavaScript files in src directory except those in lib folders:
+```
+fq "path LIKE 'src%' AND path NOT LIKE '%lib%' AND extension == 'js'"
+```
+
+Find all Python files that don't have "test" in their name:
+```
+fq "extension == 'py' AND name NOT LIKE '%test%'"
+```

{file_query_text-0.1.8 → file_query_text-0.1.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "file_query_text"
-version = "0.1.8"
+version = "0.1.10"
 description = "SQL-like interface for querying files in your filesystem"
 readme = "README.md"
 requires-python = ">=3.12"

{file_query_text-0.1.8 → file_query_text-0.1.10}/tests/test_main.py

@@ -527,3 +527,44 @@ def test_like_operator_with_wildcards(temp_dir):
     # Normalize paths for comparison
     actual = [str(p) for p in results]
     assert sorted(actual) == sorted(expected)
+
+def test_like_with_not_like_operators(temp_dir):
+    """Test combining LIKE and NOT LIKE operators."""
+    # Create specific files with different paths
+    os.makedirs(temp_dir / "src/components", exist_ok=True)
+    os.makedirs(temp_dir / "src/lib/utils", exist_ok=True)
+    os.makedirs(temp_dir / "src/views", exist_ok=True)
+
+    with open(temp_dir / "src/components/Button.js", "w") as f:
+        f.write("Component file")
+    with open(temp_dir / "src/lib/utils/helpers.js", "w") as f:
+        f.write("Library utility file")
+    with open(temp_dir / "src/views/Home.js", "w") as f:
+        f.write("View file")
+
+    # Query: Find files in src path but exclude anything with lib in the path
+    query_str = f"""
+    SELECT *
+    FROM '{temp_dir}'
+    WHERE path LIKE '{temp_dir}/src%' AND path NOT LIKE '%lib%'
+    """
+
+    parsed = parse_query(query_str)
+    visitor = QueryVisitor()
+    visitor.visit(parsed)
+
+    results = execute_query(
+        visitor.select,
+        visitor.from_dirs,
+        visitor.where
+    )
+
+    # Expected result (src files not in lib directory)
+    expected = [
+        str(temp_dir / "src/components/Button.js"),
+        str(temp_dir / "src/views/Home.js")
+    ]
+
+    # Normalize paths for comparison
+    actual = [str(p) for p in results]
+    assert sorted(actual) == sorted(expected)