From 5ca08554b8d92956c66831d4a238c1bebc8fdd2c Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 7 May 2021 23:34:40 +0300 Subject: [PATCH] Improve multiple detection, fix full url --- library.py | 7 ++++++- picsorter.py | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/library.py b/library.py index f6fb1b3..5e6358b 100644 --- a/library.py +++ b/library.py @@ -42,8 +42,13 @@ class Library: return p # Characters section characters = tags.characters_sanitized() - if len(characters) == 1: + num = len(characters) + if num == 1: p = p / self.__sanitize(characters[0]) + elif num == 2 and characters[0] in characters[1]: + p = p / self.__sanitize(characters[0]) + elif num == 2 and characters[1] in characters[0]: + p = p / self.__sanitize(characters[1]) else: p = p / "_multiple" return p diff --git a/picsorter.py b/picsorter.py index ef4ddfa..2ca8b30 100644 --- a/picsorter.py +++ b/picsorter.py @@ -103,7 +103,7 @@ class PicSorter: logging.info("Skipping exists post %d", post_id) return False - meta_result = self.metadata.process("https://danbooru.donmai.us/posts/" + url) + meta_result = self.metadata.process("https://danbooru.donmai.us/posts/" + str(post_id)) if meta_result is None: return False image_path, tags = meta_result