Add media hint to player

Author: sparklost

endcord/media.py

@@ -173,6 +173,7 @@ def __init__(self, config, keybindings, ui=True, external=False):
         self.keybindings = {key: (val,) if not isinstance(val, tuple) else val for key, val in keybindings.items()}
         if self.default_color == -1:
             self.default_color = 0
+        self.external = external
         if external:
             signal.signal(signal.SIGINT, self.sigint_handler)
         self.ascii_palette_len = len(self.ascii_palette) - 1
@@ -200,6 +201,7 @@ def sigint_handler(self, _signum, _frame):
         """Handling Ctrl-C event"""
         self.stop_playback()
         time.sleep(1)
+        terminal_utils.leave_tui()
         sys.exit()   # failsafe
 
 
@@ -546,7 +548,7 @@ def play_youtube(self, url):
             logger.warning("Cant play youtube link, yt-dlp path is invalid")
 
 
-    def play(self, path):
+    def play(self, path, hint=None):
         """Select runner based on file type"""
         if not path:
             return
@@ -573,6 +575,8 @@ def play(self, path):
                 self.play_video(path)
             else:
                 mime = get_mime(path).split("/")
+                if hint:
+                    mime = [hint, None]
                 if mime[0] == "image":
                     if mime[1] == "gif":
                         self.media_type = "gif"
@@ -591,6 +595,8 @@ def play(self, path):
                 else:
                     logger.warning(f"Unsupported media format: {mime}")
                     self.run = False
+                    if self.external:
+                        sys.exit(f"Unsupported media format: {mime}")
             while self.run:   # dont exit when video ends
                 time.sleep(0.2)
         except Exception as e:
@@ -708,7 +714,7 @@ def wait_input(self):
                 self.control_codes(104)
 
 
-def ascii_runner(path, config, keybindings):
+def runner(path, config, keybindings):
     """Main function"""
     path = os.path.expanduser(path)
     if not os.path.exists(path):

main.py

@@ -100,12 +100,12 @@ def main(args):
             importlib.util.find_spec("av") is not None and
             importlib.util.find_spec("nacl") is not None
         ):
-            sys.exit("Ascii media player is not supported")
+            sys.exit("Terminal media player is not supported")
         from endcord import media
         if uses_pgcurses:
             curses.enable_tray = False
         try:
-            media.ascii_runner(args.media, config, keybindings)
+            media.runner(args.media, config, keybindings)
         except curses.error as e:
             if str(e) != "endwin() returned ERR":
                 logger.error(traceback.format_exc())