xenofem/dlibrary
1
0
Fork 0
Code Issues 3 Pull requests Packages Projects Releases Wiki Activity

Compare commits

base: xenofem:6dffbcd320a9420755eaae721c5259240fcc959c
Branches Tags
xenofem:main
..
compare: xenofem:19e74ba90f96466fd7d708452b48dca292ec73d2
Branches Tags
xenofem:main

No commits in common. "6dffbcd320a9420755eaae721c5259240fcc959c" and "19e74ba90f96466fd7d708452b48dca292ec73d2" have entirely different histories.
6dffbcd320 ... 19e74ba90f

1 changed files with 2 additions and 5 deletions
Show stats Expand all files Collapse all files

7
dlibrary/dlibrary.py
View file

@ -36,8 +36,8 @@ FANZA_ID_REGEX = re.compile('^d_[0-9]+$')
FAKKU_ID_REGEX = re.compile('.*_FAKKU$') 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,9 +476,6 @@ 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)