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

sticker_convert/downloaders/download_telegram.py

@@ -6,70 +6,115 @@ import anyio
 from telegram import Bot
 from telegram.error import TelegramError
 
-from .download_base import DownloadBase # type: ignore
-from ..utils.metadata_handler import MetadataHandler # type: ignore
+from .download_base import DownloadBase  # type: ignore
+from ..utils.files.metadata_handler import MetadataHandler  # type: ignore
+from ..job_option import CredOption  # type: ignore
+
 
 class DownloadTelegram(DownloadBase):
     def __init__(self, *args, **kwargs):
         super(DownloadTelegram, self).__init__(*args, **kwargs)
-    
+
     def download_stickers_telegram(self) -> bool:
-        self.token = self.opt_cred.get('telegram', {}).get('token')
+        self.token = self.opt_cred.telegram_token
         if self.token == None:
-            self.cb_msg('Download failed: Token required for downloading from telegram')
+            self.cb_msg("Download failed: Token required for downloading from telegram")
             return False
-    
-        if not ('telegram.me' in self.url or 't.me' in self.url):
-            self.cb_msg('Download failed: Unrecognized URL format')
+
+        if not ("telegram.me" in self.url or "t.me" in self.url):
+            self.cb_msg("Download failed: Unrecognized URL format")
             return False
 
         self.title = ""
         try:
-            self.title = self.url.split("/addstickers/")[1].split('?')[0]
+            self.title = self.url.split("/addstickers/")[1].split("?")[0]
         except IndexError:
-            self.title = self.url.split("eu/stickers/")[1].split('?')[0]
-        
+            self.title = self.url.split("eu/stickers/")[1].split("?")[0]
+
         return anyio.run(self.save_stickers)
 
     async def save_stickers(self) -> bool:
         bot = Bot(self.token)
         async with bot:
             try:
-                sticker_set = await bot.get_sticker_set(self.title, read_timeout=30, write_timeout=30, connect_timeout=30, pool_timeout=30)
+                sticker_set = await bot.get_sticker_set(
+                    self.title,
+                    read_timeout=30,
+                    write_timeout=30,
+                    connect_timeout=30,
+                    pool_timeout=30,
+                )
             except TelegramError as e:
-                self.cb_msg(f'Failed to download telegram sticker set {self.title} due to: {e}')
+                self.cb_msg(
+                    f"Failed to download telegram sticker set {self.title} due to: {e}"
+                )
                 return False
 
             if self.cb_bar:
-                self.cb_bar(set_progress_mode='determinate', steps=len(sticker_set.stickers))
+                self.cb_bar(
+                    set_progress_mode="determinate", steps=len(sticker_set.stickers)
+                )
 
             emoji_dict = {}
             num = 0
             for i in sticker_set.stickers:
-                sticker = await i.get_file(read_timeout=30, write_timeout=30, connect_timeout=30, pool_timeout=30)
+                sticker = await i.get_file(
+                    read_timeout=30,
+                    write_timeout=30,
+                    connect_timeout=30,
+                    pool_timeout=30,
+                )
                 ext = os.path.splitext(sticker.file_path)[-1]
                 f_id = str(num).zfill(3)
                 f_name = f_id + ext
                 f_path = os.path.join(self.out_dir, f_name)
-                await sticker.download_to_drive(custom_path=f_path, read_timeout=30, write_timeout=30, connect_timeout=30, pool_timeout=30)
+                await sticker.download_to_drive(
+                    custom_path=f_path,
+                    read_timeout=30,
+                    write_timeout=30,
+                    connect_timeout=30,
+                    pool_timeout=30,
+                )
                 emoji_dict[f_id] = i.emoji
-                self.cb_msg(f'Downloaded {f_name}')
+                self.cb_msg(f"Downloaded {f_name}")
                 if self.cb_bar:
                     self.cb_bar(update_bar=True)
                 num += 1
-            
+
             if sticker_set.thumbnail:
-                cover = await sticker_set.thumbnail.get_file(read_timeout=30, write_timeout=30, connect_timeout=30, pool_timeout=30)
+                cover = await sticker_set.thumbnail.get_file(
+                    read_timeout=30,
+                    write_timeout=30,
+                    connect_timeout=30,
+                    pool_timeout=30,
+                )
                 cover_ext = os.path.splitext(cover.file_path)[-1]
-                cover_name = 'cover' + cover_ext
+                cover_name = "cover" + cover_ext
                 cover_path = os.path.join(self.out_dir, cover_name)
-                await cover.download_to_drive(custom_path=cover_path, read_timeout=30, write_timeout=30, connect_timeout=30, pool_timeout=30)
-                self.cb_msg(f'Downloaded {cover_name}')
+                await cover.download_to_drive(
+                    custom_path=cover_path,
+                    read_timeout=30,
+                    write_timeout=30,
+                    connect_timeout=30,
+                    pool_timeout=30,
+                )
+                self.cb_msg(f"Downloaded {cover_name}")
 
-        MetadataHandler.set_metadata(self.out_dir, title=self.title, emoji_dict=emoji_dict)
+        MetadataHandler.set_metadata(
+            self.out_dir, title=self.title, emoji_dict=emoji_dict
+        )
         return True
 
     @staticmethod
-    def start(url: str, out_dir: str, opt_cred: Optional[dict] = None, cb_msg=print, cb_msg_block=input, cb_bar=None) -> bool:
-        downloader = DownloadTelegram(url, out_dir, opt_cred, cb_msg, cb_msg_block, cb_bar)
-        return downloader.download_stickers_telegram()
+    def start(
+        url: str,
+        out_dir: str,
+        opt_cred: Optional[CredOption] = None,
+        cb_msg=print,
+        cb_msg_block=input,
+        cb_bar=None,
+    ) -> bool:
+        downloader = DownloadTelegram(
+            url, out_dir, opt_cred, cb_msg, cb_msg_block, cb_bar
+        )
+        return downloader.download_stickers_telegram()

sticker_convert/gui.py

@@ -16,21 +16,22 @@ from PIL import ImageFont
 from ttkbootstrap import Window, StringVar, BooleanVar, IntVar # type: ignore
 from ttkbootstrap.dialogs import Messagebox, Querybox # type: ignore
 
-from .flow import Flow # type: ignore
-from .utils.json_manager import JsonManager # type: ignore
-from .utils.curr_dir import CurrDir # type: ignore
-from .utils.metadata_handler import MetadataHandler # 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.files.dir_utils import DirUtils # type: ignore
+from .utils.files.metadata_handler import MetadataHandler # type: ignore
 from .utils.url_detect import UrlDetect # type: ignore
-from .utils.gui_utils import GUIUtils # type: ignore
+from .gui_components.gui_utils import GUIUtils # type: ignore
 from .__init__ import __version__ # type: ignore
 
-from .gui_frames.input_frame import InputFrame # type: ignore
-from .gui_frames.comp_frame import CompFrame # type: ignore
-from .gui_frames.cred_frame import CredFrame # type: ignore
-from .gui_frames.output_frame import OutputFrame # type: ignore
-from .gui_frames.config_frame import ConfigFrame # type: ignore
-from .gui_frames.progress_frame import ProgressFrame # type: ignore
-from .gui_frames.control_frame import ControlFrame # type: ignore
+from .gui_components.frames.input_frame import InputFrame # type: ignore
+from .gui_components.frames.comp_frame import CompFrame # type: ignore
+from .gui_components.frames.cred_frame import CredFrame # type: ignore
+from .gui_components.frames.output_frame import OutputFrame # type: ignore
+from .gui_components.frames.config_frame import ConfigFrame # type: ignore
+from .gui_components.frames.progress_frame import ProgressFrame # type: ignore
+from .gui_components.frames.control_frame import ControlFrame # type: ignore
 
 class GUI(Window):
     def __init__(self):
@@ -73,7 +74,7 @@ class GUI(Window):
         self.mainloop()
 
     def quit(self):
-        if self.flow:
+        if self.job:
             response = self.cb_ask_bool('Job is running, really quit?')
             if response == False:
                 return
@@ -86,7 +87,7 @@ class GUI(Window):
         else:
             self.delete_creds()
         
-        if self.flow:
+        if self.job:
             self.cancel_job()
         self.destroy()
             
@@ -157,7 +158,7 @@ class GUI(Window):
         self.response_dict_lock = Lock()
         self.response_dict = {}
         self.action_queue = Queue()
-        self.flow = None
+        self.job = None
 
     def init_frames(self):
         self.input_frame = InputFrame(self, self.scrollable_frame, borderwidth=1, text='Input')
@@ -181,11 +182,12 @@ class GUI(Window):
         if (platform.system() == 'Darwin' and
             platform.mac_ver()[0].split('.')[0] == '14' and
             sys.version_info[0] == 3 and
-            sys.version_info[1] == 11):
+            sys.version_info[1] == 11 and
+            sys.version_info[2] <= 6):
             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 macOS 14 python3.11)'
+            msg = '(This is due to a bug in tkinter specific to macOS 14 python <=3.11.6)'
             self.cb_msg(msg)
             msg = '(https://github.com/python/cpython/issues/110218)'
             self.cb_msg(msg)
@@ -201,13 +203,13 @@ class GUI(Window):
             Messagebox.show_error(message='Warning: json(s) under "resources" directory cannot be found', title='sticker-convert')
             sys.exit()
 
-        self.settings_path = os.path.join(CurrDir.get_config_dir(), 'config.json')
+        self.settings_path = os.path.join(DirUtils.get_config_dir(), 'config.json')
         if os.path.isfile(self.settings_path):
             self.settings = JsonManager.load_json(self.settings_path)
         else:
             self.settings = {}
         
-        self.creds_path = os.path.join(CurrDir.get_config_dir(), 'creds.json')
+        self.creds_path = os.path.join(DirUtils.get_config_dir(), 'creds.json')
         if os.path.isfile(self.creds_path):
             self.creds = JsonManager.load_json(self.creds_path)
         else:
@@ -216,54 +218,14 @@ class GUI(Window):
     def save_config(self):
         # Only update comp_custom if custom preset is selected
         if self.comp_preset_var.get() == 'custom':
-            comp_custom = {
-                'size_max': {
-                    'img': self.img_size_max_var.get() if not self.size_disable_var.get() else None,
-                    'vid': self.vid_size_max_var.get() if not self.size_disable_var.get() else None
-                },
-                'format': {
-                    'img': self.img_format_var.get(),
-                    'vid': self.vid_format_var.get()
-                },
-                'fps': {
-                    'min': self.fps_min_var.get() if not self.fps_disable_var.get() else None,
-                    'max': self.fps_max_var.get() if not self.fps_disable_var.get() else None
-                },
-                'res': {
-                    'w': {
-                        'min': self.res_w_min_var.get() if not self.res_w_disable_var.get() else None,
-                        'max': self.res_w_max_var.get() if not self.res_w_disable_var.get() else None
-                    },
-                    'h': {
-                        'min': self.res_h_min_var.get() if not self.res_h_disable_var.get() else None,
-                        'max': self.res_h_max_var.get() if not self.res_h_disable_var.get() else None
-                    }
-                },
-                'quality': {
-                    'min': self.quality_min_var.get() if not self.quality_disable_var.get() else None,
-                    'max': self.quality_max_var.get() if not self.quality_disable_var.get() else None
-                },
-                'color': {
-                    'min': self.color_min_var.get() if not self.color_disable_var.get() else None,
-                    'max': self.color_max_var.get() if not self.color_disable_var.get() else None
-                },
-                'duration': {
-                    'min': self.duration_min_var.get() if not self.duration_disable_var.get() else None,
-                    'max': self.duration_max_var.get() if not self.duration_disable_var.get() else None
-                },
-                'steps': self.steps_var.get(),
-                'fake_vid': self.fake_vid_var.get(),
-                'default_emoji': self.default_emoji_var.get(),
-            }
+            comp_custom = self.get_opt_comp()
+            del comp_custom['preset']
+            del comp_custom['no_compress']
         else:
             comp_custom = self.compression_presets.get('custom')
 
         self.settings = {
-            'input': {
-                'option': self.get_input_name(),
-                'url': self.input_address_var.get(),
-                'dir':  self.input_setdir_var.get()
-            },
+            'input': self.get_opt_input(),
             'comp': {
                 'no_compress': self.no_compress_var.get(),
                 'preset': self.comp_preset_var.get(),
@@ -271,12 +233,7 @@ class GUI(Window):
                 'processes': self.processes_var.get()
             },
             'comp_custom': comp_custom,
-            'output': {
-                'option': self.get_output_name(),
-                'dir': self.output_setdir_var.get(),
-                'title': self.title_var.get(),
-                'author': self.author_var.get()
-            },
+            'output': self.get_opt_output(),
             'creds': {
                 'save_cred': self.settings_save_cred_var.get()
             }
@@ -285,26 +242,7 @@ class GUI(Window):
         JsonManager.save_json(self.settings_path, self.settings)
         
     def save_creds(self):
-        self.creds = {
-            'signal': {
-                'uuid': self.signal_uuid_var.get(),
-                'password': self.signal_password_var.get()
-            },
-            'telegram': {
-                'token': self.telegram_token_var.get(),
-                'userid': self.telegram_userid_var.get()
-            },
-            'kakao': {
-                'auth_token': self.kakao_auth_token_var.get(),
-                'username': self.kakao_username_var.get(),
-                'password': self.kakao_password_var.get(),
-                'country_code': self.kakao_country_code_var.get(),
-                'phone_number': self.kakao_phone_number_var.get()
-            },
-            'line': {
-                'cookies': self.line_cookies_var.get()
-            }
-        }
+        self.creds = self.get_opt_cred()
 
         JsonManager.save_json(self.creds_path, self.creds)
     
@@ -317,38 +255,34 @@ class GUI(Window):
             os.remove(self.settings_path)
     
     def apply_config(self):
+        # Input
         self.default_input_mode = self.settings.get('input', {}).get('option', 'auto')
         self.input_address_var.set(self.settings.get('input', {}).get('url', ''))
-        
-        default_stickers_input_dir = os.path.join(CurrDir.get_curr_dir(), 'stickers_input')
+        default_stickers_input_dir = os.path.join(DirUtils.get_curr_dir(), 'stickers_input')
         self.input_setdir_var.set(self.settings.get('input', {}).get('dir', default_stickers_input_dir))
         if not os.path.isdir(self.input_setdir_var.get()):
             self.input_setdir_var.set(default_stickers_input_dir)
+        self.input_option_display_var.set(self.input_presets[self.default_input_mode]['full_name'])
+        self.input_option_true_var.set(self.input_presets[self.default_input_mode]['full_name'])
 
+        # Compression
         self.no_compress_var.set(self.settings.get('comp', {}).get('no_compress', False))
-
         default_comp_preset = list(self.compression_presets.keys())[0]
         self.comp_preset_var.set(self.settings.get('comp', {}).get('preset', default_comp_preset))
-        
+        if self.settings.get('comp_custom'):
+            self.compression_presets['custom'] = self.settings.get('comp_custom')
         self.cache_dir_var.set(self.settings.get('comp', {}).get('cache_dir', ''))
         self.processes_var.set(self.settings.get('comp', {}).get('processes', math.ceil(cpu_count() / 2)))
         self.default_output_mode = self.settings.get('output', {}).get('option', 'signal')
 
-        default_stickers_output_dir = os.path.join(CurrDir.get_curr_dir(), 'stickers_output')
+        # Output
+        default_stickers_output_dir = os.path.join(DirUtils.get_curr_dir(), 'stickers_output')
         self.output_setdir_var.set(self.settings.get('output', {}).get('dir', default_stickers_output_dir))
         if not os.path.isdir(self.output_setdir_var.get()):
             self.output_setdir_var.set(default_stickers_output_dir)
-        
         self.title_var.set(self.settings.get('output', {}).get('title', ''))
         self.author_var.set(self.settings.get('output', {}).get('author', ''))
         self.settings_save_cred_var.set(self.settings.get('creds', {}).get('save_cred', True))
-
-        if self.settings.get('comp_custom'):
-            self.compression_presets['custom'] = self.settings.get('comp_custom')
-        
-        self.input_option_display_var.set(self.input_presets[self.default_input_mode]['full_name'])
-        self.input_option_true_var.set(self.input_presets[self.default_input_mode]['full_name'])
-
         self.output_option_display_var.set(self.output_presets[self.default_output_mode]['full_name'])
         self.output_option_true_var.set(self.output_presets[self.default_output_mode]['full_name'])
     
@@ -392,31 +326,24 @@ class GUI(Window):
     
     def start_job(self):
         Thread(target=self.start_process, daemon=True).start()
-
-    def start_process(self):
-        self.save_config()
-        if self.settings_save_cred_var.get() == True:
-            self.save_creds()
-        else:
-            self.delete_creds()
-
-        self.control_frame.start_btn.config(text='Cancel', bootstyle='danger')
-        self.set_inputs('disabled')
     
-        opt_input = {
+    def get_opt_input(self) -> dict:
+        return {
             'option': self.get_input_name(),
             'url': self.input_address_var.get(),
             'dir': self.input_setdir_var.get()
         }
-
-        opt_output = {
+    
+    def get_opt_output(self) -> dict:
+        return {
             'option': self.get_output_name(),
             'dir': self.output_setdir_var.get(),
             'title': self.title_var.get(),
             'author': self.author_var.get()
         }
-
-        opt_comp = {
+    
+    def get_opt_comp(self) -> dict:
+        return {
             'preset': self.get_preset(),
             'size_max': {
                 'img': self.img_size_max_var.get() if not self.size_disable_var.get() else None,
@@ -459,8 +386,9 @@ class GUI(Window):
             'no_compress': self.no_compress_var.get(),
             'processes': self.processes_var.get()
         }
-
-        opt_cred = {
+    
+    def get_opt_cred(self) -> dict:
+        return {
             'signal': {
                 'uuid': self.signal_uuid_var.get(),
                 'password': self.signal_password_var.get()
@@ -480,16 +408,30 @@ class GUI(Window):
                 'cookies': self.line_cookies_var.get()
             }
         }
+
+    def start_process(self):
+        self.save_config()
+        if self.settings_save_cred_var.get() == True:
+            self.save_creds()
+        else:
+            self.delete_creds()
+
+        self.control_frame.start_btn.config(text='Cancel', bootstyle='danger')
+        self.set_inputs('disabled')
+    
+        opt_input = InputOption(self.get_opt_input())
+        opt_output = OutputOption(self.get_opt_output())
+        opt_comp = CompOption(self.get_opt_comp())
+        opt_cred = CredOption(self.get_opt_cred())
         
-        self.flow = Flow(
+        self.job = Job(
             opt_input, opt_comp, opt_output, opt_cred, 
-            self.input_presets, self.output_presets,
             self.cb_msg, self.cb_msg_block, self.cb_bar, self.cb_ask_bool
             )
         
-        status = self.flow.start()
+        status = self.job.start()
 
-        self.flow = None
+        self.job = None
 
         if status == 1:
             self.cb_msg(msg='An error occured during this run.')
@@ -505,10 +447,10 @@ class GUI(Window):
     
     def cancel_job(self):
         self.cb_msg(msg='Cancelling job...')
-        self.flow.is_cancel_job.value = 1
-        while not self.flow.jobs_queue.empty():
-            self.flow.jobs_queue.get()
-        for process in self.flow.processes:
+        self.job.is_cancel_job.value = 1
+        while not self.job.jobs_queue.empty():
+            self.job.jobs_queue.get()
+        for process in self.job.processes:
             process.terminate()
             process.join()
 
@@ -559,7 +501,11 @@ class GUI(Window):
         response = self.get_response_from_id(response_id)
         return response
     
-    def cb_ask_str(self, question: str, initialvalue: Optional[str] = None, cli_show_initialvalue: bool = True, parent: Optional[object] = None) -> str:
+    def cb_ask_str(self, 
+                   question: str, 
+                   initialvalue: Optional[str] = None, 
+                   cli_show_initialvalue: bool = True, 
+                   parent: Optional[object] = None) -> str:
         return self.exec_in_main(partial(Querybox.get_string, question, title='sticker-convert', initialvalue=initialvalue, parent=parent))
 
     def cb_ask_bool(self, question, parent=None) -> bool:
@@ -573,7 +519,10 @@ class GUI(Window):
         with self.msg_lock:
             self.progress_frame.update_message_box(*args, **kwargs)
     
-    def cb_msg_block(self, message: Optional[str] = None, parent: Optional[object] = None, *args, **kwargs):
+    def cb_msg_block(self, 
+                     message: Optional[str] = None, 
+                     parent: Optional[object] = None, 
+                     *args, **kwargs):
         if message == None and len(args) > 0:
             message = ' '.join(str(i) for i in args)
         self.exec_in_main(partial(Messagebox.show_info, message, title='sticker-convert', parent=parent))

sticker_convert/{gui_frames → gui_components/frames}/comp_frame.py

@@ -3,10 +3,9 @@ from ttkbootstrap import LabelFrame, OptionMenu, Button, Entry, Label, Checkbutt
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from ..gui import GUI # type: ignore
-from ..gui_windows.advanced_compression_window import AdvancedCompressionWindow # type: ignore
+    from ...gui import GUI # type: ignore
+from ..windows.advanced_compression_window import AdvancedCompressionWindow # type: ignore
 from .right_clicker import RightClicker # type: ignore
-from ..__init__ import __version__ # type: ignore
 
 class CompFrame(LabelFrame):
     def __init__(self, gui: "GUI", *args, **kwargs):

sticker_convert/{gui_frames → gui_components/frames}/config_frame.py

@@ -7,9 +7,8 @@ from ttkbootstrap import LabelFrame, Button, Label, Checkbutton # type: ignore
 
 if TYPE_CHECKING:
     from ..gui import GUI # type: ignore
-from ..utils.curr_dir import CurrDir # type: ignore
-from ..utils.run_bin import RunBin # type: ignore
-from ..__init__ import __version__ # type: ignore
+from ...utils.files.dir_utils import DirUtils # type: ignore
+from ...utils.files.run_bin import RunBin # type: ignore
 
 class ConfigFrame(LabelFrame):
     def __init__(self, gui: "GUI", *args, **kwargs):
@@ -62,7 +61,7 @@ class ConfigFrame(LabelFrame):
             self.gui.cb_msg_block('Restored to default config.')
     
     def cb_open_config_directory(self, *args, **kwargs):
-        config_dir = CurrDir.get_config_dir()
+        config_dir = DirUtils.get_config_dir()
         self.gui.cb_msg(msg=f'Config is located at {config_dir}')
         if platform.system() == 'Windows':
             os.startfile(config_dir)

sticker_convert/{gui_frames → gui_components/frames}/control_frame.py

@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING
 from ttkbootstrap import Frame, Button # type: ignore
 
 if TYPE_CHECKING:
-    from ..gui import GUI # type: ignore
+    from ...gui import GUI # type: ignore
 
 class ControlFrame(Frame):
     def __init__(self, gui: "GUI", *args, **kwargs):
@@ -16,7 +16,7 @@ class ControlFrame(Frame):
         self.start_btn.pack(expand=True, fill='x')
     
     def cb_start_btn(self, *args, **kwargs):
-        if self.gui.flow:
+        if self.gui.job:
             response = self.gui.cb_ask_bool('Cancel job?')
             if response == True:
                 self.gui.cancel_job()

sticker_convert/{gui_frames → gui_components/frames}/cred_frame.py

@@ -5,10 +5,10 @@ from typing import TYPE_CHECKING
 from ttkbootstrap import LabelFrame, Button, Entry, Label # type: ignore
 
 if TYPE_CHECKING:
-    from ..gui import GUI # type: ignore
-from ..gui_windows.signal_get_auth_window import SignalGetAuthWindow # type: ignore
-from ..gui_windows.line_get_auth_window import LineGetAuthWindow # type: ignore
-from ..gui_windows.kakao_get_auth_window import KakaoGetAuthWindow # type: ignore
+    from ...gui import GUI # type: ignore
+from ..windows.signal_get_auth_window import SignalGetAuthWindow # type: ignore
+from ..windows.line_get_auth_window import LineGetAuthWindow # type: ignore
+from ..windows.kakao_get_auth_window import KakaoGetAuthWindow # type: ignore
 from .right_clicker import RightClicker # type: ignore
 
 class CredFrame(LabelFrame):

sticker_convert/{gui_frames → gui_components/frames}/input_frame.py

@@ -6,9 +6,9 @@ from tkinter import filedialog
 from ttkbootstrap import LabelFrame, OptionMenu, Button, Entry, Label # type: ignore
 
 if TYPE_CHECKING:
-    from ..gui import GUI # type: ignore
-from ..utils.url_detect import UrlDetect # type: ignore
-from ..utils.curr_dir import CurrDir # type: ignore
+    from ...gui import GUI # type: ignore
+from ...utils.url_detect import UrlDetect # type: ignore
+from ...utils.files.dir_utils import DirUtils # type: ignore
 from .right_clicker import RightClicker # type: ignore
 
 class InputFrame(LabelFrame):
@@ -50,7 +50,7 @@ class InputFrame(LabelFrame):
     def cb_set_indir(self, *args):
         orig_input_dir = self.gui.input_setdir_var.get()
         if not os.path.isdir(orig_input_dir):
-            orig_input_dir = CurrDir.get_curr_dir()
+            orig_input_dir = DirUtils.get_curr_dir()
         input_dir = filedialog.askdirectory(initialdir=orig_input_dir)
         if input_dir:
             self.gui.input_setdir_var.set(input_dir)

sticker_convert/{gui_frames → gui_components/frames}/output_frame.py

@@ -6,8 +6,8 @@ from tkinter import filedialog
 from ttkbootstrap import LabelFrame, OptionMenu, Button, Entry, Label # type: ignore
 
 if TYPE_CHECKING:
-    from ..gui import GUI # type: ignore
-from ..utils.curr_dir import CurrDir # type: ignore
+    from ...gui import GUI # type: ignore
+from ...utils.files.dir_utils import DirUtils # type: ignore
 from .right_clicker import RightClicker # type: ignore
 
 class OutputFrame(LabelFrame):
@@ -48,7 +48,7 @@ class OutputFrame(LabelFrame):
     def cb_set_outdir(self, *args):
         orig_output_dir = self.gui.output_setdir_var.get()
         if not os.path.isdir(orig_output_dir):
-            orig_output_dir = CurrDir.get_curr_dir()
+            orig_output_dir = DirUtils.get_curr_dir()
         output_dir = filedialog.askdirectory(initialdir=orig_output_dir)
         if output_dir:
             self.gui.output_setdir_var.set(output_dir)

sticker_convert/{gui_frames → gui_components/frames}/progress_frame.py

@@ -6,7 +6,7 @@ from ttkbootstrap.scrolled import ScrolledText # type: ignore
 from tqdm import tqdm
 
 if TYPE_CHECKING:
-    from ..gui import GUI # type: ignore
+    from ...gui import GUI # type: ignore
 from .right_clicker import RightClicker # type: ignore
 
 class ProgressFrame(LabelFrame):