From f2d71014cd35783862fc54abc47122ae0c86893b Mon Sep 17 00:00:00 2001 From: xenofem Date: Thu, 28 Mar 2024 23:21:19 -0400 Subject: [PATCH 1/2] more hi-res regex --- dlibrary/dlibrary.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlibrary/dlibrary.py b/dlibrary/dlibrary.py index 46da923..310290b 100755 --- a/dlibrary/dlibrary.py +++ b/dlibrary/dlibrary.py @@ -31,7 +31,7 @@ DLSITE_ID_REGEX = re.compile('^[BR]J[0-9]+$') FANZA_ID_REGEX = re.compile('^d_[0-9]+$') 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) TONE_REGEX = re.compile('トーン(版|(効果)?[有あ]り)', re.I) COLOR_REGEX = re.compile('カラー', re.I) From d0cd88c289d54f170ff7493e7d83af8536c50449 Mon Sep 17 00:00:00 2001 From: xenofem Date: Fri, 29 Mar 2024 13:55:22 -0400 Subject: [PATCH 2/2] allow things like [3.jpg, 3.5.jpg] to override the minimum level delta check --- dlibrary/dlibrary.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlibrary/dlibrary.py b/dlibrary/dlibrary.py index 310290b..d0c17dc 100755 --- a/dlibrary/dlibrary.py +++ b/dlibrary/dlibrary.py @@ -757,7 +757,7 @@ def complete_prefix_number_ordering(entries): cur = unified_indices[i] prev = unified_indices[i-1] for level in range(min(len(cur), len(prev))): - if cur[level] != prev[level]: + if cur[level] != prev[level] and not (cur[level] == 5 and prev[level] == 0): delta = cur[level] - prev[level] min_delta_by_level[level] = min(min_delta_by_level.get(level, delta), delta) if any(delta > 2 for delta in min_delta_by_level.values()):