Merge pull request '⬆️ Update dependency urllib3 to v2.2.2' (#35) from renovate/urllib3-2.x into main

Reviewed-on: #35

.gitea/workflows/docker.yml

@@ -0,0 +1,48 @@
+name: ci
+
+on:
+  push:
+    branches:
+      - "*"
+    tags:
+      - "*"
+  pull_request:
+    branches:
+      - "main"
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    container:
+      image: catthehacker/ubuntu:act-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            git.sebclem.fr/${{ gitea.repository }}            
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}            
+
+      - name: Login to registry
+        if: github.ref_type == 'tag'
+        uses: docker/login-action@v3
+        with:
+          registry: git.sebclem.fr
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: ${{ github.ref_type == 'tag' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -1,5 +1,5 @@
 # For more information, please refer to https://aka.ms/vscode-docker-python
-FROM python:3.10-slim
+FROM python:3.12-alpine
 
 # Keeps Python from generating .pyc files in the container
 ENV PYTHONDONTWRITEBYTECODE=1
@@ -7,6 +7,8 @@ ENV PYTHONDONTWRITEBYTECODE=1
 # Turns off buffering for easier container logging
 ENV PYTHONUNBUFFERED=1
 
+RUN apk add build-base
+
 # Install pip requirements
 COPY requirements.txt .
 RUN python -m pip install -r requirements.txt

renovate.json

@@ -0,0 +1,8 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ],
+  "commitMessagePrefix": ":arrow_up:"
+
+}

requirements.txt

@@ -1,2 +1,21 @@
-pixivpy3
-discord.py
+pixivpy3==3.7.5
+discord.py==2.3.2
+
+# Freeze
+aiohttp==3.9.5
+aiosignal==1.3.1
+async-timeout==4.0.3
+attrs==23.2.0
+certifi==2024.6.2
+charset-normalizer==3.3.2
+cloudscraper==1.2.71
+frozenlist==1.4.1
+idna==3.7
+isort==5.13.2
+multidict==6.0.5
+pyparsing==3.1.2
+requests==2.32.3
+requests-toolbelt==1.0.0
+typing_extensions==4.12.2
+urllib3==2.2.2
+yarl==1.9.4

src/discord_tools/message.py

@@ -9,7 +9,14 @@ IMAGE_NBR_LIMIT = 10
 DEFAULT_UPLOAD_SIZE_LIMIT = 209715200
 
 
-async def send_message(message: discord.Message, files, tmp_dir: str, muted: bool):
+async def send_message(
+    message: discord.Message,
+    files,
+    tmp_dir: str,
+    muted: bool,
+    title: str,
+    art_author: str,
+):
     to_send_files = []
     for file in files:
         joined = os.path.join(tmp_dir, file)
@@ -32,7 +39,8 @@ async def send_message(message: discord.Message, files, tmp_dir: str, muted: boo
             to_send_files = to_send_files[1:]
         elif first:
             await message.reply(
-                files=splited_file, content=(TIPS_MESSAGE if not muted else None)
+                files=splited_file,
+                content=f"**{title}** by `{art_author}` {chr(10) + TIPS_MESSAGE if not muted else ''}",
             )
             first = False
         else:
@@ -75,7 +83,7 @@ async def send_command_reply(
         elif first:
             await interaction.followup.send(
                 files=splited_file,
-                content=f"{title} by {art_author} - <{url}> - Submited by {author.mention} {chr(10) + TIPS_MESSAGE if not muted else ''}",
+                content=f"**{title}** by `{art_author}` - <{url}> - Submited by {author.mention} {chr(10) + TIPS_MESSAGE if not muted else ''}",
             )
             first = False
         else:

src/main.py

@@ -1,3 +1,4 @@
+import asyncio
 import logging
 import os
 from shlex import join
@@ -55,8 +56,13 @@ async def pixivprev(interaction: discord.Interaction, url: str):
     if result and match is not None:
         await interaction.response.defer()
         with TemporaryDirectory() as tmp_dir:
-            data = pixiv_api.dowload_pixiv_images(
-                int(match.group("id")), tmp_dir, REFRESH_TOKEN
+            loop = asyncio.get_running_loop()
+            data = await loop.run_in_executor(
+                None,
+                pixiv_api.download_pixiv_images,
+                int(match.group("id")),
+                tmp_dir,
+                REFRESH_TOKEN,
             )
             if data is None:
                 await interaction.response.send_message(
@@ -86,8 +92,13 @@ async def pixiv_preview(interaction: discord.Interaction, message: discord.Messa
     if result and match is not None:
         await interaction.response.defer()
         with TemporaryDirectory() as tmp_dir:
-            data = pixiv_api.dowload_pixiv_images(
-                int(match.group("id")), tmp_dir, REFRESH_TOKEN
+            loop = asyncio.get_running_loop()
+            data = await loop.run_in_executor(
+                None,
+                pixiv_api.download_pixiv_images,
+                int(match.group("id")),
+                tmp_dir,
+                REFRESH_TOKEN,
             )
             if data is None:
                 await interaction.response.send_message(
@@ -105,7 +116,7 @@ async def pixiv_preview(interaction: discord.Interaction, message: discord.Messa
                 title=title,
                 art_author=author,
                 url=match.group("url"),
-                author=interaction.user,
+                author=message.author,
             )
     else:
         await interaction.response.send_message(
@@ -126,17 +137,25 @@ async def on_message(message: discord.Message):
     if result and match is not None:
         with TemporaryDirectory() as tmp_dir:
             async with message.channel.typing():
-                data = pixiv_api.dowload_pixiv_images(
-                    int(match.group("id")), tmp_dir, REFRESH_TOKEN
+                loop = asyncio.get_running_loop()
+                data = await loop.run_in_executor(
+                    None,
+                    pixiv_api.download_pixiv_images,
+                    int(match.group("id")),
+                    tmp_dir,
+                    REFRESH_TOKEN,
                 )
                 if data is None:
                     return
+                (title, author) = data
                 files = os.listdir(tmp_dir)
                 files.sort()
                 # await send_message.send_message_with_embed(
                 #     message, files, title, tmp_dir, match.group("url")
                 # )
-                await discord_tools.message.send_message(message, files, tmp_dir, muted)
+                await discord_tools.message.send_message(
+                    message, files, tmp_dir, muted, title, author
+                )
 
 
 client.run(DISCORD_TOKEN)

src/pixiv/pixiv_api.py

@@ -9,9 +9,11 @@ import pixivpy3
 
 cpu_count = os.cpu_count()
 max_thread_num = cpu_count * 2 if cpu_count is not None else 4
+if max_thread_num > 10:
+    max_thread_num = 10
 
 
-def dowload_pixiv_images(
+def download_pixiv_images(
     illust_id: int,
     dest_folder: str,
     refresh_token: str,
@@ -22,6 +24,7 @@ def dowload_pixiv_images(
     json_result = api.illust_detail(illust_id)
     illust = json_result.illust
     if not illust["visible"]:
+        logging.info("Can't be viewed, return None")
         return None
     pages = illust["meta_pages"]
     if len(pages) > 0:
@@ -59,7 +62,7 @@ def dowload_pixiv_images(
             url=illust["meta_single_page"]["original_image_url"], path=dest_folder
         )
     logging.info("Download finished !")
-    return (illust["title"], f"{illust['user']['name']}({illust['user']['account']})")
+    return (illust["title"], f"{illust['user']['name']} ({illust['user']['account']})")
 
 
 def download_thread(q: Queue[Union[Tuple[str, str, pixivpy3.AppPixivAPI], None]]):