Public/automatic
1
0
Fork 0
mirror of https://github.com/vladmandic/automatic synced 2026-09-20 01:31:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix wildcards with path sequence

Browse Source 
Signed-off-by: Vladimir Mandic <mandic00@live.com>
This commit is contained in:
Vladimir Mandic
2025-01-31 18:45:25 -05:00
parent 7d2d4ffe9a
commit 780ceb0131
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/styles.py
+6 -4
View File
@@ -44,13 +44,13 @@ def apply_styles_to_prompt(prompt, styles):
def apply_file_wildcards(prompt, replaced = [], not_found = [], recursion=0, seed=-1):
def check_wildcard_files(prompt, wildcard, files, file_only=True):
trimmed = wildcard.replace('\\', '').replace('/', '').strip().lower()
trimmed = wildcard.replace('\\', os.path.sep).strip().lower()
for file in files:
if file_only:
paths = [os.path.splitext(os.path.basename(file).lower())[0]]
paths = [os.path.splitext(file)[0].lower(), os.path.splitext(os.path.basename(file).lower())[0]] # fullname and basename
else:
paths = [os.path.splitext(p.lower())[0] for p in os.path.normpath(file).split(os.path.sep)]
if trimmed in paths:
paths = [os.path.splitext(p.lower())[0] for p in os.path.normpath(file).split(os.path.sep)] # every path component
if (trimmed in paths) or (os.path.sep in trimmed and trimmed in paths[0]):
try:
with open(file, 'r', encoding='utf-8') as f:
lines = f.readlines()
@@ -77,6 +77,8 @@ def apply_file_wildcards(prompt, replaced = [], not_found = [], recursion=0, see
if len(matches) == 0:
return prompt, replaced, not_found
files = list(files_cache.list_files(shared.opts.wildcards_dir, ext_filter=[".txt"], recursive=True))
if len(files) == 0:
return prompt, replaced, not_found
for wildcard in matches:
prompt, found = check_wildcard_files(prompt, wildcard, files)
if found and wildcard in not_found: