From acf99d236b7b8981436e94df909b67c1fb9ea28c Mon Sep 17 00:00:00 2001
From: xenofem <xenofem@xeno.science>
Date: Sat, 20 Apr 2024 13:00:20 -0400
Subject: [PATCH 1/3] fancier alphabetic numbering analysis
---
dlibrary/dlibrary.py | 30 +++++++++++++++++++++++++-----
1 file changed, 25 insertions(+), 5 deletions(-)
diff --git a/dlibrary/dlibrary.py b/dlibrary/dlibrary.py
index dd5c4c6..9e52d35 100755
--- a/dlibrary/dlibrary.py
+++ b/dlibrary/dlibrary.py
@@ -30,6 +30,7 @@ import rarfile
import requests
NUMBER_REGEX = re.compile('[0-9０-９]+')
+ALPHABETIC_NUMBERING_REGEX = re.compile('^(?P<prefix>[^a-zａ-ｚ0-9０-９]*)((?P<letter>[a-zａ-ｚ])(?P<suffix>[^a-zａ-ｚ0-9０-９]*))?$', re.I)
DLSITE_ID_REGEX = re.compile('^[BR]J[0-9]+$')
FANZA_ID_REGEX = re.compile('^d_[0-9]+$')
@@ -904,20 +905,39 @@ def unique_hierarchical_prefix_numbering(entries, start_point=0):
def alphabetic_numbering(entries, start_point):
debug(f'Finding alphabetic numbering from start point {start_point} for {entries}')
alphabetized = {}
+ prefix_suffix = None
for entry in entries:
- ending = nfc(entry.stem)[start_point:].strip(' -_()')
+ ending = nfc(entry.stem)[start_point:]
debug(f'{entry} has ending {ending}')
- if len(ending) > 1:
- debug('Ending is more than one character, giving up')
+
+ ending_match = ALPHABETIC_NUMBERING_REGEX.fullmatch(ending)
+ if not ending_match:
+ debug('Ending has more than one letter, giving up')
return None
- index = 0 if ending == '' else ord(ending.lower()) - ord('a') + 1
- if index < 0 or index > 26:
+
+ current_prefix_suffix = (ending_match.group('prefix'), ending_match.group('suffix') or '')
+ if prefix_suffix is None:
+ prefix_suffix = current_prefix_suffix
+ elif current_prefix_suffix != prefix_suffix:
+ debug(f'Ending prefix/suffix does not match {prefix_suffix}, giving up')
+ return None
+
+ ending_letter = (ending_match.group('letter') or '').lower()
+ if ending_letter == '':
+ index = 0
+ elif ending_letter >= 'a' and ending_letter <= 'z':
+ index = ord(ending_letter) - ord('a') + 1
+ elif ending_letter >= 'ａ' and ending_letter <= 'ｚ':
+ index = ord(ending_letter) - ord('ａ') + 1
+ else:
debug('Ending is not a letter, giving up')
return None
+
if (index,) in alphabetized:
debug(f'Index value {index} is already present, giving up')
return None
alphabetized[(index,)] = [entry]
+
return alphabetized
def check_extension(path, exts):
From d33d4816c6d798dd095f47ec4c3f97ede66adc76 Mon Sep 17 00:00:00 2001
From: xenofem <xenofem@xeno.science>
Date: Sat, 20 Apr 2024 13:08:21 -0400
Subject: [PATCH 2/3] afterword
---
dlibrary/dlibrary.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dlibrary/dlibrary.py b/dlibrary/dlibrary.py
index 9e52d35..3aa7b33 100755
--- a/dlibrary/dlibrary.py
+++ b/dlibrary/dlibrary.py
@@ -65,11 +65,13 @@ FRONT_COVER_REGEX = re.compile('(?<!裏)表紙(?!裏)|(?<!back[-_ ])(?<!back)cov
BACK_COVER_REGEX = re.compile('裏表紙|hyou?sh?i[-_ ]?ura|ura[-_ ]?hyou?sh?i', re.I)
BONUS_REGEX = re.compile('設定|キャラ|特典|ポスター|bonus', re.I)
EPILOGUE_REGEX = re.compile('after|後日談|おまけ', re.I)
+AFTERWORD_REGEX = re.compile('あとがき', re.I)
SPLITS = [
{ 'later': TEXTLESS_REGEX },
{ 'later': FXLESS_REGEX },
{ 'earlier': FRONT_COVER_REGEX, 'later': BACK_COVER_REGEX },
{ 'later': BONUS_REGEX },
+ { 'later': AFTERWORD_REGEX },
{ 'later': EPILOGUE_REGEX },
]
From b26a854bdb6fc6e90d035ec97daf67016f277f4c Mon Sep 17 00:00:00 2001
From: xenofem <xenofem@xeno.science>
Date: Sat, 20 Apr 2024 13:45:55 -0400
Subject: [PATCH 3/3] use warning color when skipping non-manga/CG work
---
dlibrary/dlibrary.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlibrary/dlibrary.py b/dlibrary/dlibrary.py
index 3aa7b33..5f0b489 100755
--- a/dlibrary/dlibrary.py
+++ b/dlibrary/dlibrary.py
@@ -267,7 +267,7 @@ async def fetch_async(args):
print(f'Fetching DLSite metadata for {work_id}')
dlsite_metadata = await api.get_work(work_id)
if dlsite_metadata.work_type not in [dlsite_async.WorkType.MANGA, dlsite_async.WorkType.CG_ILLUSTRATIONS]:
- print(f'Work {work_id} is not a manga or CG set, skipping')
+ warn(f'Work {work_id} is not a manga or CG set, skipping')
any_warnings = True
continue
db_row = {