sticker-convert 2.1.7__py3-none-any.whl → 2.1.9__py3-none-any.whl

sticker_convert/__init__.py

@@ -1,3 +1,3 @@
 #!/usr/bin/env python3
 '''sticker-convert'''
-__version__ = '2.1.7'
+__version__ = '2.1.9'

sticker_convert/utils/auth/get_signal_auth.py

@@ -129,15 +129,21 @@ class GetSignalAuth:
             chromedriver_url = f'https://chromedriver.storage.googleapis.com/{chromedriver_version}/chromedriver_{chromedriver_platform}.zip'
         else:
             new_chrome = True
-            r = requests.get('https://googlechromelabs.github.io/chrome-for-testing/last-known-good-versions-with-downloads.json')
+            r = requests.get('https://googlechromelabs.github.io/chrome-for-testing/latest-versions-per-milestone-with-downloads.json')
             versions_dict = json.loads(r.text)
-            for channel, channel_info in versions_dict['channels'].items():
-                for i in channel_info['downloads']['chromedriver']:
-                    if i['platform'] == chromedriver_platform_new:
-                        chromedriver_url = i['url']
-                        break
-                if chromedriver_url:
-                    break
+            chromedriver_list = versions_dict \
+                .get('milestones', {}) \
+                .get(major_version, {}) \
+                .get('downloads', {}) \
+                .get('chromedriver', {})
+        
+            chromedriver_url = None
+            for i in chromedriver_list:
+                if i.get('platform') == chromedriver_platform_new:
+                    chromedriver_url = i.get('url')
+        
+        if not chromedriver_url:
+            return ''
 
         if platform.system() == 'Windows':
             chromedriver_name = 'chromedriver.exe'
@@ -251,6 +257,9 @@ class GetSignalAuth:
             self.cb_msg(f'Found chromedriver version {local_chromedriver_version}, skip downloading')
         else:
             chromedriver_path = self.download_chromedriver(major_version, chromedriver_download_dir=self.chromedriver_download_dir)
+            if chromedriver_path == '':
+                self.cb_msg('Unable to download suitable chromedriver')
+                return
 
         self.cb_msg('Killing all Signal Desktop processes')
         self.killall_signal()

sticker_convert/utils/files/metadata_handler.py

@@ -184,7 +184,7 @@ class MetadataHandler:
                 anim_present = anim_present or len(anim_stickers) > 0
                 image_present = image_present or len(image_stickers) > 0
 
-                finished_all = True if processed == len(stickers_present) else False
+                finished_all = True if processed == len(stickers_present) - 1 else False
 
                 if len(anim_stickers) == file_per_anim_pack or (
                     finished_all and len(anim_stickers) > 0
@@ -212,7 +212,7 @@ class MetadataHandler:
 
                 stickers.append(file_path)
 
-                finished_all = True if processed == len(stickers_present) else False
+                finished_all = True if processed == len(stickers_present) - 1 else False
 
                 if len(stickers) == file_per_pack or (
                     finished_all and len(stickers) > 0

sticker_convert/utils/media/codec_info.py

@@ -30,22 +30,37 @@ class CodecInfo:
                 fps = anim.lottie_animation_get_framerate()
         else:
             if file_ext == ".webp":
+                total_duration = 0
+                frames = 0
+                
                 with open(file, "r+b") as f:
                     mm = mmap.mmap(f.fileno(), 0)
-                    anmf_pos = mm.find(b"ANMF")
-                    if anmf_pos == -1:
-                        return 1
-                    mm.seek(anmf_pos + 20)
-                    frame_duration_32 = mm.read(4)
-                    frame_duration = frame_duration_32[:-1] + bytes(
-                        int(frame_duration_32[-1]) & 0b11111100
-                    )
-                    fps = 1000 / int.from_bytes(frame_duration, "little")
+                    while True:
+                        anmf_pos = mm.find(b"ANMF")
+                        if anmf_pos == -1:
+                            break
+                        mm.seek(anmf_pos + 20)
+                        frame_duration_32 = mm.read(4)
+                        frame_duration = frame_duration_32[:-1] + bytes(
+                            int(frame_duration_32[-1]) & 0b11111100
+                        )
+                        total_duration += int.from_bytes(frame_duration, "little")
+                        frames += 1
+                
+                if frames == 0:
+                    fps = 1
+                else:
+                    fps = frames / total_duration * 1000
             elif file_ext in (".gif", ".apng", ".png"):
-                metadata = iio.immeta(
-                    file, index=0, plugin="pillow", exclude_applied=False
-                )
-                fps = int(1000 / metadata.get("duration", 1000))
+                total_duration = 0
+                frames = len([* iio.imiter(file, plugin="pillow")])
+
+                for frame in range(frames):
+                    metadata = iio.immeta(
+                        file, index=frame, plugin="pillow", exclude_applied=False
+                    )
+                    total_duration += metadata.get("duration", 1000)
+                fps = frames / total_duration * 1000
             else:
                 metadata = iio.immeta(file, plugin="pyav", exclude_applied=False)
                 fps = metadata.get("fps", 1)
@@ -95,7 +110,7 @@ class CodecInfo:
             if file_ext == ".webp":
                 frames = Image.open(file).n_frames
             else:
-                frames = len(iio.imread(file, plugin="pyav"))
+                frames = frames = len([* iio.imiter(file, plugin="pyav")])
 
         return frames
 

{sticker_convert-2.1.7.dist-info → sticker_convert-2.1.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.1.7
+Version: 2.1.9
 Summary: Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, iMessage. Written in Python.
 Author-email: laggykiller <chaudominic2@gmail.com>
 Maintainer-email: laggykiller <chaudominic2@gmail.com>
@@ -367,7 +367,7 @@ License-File: LICENSE
 Requires-Dist: apngasm-python ~=1.2.1
 Requires-Dist: pyav ~=11.4.1
 Requires-Dist: beautifulsoup4 ~=4.12.2
-Requires-Dist: rookiepy ~=0.3.3
+Requires-Dist: rookiepy ~=0.3.4
 Requires-Dist: imageio ~=2.33.1
 Requires-Dist: memory-tempfile ~=2.2.3
 Requires-Dist: numpy ~=1.26.2

{sticker_convert-2.1.7.dist-info → sticker_convert-2.1.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-sticker_convert/__init__.py,sha256=NnqW7pbvkP5AqwtqG8v2g4EipYnPQMyEhvLSH0CEwvY,66
+sticker_convert/__init__.py,sha256=zf1bu4kQQP4LSB6ob4bAcE49gUjCSK8vwKnkF_7mnPc,66
 sticker_convert/__main__.py,sha256=W3n9SprqoDQxaWDAqLVA7DiavMdbPLVdtbASTKSpZS0,546
 sticker_convert/cli.py,sha256=21D5lAghcB3f5V7vk_qS6Di-NtGlH1ilAqDCPpzVUak,16534
 sticker_convert/converter.py,sha256=k4wy8nYtUFaEFxQ6QRPWPUyAorGgRIWQ0WLElsnKTXw,16780
@@ -74,19 +74,19 @@ sticker_convert/utils/fake_cb_msg.py,sha256=LYHWKqjL4GdNG2HUCbvVNsRjQOErJBXsJS-k
 sticker_convert/utils/url_detect.py,sha256=x163bVIH4rEimozvFHMC-XBmxyecf3qpBjJIBt8WPeE,793
 sticker_convert/utils/auth/get_kakao_auth.py,sha256=Q3CxzDqzoo9vf_bsbmpKZXeQODEXQ5leijKjjMt2Gv8,9306
 sticker_convert/utils/auth/get_line_auth.py,sha256=pKe2N3QLTyB0wWBpkD9rlDBqHK7LZ5hnAmfPH7XVmFI,1211
-sticker_convert/utils/auth/get_signal_auth.py,sha256=Q68aJdO6FQBr8Q5anHnktgjvNLyijiWCFsQ5nN_Sy3g,12066
+sticker_convert/utils/auth/get_signal_auth.py,sha256=19rv5JCzFD8GOBhR2ThW5MLFWOxiDxJZk7rK8Qo9zME,12330
 sticker_convert/utils/files/cache_store.py,sha256=lNS6ItZ3lwNa7NipkDo7n0wIoAf728dcRV0r0ohmM3s,730
 sticker_convert/utils/files/dir_utils.py,sha256=_jDyyPTVQXiVr4dJhPFaXqaKvch_MWLngwH7eZfezv4,1861
 sticker_convert/utils/files/json_manager.py,sha256=BBndjSY5kvjxurOpnDI2DRsKoLrNBTf5HoGfUqlf-4Y,503
-sticker_convert/utils/files/metadata_handler.py,sha256=t3vqbsrB-Rf43bGYvvdFsKPMcfTREC8DocBmMH0rkNI,8338
+sticker_convert/utils/files/metadata_handler.py,sha256=KIy8j89DMBW7-gpL9jqhzz96GgBvPHsRYegHXemk_mY,8346
 sticker_convert/utils/files/run_bin.py,sha256=4c8y5c_2wUfm0hbJSOGFcezpW5BVqM5_e9aliPbxvwo,1632
 sticker_convert/utils/media/apple_png_normalize.py,sha256=YGrZ8pZvgfhw8dW-0gf7XcXk_R82lJTX-oTo6SsB7uY,3719
-sticker_convert/utils/media/codec_info.py,sha256=PjUPlyKKXRW57mteGQMvTlVVB2S7eHGiTfgtMrFbVK4,3690
+sticker_convert/utils/media/codec_info.py,sha256=GEfpA3OPNfB9pnsj6sFeVGFBJ34_etkmEAWaTXcnoJ4,4265
 sticker_convert/utils/media/decrypt_kakao.py,sha256=gMz64vIGEIPAl4FFWuUbPMHE7vExr46ZFpzMoukvwws,1918
 sticker_convert/utils/media/format_verify.py,sha256=7WvvDSFDkyG1WlkXKqVbmPjKiyEedtqivZcCqSNziD8,6179
-sticker_convert-2.1.7.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-sticker_convert-2.1.7.dist-info/METADATA,sha256=VcqJRNpLptWSphB0SvnRm9rx63EGaLME36CCKoaEw_w,44696
-sticker_convert-2.1.7.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-sticker_convert-2.1.7.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
-sticker_convert-2.1.7.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
-sticker_convert-2.1.7.dist-info/RECORD,,
+sticker_convert-2.1.9.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+sticker_convert-2.1.9.dist-info/METADATA,sha256=yyJDvxP8jqAbH6WM_UbUb3aqBdwNF5ayZ6td6gxk88o,44696
+sticker_convert-2.1.9.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+sticker_convert-2.1.9.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
+sticker_convert-2.1.9.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
+sticker_convert-2.1.9.dist-info/RECORD,,