diff --git a/core/cli.py b/core/cli.py index 5b67d98..e12e12b 100644 --- a/core/cli.py +++ b/core/cli.py @@ -80,9 +80,9 @@ def change_hysteria2_sni(sni: str): @cli.command('backup-hysteria') -def backup_hysteria(): +def backup_hysteria2(): try: - cli_api.backup_hysteria() + cli_api.backup_hysteria2() click.echo("Hysteria configuration backed up successfully.") except Exception as e: click.echo(f'{e}', err=True) @@ -216,10 +216,10 @@ def manage_obfs(remove: bool, generate: bool): if remove and generate: raise click.UsageError('Error: You cannot use both --remove and --generate at the same time') elif generate: - cli_api.generate_hysteria_obfs() + cli_api.enable_hysteria2_obfs() click.echo("Obfs generated successfully.") elif remove: - cli_api.remove_hysteria_obfs() + cli_api.disable_hysteria2_obfs() click.echo("Obfs removed successfully.") except Exception as e: click.echo(f'{e}', err=True) diff --git a/core/cli_api.py b/core/cli_api.py index 90e2b49..734a4cf 100644 --- a/core/cli_api.py +++ b/core/cli_api.py @@ -30,7 +30,7 @@ class Command(Enum): UPDATE_GEO = os.path.join(SCRIPT_DIR, 'hysteria2', 'update_geo.py') LIST_USERS = os.path.join(SCRIPT_DIR, 'hysteria2', 'list_users.sh') SERVER_INFO = os.path.join(SCRIPT_DIR, 'hysteria2', 'server_info.sh') - BACKUP_HYSTERIA = os.path.join(SCRIPT_DIR, 'hysteria2', 'backup.sh') + BACKUP_HYSTERIA2 = os.path.join(SCRIPT_DIR, 'hysteria2', 'backup.sh') INSTALL_TELEGRAMBOT = os.path.join(SCRIPT_DIR, 'telegrambot', 'runbot.sh') INSTALL_SINGBOX = os.path.join(SCRIPT_DIR, 'singbox', 'singbox_shell.sh') INSTALL_NORMALSUB = os.path.join(SCRIPT_DIR, 'normalsub', 'normalsub.sh') @@ -143,17 +143,17 @@ def change_hysteria2_sni(sni: str): run_cmd(['bash', Command.CHANGE_SNI_HYSTERIA2.value, sni]) -def backup_hysteria(): +def backup_hysteria2(): '''Backups Hysteria configuration.''' - run_cmd(['bash', Command.BACKUP_HYSTERIA.value]) + run_cmd(['bash', Command.BACKUP_HYSTERIA2.value]) -def generate_hysteria_obfs(): +def enable_hysteria2_obfs(): '''Generates 'obfs' in Hysteria2 configuration.''' run_cmd(['bash', Command.MANAGE_OBFS.value, '--generate']) -def remove_hysteria_obfs(): +def disable_hysteria2_obfs(): '''Removes 'obfs' from Hysteria2 configuration.''' run_cmd(['bash', Command.MANAGE_OBFS.value, '--remove'])