ASD

API/app.py

@@ -7,7 +7,7 @@ import time
 import uvicorn
 from dotenv import load_dotenv
 import os
-from aiofiles import open as aio_open
+import io
 from pydantic import BaseModel
 from typing import List, Dict
 from zipfile import ZipFile
@@ -19,8 +19,6 @@ class pixifModel(BaseModel):
 class PixifDownloadModel(BaseModel):
     posts: Dict[str, str]
 
-os.makedirs('Stash', exist_ok=True)
-
 env_path = os.path.dirname(os.path.realpath(__file__)) + "/../.env"
 # config = dotenv_values(env_path)
 # PHPSESSID = config.get("PHPSESSID")
@@ -197,7 +195,7 @@ async def process_post(post_id, session, semaphore):
     async with semaphore:
         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']][:12]
+            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)
@@ -223,13 +221,9 @@ async def pixif(
 
 async def download_image(session, post_id, post_url):
     url = f"{img_base}{post_url}"
-    if os.path.exists(f"Stash/{post_id}.png"):
-        return
     async with session.get(url) as response:
         content = await response.read()
-        async with aio_open(f"Stash/{post_id}.png", "wb") as f:
-            await f.write(content)
-
+        return (post_id, content)
 
 @app.post("/download")
 async def download(
@@ -239,14 +233,20 @@ async def download(
     
     async with aiohttp.ClientSession(cookies=cookies, headers=headers) as session:
         tasks = [download_image(session, post_id, image_url) for post_id, image_url in posts.items()]
-        await asyncio.gather(*tasks)
-
-    timezip = base26_time()
-    with ZipFile(f"Stash/{timezip}.zip", "w") as zipf:
-        for post_id in posts:
-            zipf.write(f"Stash/{post_id}.png", post_id + ".png")
-            
-    return FileResponse(path=f"Stash/{timezip}.zip", media_type="application/zip", filename=f"{timezip}.zip")
+        images = await asyncio.gather(*tasks)
+
+    zip_buffer = io.BytesIO()
+
+    with ZipFile(zip_buffer, "w") as zipf:
+        for post_id, image_data in images:
+            zipf.writestr(f"{post_id}.png", image_data)
+
+    zip_buffer.seek(0)
+    return FileResponse(
+        zip_buffer, 
+        media_type="application/zip", 
+        filename=f"X.zip"
+    )
 
 @app.get("/")
 async def read_root():

Client/t2.py

@@ -9,4 +9,5 @@ db = lmdb.open("db", subdir=True, map_size=1048576)
 # view all in db
 with db.begin() as txn:
     for key, value in txn.cursor():
-        print(key.decode(), value.decode())
+        if value != b'\x00':
+            print(key.decode(), value.decode().split('p')[1])