Fixed utils.

scrape_gel.py

@@ -22,7 +22,7 @@ async def process_link(thread_pool, session, image_url, image_ids_to_ignore, wid
     error = None
     for i in range(1, MAX_RETRY + 2): # 1 indexed.
         try:
-            if utils.SIGINT_COUNTER >= 1:
+            if utils.get_sigint_count() >= 1:
                 break
             # print(f"Processing image {image_id}...")
             async with session.get(image_url) as response:
@@ -114,7 +114,8 @@ async def main():
     page_number = 0
     search_tags = "+".join(urllib.parse.quote(tag, safe="") for tag in args.tags_to_search)
 
-    image_ids_to_ignore = utils.get_existing_image_tags_set(IMAGE_DIR)
+    os.makedirs(IMAGE_DIR, exist_ok=True)
+    image_ids_to_ignore = utils.get_existing_image_id_set(IMAGE_DIR)
     utils.register_sigint_callback()
 
     async with aiohttp.ClientSession(cookies={"fringeBenefits": "yup"}, timeout=aiohttp.ClientTimeout(total=TIMEOUT)) as session:
@@ -122,7 +123,7 @@ async def main():
         tasks = []
         while True:
             try:
-                if utils.SIGINT_COUNTER >= 1:
+                if utils.get_sigint_count() >= 1:
                     break
                 request_url = f"{args.site}/index.php?page=post&s=list&tags={search_tags}&pid={page_number}"
                 print(f"Going to {request_url}")
@@ -140,10 +141,10 @@ async def main():
                 print(f"Got {image_url_count} posts.")
                 page_number += image_url_count
                 for image_url in image_urls:
-                    if utils.SIGINT_COUNTER >= 1:
+                    if utils.get_sigint_count() >= 1:
                         break
                     while len(tasks) >= MAX_TASKS:
-                        if utils.SIGINT_COUNTER >= 1:
+                        if utils.get_sigint_count() >= 1:
                             break
                         await asyncio.sleep(0.1)
                         for i in range(len(tasks) - 1, -1, -1):
@@ -155,18 +156,18 @@ async def main():
             except Exception as e:
                 print(f"An error occurred: {e}\nPausing for 0.1 second before retrying...")
                 await asyncio.sleep(0.1)
-        if utils.SIGINT_COUNTER >= 1:
+        if utils.get_sigint_count() >= 1:
             print("Script interrupted by user, gracefully exiting...\nYou can interrupt again to exit semi-forcefully, but it will break image checks!")
         else:
             print("No more images to download, waiting already submitted tasks to finish...")
-        while tasks and utils.SIGINT_COUNTER <= 1:
+        while tasks and utils.get_sigint_count() <= 1:
             await asyncio.sleep(0.1)
             for i in range(len(tasks) - 1, -1, -1):
                 task = tasks[i]
                 if task.done():
                     await task
                     del tasks[i]
-    if utils.SIGINT_COUNTER >= 2:
+    if utils.get_sigint_count() >= 2:
         print("Another interrupt received, exiting semi-forcefully...\nYou can interrupt again for truly forceful exit, but it most likely will break a lot of things!")
         sys.exit(1)
 

scrape_yan.py

@@ -21,7 +21,7 @@ async def process_link(thread_pool, session, image_object, image_ids_to_ignore,
     error = None
     for i in range(1, MAX_RETRY + 2): # 1 indexed.
         try:
-            if utils.SIGINT_COUNTER >= 1:
+            if utils.get_sigint_count() >= 1:
                 break
             # print(f"Processing image {image_id}...")
             if not use_low_quality:
@@ -107,7 +107,8 @@ async def main():
     page_number = 1
     search_tags = "+".join(urllib.parse.quote(tag, safe="") for tag in args.tags_to_search)
 
-    image_ids_to_ignore = utils.get_existing_image_tags_set(IMAGE_DIR)
+    os.makedirs(IMAGE_DIR, exist_ok=True)
+    image_ids_to_ignore = utils.get_existing_image_id_set(IMAGE_DIR)
     utils.register_sigint_callback()
 
     async with aiohttp.ClientSession(timeout=aiohttp.ClientTimeout(total=TIMEOUT)) as session:
@@ -115,7 +116,7 @@ async def main():
         tasks = []
         while True:
             try:
-                if utils.SIGINT_COUNTER >= 1:
+                if utils.get_sigint_count() >= 1:
                     break
                 request_url = f"{args.site}/post.json?limit=1000&tags={search_tags}&page={page_number}"
                 print(f"Going to {request_url}")
@@ -128,10 +129,10 @@ async def main():
                 print(f"Got {image_count} posts.")
                 page_number += 1
                 for image_object in image_objects:
-                    if utils.SIGINT_COUNTER >= 1:
+                    if utils.get_sigint_count() >= 1:
                         break
                     while len(tasks) >= MAX_TASKS:
-                        if utils.SIGINT_COUNTER >= 1:
+                        if utils.get_sigint_count() >= 1:
                             break
                         await asyncio.sleep(0.1)
                         for i in range(len(tasks) - 1, -1, -1):
@@ -143,18 +144,18 @@ async def main():
             except Exception as e:
                 print(f"An error occurred: {e}\nPausing for 0.1 second before retrying...")
                 await asyncio.sleep(0.1)
-        if utils.SIGINT_COUNTER >= 1:
+        if utils.get_sigint_count() >= 1:
             print("Script interrupted by user, gracefully exiting...\nYou can interrupt again to exit semi-forcefully, but it will break image checks!")
         else:
             print("No more images to download, waiting already submitted tasks to finish...")
-        while tasks and utils.SIGINT_COUNTER <= 1:
+        while tasks and utils.get_sigint_count() <= 1:
             await asyncio.sleep(0.1)
             for i in range(len(tasks) - 1, -1, -1):
                 task = tasks[i]
                 if task.done():
                     await task
                     del tasks[i]
-    if utils.SIGINT_COUNTER >= 2:
+    if utils.get_sigint_count() >= 2:
         print("Another interrupt received, exiting semi-forcefully...\nYou can interrupt again for truly forceful exit, but it most likely will break a lot of things!")
         sys.exit(1)
 

utils/__init__.py

@@ -0,0 +1,3 @@
+from .utils import *
+from .scrape_state import *
+from .sigint_handler import *

utils/sigint_handler.py

@@ -0,0 +1,18 @@
+import sys
+import signal
+
+_SIGINT_COUNTER = 0
+
+def get_sigint_count():
+    return _SIGINT_COUNTER
+
+def sigint_handler(signum, frame):
+    global _SIGINT_COUNTER
+    _SIGINT_COUNTER += 1
+    print()
+    if _SIGINT_COUNTER >= 3:
+        print("Script force quit by user, exiting...")
+        sys.exit(1)
+
+def register_sigint_callback():
+    signal.signal(signal.SIGINT, sigint_handler)

utils.py → utils/utils.py

@@ -1,22 +1,7 @@
 import os
-import sys
-import signal
 import asyncio
 from PIL import Image
 
-SIGINT_COUNTER = 0
-
-def sigint_handler(signum, frame):
-    global SIGINT_COUNTER
-    SIGINT_COUNTER += 1
-    print()
-    if SIGINT_COUNTER >= 3:
-        print("Script force quit by user, exiting...")
-        sys.exit(1)
-
-def register_sigint_callback():
-    signal.signal(signal.SIGINT, sigint_handler)
-
 def validate_image(image_path, tags_path, width=None, height=None, convert_to_avif=False):
     new_path = None
     try:
@@ -76,5 +61,5 @@ def get_image_id_image_tags_path_tuple_dict(image_dir):
         image_id_image_tags_path_tuple_dict[image_id] = (path, tags_path)
     return image_id_image_tags_path_tuple_dict
 
-def get_existing_image_tags_set(image_dir):
-    return {tags_path for _, tags_path in get_image_id_image_tags_path_tuple_dict(image_dir)}
+def get_existing_image_id_set(image_dir):
+    return set(get_image_id_image_tags_path_tuple_dict(image_dir))