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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.1.5
+Version: 2.1.7
 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,23 @@ 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.4.1
 Requires-Dist: beautifulsoup4~=4.12.2
-Requires-Dist: browser-cookie3~=0.19.1
-Requires-Dist: imageio~=2.31.5
+Requires-Dist: rookiepy~=0.3.3
+Requires-Dist: imageio~=2.33.1
 Requires-Dist: memory-tempfile~=2.2.3
-Requires-Dist: mergedeep~=1.3.4
-Requires-Dist: Pillow~=10.0.1
-Requires-Dist: pyoxipng~=8.0.0
+Requires-Dist: numpy~=1.26.2
+Requires-Dist: Pillow~=10.1.0
+Requires-Dist: pyoxipng~=9.0.0
 Requires-Dist: python-telegram-bot~=20.5
 Requires-Dist: requests~=2.31.0
-Requires-Dist: rlottie_python~=1.1.9
-Requires-Dist: selenium~=4.13.0
+Requires-Dist: rlottie_python~=1.2.1
+Requires-Dist: selenium~=4.16.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.7/requirements.txt

@@ -0,0 +1,17 @@
+apngasm_python~=1.2.1
+pyav~=11.4.1
+beautifulsoup4~=4.12.2
+rookiepy~=0.3.3
+imageio~=2.33.1
+memory-tempfile~=2.2.3
+numpy~=1.26.2
+Pillow~=10.1.0
+pyoxipng~=9.0.0
+python-telegram-bot~=20.5
+requests~=2.31.0
+rlottie_python~=1.2.1
+selenium~=4.16.0
+signalstickers-client~=3.3.0
+tqdm~=4.66.1
+ttkbootstrap-fork-laggykiller~=1.5.1
+webp~=0.3.0

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

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

{sticker-convert-2.1.5 → sticker-convert-2.1.7}/src/sticker_convert/__main__.py

@@ -10,12 +10,15 @@ def main():
         script_path = os.path.dirname(sys.argv[0])
     os.chdir(script_path)
     if len(sys.argv) == 1:
-        print('Launching GUI...')
-        from sticker_convert.gui import GUI # type: ignore
+        print("Launching GUI...")
+        from sticker_convert.gui import GUI  # type: ignore
+
         GUI().gui()
     else:
         from sticker_convert.cli import CLI
+
         CLI().cli()
 
-if __name__ == '__main__':
-    main()
+
+if __name__ == "__main__":
+    main()

{sticker-convert-2.1.5 → sticker-convert-2.1.7}/src/sticker_convert/cli.py

@@ -7,12 +7,13 @@ from typing import Optional
 
 from tqdm import tqdm
 
-from .flow import Flow # type: ignore
-from .utils.json_manager import JsonManager # type: ignore
-from .auth.get_kakao_auth import GetKakaoAuth # type: ignore
-from .auth.get_signal_auth import GetSignalAuth # type: ignore
-from .auth.get_line_auth import GetLineAuth # type: ignore
-from .utils.curr_dir import CurrDir # type: ignore
+from .job import Job # type: ignore
+from .job_option import InputOption, CompOption, OutputOption, CredOption  # type: ignore
+from .utils.files.json_manager import JsonManager # type: ignore
+from .utils.auth.get_kakao_auth import GetKakaoAuth # type: ignore
+from .utils.auth.get_signal_auth import GetSignalAuth # type: ignore
+from .utils.auth.get_line_auth import GetLineAuth # type: ignore
+from .utils.files.dir_utils import DirUtils # type: ignore
 from .utils.url_detect import UrlDetect # type: ignore
 from .__init__ import __version__ # type: ignore
 
@@ -92,23 +93,24 @@ class CLI:
         
         self.no_confirm = args.no_confirm
 
-        self.get_opt_input(args)
-        self.get_opt_output(args)
-        self.get_opt_comp(args)
-        self.get_opt_cred(args)
+        self.opt_input = InputOption(self.get_opt_input(args))
+        self.opt_output = OutputOption(self.get_opt_output(args))
+        self.opt_comp = CompOption(self.get_opt_comp(args))
+        self.opt_cred = CredOption(self.get_opt_cred(args))
 
-        flow = Flow(
+        job = Job(
             self.opt_input, self.opt_comp, self.opt_output, self.opt_cred, 
-            self.input_presets, self.output_presets,
             self.cb_msg, self.cb_msg_block, self.cb_bar, self.cb_ask_bool
         )
 
-        success = flow.start()
+        status = job.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):
+    def get_opt_input(self, args) -> dict:
         download_options = {
             'auto': args.download_auto,
             'signal': args.download_signal, 
@@ -132,13 +134,15 @@ class CLI:
                 self.cb_msg(f'Error: Unrecognied URL input source for url: {url}')
                 exit()
 
-        self.opt_input = {
+        opt_input = {
             'option': download_option,
             'url': url,
-            'dir': args.input_dir if args.input_dir else os.path.join(CurrDir.get_curr_dir(), 'stickers_input')
+            'dir': args.input_dir if args.input_dir else os.path.join(DirUtils.get_curr_dir(), 'stickers_input')
         }
 
-    def get_opt_output(self, args):
+        return opt_input
+
+    def get_opt_output(self, args) -> dict:
         if args.export_whatsapp:
             export_option = 'whatsapp'
         elif args.export_signal:
@@ -150,14 +154,16 @@ class CLI:
         else:
             export_option = 'local'
         
-        self.opt_output = {
+        opt_output = {
             'option': export_option,
-            'dir': args.output_dir if args.output_dir else os.path.join(CurrDir.get_curr_dir(), 'stickers_output'),
+            'dir': args.output_dir if args.output_dir else os.path.join(DirUtils.get_curr_dir(), 'stickers_output'),
             'title': args.title,
             'author': args.author
         }
 
-    def get_opt_comp(self, args):
+        return opt_output
+
+    def get_opt_comp(self, args) -> dict:
         preset = args.preset
         if args.preset == 'custom':
             if sum((args.export_whatsapp, args.export_signal, args.export_telegram, args.export_imessage)) > 1:
@@ -172,7 +178,7 @@ class CLI:
             elif args.export_imessage:
                 preset = 'imessage_small'
         elif args.preset == 'auto':
-            output_option = self.opt_output['option']
+            output_option = self.opt_output.option
             if output_option == 'local':
                 preset = 'custom'
                 args.no_compress = True
@@ -184,7 +190,7 @@ class CLI:
                 preset = output_option
                 self.cb_msg(f'Auto compression option set to {preset}')
 
-        self.opt_comp = {
+        opt_comp = {
             'preset': preset,
             'size_max': {
                 'img': self.compression_presets[preset]['size_max']['img'] if args.img_size_max == None else args.img_size_max,
@@ -228,15 +234,17 @@ class CLI:
             'processes': args.processes if args.processes else math.ceil(cpu_count() / 2)
         }
 
-    def get_opt_cred(self, args):
-        creds_path = os.path.join(CurrDir.get_config_dir(), 'creds.json')
+        return opt_comp
+
+    def get_opt_cred(self, args) -> dict:
+        creds_path = os.path.join(DirUtils.get_config_dir(), 'creds.json')
         creds = JsonManager.load_json(creds_path)
         if creds:
             self.cb_msg('Loaded credentials from creds.json')
         else:
             creds = {}
 
-        self.opt_cred = {
+        opt_cred = {
             'signal': {
                 'uuid': args.signal_uuid if args.signal_uuid else creds.get('signal', {}).get('uuid'),
                 'password': args.signal_password if args.signal_password else creds.get('signal', {}).get('password')
@@ -262,7 +270,7 @@ class CLI:
             auth_token = m.get_cred()
 
             if auth_token:
-                self.opt_cred['kakao']['auth_token'] = auth_token
+                opt_cred['kakao']['auth_token'] = auth_token
                 
                 self.cb_msg(f'Got auth_token successfully: {auth_token}')
         
@@ -274,8 +282,8 @@ class CLI:
                 uuid, password = m.get_cred()
 
                 if uuid and password:
-                    self.opt_cred['signal']['uuid'] = uuid
-                    self.opt_cred['signal']['password'] = password
+                    opt_cred['signal']['uuid'] = uuid
+                    opt_cred['signal']['password'] = password
                 
                     self.cb_msg(f'Got uuid and password successfully: {uuid}, {password}')
                     break
@@ -286,16 +294,18 @@ class CLI:
             line_cookies = m.get_cred()
 
             if line_cookies:
-                self.opt_cred['line']['cookies'] = line_cookies
+                opt_cred['line']['cookies'] = line_cookies
             
                 self.cb_msg('Got Line cookies successfully')
             else:
                 self.cb_msg('Failed to get Line cookies. Have you logged in the web browser?')
         
         if args.save_cred:
-            creds_path = os.path.join(CurrDir.get_config_dir(), 'creds.json')
-            JsonManager.save_json(creds_path, self.opt_cred)
+            creds_path = os.path.join(DirUtils.get_config_dir(), 'creds.json')
+            JsonManager.save_json(creds_path, opt_cred)
             self.cb_msg('Saved credentials to creds.json')
+        
+        return opt_cred
     
     def cb_ask_str(self, msg: Optional[str] = None, initialvalue: Optional[str] = None, cli_show_initialvalue: bool = True) -> str:
         self.cb_msg(msg)