file_query_text 0.1.9__py3-none-any.whl → 0.1.11__py3-none-any.whl

file_query_text/__init__.py

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

file_query_text/cli.py

@@ -86,7 +86,7 @@ def main():
             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']}")
+                print(f"{attrs['extension']:<15} {attrs['name']:<30} {attrs['size']:<10} {attrs['path']}")
             else:
                 # Standard output
                 print(file_path)

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":
@@ -151,20 +153,28 @@ def evaluate_conditions(file_path, condition):
 
         # 4. Special case for NOT LIKE: [attr, 'NOT', 'LIKE', value]
         elif len(expr) == 4 and expr[1] == "NOT" and expr[2] == "LIKE":
-            attr_val = get_file_attr(expr[0])
+            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
 
-            # Convert SQL LIKE pattern (with % wildcards) to regex pattern
-            pattern = re.escape(val).replace('\\%', '%')  # Unescape % after escaping everything else
-            pattern = pattern.replace("%", ".*")
-            pattern = f"^{pattern}$"  # Anchor pattern to match whole string
-            return not bool(re.search(pattern, str(attr_val), re.IGNORECASE))
+            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
@@ -182,8 +192,7 @@ 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
     }
     return attributes
 

{file_query_text-0.1.9.dist-info → file_query_text-0.1.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: file_query_text
-Version: 0.1.9
+Version: 0.1.11
 Summary: SQL-like interface for querying files in your filesystem
 Author-email: nik <42a11b@nikdav.is>
 License-Expression: MIT

file_query_text-0.1.11.dist-info/RECORD

@@ -0,0 +1,10 @@
+file_query_text/__init__.py,sha256=zU3FMXN8el2gf2nq_7pCZate3Q0N42hSDVQK9bDgy1c,90
+file_query_text/cli.py,sha256=kIBLzYM2doMFVtrC6qP-85GcWeoftObOk-nUVxPxAto,3700
+file_query_text/gitignore_parser.py,sha256=PZk5MKyW5e8NXCyfC8w3r2JIp1HeF5CpZ5MdXOWlPNM,7734
+file_query_text/grammar.py,sha256=shs5Vh30ybAhsrEjRmSaiUAtt1PKDHvw4nVJ6mktmBM,1906
+file_query_text/main.py,sha256=Td3zB-F9aV5q823ScOx1OF3_RQ654M-0EeQLxLcd6BU,8576
+file_query_text-0.1.11.dist-info/METADATA,sha256=cNyBd7Lc2xpLMTG2dEUnWA0xnEBk16Yr2dKjoECv_Xg,3059
+file_query_text-0.1.11.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+file_query_text-0.1.11.dist-info/entry_points.txt,sha256=rNFYWzvcIsUZkGNsc_E_B5HyYRnqqdj_u8_IeQpw1wo,48
+file_query_text-0.1.11.dist-info/top_level.txt,sha256=o1FzSvLa6kSV61b7RLHWRhEezc96m05YwIKqjuWUSxU,16
+file_query_text-0.1.11.dist-info/RECORD,,

file_query_text-0.1.9.dist-info/RECORD

@@ -1,10 +0,0 @@
-file_query_text/__init__.py,sha256=DscljOkp8bJlAFVMhb6P8fV2gFzCHmf9BhSd60zI9Xg,89
-file_query_text/cli.py,sha256=eijCT1pHk4wtBhhmFHyeTOoLNz0zwk7Bm4izRLrjZb4,3709
-file_query_text/gitignore_parser.py,sha256=PZk5MKyW5e8NXCyfC8w3r2JIp1HeF5CpZ5MdXOWlPNM,7734
-file_query_text/grammar.py,sha256=shs5Vh30ybAhsrEjRmSaiUAtt1PKDHvw4nVJ6mktmBM,1906
-file_query_text/main.py,sha256=cjp7FiyaRHN4rV8l5DsLN5ZYqfLir8nKC2vj70v30PI,8446
-file_query_text-0.1.9.dist-info/METADATA,sha256=PlhAF2sao4kDe28BcIbi6fcgTWKXmUOgcALb7psYpY8,3058
-file_query_text-0.1.9.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-file_query_text-0.1.9.dist-info/entry_points.txt,sha256=rNFYWzvcIsUZkGNsc_E_B5HyYRnqqdj_u8_IeQpw1wo,48
-file_query_text-0.1.9.dist-info/top_level.txt,sha256=o1FzSvLa6kSV61b7RLHWRhEezc96m05YwIKqjuWUSxU,16
-file_query_text-0.1.9.dist-info/RECORD,,