Function : 'ESC' (return) , 'S' (seek)

fluffy-melli · Nov 23, 2024 · 05cbba9 · 05cbba9
1 parent 037246c
commit 05cbba9
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 12 deletions.
diff --git a/README.en.md b/README.en.md
@@ -78,6 +78,7 @@ start.sh --nogui --play [URL1] [URL2]...
 
 | Key | Function          |
 | --- | ----------------- |
+| `S` | Seek video        |
 | `R` | Restart video     |
 | `P` | Play/Pause        |
 | `M` | Mute/Unmute       |
@@ -95,9 +96,10 @@ start.sh --nogui --play [URL1] [URL2]...
 
 ### Function
 
-|  Key  | Function   |
-| ----- | ---------- |
-| `f11` | Fullscreen |
+|  Key  | Function                |
+| ----- | ----------------------- |
+| `esc` | Return to search screen |
+| `f11` | Fullscreen              |
 
 
 ## 🔍 Search Interface

diff --git a/README.md b/README.md
@@ -78,6 +78,7 @@ start.sh --play [URL1] [URL2]...
 
 | 키  | 기능               |
 | --- | ------------------ |
+| `S` | 비디오 스킵         |
 | `R` | 비디오 재시작      |
 | `P` | 재생/일시정지      |
 | `M` | 음소거/음소거 해제 |
@@ -95,9 +96,10 @@ start.sh --play [URL1] [URL2]...
 
 ### 기능
 
-|   키  | 기능     |
-| ----- | ------- |
-| `f11` | 전체화면 |
+|   키  | 기능                |
+| ----- | ------------------- |
+| `esc` | 검색화면으로 돌아가기 |
+| `f11` | 전체화면             |
 
 ## 🔍 검색 인터페이스
 

diff --git a/src/gui.py b/src/gui.py
@@ -91,8 +91,12 @@ def handle_key_event(key: str) -> None:
     """
     if not key:
         return
-
-    if key == "r":
+    if key == "s":
+        src.win.screen.vid.seek(src.win.screen.vid.duration - src.win.screen.vid.get_pos())
+    elif key == "escape":
+        src.win.setting.video_list = []
+        src.win.screen.vid.seek(src.win.screen.vid.duration - src.win.screen.vid.get_pos())
+    elif key == "r":
         src.win.screen.vid.restart()
         state.msg_text = "Restarted"
     elif key == "p":
@@ -282,9 +286,13 @@ def wait():
                 if event.type == pygame.QUIT:
                     pygame.display.quit()
                     pygame.quit()
-                    return  
+                    return 
                 elif event.type == pygame.KEYDOWN:
-                    if event.key == pygame.K_BACKSPACE:
+                    if event.key == pygame.K_ESCAPE:
+                        src.discord.client.RPC.close()
+                        pygame.quit()
+                        exit(0)
+                    elif event.key == pygame.K_BACKSPACE:
                         state.search = state.search[:-1]
                     elif event.key == pygame.K_RETURN:
                         key = "return"
@@ -354,6 +362,9 @@ def wait():
                                 choice += 1
                             else:
                                 choice = 0
+                        elif key == "escape":
+                            src.win.setting.video_list = []
+                            break
                         src.win.screen.win.fill((0,0,0))
                         for i, video in enumerate(videos):
                             if i == choice:

diff --git a/src/nogui.py b/src/nogui.py
@@ -1,12 +1,12 @@
 from moviepy.editor import AudioFileClip
 import pygame
-from src.utils import download
+from src.utils import download,user_setting
 import os
 
 def run(url:str):
     pygame.init()
     pygame.mixer.init()
-    download.clear("./src/down/storage/")
+    download.clear(user_setting.file_save_dir)
     fn = download.install_nogui(url)
     mp3_path = fn + ".mp3"
     wav_path = fn + ".wav"