Back

API/app.py

@@ -189,49 +189,33 @@ def parse_png_metadata(data):
         index += chunk_len + 4
     return None
 
-async def process_image(image_dict, session, semaphore):
+async def process_post(post_id, session, semaphore):
     async with semaphore:
-        image_url = image_dict['image_url']
-        post_id = image_dict['post_id']
-        metadata = await get_exif(image_url, session)
-        exif_type = determine_exif_type(metadata)
-        if exif_type not in ['photoshop', 'celsys', None]:
-            return {'post_id': post_id, 'image_url': image_url}
-    return None
-
+        try:
+            data = await fetch_page(session, f"https://www.pixiv.net/ajax/illust/{post_id}/pages")
+            image_urls = [page['urls']['original'] for page in data['body'] if 'png' in page['urls']['original']][:20]
+            for image_url in image_urls:
+                metadata = await get_exif(image_url, session)
+                exif_type = determine_exif_type(metadata)
+                if exif_type not in ['photoshop', 'celsys', None]:
+                    return post_id, image_url
+            return post_id, None
+        except Exception as e:
+            return post_id, None
 
 @app.post("/pixif")
 async def pixif(
     items: pixifModel
 ):
     post_ids = items.post_ids
-    semaphore = asyncio.Semaphore(200)
+    semaphore = asyncio.Semaphore(100)
 
     async with aiohttp.ClientSession(cookies=cookies, headers=headers) as session:
-        pages_tasks = [fetch_page(session, f"https://www.pixiv.net/ajax/illust/{post_id}/pages") for post_id in post_ids]
-        pages_results = await asyncio.gather(*pages_tasks)
-    
-        image_list = []
-        for post_id, data in zip(post_ids, pages_results):
-            image_urls = [page['urls']['original'] for page in data['body'] if 'png' in page['urls']['original']][:20]
-            for image_url in image_urls:
-                image_list.append({'post_id': post_id, 'image_url': image_url})
-
-        image_list.sort(key=lambda x: int(x['post_id']))
-
-        batch_size = 20
-        for i in range(0, len(image_list), batch_size):
-            batch = image_list[i:i+batch_size]
-            tasks = [process_image(image_dict, session, semaphore) for image_dict in batch]
-            results = await asyncio.gather(*tasks)
-            for result in results:
-                if result:
-                    post_id = result['post_id']
-                    image_url = result['image_url']
-                    image_exifs = {post_id: image_url.replace('https://i.pximg.net/img-original/', '', 1)}
-                    return image_exifs
-        return {}
+        tasks = [process_post(post_id, session, semaphore) for post_id in post_ids]
+        results = await asyncio.gather(*tasks)
 
+    image_exifs = {post_id: image_url.replace('https://i.pximg.net/img-original/', '', 1) for post_id, image_url in results if image_url}
+    return image_exifs
 
 async def generate_zip(posts, session):
     zip_buffer = io.BytesIO()