sticker-convert 2.1.3__tar.gz → 2.1.5__tar.gz

{sticker-convert-2.1.3/src/sticker_convert.egg-info → sticker-convert-2.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.1.3
+Version: 2.1.5
 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>

{sticker-convert-2.1.3 → sticker-convert-2.1.5}/src/sticker_convert/__init__.py

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

{sticker-convert-2.1.3 → sticker-convert-2.1.5}/src/sticker_convert/gui.py

@@ -179,13 +179,13 @@ class GUI(Window):
     
     def warn_tkinter_bug(self):
         if (platform.system() == 'Darwin' and
-            platform.machine() == 'x86_64' and
+            platform.mac_ver().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 '
             msg += 'on title bar or move mouse cursor away from window for a while.'
             self.cb_msg(msg)
-            msg = '(This is due to a bug in tkinter specific to x86_64 macOS python3.11)'
+            msg = '(This is due to a bug in tkinter specific to macOS 14 python3.11)'
             self.cb_msg(msg)
             msg = '(https://github.com/python/cpython/issues/110218)'
             self.cb_msg(msg)
@@ -614,7 +614,7 @@ class GUI(Window):
                 self.input_frame.address_entry.config(bootstyle='warning')
 
             elif (download_option != input_option and
-                  not (input_option == 'kakao' and url.isnumeric())):
+                  not (input_option in ('kakao', 'line') and url.isnumeric())):
                 
                 self.input_frame.address_entry.config(bootstyle='danger')
                 self.input_frame.address_tip.config(text=f"Invalid URL. {self.input_presets[input_option_display]['example']}")

{sticker-convert-2.1.3 → sticker-convert-2.1.5}/src/sticker_convert/uploaders/upload_signal.py

@@ -114,6 +114,7 @@ class UploadSignal(UploadBase):
         
         packs = MetadataHandler.split_sticker_packs(self.in_dir, title=title, file_per_pack=200, separate_image_anim=False)
         for pack_title, stickers in packs.items():
+            self.cb_msg(f'Uploading pack {pack_title}')
             pack = LocalStickerPack()
             pack.title = pack_title
             pack.author = author

{sticker-convert-2.1.3 → sticker-convert-2.1.5}/src/sticker_convert/uploaders/upload_telegram.py

@@ -227,6 +227,7 @@ class UploadTelegram(UploadBase):
         packs = MetadataHandler.split_sticker_packs(self.in_dir, title=title, file_per_anim_pack=50, file_per_image_pack=120, separate_image_anim=not self.fake_vid)
 
         for pack_title, stickers in packs.items():
+            self.cb_msg(f'Uploading pack {pack_title}')
             result = anyio.run(self.upload_pack, pack_title, stickers, emoji_dict)
             self.cb_msg(result)
             urls.append(result)

{sticker-convert-2.1.3 → sticker-convert-2.1.5}/src/sticker_convert/uploaders/xcode_imessage.py

@@ -19,8 +19,14 @@ class XcodeImessageIconset:
     def __init__(self):
         self.iconset = {}
 
-        with open('ios-message-stickers-template/stickers StickerPackExtension/Stickers.xcstickers/iMessage App Icon.stickersiconset/Contents.json') as f:
-            dict = json.load(f)
+        if os.path.isdir('ios-message-stickers-template'):
+            with open('ios-message-stickers-template/stickers StickerPackExtension/Stickers.xcstickers/iMessage App Icon.stickersiconset/Contents.json') as f:
+                dict = json.load(f)
+        elif os.path.isfile('ios-message-stickers-template.zip'):
+            with zipfile.ZipFile('ios-message-stickers-template.zip', 'r') as f:
+                dict = json.loads(f.read('stickers StickerPackExtension/Stickers.xcstickers/iMessage App Icon.stickersiconset/Contents.json').decode())
+        else:
+            raise FileNotFoundError('ios-message-stickers-template not found')
         
         for i in dict['images']:
             filename = i['filename']
@@ -47,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)
+        # }
 
 
 
@@ -91,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
@@ -135,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
 
@@ -193,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.3 → sticker-convert-2.1.5}/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,7 +303,10 @@ class StickerConvert:
         return frames_out
 
     def frames_export(self):
-        if self.out_f_ext == '.apng':
+        if (self.out_f_ext == '.apng' or
+            (self.out_f_ext == '.png' and
+             self.fps != None and
+             (len(self.frames_processed) > 1 or self.fake_vid))):
             self.frames_export_apng()
         elif self.out_f_ext == '.png':
             self.frames_export_png()
@@ -388,9 +391,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.3 → sticker-convert-2.1.5/src/sticker_convert.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.1.3
+Version: 2.1.5
 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>