From b46a58bd233cc526dfa4e45bbdbdbd3754e2fc17 Mon Sep 17 00:00:00 2001 From: Cantue35 <71815869+Cantue35@users.noreply.github.com> Date: Tue, 8 Apr 2025 20:35:09 +0300 Subject: [PATCH 1/3] Fix forced update config deletion when update check is disabled - Added a conditional check in force_update_config() to verify that enabled_update_check in the [Utils] section is read as False. - If disabled, the config file will not be deleted. - This prevents loss of custom configuration and improves usability. - Tested on macOS with our modifications. --- config.py | 49 +++++++++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/config.py b/config.py index e5839c8..98706af 100644 --- a/config.py +++ b/config.py @@ -261,7 +261,7 @@ def print_config(config, translator=None): def force_update_config(translator=None): """ - Force update configuration file with latest defaults + Force update configuration file with latest defaults if update check is enabled. Args: translator: Translator instance Returns: @@ -271,26 +271,39 @@ def force_update_config(translator=None): config_dir = os.path.join(get_user_documents_path(), ".cursor-free-vip") config_file = os.path.join(config_dir, "config.ini") current_time = datetime.datetime.now() - + + # If the config file exists, check if forced update is enabled if os.path.exists(config_file): - try: - # create backup - backup_file = f"{config_file}.bak.{current_time.strftime('%Y%m%d_%H%M%S')}" - shutil.copy2(config_file, backup_file) + # First, read the existing configuration + existing_config = configparser.ConfigParser() + existing_config.read(config_file, encoding='utf-8') + # Check if "enabled_update_check" is True + update_enabled = True # Default to True if not set + if existing_config.has_section('Utils') and existing_config.has_option('Utils', 'enabled_update_check'): + update_enabled = existing_config.get('Utils', 'enabled_update_check').strip().lower() in ('true', 'yes', '1', 'on') + + if update_enabled: + try: + # Create a backup + backup_file = f"{config_file}.bak.{current_time.strftime('%Y%m%d_%H%M%S')}" + shutil.copy2(config_file, backup_file) + if translator: + print(f"{Fore.CYAN}{EMOJI['INFO']} {translator.get('config.backup_created', path=backup_file) if translator else f'Backup created: {backup_file}'}{Style.RESET_ALL}") + + # Delete the original config file (forced update) + os.remove(config_file) + if translator: + print(f"{Fore.CYAN}{EMOJI['INFO']} {translator.get('config.config_removed') if translator else 'Config file removed for forced update'}{Style.RESET_ALL}") + except Exception as e: + if translator: + print(f"{Fore.RED}{EMOJI['ERROR']} {translator.get('config.backup_failed', error=str(e)) if translator else f'Failed to backup config: {str(e)}'}{Style.RESET_ALL}") + else: if translator: - print(f"{Fore.CYAN}{EMOJI['INFO']} {translator.get('config.backup_created', path=backup_file) if translator else f'Backup created: {backup_file}'}{Style.RESET_ALL}") - - # delete original file - os.remove(config_file) - if translator: - print(f"{Fore.CYAN}{EMOJI['INFO']} {translator.get('config.config_removed') if translator else 'Config file removed for forced update'}{Style.RESET_ALL}") - except Exception as e: - if translator: - print(f"{Fore.RED}{EMOJI['ERROR']} {translator.get('config.backup_failed', error=str(e)) if translator else f'Failed to backup config: {str(e)}'}{Style.RESET_ALL}") - - # use existing setup_config function to create new config + print(f"{Fore.CYAN}{EMOJI['INFO']} {translator.get('config.force_update_disabled', fallback='Force update disabled by configuration. Keeping existing config file.') if translator else 'Force update disabled by configuration. Keeping existing config file.'}{Style.RESET_ALL}") + + # Generate a new (or updated) configuration if needed return setup_config(translator) - + except Exception as e: if translator: print(f"{Fore.RED}{EMOJI['ERROR']} {translator.get('config.force_update_failed', error=str(e)) if translator else f'Force update config failed: {str(e)}'}{Style.RESET_ALL}") From 6a258713667f228b96078eba493732ad6d8daaf6 Mon Sep 17 00:00:00 2001 From: yeongpin Date: Wed, 9 Apr 2025 10:29:28 +0800 Subject: [PATCH 2/3] feat: Enhance force update configuration with new options and multilingual support - Added 'enabled_force_update' option in the [Utils] section of the configuration. - Updated the force_update_config() function to utilize the new option for determining update behavior. - Improved user feedback messages for force update status in English, Simplified Chinese, and Traditional Chinese locale files. - Ensured consistent messaging for enabling and disabling force updates. --- config.py | 11 ++++++----- locales/en.json | 4 +++- locales/zh_cn.json | 4 +++- locales/zh_tw.json | 4 +++- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/config.py b/config.py index 98706af..d7b70f2 100644 --- a/config.py +++ b/config.py @@ -54,6 +54,7 @@ def setup_config(translator=None): }, 'Utils': { 'enabled_update_check': 'True', + 'enabled_force_update': 'True', 'enabled_account_info': 'True' } } @@ -279,8 +280,8 @@ def force_update_config(translator=None): existing_config.read(config_file, encoding='utf-8') # Check if "enabled_update_check" is True update_enabled = True # Default to True if not set - if existing_config.has_section('Utils') and existing_config.has_option('Utils', 'enabled_update_check'): - update_enabled = existing_config.get('Utils', 'enabled_update_check').strip().lower() in ('true', 'yes', '1', 'on') + if existing_config.has_section('Utils') and existing_config.has_option('Utils', 'enabled_force_update'): + update_enabled = existing_config.get('Utils', 'enabled_force_update').strip().lower() in ('true', 'yes', '1', 'on') if update_enabled: try: @@ -288,8 +289,8 @@ def force_update_config(translator=None): backup_file = f"{config_file}.bak.{current_time.strftime('%Y%m%d_%H%M%S')}" shutil.copy2(config_file, backup_file) if translator: - print(f"{Fore.CYAN}{EMOJI['INFO']} {translator.get('config.backup_created', path=backup_file) if translator else f'Backup created: {backup_file}'}{Style.RESET_ALL}") - + print(f"\n{Fore.CYAN}{EMOJI['INFO']} {translator.get('config.backup_created', path=backup_file) if translator else f'Backup created: {backup_file}'}{Style.RESET_ALL}") + print(f"\n{Fore.CYAN}{EMOJI['INFO']} {translator.get('config.config_force_update_enabled') if translator else 'Config file force update enabled'}{Style.RESET_ALL}") # Delete the original config file (forced update) os.remove(config_file) if translator: @@ -299,7 +300,7 @@ def force_update_config(translator=None): print(f"{Fore.RED}{EMOJI['ERROR']} {translator.get('config.backup_failed', error=str(e)) if translator else f'Failed to backup config: {str(e)}'}{Style.RESET_ALL}") else: if translator: - print(f"{Fore.CYAN}{EMOJI['INFO']} {translator.get('config.force_update_disabled', fallback='Force update disabled by configuration. Keeping existing config file.') if translator else 'Force update disabled by configuration. Keeping existing config file.'}{Style.RESET_ALL}") + print(f"\n{Fore.CYAN}{EMOJI['INFO']} {translator.get('config.config_force_update_disabled', fallback='Config file force update disabled by configuration. Keeping existing config file.') if translator else 'Config file force update disabled by configuration. Keeping existing config file.'}{Style.RESET_ALL}") # Generate a new (or updated) configuration if needed return setup_config(translator) diff --git a/locales/en.json b/locales/en.json index 4e6f1b0..5ffaaf3 100644 --- a/locales/en.json +++ b/locales/en.json @@ -560,7 +560,9 @@ "backup_created": "Backup created: {path}", "config_removed": "Config file removed for forced update", "backup_failed": "Failed to backup config: {error}", - "force_update_failed": "Force update config failed: {error}" + "force_update_failed": "Force update config failed: {error}", + "config_force_update_disabled": "Config file force update disabled , skipping forced update", + "config_force_update_enabled": "Config file force update enabled , performing forced update" }, "oauth": { "authentication_button_not_found": "Authentication button not found", diff --git a/locales/zh_cn.json b/locales/zh_cn.json index 6167e10..2e4a90a 100644 --- a/locales/zh_cn.json +++ b/locales/zh_cn.json @@ -538,7 +538,9 @@ "backup_created": "备份创建: {path}", "config_removed": "配置文件已删除用于强制更新", "backup_failed": "备份失败: {error}", - "force_update_failed": "强制更新配置失败: {error}" + "force_update_failed": "强制更新配置失败: {error}", + "config_force_update_disabled": "配置文件强制更新已禁用，跳过强制更新", + "config_force_update_enabled": "配置文件强制更新已启用，正在执行强制更新" }, "oauth": { "authentication_button_not_found": "未找到认证按钮", diff --git a/locales/zh_tw.json b/locales/zh_tw.json index 43b2db8..a748a2a 100644 --- a/locales/zh_tw.json +++ b/locales/zh_tw.json @@ -520,7 +520,9 @@ "backup_created": "備份已創建: {path}", "config_removed": "配置文件已刪除用於強制更新", "backup_failed": "備份失敗: {error}", - "force_update_failed": "強制更新配置失敗: {error}" + "force_update_failed": "強制更新配置失敗: {error}", + "config_force_update_disabled": "配置文件強制更新已禁用，跳過強制更新", + "config_force_update_enabled": "配置文件強制更新已啟用，正在執行強制更新" }, "oauth": { "authentication_button_not_found": "未找到認證按鈕", From 60a438e618d96e5eb3d3e02e137aa97f9d218332 Mon Sep 17 00:00:00 2001 From: yeongpin Date: Wed, 9 Apr 2025 10:29:43 +0800 Subject: [PATCH 3/3] Update CHANGELOG.md for version 1.8.09, adding new entries for force update configuration enhancements and multilingual support, along with minor issue fixes. --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa1aec8..9441fb3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## v1.8.09 +1. Add: Force Update Config | 添加強制更新配置 +2. Add: Multilanguage support for force update | 添加強制更新功能的多語言支持 +3. Fix: Some Issues | 修復一些問題 + ## v1.8.08 1. Add: Force Update Config | 添加強制更新配置 2. Add: Multilanguage support for force update | 添加強制更新功能的多語言支持