Now the dumping scripts only save the image once.

scrape_gel.py

@@ -5,7 +5,6 @@ import time
 import json
 import utils
 import asyncio
-import aiofiles
 import argparse
 import concurrent
 from constants import *
@@ -107,12 +106,7 @@ async def process_link(scrape_args, scrape_state):
                 img_data = await img_response.read()
             download_used_time = time.time() - download_start_time
 
-            async with aiofiles.open(image_path, "wb") as f:
-                await f.write(img_data)
-            async with aiofiles.open(metadata_path, "w", encoding="utf8") as f:
-                await f.write(metadata)
-
-            if not await utils.submit_validation(scrape_state.thread_pool, image_path, metadata_path, scrape_args.width, scrape_args.height, scrape_args.convert_to_avif):
+            if not await utils.submit_validation(scrape_state.thread_pool, img_data, metadata, image_path, metadata_path, scrape_args.width, scrape_args.height, scrape_args.convert_to_avif):
                 return
             scrape_state.scraped_image_count += 1
             total_query_time = scrape_state.avg_query_time[0] * scrape_state.avg_query_time[1] + query_used_time

scrape_yan.py

@@ -5,7 +5,6 @@ import json
 import utils
 import urllib
 import asyncio
-import aiofiles
 import argparse
 import concurrent
 from constants import *
@@ -78,12 +77,7 @@ async def process_image_object(scrape_args, scrape_state):
                 img_data = await img_response.read()
             download_used_time = time.time() - download_start_time
 
-            async with aiofiles.open(image_path, "wb") as f:
-                await f.write(img_data)
-            async with aiofiles.open(metadata_path, "w", encoding="utf8") as f:
-                await f.write(metadata)
-
-            if not await utils.submit_validation(scrape_state.thread_pool, image_path, metadata_path, scrape_args.width, scrape_args.height, scrape_args.convert_to_avif):
+            if not await utils.submit_validation(scrape_state.thread_pool, img_data, metadata, image_path, metadata_path, scrape_args.width, scrape_args.height, scrape_args.convert_to_avif):
                 return
             scrape_state.scraped_image_count += 1
             total_download_time = scrape_state.avg_download_time[0] * scrape_state.avg_download_time[1] + download_used_time

utils/utils.py

@@ -1,50 +1,45 @@
 import os
+import io
 import json
 import asyncio
 import aiohttp
 from PIL import Image
 
-def validate_image(image_path, metadata_path, width=None, height=None, convert_to_avif=False):
-    new_path = None
+def validate_image(image_data, metadata, image_path, metadata_path, width=None, height=None, convert_to_avif=False):
     try:
-        with Image.open(image_path) as img:
-            save_kwargs = {}
-            if isinstance(width, int) and width > 0 and isinstance(height, int) and height > 0:
-                img = img.resize((width, height))
-                new_path = image_path
-            if convert_to_avif:
-                import pillow_avif
-                save_kwargs["quality"] = 50
-                new_path = os.path.splitext(image_path)[0] + ".avif"
-            if new_path is not None:
+        with io.BytesIO(image_data) as image_filelike:
+            with Image.open(image_filelike) as img:
+                save_kwargs = {}
+                if isinstance(width, int) and width > 0 and isinstance(height, int) and height > 0:
+                    img = img.resize((width, height))
+                if convert_to_avif:
+                    import pillow_avif
+                    save_kwargs["quality"] = 50
+                    image_path = os.path.splitext(image_path)[0] + ".avif"
                 img.load()
-                img.save(new_path, **save_kwargs)
-            else:
-                img.verify()
-        if new_path is not None and os.path.isfile(new_path) and os.path.realpath(new_path) != os.path.realpath(image_path):
-            os.remove(image_path)
+                img.save(image_path, **save_kwargs)
+        with open(metadata_path, "w", encoding="utf8") as metadata_file:
+            metadata_file.write(metadata)
         return True
     except Exception as e:
         print(f"Error validating image {image_path}: {e}")
         try:
             os.remove(image_path)
+        except FileNotFoundError:
+            pass
         except Exception as e:
             print("Error deleting image file:", e)
         try:
             os.remove(metadata_path)
-            print(f"Deleted invalid image and metadata files: {image_path}, {metadata_path}")
+            print(f"Deleted invalid image and metadata files: \"{image_path}\", \"{metadata_path}\"")
+        except FileNotFoundError:
+            pass
         except Exception as e:
             print("Error deleting metadata file:", e)
-        try:
-            if new_path is not None and os.path.isfile(new_path):
-                os.remove(new_path)
-                print("Deleted invalid new image file:", new_path)
-        except Exception as e:
-            print("Error deleting new image file:", e)
     return False
 
-async def submit_validation(thread_pool, image_path, metadata_path, width=None, height=None, convert_to_avif=False):
-    return await asyncio.wrap_future(thread_pool.submit(validate_image, image_path, metadata_path, width, height, convert_to_avif))
+async def submit_validation(thread_pool, image_data, metadata, image_path, metadata_path, width=None, height=None, convert_to_avif=False):
+    return await asyncio.wrap_future(thread_pool.submit(validate_image, image_data, metadata, image_path, metadata_path, width, height, convert_to_avif))
 
 def get_image_id_image_metadata_path_tuple_dict(image_dir):
     if not os.path.isdir(image_dir):