sticker-convert 2.13.1.0__py3-none-any.whl → 2.13.2.1__py3-none-any.whl

sticker_convert/cli.py

@@ -233,6 +233,7 @@ class CLI:
             "telegram_telethon": args.download_telegram_telethon,
             "kakao": args.download_kakao,
             "band": args.download_band,
+            "ogq": args.download_ogq,
             "viber": args.download_viber,
             "discord": args.download_discord,
             "discord_emoji": args.download_discord_emoji,

sticker_convert/downloaders/download_ogq.py

@@ -0,0 +1,79 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+from pathlib import Path
+from typing import Any, List, Optional, Tuple
+from urllib import parse
+
+import requests
+from bs4 import BeautifulSoup
+
+from sticker_convert.downloaders.download_base import DownloadBase
+from sticker_convert.job_option import CredOption, InputOption
+from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
+from sticker_convert.utils.files.metadata_handler import MetadataHandler
+
+# Reference: https://github.com/star-39/moe-sticker-bot/issues/49
+
+
+class DownloadOgq(DownloadBase):
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        super().__init__(*args, **kwargs)
+        self.headers = {"User-Agent": "Mozilla/5.0"}
+
+    def download_stickers_ogq(self) -> Tuple[int, int]:
+        url_parse = parse.urlparse(self.url)
+        if (
+            url_parse.netloc != "ogqmarket.naver.com"
+            or url_parse.path.startswith("/artworks/sticker/detail") is False
+        ):
+            self.cb.put(f"Invalid url: {self.url}")
+        artwork_id = {
+            i.split("=")[0]: i.split("=")[1] for i in url_parse.query.split("&")
+        }["artworkId"]
+
+        html = requests.get(self.url, headers=self.headers).text
+        soup = BeautifulSoup(html, "html.parser")
+
+        author_tag = soup.select_one("div.info div.nickname span")  # type: ignore
+        author = author_tag.text.strip() if author_tag else "OGQ"
+        title_tag = soup.select_one("div.header div div.title p")  # type: ignore
+        title = title_tag.text.strip() if title_tag else artwork_id
+
+        seen: List[str] = []
+        imgs: List[str] = []
+        targets: List[Tuple[str, Path]] = []
+        n = 0
+        for img in soup.find_all("img", alt="sticker-detail-image-prevew"):
+            src = img.get("src")
+            if not src:
+                continue
+            src = src.split("?")[0]
+            if src in seen:
+                continue
+            seen.append(src)
+            imgs.append(src)
+            sticker_url = f"{src}?type=ma480_480"
+            sticker_url_parse = parse.urlparse(sticker_url)
+            ext = sticker_url_parse.path.split(".")[-1]
+            if sticker_url_parse.path.split("/")[-1].startswith("original_"):
+                path = self.out_dir / f"{n}.{ext}"
+            else:
+                path = self.out_dir / f"cover.{ext}"
+            targets.append((sticker_url, path))
+            n += 1
+
+        results = self.download_multiple_files(targets)
+        MetadataHandler.set_metadata(self.out_dir, title=title, author=author)
+
+        return len(results.values()), len(targets)
+
+    @staticmethod
+    def start(
+        opt_input: InputOption,
+        opt_cred: Optional[CredOption],
+        cb: CallbackProtocol,
+        cb_return: CallbackReturn,
+    ) -> Tuple[int, int]:
+        downloader = DownloadOgq(opt_input, opt_cred, cb, cb_return)
+        return downloader.download_stickers_ogq()

sticker_convert/job.py

@@ -16,6 +16,7 @@ from sticker_convert.downloaders.download_band import DownloadBand
 from sticker_convert.downloaders.download_discord import DownloadDiscord
 from sticker_convert.downloaders.download_kakao import DownloadKakao
 from sticker_convert.downloaders.download_line import DownloadLine
+from sticker_convert.downloaders.download_ogq import DownloadOgq
 from sticker_convert.downloaders.download_signal import DownloadSignal
 from sticker_convert.downloaders.download_telegram import DownloadTelegram
 from sticker_convert.downloaders.download_viber import DownloadViber
@@ -570,6 +571,9 @@ class Job:
         if self.opt_input.option == "band":
             downloaders.append(DownloadBand.start)
 
+        if self.opt_input.option == "ogq":
+            downloaders.append(DownloadOgq.start)
+
         if self.opt_input.option == "viber":
             downloaders.append(DownloadViber.start)
 

sticker_convert/resources/compression.json

@@ -375,6 +375,53 @@
         "quantize_method": "imagequant",
         "default_emoji": "😀"
     },
+    "ogq": {
+        "size_max": {
+            "img": 0,
+            "vid": 0
+        },
+        "format": {
+            "img": ".png",
+            "vid": ".gif"
+        },
+        "fps": {
+            "min": 1,
+            "max": 30,
+            "power": -0.5
+        },
+        "res": {
+            "w": {
+                "min": 480,
+                "max": 480
+            },
+            "h": {
+                "min": 480,
+                "max": 480
+            },
+            "power": 3
+        },
+        "quality": {
+            "min": 10,
+            "max": 95,
+            "power": 5
+        },
+        "color": {
+            "min": 32,
+            "max": 257,
+            "power": 3
+        },
+        "duration": {
+            "min": 83,
+            "max": 4000
+        },
+        "padding_percent": 0,
+        "bg_color": "",
+        "steps": 16,
+        "fake_vid": false,
+        "scale_filter": "bicubic",
+        "quantize_method": "imagequant",
+        "default_emoji": "😀"
+    },
     "viber": {
         "size_max": {
             "img": 0,

sticker_convert/resources/input.json

@@ -69,6 +69,16 @@
             "author": false
         }
     },
+    "ogq": {
+        "full_name": "Download from OGQ",
+        "help": "Download OGQ stickers from a URL / ID as input",
+        "example": "Example: https://ogqmarket.naver.com/artworks/sticker/detail?artworkId=xxxxx",
+        "address_lbls": "URL address",
+        "metadata_provides": {
+            "title": true,
+            "author": false
+        }
+    },
     "viber": {
         "full_name": "Download from Viber",
         "help": "Download viber stickers from a URL as input",

sticker_convert/version.py

@@ -1,3 +1,3 @@
 #!/usr/bin/env python3
 
-__version__ = "2.13.1.0"
+__version__ = "2.13.2.1"

{sticker_convert-2.13.1.0.dist-info → sticker_convert-2.13.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sticker-convert
-Version: 2.13.1.0
+Version: 2.13.2.1
 Summary: Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, Viber, Discord, iMessage. Written in Python.
 Author-email: laggykiller <chaudominic2@gmail.com>
 Maintainer-email: laggykiller <chaudominic2@gmail.com>
@@ -380,7 +380,7 @@ Requires-Dist: pyoxipng~=9.1.0
 Requires-Dist: python-telegram-bot~=22.1
 Requires-Dist: psutil~=7.0.0
 Requires-Dist: PyMemoryEditor~=1.5.22
-Requires-Dist: requests~=2.32.3
+Requires-Dist: requests~=2.32.4
 Requires-Dist: rlottie_python~=1.3.7
 Requires-Dist: signalstickers-client-fork-laggykiller~=3.3.0.post2
 Requires-Dist: socksio~=1.0.0
@@ -396,7 +396,7 @@ Dynamic: license-file
 
 - A python script for creating, downloading, converting+compressing and uploading stickers from multiple instant messaging applications.
 - With GUI and CLI that runs on Windows, MacOS and Linux
-- Currently supports Signal, Telegram, WhatsApp (Create .wastickers), Line (Download only), Kakao (Download only), Naver Band (Download only), Viber, Discord (Download only), iMessage (Create Xcode sticker pack project)
+- Currently supports Signal, Telegram, WhatsApp (Create .wastickers), Line (Download only), Kakao (Download only), Naver Band (Download only), OGQ (Download only), Viber, Discord (Download only), iMessage (Create Xcode sticker pack project)
 - Supports static and animated stickers, with transparency support
 
 ## Downloads
@@ -438,6 +438,7 @@ Dynamic: license-file
 | [Line](docs/guide_line.md)            | ✅                                  | 🚫 (Need to submit for manual approval)                  |
 | [Kakao](docs/guide_kakao.md)          | ✅ (Need 'auth_token' for animated) | 🚫 (Need to submit for manual approval)                  |
 | [Band](docs/guide_band.md)            | ✅                                  | 🚫 (Need to submit for manual approval)                  |
+| [OGQ](docs/guide_ogq.md)            | ✅                                  | 🚫 (Need to submit for manual approval)                  |
 | [Viber](docs/guide_viber.md)          | ✅                                  | ✅ (Require `viber_auth`)                                |
 | [Discord](docs/guide_discord.md)      | ✅ (Require `token`)                | 🚫                                                       |
 | [iMessage](docs/guide_imessage.md)    | 🚫                                  | ⭕ (Create Xcode stickerpack project for sideload)       |
@@ -467,6 +468,9 @@ Dynamic: license-file
 - Band
     - Download: Supported (e.g. `https://www.band.us/sticker/xxxx` OR 2535). Learn how to get share link from [docs/guide_band.md](docs/guide_band.md)
     - Upload: Not supported. You need to manually submit sticker pack for approval before you can use in app.
+- OGQ
+    - Download: Supported (e.g. `https://ogqmarket.naver.com/artworks/sticker/detail?artworkId=xxxxx`)
+    - Upload: Not supported. You need to manually submit sticker pack for approval before you can use in app.
 - Viber
     - Download: Supported (e.g. `https://stickers.viber.com/pages/example` OR `https://stickers.viber.com/pages/custom-sticker-packs/example`)
     - Upload: Supported. Viber authentication data required for uploading Viber stickers, which could be fetched from Viber Desktop application automatically.
@@ -494,11 +498,11 @@ To run in CLI mode, pass on any arguments
 
 ```
 usage: sticker-convert.py [-h] [--version] [--no-confirm] [--no-progress] [--custom-presets CUSTOM_PRESETS] [--input-dir INPUT_DIR]
-                          [--download-auto DOWNLOAD_AUTO | --download-signal DOWNLOAD_SIGNAL | --download-telegram DOWNLOAD_TELEGRAM | --download-telegram-telethon DOWNLOAD_TELEGRAM_TELETHON | --download-line DOWNLOAD_LINE | --download-kakao DOWNLOAD_KAKAO | --download-band DOWNLOAD_BAND | --download-viber DOWNLOAD_VIBER | --download-discord DOWNLOAD_DISCORD | --download-discord-emoji DOWNLOAD_DISCORD_EMOJI]
+                          [--download-auto DOWNLOAD_AUTO | --download-signal DOWNLOAD_SIGNAL | --download-telegram DOWNLOAD_TELEGRAM | --download-telegram-telethon DOWNLOAD_TELEGRAM_TELETHON | --download-line DOWNLOAD_LINE | --download-kakao DOWNLOAD_KAKAO | --download-band DOWNLOAD_BAND | --download-ogq DOWNLOAD_OGQ | --download-viber DOWNLOAD_VIBER | --download-discord DOWNLOAD_DISCORD | --download-discord-emoji DOWNLOAD_DISCORD_EMOJI]
                           [--output-dir OUTPUT_DIR] [--author AUTHOR] [--title TITLE]
                           [--export-signal | --export-telegram | --export-telegram-emoji | --export-telegram-telethon | --export-telegram-emoji-telethon | --export-viber | --export-whatsapp | --export-imessage]
                           [--no-compress]
-                          [--preset {auto,signal,telegram,telegram_emoji,whatsapp,line,kakao,viber,discord,discord_emoji,imessage_small,imessage_medium,imessage_large,custom}]
+                          [--preset {auto,signal,telegram,telegram_emoji,whatsapp,line,kakao,band,ogq,viber,discord,discord_emoji,imessage_small,imessage_medium,imessage_large,custom}]
                           [--steps STEPS] [--processes PROCESSES] [--fps-min FPS_MIN] [--fps-max FPS_MAX] [--fps-power FPS_POWER]
                           [--res-min RES_MIN] [--res-max RES_MAX] [--res-w-min RES_W_MIN] [--res-w-max RES_W_MAX] [--res-h-min RES_H_MIN]
                           [--res-h-max RES_H_MAX] [--res-power RES_POWER] [--quality-min QUALITY_MIN] [--quality-max QUALITY_MAX]
@@ -555,6 +559,9 @@ Input options:
   --download-band DOWNLOAD_BAND
                         Download Naver Band stickers from a URL / ID as input
                         (Example: https://www.band.us/sticker/xxxx OR 2535)
+  --download-ogq DOWNLOAD_OGQ
+                        Download OGQ stickers from a URL / ID as input
+                        (Example: https://ogqmarket.naver.com/artworks/sticker/detail?artworkId=xxxxx)
   --download-viber DOWNLOAD_VIBER
                         Download viber stickers from a URL as input
                         (Example: https://stickers.viber.com/pages/example
@@ -587,7 +594,7 @@ Output options:
 
 Compression options:
   --no-compress         Do not compress files. Useful for only downloading stickers.
-  --preset {auto,signal,telegram,telegram_emoji,whatsapp,line,kakao,viber,discord,discord_emoji,imessage_small,imessage_medium,imessage_large,custom}
+  --preset {auto,signal,telegram,telegram_emoji,whatsapp,line,kakao,band,ogq,viber,discord,discord_emoji,imessage_small,imessage_medium,imessage_large,custom}
                         Apply preset for compression.
   --steps STEPS         Set number of divisions between min and max settings.
                         Steps higher = Slower but yields file more closer to the specified file size limit.
@@ -893,5 +900,5 @@ See [docs/TODO.md](docs/TODO.md)
 - Free code signing on Windows provided by [SignPath.io](https://about.signpath.io/), certificate by [SignPath Foundation](https://signpath.org/)
 
 ## DISCLAIMER
-- The author of this repo is NOT affiliated with Signal, Telegram, WhatsApp, Line, Kakao, Naver Band, Viber, Discord, iMessage or Sticker Maker.
+- The author of this repo is NOT affiliated with Signal, Telegram, WhatsApp, Line, Kakao, Naver Band, OGQ, Viber, Discord, iMessage or Sticker Maker.
 - The author of this repo is NOT repsonsible for any legal consequences and loss incurred from using this repo.

{sticker_convert-2.13.1.0.dist-info → sticker_convert-2.13.2.1.dist-info}/RECORD

@@ -1,18 +1,19 @@
 sticker_convert/__init__.py,sha256=iQnv6UOOA69c3soAn7ZOnAIubTIQSUxtq1Uhh8xRWvU,102
 sticker_convert/__main__.py,sha256=elDCMvU27letiYs8jPUpxaCq5puURnvcDuqGsAAb6_w,592
-sticker_convert/cli.py,sha256=JdfZe4-GGFoa8vkNaUwCtwzmypCfMNaPZuhzHpmLBpM,22544
+sticker_convert/cli.py,sha256=RG62v3JFSokhKZo1J7zbc1NL0oY43ufVrIub8nT_f_A,22582
 sticker_convert/converter.py,sha256=6_FGXW-S6t2xs56fid49z2FaEc1VFtJ-jJOA-SUKSH8,39760
 sticker_convert/definitions.py,sha256=BqROmOvqIqw8ANaqZXIxJAXGD0HgjAvCfFouQ4SaWHc,2254
 sticker_convert/gui.py,sha256=bd8rMgFaXrn41y6aOHNlD6gPBDleDmiHMsGMZNfz1jk,34239
-sticker_convert/job.py,sha256=FJiaJEcfMr8GnNfPC3SDcpTs7ytoiAZk6cxUbzsw9IE,28257
+sticker_convert/job.py,sha256=jK65lOuPyevQ6Pt9Qw029bGcgYLMuaHlexpc1n1qFxE,28416
 sticker_convert/job_option.py,sha256=yI_uKWJEAul2XTC6pucz9PfW0iNwwOr0aVC-PAHkMA4,8109
-sticker_convert/version.py,sha256=IqHvkpNtjDMGeiZS1r9gF2cyof0NHldraqS5R5rrq10,49
+sticker_convert/version.py,sha256=f-IGg55P9iTzFu-qVlNDW5ioRe04BJzemQ14gfGLoEQ,49
 sticker_convert/downloaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sticker_convert/downloaders/download_band.py,sha256=JPjwwdxbMXPBM9TXF76wT9mtoDCLssYnrm1iS2C6uVM,3629
 sticker_convert/downloaders/download_base.py,sha256=MI5pCT_tkfoaFlrD1oNynDj1Rv1CK0APuNVElTEAEis,5110
 sticker_convert/downloaders/download_discord.py,sha256=6AFpLAYL2hRvVcsqUtzDUC31U66U02ZcnKXDnZRi2jk,3496
 sticker_convert/downloaders/download_kakao.py,sha256=lRmpEcYjHizIRM0uFBDvjMqNEpur0VmOTKAmiir9eB0,15181
 sticker_convert/downloaders/download_line.py,sha256=751-g6BH0ITwNlYNsZuBxyB92Q8f3o6Qv9VHmHDoLps,18161
+sticker_convert/downloaders/download_ogq.py,sha256=-iSTQaCUlROfY7a9EFhJGq6fenY48AZEevfQLT9-pAk,2951
 sticker_convert/downloaders/download_signal.py,sha256=3wv-BLd4qggly4AdtwV8f3vUpCVZ-8GnoPLoWngY3Pk,3728
 sticker_convert/downloaders/download_telegram.py,sha256=iGmOcVjU2Ai19t1lyDY2JhQIc--O5XMyNCGXZAA4DVY,2028
 sticker_convert/downloaders/download_viber.py,sha256=SFnyaVEd_33J1KvRhcHDJqnLKGsbLMeA2NomVHm2ulM,4226
@@ -71,10 +72,10 @@ sticker_convert/resources/NotoColorEmoji.ttf,sha256=LurIVaCIA8bSCfjrdO1feYr0bhKL
 sticker_convert/resources/appicon.icns,sha256=FB2DVTOQcFfQNZ9RcyG3z9c9k7eOiI1qw0IJhXMRFg4,5404
 sticker_convert/resources/appicon.ico,sha256=-ldugcl2Yq2pBRTktnhGKWInpKyWzRjCiPvMr3XPTlc,38078
 sticker_convert/resources/appicon.png,sha256=6XBEQz7PnerqS43aRkwpWolFG4WvKMuQ-st1ly-_JPg,5265
-sticker_convert/resources/compression.json,sha256=wEgtjcDyLEYup53s-SCGu2Wc3UdReWeSj9POWn5PXkk,15184
+sticker_convert/resources/compression.json,sha256=UUY375C1PDHVrbaHO0V3O2TCayNBkrIHchKNjfc10Aw,16183
 sticker_convert/resources/emoji.json,sha256=q9DRFdVJfm7feZW7ZM6Xa5P1QsMvrn0PbBVU9jKcJKI,422720
 sticker_convert/resources/help.json,sha256=28m5oMhybN3yg7EhmjBlPJq1HtHYa0joG355Ie1Zn10,7336
-sticker_convert/resources/input.json,sha256=vLP8pVo4Mfh-yLRjy5j1x4SMR1dQC9xCRzQ6RWN_t2E,4213
+sticker_convert/resources/input.json,sha256=cpLQQ-jwXSHQUd8faLn-e-mAEvJViKs_d7UuqIvF7ZQ,4575
 sticker_convert/resources/memdump_linux.sh,sha256=SFKXiE0ztZyGvpFYPOrdQ0wmY3ndgJuqfiofC7BQon0,625
 sticker_convert/resources/memdump_windows.ps1,sha256=CfyNSSEW3HJOkTu-mKrP3qh5aprN-1VCBfj-R1fELA0,302
 sticker_convert/resources/output.json,sha256=SC_3vtEBJ79R7q0vy_p33eLsGFEyBsSOai0Hy7mLqG8,2208
@@ -112,9 +113,9 @@ sticker_convert/utils/media/apple_png_normalize.py,sha256=LbrQhc7LlYX4I9ek4XJsZE
 sticker_convert/utils/media/codec_info.py,sha256=HwA6eVh7cLhOlUoR_K9d_wyBRJ_ocGtB3GAyne_iZAU,16483
 sticker_convert/utils/media/decrypt_kakao.py,sha256=4wq9ZDRnFkx1WmFZnyEogBofiLGsWQM_X69HlA36578,1947
 sticker_convert/utils/media/format_verify.py,sha256=oM32P186tWe9YxvBQRPr8D3FEmBN3b2rEe_2S_MwxyQ,6236
-sticker_convert-2.13.1.0.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-sticker_convert-2.13.1.0.dist-info/METADATA,sha256=HS8RD0rAFH3H34wZn7ilCqeVEa0p8L0QOYik4EB_dIY,54533
-sticker_convert-2.13.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sticker_convert-2.13.1.0.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
-sticker_convert-2.13.1.0.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
-sticker_convert-2.13.1.0.dist-info/RECORD,,
+sticker_convert-2.13.2.1.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+sticker_convert-2.13.2.1.dist-info/METADATA,sha256=f9Um0rHP7eNK8ImI6GdGFiJ3DaOss54vE3XpBOA_r90,55170
+sticker_convert-2.13.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sticker_convert-2.13.2.1.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
+sticker_convert-2.13.2.1.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
+sticker_convert-2.13.2.1.dist-info/RECORD,,