Update version to 1.8.02 in .env and CHANGELOG.md, adding new features and fixes including disabling auto-update, configuration options, and contributors options.

2026-01-03 17:29:04 +03:00 · 2025-03-29 21:49:57 +08:00
parent 350d781ce8
commit c15ea25cb3
12 changed files with 436 additions and 68 deletions
--- a/main.py
+++ b/main.py
@@ -9,12 +9,14 @@ import locale
 import platform
 import requests
 import subprocess
-from config import get_config  
+from config import get_config
+import shutil
+import re

 # Only import windll on Windows systems
 if platform.system() == 'Windows':
    import ctypes
-    # 只在 Windows 上导入 windll
+    # Only import windll on Windows systems
    from ctypes import windll

 # Initialize colorama
@@ -32,7 +34,13 @@ EMOJI = {
    "ARROW": "➜",
    "LANG": "🌐",
    "UPDATE": "🔄",
-    "ADMIN": "🔐"
+    "ADMIN": "🔐",
+    "AIRDROP": "💰",
+    "ROCKET": "🚀",
+    "STAR": "⭐",
+    "SUN": "🌟",
+    "CONTRIBUTE": "🤝",
+    "SETTINGS": "⚙️"
 }

 # Function to check if running as frozen executable
@@ -243,27 +251,110 @@ translator = Translator()
 def print_menu():
    """Print menu options"""
    try:
-        import cursor_acc_info
-        cursor_acc_info.display_account_info(translator)
+        config = get_config()
+        if config.getboolean('Utils', 'enabled_account_info'):
+            import cursor_acc_info
+            cursor_acc_info.display_account_info(translator)
    except Exception as e:
        print(f"{Fore.YELLOW}{EMOJI['INFO']} {translator.get('menu.account_info_error', error=str(e))}{Style.RESET_ALL}")
    
    print(f"\n{Fore.CYAN}{EMOJI['MENU']} {translator.get('menu.title')}:{Style.RESET_ALL}")
-    print(f"{Fore.YELLOW}{'─' * 40}{Style.RESET_ALL}")
-    print(f"{Fore.GREEN}0{Style.RESET_ALL}. {EMOJI['ERROR']} {translator.get('menu.exit')}")
-    print(f"{Fore.GREEN}1{Style.RESET_ALL}. {EMOJI['RESET']} {translator.get('menu.reset')}")
-    print(f"{Fore.GREEN}2{Style.RESET_ALL}. {EMOJI['SUCCESS']} {translator.get('menu.register')} ({Fore.RED}{translator.get('menu.outdate')}{Style.RESET_ALL})")
-    print(f"{Fore.GREEN}3{Style.RESET_ALL}. 🌟 {translator.get('menu.register_google')}")
-    print(f"{Fore.YELLOW}   ┗━━ 🔥 {translator.get('menu.lifetime_access_enabled')} 🔥{Style.RESET_ALL}")
-    print(f"{Fore.GREEN}4{Style.RESET_ALL}. ⭐ {translator.get('menu.register_github')}")
-    print(f"{Fore.YELLOW}   ┗━━ 🚀 {translator.get('menu.lifetime_access_enabled')} 🚀{Style.RESET_ALL}")
-    print(f"{Fore.GREEN}5{Style.RESET_ALL}. {EMOJI['SUCCESS']} {translator.get('menu.register_manual')}")
-    print(f"{Fore.GREEN}6{Style.RESET_ALL}. {EMOJI['RESET']} {translator.get('menu.temp_github_register')}")
-    print(f"{Fore.GREEN}7{Style.RESET_ALL}. {EMOJI['ERROR']} {translator.get('menu.quit')}")
-    print(f"{Fore.GREEN}8{Style.RESET_ALL}. {EMOJI['LANG']} {translator.get('menu.select_language')}")
-    print(f"{Fore.GREEN}9{Style.RESET_ALL}. {EMOJI['UPDATE']} {translator.get('menu.disable_auto_update')}")
-    print(f"{Fore.GREEN}10{Style.RESET_ALL}. {EMOJI['RESET']} {translator.get('menu.totally_reset')}")
-    print(f"{Fore.YELLOW}{'─' * 40}{Style.RESET_ALL}")
+    if translator.current_language == 'zh_cn' or translator.current_language == 'zh_tw':
+        print(f"{Fore.YELLOW}{'─' * 70}{Style.RESET_ALL}")
+    else:
+        print(f"{Fore.YELLOW}{'─' * 110}{Style.RESET_ALL}")
+    
+    # Get terminal width
+    try:
+        terminal_width = shutil.get_terminal_size().columns
+    except:
+        terminal_width = 80  # Default width
+    
+    # Define all menu items
+    menu_items = {
+        0: f"{Fore.GREEN}0{Style.RESET_ALL}. {EMOJI['ERROR']} {translator.get('menu.exit')}",
+        1: f"{Fore.GREEN}1{Style.RESET_ALL}. {EMOJI['RESET']} {translator.get('menu.reset')}",
+        2: f"{Fore.GREEN}2{Style.RESET_ALL}. {EMOJI['SUCCESS']} {translator.get('menu.register')} ({Fore.RED}{translator.get('menu.outdate')}{Style.RESET_ALL})",
+        3: f"{Fore.GREEN}3{Style.RESET_ALL}. {EMOJI['SUN']} {translator.get('menu.register_google')} {EMOJI['ROCKET']} ({Fore.YELLOW}{translator.get('menu.lifetime_access_enabled')}{Style.RESET_ALL})",
+        4: f"{Fore.GREEN}4{Style.RESET_ALL}. {EMOJI['STAR']} {translator.get('menu.register_github')} {EMOJI['ROCKET']} ({Fore.YELLOW}{translator.get('menu.lifetime_access_enabled')}{Style.RESET_ALL})",
+        5: f"{Fore.GREEN}5{Style.RESET_ALL}. {EMOJI['SUCCESS']} {translator.get('menu.register_manual')}",
+        6: f"{Fore.GREEN}6{Style.RESET_ALL}. {EMOJI['RESET']} {translator.get('menu.temp_github_register')}",
+        7: f"{Fore.GREEN}7{Style.RESET_ALL}. {EMOJI['ERROR']} {translator.get('menu.quit')}",
+        8: f"{Fore.GREEN}8{Style.RESET_ALL}. {EMOJI['LANG']} {translator.get('menu.select_language')}",
+        9: f"{Fore.GREEN}9{Style.RESET_ALL}. {EMOJI['UPDATE']} {translator.get('menu.disable_auto_update')}",
+        10: f"{Fore.GREEN}10{Style.RESET_ALL}. {EMOJI['RESET']} {translator.get('menu.totally_reset')}",
+        11: f"{Fore.GREEN}11{Style.RESET_ALL}. {EMOJI['CONTRIBUTE']} {translator.get('menu.contribute')}",
+        12: f"{Fore.GREEN}12{Style.RESET_ALL}. {EMOJI['SETTINGS']}  {translator.get('menu.config')}"
+    }
+    
+    # Automatically calculate the number of menu items in the left and right columns
+    total_items = len(menu_items)
+    left_column_count = (total_items + 1) // 2  # The number of options displayed on the left (rounded up)
+    
+    # Build left and right columns of menus
+    sorted_indices = sorted(menu_items.keys())
+    left_menu = [menu_items[i] for i in sorted_indices[:left_column_count]]
+    right_menu = [menu_items[i] for i in sorted_indices[left_column_count:]]
+    
+    # Calculate the maximum display width of left menu items
+    ansi_escape = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])')
+    
+    def get_display_width(s):
+        """Calculate the display width of a string, considering Chinese characters and emojis"""
+        # Remove ANSI color codes
+        clean_s = ansi_escape.sub('', s)
+        width = 0
+        for c in clean_s:
+            # Chinese characters and some emojis occupy two character widths
+            if ord(c) > 127:
+                width += 2
+            else:
+                width += 1
+        return width
+    
+    max_left_width = 0
+    for item in left_menu:
+        width = get_display_width(item)
+        max_left_width = max(max_left_width, width)
+    
+    # Set the starting position of right menu
+    fixed_spacing = 4  # Fixed spacing
+    right_start = max_left_width + fixed_spacing
+    
+    # Calculate the number of spaces needed for right menu items
+    spaces_list = []
+    for i in range(len(left_menu)):
+        if i < len(left_menu):
+            left_item = left_menu[i]
+            left_width = get_display_width(left_item)
+            spaces = right_start - left_width
+            spaces_list.append(spaces)
+    
+    # Print menu items
+    max_rows = max(len(left_menu), len(right_menu))
+    
+    for i in range(max_rows):
+        # Print left menu items
+        if i < len(left_menu):
+            left_item = left_menu[i]
+            print(left_item, end='')
+            
+            # Use pre-calculated spaces
+            spaces = spaces_list[i]
+        else:
+            # If left side has no items, print only spaces
+            spaces = right_start
+            print('', end='')
+        
+        # Print right menu items
+        if i < len(right_menu):
+            print(' ' * spaces + right_menu[i])
+        else:
+            print()  # Change line
+    if translator.current_language == 'zh_cn' or translator.current_language == 'zh_tw':
+        print(f"{Fore.YELLOW}{'─' * 70}{Style.RESET_ALL}")
+    else:
+        print(f"{Fore.YELLOW}{'─' * 110}{Style.RESET_ALL}")

 def select_language():
    """Language selection menu"""
@@ -303,6 +394,11 @@ def check_latest_version():
            timeout=10
        )
        
+        # Check if rate limit exceeded
+        if response.status_code == 403 and "rate limit exceeded" in response.text.lower():
+            print(f"{Fore.YELLOW}{EMOJI['INFO']} {translator.get('updater.rate_limit_exceeded', fallback='GitHub API rate limit exceeded. Skipping update check.')}{Style.RESET_ALL}")
+            return
+        
        # Check if response is successful
        if response.status_code != 200:
            raise Exception(f"GitHub API returned status code {response.status_code}")
@@ -454,12 +550,14 @@ def main():
        print(f"{Fore.RED}{EMOJI['ERROR']} {translator.get('menu.config_init_failed')}{Style.RESET_ALL}")
        return
        
-    check_latest_version()  # Add version check before showing menu
+    if config.getboolean('Utils', 'enabled_update_check'):
+        check_latest_version()  # Add version check before showing menu
    print_menu()
    
    while True:
        try:
-            choice = input(f"\n{EMOJI['ARROW']} {Fore.CYAN}{translator.get('menu.input_choice', choices='0-10')}: {Style.RESET_ALL}")
+            choice_num = 12
+            choice = input(f"\n{EMOJI['ARROW']} {Fore.CYAN}{translator.get('menu.input_choice', choices=f'0-{choice_num}')}: {Style.RESET_ALL}")

            if choice == "0":
                print(f"\n{Fore.YELLOW}{EMOJI['INFO']} {translator.get('menu.exit')}...{Style.RESET_ALL}")
@@ -507,6 +605,14 @@ def main():
                totally_reset_cursor.run(translator)
                # print(f"{Fore.YELLOW}{EMOJI['INFO']} {translator.get('menu.fixed_soon')}{Style.RESET_ALL}")
                print_menu()
+            elif choice == "11":
+                import logo
+                print(logo.CURSOR_CONTRIBUTORS)
+                print_menu()
+            elif choice == "12":
+                from config import print_config
+                print_config(get_config(), translator)
+                print_menu()
            else:
                print(f"{Fore.RED}{EMOJI['ERROR']} {translator.get('menu.invalid_choice')}{Style.RESET_ALL}")
                print_menu()