sticker-convert 2.1.4__tar.gz → 2.1.6__tar.gz

{sticker-convert-2.1.4/src/sticker_convert.egg-info → sticker-convert-2.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.1.4
+Version: 2.1.6
 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>
@@ -364,23 +364,24 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: apngasm_python~=1.2.0
-Requires-Dist: av~=10.0.0
+Requires-Dist: apngasm_python~=1.2.1
+Requires-Dist: pyav~=11.0.1
 Requires-Dist: beautifulsoup4~=4.12.2
-Requires-Dist: browser-cookie3~=0.19.1
+Requires-Dist: rookiepy~=0.2.7
 Requires-Dist: imageio~=2.31.5
 Requires-Dist: memory-tempfile~=2.2.3
 Requires-Dist: mergedeep~=1.3.4
+Requires-Dist: numpy~=1.26.0
 Requires-Dist: Pillow~=10.0.1
-Requires-Dist: pyoxipng~=8.0.0
+Requires-Dist: pyoxipng~=8.0.1
 Requires-Dist: python-telegram-bot~=20.5
 Requires-Dist: requests~=2.31.0
-Requires-Dist: rlottie_python~=1.1.9
+Requires-Dist: rlottie_python~=1.2.1
 Requires-Dist: selenium~=4.13.0
 Requires-Dist: signalstickers-client~=3.3.0
 Requires-Dist: tqdm~=4.66.1
 Requires-Dist: ttkbootstrap-fork-laggykiller~=1.5.1
-Requires-Dist: webp~=0.2.0
+Requires-Dist: webp~=0.3.0
 
 # sticker-convert
 ![imgs/banner.png](imgs/banner.png)

{sticker-convert-2.1.4 → sticker-convert-2.1.6}/requirements.txt

@@ -1,17 +1,18 @@
-apngasm_python~=1.2.0
-av~=10.0.0
+apngasm_python~=1.2.1
+pyav~=11.0.1
 beautifulsoup4~=4.12.2
-browser-cookie3~=0.19.1
+rookiepy~=0.2.7
 imageio~=2.31.5
 memory-tempfile~=2.2.3
 mergedeep~=1.3.4
+numpy~=1.26.0
 Pillow~=10.0.1
-pyoxipng~=8.0.0
+pyoxipng~=8.0.1
 python-telegram-bot~=20.5
 requests~=2.31.0
-rlottie_python~=1.1.9
+rlottie_python~=1.2.1
 selenium~=4.13.0
 signalstickers-client~=3.3.0
 tqdm~=4.66.1
 ttkbootstrap-fork-laggykiller~=1.5.1
-webp~=0.2.0
+webp~=0.3.0

{sticker-convert-2.1.4 → sticker-convert-2.1.6}/src/sticker_convert/__init__.py

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

{sticker-convert-2.1.4 → sticker-convert-2.1.6}/src/sticker_convert/auth/get_line_auth.py

@@ -2,18 +2,19 @@
 import json
 from typing import Optional
 
-import browser_cookie3 # type: ignore
+import rookiepy # type: ignore
 import requests
 
 class GetLineAuth:
     def get_cred(self) -> Optional[str]:
-        cookies_jar = browser_cookie3.load(domain_name='store.line.me')
+        cookies = [c for c in rookiepy.load() if c.domain == 'store.line.me']
+        cookies_dict = rookiepy.to_dict(cookies)
+        cookies_jar = rookiepy.to_cookiejar(cookies)
 
         if not GetLineAuth.validate_cookies(cookies_jar):
             return None
-
-        cookies_dict = requests.utils.dict_from_cookiejar(cookies_jar)
-        cookies_list = ['%s=%s' % (name, value) for (name, value) in cookies_dict.items()]
+                
+        cookies_list = ['%s=%s' % (i['name'], i['value']) for i in cookies_dict]
         cookies = ';'.join(cookies_list)
 
         return cookies

{sticker-convert-2.1.4 → sticker-convert-2.1.6}/src/sticker_convert/cli.py

@@ -103,10 +103,12 @@ class CLI:
             self.cb_msg, self.cb_msg_block, self.cb_bar, self.cb_ask_bool
         )
 
-        success = flow.start()
+        status = flow.start()
 
-        if not success:
+        if status == 1:
             self.cb_msg(msg='An error occured during this run.')
+        elif status == 2:
+            self.cb_msg(msg='Job cancelled.')
 
     def get_opt_input(self, args):
         download_options = {

{sticker-convert-2.1.4 → sticker-convert-2.1.6}/src/sticker_convert/downloaders/download_line.py

@@ -143,16 +143,24 @@ class DownloadLine(DownloadBase):
     def load_cookies(self) -> dict[str, str]:
         cookies = {}
         if self.opt_cred and self.opt_cred.get('line', {}).get('cookies'):
+            line_cookies = self.opt_cred['line']['cookies']
+
             try:
-                for i in self.opt_cred['line']['cookies'].split(';'):
-                    c_key, c_value = i.split('=')
-                    cookies[c_key] = c_value
-                if not GetLineAuth.validate_cookies(cookies):
+                line_cookies_dict = json.loads(line_cookies)
+                for c in line_cookies_dict:
+                    cookies[c['name']] = c['value']
+            except json.decoder.JSONDecodeError:
+                try:
+                    for i in line_cookies.split(';'):
+                        c_key, c_value = i.split('=')
+                        cookies[c_key] = c_value
+                except ValueError:
                     self.cb_msg('Warning: Line cookies invalid, you will not be able to add text to "Custom stickers"')
-                    cookies = {}
-            except ValueError:
-                self.cb_msg('Warning: Line cookies invalid, you will not be able to add text to "Custom stickers"')
         
+            if not GetLineAuth.validate_cookies(cookies):
+                self.cb_msg('Warning: Line cookies invalid, you will not be able to add text to "Custom stickers"')
+                cookies = {}
+
         return cookies
 
     def get_pack_url(self) -> str:

{sticker-convert-2.1.4 → sticker-convert-2.1.6}/src/sticker_convert/gui.py

@@ -179,7 +179,7 @@ class GUI(Window):
     
     def warn_tkinter_bug(self):
         if (platform.system() == 'Darwin' and
-            platform.mac_ver().split('.')[0] == '14' and
+            platform.mac_ver()[0].split('.')[0] == '14' and
             sys.version_info[0] == 3 and
             sys.version_info[1] == 11):
             msg = 'NOTICE: If buttons are not responsive, try to press '

{sticker-convert-2.1.4 → sticker-convert-2.1.6}/src/sticker_convert/uploaders/xcode_imessage.py

@@ -53,6 +53,7 @@ class XcodeImessageIconset:
         #     'Messages-iPad-Pro-74x55pt@2x.png': (148, 110),
         #     'Messages-iPhone-60x45pt@2x.png': (120, 90),
         #     'Messages-iPhone-60x45pt@3x.png': (180, 135)
+        # }
 
 
 
@@ -97,6 +98,8 @@ class XcodeImessage(UploadBase):
     def create_imessage_xcode(self) -> list[str]:
         urls = []
         title, author, emoji_dict = MetadataHandler.get_metadata(self.in_dir, title=self.opt_output.get('title'), author=self.opt_output.get('author'))
+        author = author.replace(' ', '_')
+        title = title.replace(' ', '_')
         packs = MetadataHandler.split_sticker_packs(self.in_dir, title=title, file_per_pack=100, separate_image_anim=False)
 
         res_choice = None
@@ -141,13 +144,9 @@ class XcodeImessage(UploadBase):
 
     def add_metadata(self, author: str, title: str):
         first_image_path = os.path.join(self.in_dir, [i for i in sorted(os.listdir(self.in_dir)) if os.path.isfile(os.path.join(self.in_dir, i)) and i.endswith('.png')][0])
-        cover_path_old = MetadataHandler.get_cover(self.in_dir)
-        cover_path_new = os.path.join(self.out_dir, 'cover.png')
-        if os.path.isfile(cover_path_old) and cover_path_new != cover_path_old:
-            shutil.copy(cover_path_old, cover_path_new)
-
-        if os.path.isfile(cover_path_old):
-            icon_source = cover_path_old
+        cover_path = MetadataHandler.get_cover(self.in_dir)
+        if cover_path:
+            icon_source = cover_path
         else:
             icon_source = first_image_path
 
@@ -199,7 +198,7 @@ class XcodeImessage(UploadBase):
         pbxproj_data = pbxproj_data.replace('/* Build configuration list for PBXProject "stickers" */', f'/* Build configuration list for PBXProject "{title}" */')
         pbxproj_data = pbxproj_data.replace('/* Build configuration list for PBXNativeTarget "stickers StickerPackExtension" */', f'/* Build configuration list for PBXNativeTarget "{title} StickerPackExtension" */')
         pbxproj_data = pbxproj_data.replace('/* Build configuration list for PBXNativeTarget "stickers" */', f'/* Build configuration list for PBXNativeTarget "{title}" */')
-        pbxproj_data = pbxproj_data.replace('com.niklaspeterson', f'{title}.{author}')
+        pbxproj_data = pbxproj_data.replace('com.niklaspeterson', f'com.{author}')
         pbxproj_data = pbxproj_data.replace('stickers/Info.plist', f'{title}/Info.plist')
 
         with open(os.path.join(pack_path, 'stickers.xcodeproj/project.pbxproj'), 'w+', encoding='utf-8') as f:

{sticker-convert-2.1.4 → sticker-convert-2.1.6}/src/sticker_convert/utils/converter.py

@@ -274,10 +274,10 @@ class StickerConvert:
         return frames_out
     
     def frames_drop(self, frames_in: list[np.ndarray]) -> list[np.ndarray]:
-        frames_out = []
+        if not self.fps:
+            return [frames_in[0]]
 
-        if not (self.duration_min or self.duration_max):
-            return frames_in
+        frames_out = []
         
         frames_orig = CodecInfo.get_file_frames(self.in_f)
         fps_orig = CodecInfo.get_file_fps(self.in_f)
@@ -303,20 +303,31 @@ class StickerConvert:
         return frames_out
 
     def frames_export(self):
-        if self.out_f_ext == '.apng':
+        if self.out_f_ext in ('.apng', '.png') and self.fps:
             self.frames_export_apng()
         elif self.out_f_ext == '.png':
             self.frames_export_png()
-        elif self.out_f_ext == '.webp':
+        elif self.out_f_ext == '.webp' and self.fps:
             self.frames_export_webp()
+        elif self.fps:
+            self.frames_export_pyav()
         else:
-            self.frames_export_imageio()
-
-    def frames_export_imageio(self):
-        options = {
-                'quality': str(self.quality),
-                'lossless': '0'
-            }
+            self.frames_export_pil()
+    
+    def frames_export_pil(self):
+        image = Image.fromarray(self.frames_processed[0])
+        image.save(
+            self.tmp_f,
+            format=self.out_f_ext.replace('.', ''),
+            quality=self.quality
+        )
+
+    def frames_export_pyav(self):
+        options = {}
+        
+        if type(self.quality) == int:
+            options['quality'] = str(self.quality)
+            options['lossless'] = '0'
 
         if self.out_f_ext == '.gif':
             codec = 'gif'
@@ -388,9 +399,9 @@ class StickerConvert:
             self.apngasm.add_frame(frame_final)
 
         with CacheStore.get_cache_store(path=self.cache_dir) as tempdir:
-            self.apngasm.assemble(os.path.join(tempdir, 'out.apng'))
+            self.apngasm.assemble(os.path.join(tempdir, f'out{self.out_f_ext}'))
 
-            with open(os.path.join(tempdir, 'out.apng'), 'rb') as f:
+            with open(os.path.join(tempdir, f'out{self.out_f_ext}'), 'rb') as f:
                 self.tmp_f.write(f.read())
 
         self.apngasm.reset()

{sticker-convert-2.1.4 → sticker-convert-2.1.6/src/sticker_convert.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.1.4
+Version: 2.1.6
 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>
@@ -364,23 +364,24 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: apngasm_python~=1.2.0
-Requires-Dist: av~=10.0.0
+Requires-Dist: apngasm_python~=1.2.1
+Requires-Dist: pyav~=11.0.1
 Requires-Dist: beautifulsoup4~=4.12.2
-Requires-Dist: browser-cookie3~=0.19.1
+Requires-Dist: rookiepy~=0.2.7
 Requires-Dist: imageio~=2.31.5
 Requires-Dist: memory-tempfile~=2.2.3
 Requires-Dist: mergedeep~=1.3.4
+Requires-Dist: numpy~=1.26.0
 Requires-Dist: Pillow~=10.0.1
-Requires-Dist: pyoxipng~=8.0.0
+Requires-Dist: pyoxipng~=8.0.1
 Requires-Dist: python-telegram-bot~=20.5
 Requires-Dist: requests~=2.31.0
-Requires-Dist: rlottie_python~=1.1.9
+Requires-Dist: rlottie_python~=1.2.1
 Requires-Dist: selenium~=4.13.0
 Requires-Dist: signalstickers-client~=3.3.0
 Requires-Dist: tqdm~=4.66.1
 Requires-Dist: ttkbootstrap-fork-laggykiller~=1.5.1
-Requires-Dist: webp~=0.2.0
+Requires-Dist: webp~=0.3.0
 
 # sticker-convert
 ![imgs/banner.png](imgs/banner.png)

{sticker-convert-2.1.4 → sticker-convert-2.1.6}/src/sticker_convert.egg-info/requires.txt

@@ -1,17 +1,18 @@
-apngasm_python~=1.2.0
-av~=10.0.0
+apngasm_python~=1.2.1
+pyav~=11.0.1
 beautifulsoup4~=4.12.2
-browser-cookie3~=0.19.1
+rookiepy~=0.2.7
 imageio~=2.31.5
 memory-tempfile~=2.2.3
 mergedeep~=1.3.4
+numpy~=1.26.0
 Pillow~=10.0.1
-pyoxipng~=8.0.0
+pyoxipng~=8.0.1
 python-telegram-bot~=20.5
 requests~=2.31.0
-rlottie_python~=1.1.9
+rlottie_python~=1.2.1
 selenium~=4.13.0
 signalstickers-client~=3.3.0
 tqdm~=4.66.1
 ttkbootstrap-fork-laggykiller~=1.5.1
-webp~=0.2.0
+webp~=0.3.0