i'm the one on your tone tone tone i'm the one on your MMO

This commit is contained in:
xenofem 2024-04-14 22:14:19 -04:00
parent 0de60359ba
commit 6dffbcd320

View file

@ -37,7 +37,7 @@ FAKKU_ID_REGEX = re.compile('.*_FAKKU$')
HI_RES_REGEX = re.compile('高解像度|原寸|大サイズ', re.I) HI_RES_REGEX = re.compile('高解像度|原寸|大サイズ', re.I)
NO_TONE_REGEX = re.compile('トーン(効果)?[な無]し|グレー?スケ', re.I) NO_TONE_REGEX = re.compile('トーン(効果)?[な無]し|グレー?スケ', re.I)
TONE_REGEX = re.compile('トーン(版|(効果)?[有あ]り)', re.I) TONE_REGEX = re.compile('トーン($|版|(効果)?[有あ]り)', re.I)
COLOR_REGEX = re.compile('カラー', re.I) COLOR_REGEX = re.compile('カラー', re.I)
MONOCHROME_REGEX = re.compile('モノクロ', re.I) MONOCHROME_REGEX = re.compile('モノクロ', re.I)
MOSAIC_REGEX = re.compile('モザイク', re.I) MOSAIC_REGEX = re.compile('モザイク', re.I)
@ -476,6 +476,9 @@ class Collator:
return not quality[b].search(nname(src)) return not quality[b].search(nname(src))
better_dirs = [src for src in dirs if a_not_b('better', 'worse', src)] better_dirs = [src for src in dirs if a_not_b('better', 'worse', src)]
worse_dirs = [src for src in dirs if a_not_b('worse', 'better', src)] worse_dirs = [src for src in dirs if a_not_b('worse', 'better', src)]
debug('Regex results')
debug(f'Better: {better_dirs}')
debug(f'Worse: {worse_dirs}')
if len(better_dirs) == 1 and len(worse_dirs) == 1 and better_dirs[0] != worse_dirs[0]: if len(better_dirs) == 1 and len(worse_dirs) == 1 and better_dirs[0] != worse_dirs[0]:
return self.collate_from_paths(better_dirs + non_dirs) return self.collate_from_paths(better_dirs + non_dirs)