wah.su/stickerbridge
1
0
Fork 0
mirror of https://github.com/wah-su/stickerbridge.git synced 2025-04-05 15:54:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix argument parsing edge cases

Browse source
This commit is contained in:
Kentai Radiquum 2024-12-29 03:57:06 +05:00
parent f4a4f0044f
commit d57612e5a1
Signed by: Radiquum
GPG key ID: 858E8EE696525EED
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
stickerbridge/bot_commands.py
View file

@ -5,7 +5,7 @@ from matrix_reuploader import MatrixReuploader
from matrix_preview import MatrixPreview from matrix_preview import MatrixPreview
from telegram_exporter import TelegramExporter from telegram_exporter import TelegramExporter
async def _parse_args(args: list[str]) -> tuple[str, str, list[str]]: async def _parse_args(args: list[str], command: str) -> tuple[str, str, list[str]]:
_pack_name = "" _pack_name = ""
_parsed_args = [] _parsed_args = []
_import_name = [] _import_name = []
@ -19,13 +19,13 @@ async def _parse_args(args: list[str]) -> tuple[str, str, list[str]]:
continue continue
if index == 1 and not arg.startswith("-") and arg.startswith("\""): # import name should always be 2nd arg if index == 1 and not arg.startswith("-") and arg.startswith("\""): # import name should always be 2nd arg
arg = arg.strip("\"") arg = arg[1:]
_is_import_name = True _is_import_name = True
elif index == 1 and not arg.startswith("-"): elif index == 1 and not arg.startswith("-") and command.split()[0].lower() != "preview":
_import_name.append(arg) _import_name.append(arg)
continue continue
if not arg.startswith("-") and arg.endswith("\""): if _is_import_name and not arg.startswith("-") and arg.endswith("\""):
if _is_import_name: if _is_import_name:
arg = arg.strip("\"") arg = arg.strip("\"")
_import_name.append(arg) _import_name.append(arg)
@ -102,7 +102,7 @@ class Command:
await send_text_to_room(self.client, self.room.room_id, text) await send_text_to_room(self.client, self.room.room_id, text)
return return
pack_name, import_name, flags = await _parse_args(self.args) pack_name, import_name, flags = await _parse_args(self.args, self.command)
# TODO?: add --help flag # TODO?: add --help flag
@ -140,7 +140,7 @@ class Command:
await send_text_to_room(self.client, self.room.room_id, text) await send_text_to_room(self.client, self.room.room_id, text)
async def _generate_preview(self): async def _generate_preview(self):
pack_name, _, flags = await _parse_args(self.args) pack_name, _, flags = await _parse_args(self.args, self.command)
if pack_name == "": if pack_name == "":
await send_text_to_room( await send_text_to_room(
self.client, self.client,