diff --git a/aques.py b/aques.py index 610a4fc..8f0e09d 100644 --- a/aques.py +++ b/aques.py @@ -1,5 +1,5 @@ -from ctypes import * import subprocess +from ctypes import * class Aques: diff --git a/main.py b/main.py index 990a1ab..248f90e 100644 --- a/main.py +++ b/main.py @@ -1,23 +1,38 @@ -import pygame -from pygame.locals import * -import sys -import pytchat -import time +import json import random -from talk import Talk import subprocess -from aques import Aques +import sys +import time +from datetime import datetime + +import emoji +import pygame +import pytchat from playsound import playsound +from pygame.locals import * + +from aques import Aques from common_module import CommonModule +from mode import Mode +from talk import Talk from youtube import * -from datetime import datetime -import json -import emoji class Main: @classmethod - def main (cls, goatoh_mode: bool = False) -> None: + def main (cls, argv: list, argc: int) -> None: + mode = Mode.NIZIKA + if argc > 0: + match argv[0]: + case '-g': + mode = Mode.GOATOH + + case '-w': + mode = Mode.DOUBLE + + goatoh_mode = mode == Mode.GOATOH + double_mode = mode == Mode.DOUBLE + print (goatoh_mode) pygame.init () @@ -34,8 +49,7 @@ class Main: live_chat = pytchat.create (video_id = YOUTUBE_ID) system_font = pygame.font.SysFont ('notosanscjkjp', 24, bold = True) - user_font = pygame.font.SysFont ('notosanscjkjp', 32, - italic = True) + user_font = pygame.font.SysFont ('notosanscjkjp', 32, italic = True) nizika_font = pygame.font.SysFont ('07nikumarufont', 50) chat_items: list = [] @@ -133,5 +147,6 @@ class Main: if __name__ == '__main__': - Main.main ((len (sys.argv) > 1) and (sys.argv[1] == '-g')) + # Main.main ((len (sys.argv) > 1) and (sys.argv[1] == '-g')) + Main.main (sys.argv, len (sys.argv)) diff --git a/mode.py b/mode.py new file mode 100644 index 0000000..0d21e17 --- /dev/null +++ b/mode.py @@ -0,0 +1,8 @@ +from enum import Enum, auto + + +class Mode (Enum): + NIZIKA = auto () + GOATOH = auto () + DOUBLE = auto () + diff --git a/talk.py b/talk.py index cd11a12..a8b17af 100644 --- a/talk.py +++ b/talk.py @@ -1,7 +1,8 @@ import sys +from datetime import datetime + import openai from openai.types import * -from datetime import datetime from connection import *