dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-05-25 14:55:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

use regex not shlex to parse quoted filenames portably on windows and others

Browse source
This commit is contained in:
Paul Gauthier 2023-09-29 17:07:17 -07:00
parent 2dc01bb9bd
commit b78b8fabf4
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
aider/commands.py
View file

@ -1,4 +1,5 @@
import json import json
import re
import shlex import shlex
import subprocess import subprocess
import sys import sys
@ -272,7 +273,9 @@ class Commands:
git_files = self.coder.repo.get_tracked_files() if self.coder.repo else [] git_files = self.coder.repo.get_tracked_files() if self.coder.repo else []
all_matched_files = set() all_matched_files = set()
for word in shlex.split(args):
filenames = parse_quoted_filenames(args)
for word in filenames:
if Path(word).is_absolute(): if Path(word).is_absolute():
fname = Path(word) fname = Path(word)
else: else:
@ -345,7 +348,8 @@ class Commands:
self.io.tool_output("Dropping all files from the chat session.") self.io.tool_output("Dropping all files from the chat session.")
self.coder.abs_fnames = set() self.coder.abs_fnames = set()
for word in shlex.split(args): filenames = parse_quoted_filenames(args)
for word in filenames:
matched_files = self.glob_filtered_to_repo(word) matched_files = self.glob_filtered_to_repo(word)
if not matched_files: if not matched_files:
@ -493,3 +497,9 @@ def expand_subdir(file_path):
for file in file_path.rglob("*"): for file in file_path.rglob("*"):
if file.is_file(): if file.is_file():
yield str(file) yield str(file)
def parse_quoted_filenames(args):
filenames = re.findall(r"\"(.+?)\"|(\S+)", args)
filenames = [name for sublist in filenames for name in sublist if name]
return filenames