sticker-convert 2.1.3__py3-none-any.whl → 2.1.5__py3-none-any.whl

sticker_convert/__init__.py

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

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/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/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/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/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.dist-info → sticker_convert-2.1.5.dist-info}/METADATA

@@ -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.dist-info → sticker_convert-2.1.5.dist-info}/RECORD

@@ -1,8 +1,8 @@
-sticker_convert/__init__.py,sha256=GpyYi5CEA7sb5yAqBamWoSMUFPtbUHfAOzrQ8A_BY4I,66
+sticker_convert/__init__.py,sha256=zrhIFFkdukbv6wn7kdQ8y4tDW7_yyslMmBP-Wt9ZFjY,66
 sticker_convert/__main__.py,sha256=gzkK62bHS__nnQnktN2BEL7d3NE0KPMGkNOA-BBR5dg,541
 sticker_convert/cli.py,sha256=w_NRwMesXdgmynOqUkaQ7ofNN9rrhxnlyHPteTQAv7w,16182
 sticker_convert/flow.py,sha256=FM3mwMbeQo2uxjf3J8zg4CidtMOkMIAdRYaqWF-wSPc,18975
-sticker_convert/gui.py,sha256=AO3990pOYEyeAdMoPibwvGE8XnkMD7N8xc1ITYfpHWM,29867
+sticker_convert/gui.py,sha256=DH1XGcSyBKqzOES_fapa8SEqNvIz82BYUo6Y_uaNa4U,29883
 sticker_convert/auth/get_kakao_auth.py,sha256=vjoCP60hPe90x2IwmfZyoiF7ewwvtyQ7kTByocD0HzE,9286
 sticker_convert/auth/get_line_auth.py,sha256=aN61yinyFw_AYC1phT2R-jpWVIaAdbtT0XGdm5RFbSE,1154
 sticker_convert/auth/get_signal_auth.py,sha256=gORF1svJrYYisBbDHuHlEkc9JSrZWt014tZ-I5tRsxo,12066
@@ -67,13 +67,13 @@ sticker_convert/resources/input.json,sha256=ca-S5o4Yt2Qke7iNf_RR18MAg5HKDoXd6j9G
 sticker_convert/resources/output.json,sha256=0k8J3z0nPRkyIZj4DvXI4FPvlFuYFoYgA2ldVaMtF0Y,1131
 sticker_convert/uploaders/compress_wastickers.py,sha256=aBUMxKnZ69Hd6ZOR_3XotrExj8yVupgPXiMP3QjxxmM,5242
 sticker_convert/uploaders/upload_base.py,sha256=5bNIh2a2K_ako_TmkVJ0mHtXdiILhY-chHOZXPBhzcE,658
-sticker_convert/uploaders/upload_signal.py,sha256=TUD4GOUxA2wItNo75DpAj-YSveaPZv3pB6wqEy9m2IY,5357
-sticker_convert/uploaders/upload_telegram.py,sha256=WGjZNMOulVJmmuZF2IU2nrnTHR3UYGk20edD3zivlyE,9966
-sticker_convert/uploaders/xcode_imessage.py,sha256=jOnBEOwsF6U87UjOGLo60QeBKSMOv4zomDStikvTbp0,12626
+sticker_convert/uploaders/upload_signal.py,sha256=uEeMkqV9_jcZNO6DcUhuHiaufDJjcdE5oz4geGWIAf0,5413
+sticker_convert/uploaders/upload_telegram.py,sha256=Uj0njsCyuq_xQkx7u2yABDzE4hUT-u0Gd-fTJguNQZ8,10022
+sticker_convert/uploaders/xcode_imessage.py,sha256=2kzF_FE16toeGFMqCITirx2xSiZdbYzhPpIjcHXUPvo,12945
 sticker_convert/utils/apple_png_normalize.py,sha256=Qg_k4BBZllUXZ2pQrSmp5aP2xEGwRjMJ6kAXTeEB5sw,3571
 sticker_convert/utils/cache_store.py,sha256=dRQazWoTm3ZGg9QwjQ_6EeQtx4vj3JY5pxy8ITHW_Ek,724
 sticker_convert/utils/codec_info.py,sha256=FqK_4Wi6s2tqtyDbqQeW4kNXvlRmLLQLtZIbjEV2Dls,3602
-sticker_convert/utils/converter.py,sha256=Mkp5_mN77tXqC7rBJ9sXDOwH2j5eaX5WB1jxJftt9EM,17902
+sticker_convert/utils/converter.py,sha256=6GqGttdG-VcFciZTdg4hFSQG2wMnJb-0D0tIIYcQlSY,18044
 sticker_convert/utils/curr_dir.py,sha256=xLg_9FygEp7PE5drzkirtdwzzW24H3gdBj8zIIgkBf8,2431
 sticker_convert/utils/fake_cb_msg.py,sha256=QRqEnduEfhVdE0oVdZvQquUHnyZ9ICrVcGNHcMBk2-s,213
 sticker_convert/utils/format_verify.py,sha256=RGxjS7KD0upgC5bFXSICB649vum9yu3YragP1nRoiWo,6848
@@ -82,9 +82,9 @@ sticker_convert/utils/json_manager.py,sha256=kGIeDNN0h7He__0d1Ej8ZVsbY6z_LxHqHAy
 sticker_convert/utils/metadata_handler.py,sha256=8SAMT0MwDn6cbg8snx0GQ3FD43FltDvDurfoIokwCMk,8200
 sticker_convert/utils/run_bin.py,sha256=Ck1Ktqg_6mkZYhMuGyg343QMcf8GvprHQeea4GObVwc,1519
 sticker_convert/utils/url_detect.py,sha256=SCk1PanPIEIBNE-_xWfnqHrg8xlMJQXlMaBIV8kqW_A,763
-sticker_convert-2.1.3.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-sticker_convert-2.1.3.dist-info/METADATA,sha256=NKa4wObLNyBbBi3zGI7SfHI9lEL72KA_Gy_HGzc9Qq4,44705
-sticker_convert-2.1.3.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-sticker_convert-2.1.3.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
-sticker_convert-2.1.3.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
-sticker_convert-2.1.3.dist-info/RECORD,,
+sticker_convert-2.1.5.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+sticker_convert-2.1.5.dist-info/METADATA,sha256=2fCG4wszsojlQx45mmZRjTHwD83QA3yGbV_-XljMW1k,44705
+sticker_convert-2.1.5.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+sticker_convert-2.1.5.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
+sticker_convert-2.1.5.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
+sticker_convert-2.1.5.dist-info/RECORD,,