From ba627149559033e00c2af190dc0748c03e41fcd3 Mon Sep 17 00:00:00 2001 From: blank X Date: Thu, 24 Dec 2020 23:16:37 +0700 Subject: [PATCH] Get next high quality pic if it can --- sukuinote/plugins/saucenao.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sukuinote/plugins/saucenao.py b/sukuinote/plugins/saucenao.py index aa9df4a..c97c28b 100644 --- a/sukuinote/plugins/saucenao.py +++ b/sukuinote/plugins/saucenao.py @@ -55,12 +55,14 @@ async def saucenao(client, message): minimum_similarity = Decimal(json['header']['minimum_similarity']) caption = text = '' to_image = False + to_thumbnail = None filename = os.path.join(tempdir, '0') for result in json['results']: if not result['data'].get('ext_urls'): continue atext = f'{html.escape(result["header"]["index_name"])}' - if Decimal(result['header']['similarity']) < minimum_similarity: + low_similarity = Decimal(result['header']['similarity']) < minimum_similarity + if low_similarity: atext += ' (low similarity result)' atext += '' atext += '\nURL' @@ -105,16 +107,19 @@ async def saucenao(client, message): to_image = True break else: - await download_file(result['header']['thumbnail'], filename) - to_image = True + if not to_thumbnail: + to_thumbnail = result['header'].get('thumbnail') atext += '\n\n' length = len((await client.parser.parse(caption + atext, 'html'))['message']) if length <= 1024: caption += atext - if length > 4096: + if length < 4096: + text += atext + elif low_similarity: break - text += atext try: + if to_thumbnail and not to_image: + await download_file(to_thumbnail, filename) ext = await get_file_ext(filename) os.rename(filename, filename + ext) await message.reply_photo(filename + ext, caption=caption)