Merge pull request #5 from FarisR99/release-1.1.2

Release 1.1.2

Author: FarisR99

Anime4K.py

@@ -1,7 +1,9 @@
 import argparse
+import glob
 import os
 import sys
 
+from encode import encode_to_hevc
 from extract_audio import extract_audio
 from extract_subs import extract_subs
 from multi import multi
@@ -11,7 +13,7 @@
 from utils import __current_version__, is_tool, credz, str2dict
 
 # Constant variables
-MODES_SUPPORTING_MULTI_INPUTS = ["shader", "multi"]
+MODES_SUPPORTING_MULTI_INPUTS = ["shader", "multi", "encode"]
 
 # Print credits
 credz()
@@ -43,6 +45,7 @@
  subs - Extract subtitles from a media file
  mux - Mux/compile a media file with audio files and subtitle files
  multi - Apply shader with -ss and -sa, audio, subs and mux mode in order
+ encode - Encode media files using X265 with predefined settings
  split - Split a media file into parts''')
 parser.add_argument("-ew", "--width", required=False, type=int, default=3840,
                     help="Desired width when applying shader")
@@ -69,10 +72,14 @@
                     default=False,
                     help="Set this flag if you want to manually mux audio when using mode shader")
 parser.add_argument("-sm", "--skip_menus", required=False, type=str2dict,
-                    help='''Skip shader/encoding choice menus when using mode shader
-Example:
+                    help='''Skip choice menus
+Examples for mode shader:
  --skip_menus="shader=4,encoder=cpu,codec=h264,preset=fast,crf=23"
- --skip_menus="shader=4,encoder=nvenc,codec=hevc,preset=fast,qp=24"''')
+ --skip_menus="shader=4,encoder=nvenc,codec=hevc,preset=fast,qp=24"
+Example for mode audio:
+ --skip_menus="convert=0"
+Example for mode encode:
+ --skip_menus="encode=0"''')
 parser.add_argument("-al", "--audio_language", required=False, type=str,
                     help=
                     '''Set this to the audio track language for the output video.
@@ -82,6 +89,8 @@
                     action='store_true',
                     default=False,
                     help="Set this flag to delete output files that have failed to compile when using mode multi")
+parser.add_argument("-si", "--skip_input", required=False, action='append',
+                    help="Input file to skip when using a directory as an input for modes shader and multi")
 
 args = vars(parser.parse_args())
 if args['version']:
@@ -97,21 +106,25 @@ def exit_if_missing(file_path: str, allow_dir: bool = True):
     elif allow_dir is False:
         print("error: cannot use a directory ({0}) as an input for this mode"
               .format(file_path))
+        sys.exit(-2)
 
 
-fn = args['input']
+# Validate "mode" argument
 mode = str(args['mode']).lower()
+if mode == "subtitles":
+    mode = "subs"
 
 # Validate "input" argument
+fn = args['input']
 if fn is None:
     parser.print_help()
     print("error: the following arguments are required: -i/--input")
     sys.exit(-2)
 if type(fn) is list:
     if len(fn) != 1:
-        if mode != "shader":
+        if mode not in MODES_SUPPORTING_MULTI_INPUTS:
             print(
-                "error: Cannot use multiple inputs with mode={0}".format(mode))
+                "error: cannot use multiple inputs with mode={0}".format(mode))
             sys.exit(-2)
         for file in fn:
             exit_if_missing(file, mode in MODES_SUPPORTING_MULTI_INPUTS)
@@ -120,9 +133,9 @@ def exit_if_missing(file_path: str, allow_dir: bool = True):
         exit_if_missing(fn, mode in MODES_SUPPORTING_MULTI_INPUTS)
 else:
     exit_if_missing(fn, mode in MODES_SUPPORTING_MULTI_INPUTS)
-
-if mode == "subtitles":
-    mode = "subs"
+if mode in MODES_SUPPORTING_MULTI_INPUTS:
+    if type(fn) is str:
+        fn = [fn]
 
 # Validate "output" argument
 if mode == "audio" or mode == "subs":
@@ -131,36 +144,86 @@ def exit_if_missing(file_path: str, allow_dir: bool = True):
         output = ""
     if output != "":
         if not os.path.isdir(output):
-            print("Output directory {0} does not exist".format(output))
+            print("error: output directory {0} does not exist".format(output))
             sys.exit(-2)
         else:
             if not output.endswith("/"):
                 output = output + "/"
-elif mode == "mux" or mode == "shader" or mode == "multi":
+elif mode in MODES_SUPPORTING_MULTI_INPUTS:
+    output = args['output'] or "out.mkv"
+    if os.path.isdir(output) and not os.path.exists(output):
+        try:
+            os.mkdir(output)
+        except Exception as e:
+            print(
+                "error: failed to create output directory={0}:".format(output))
+            print(e)
+            sys.exit(-2)
+else:
     output = args['output'] or "out.mkv"
-elif mode == "split":
-    output = args['output']
 
+# Collect input file paths from the input argument(s)
+in_files = []
+if mode in MODES_SUPPORTING_MULTI_INPUTS:
+    skip_inputs = args['skip_input']
+    if skip_inputs is None:
+        skip_inputs = []
+    elif type(skip_inputs) is str:
+        skip_inputs = [skip_inputs]
+
+    for file in fn:
+        if os.path.isdir(file):
+            for file_in_dir in glob.glob(
+                    os.path.join(file, "*.mkv")
+            ) + glob.glob(
+                os.path.join(file, "*.mp4")
+            ):
+                file_name = os.path.basename(file_in_dir)
+                if file_name in skip_inputs:
+                    continue
+                in_files.append(os.path.join(file_in_dir))
+        else:
+            # Only here for consistency
+            # Why would you specify a file input then add that file
+            # to a list of files to ignore?
+            if file in skip_inputs:
+                continue
+            in_files.append(os.path.join(file))
+    file_count = len(in_files)
+    if file_count > 1:
+        if not os.path.isdir(output):
+            print(
+                "error: output path must be a directory when there are more than one input files")
+            sys.exit(-2)
+    elif file_count == 0:
+        print("error: no valid input media files found")
+        sys.exit(-2)
+
+# Validate "skip_menus" argument
+skip_menus = args['skip_menus']
+if skip_menus is None:
+    skip_menus = {}
+
+# Perform action based on mode
 if mode == "audio":
-    extract_audio(fn, output)
+    extract_audio(fn, output, skip_menus)
 elif mode == "subs":
     extract_subs(fn, output)
 elif mode == "mux":
     mux(fn, output)
 elif mode == "shader":
-    if type(fn) is str:
-        fn = [fn]
-    shader(fn, args['width'], args['height'], args['shader_dir'], args['bit'],
-           args['audio_language'], args['softsubs'], args['softaudio'],
-           args['skip_menus'] or {}, output)
+    shader(in_files, args['width'], args['height'],
+           args['shader_dir'], args['bit'], args['audio_language'],
+           args['softsubs'], args['softaudio'], skip_menus, True, output)
 elif mode == "multi":
-    if type(fn) is str:
-        fn = [fn]
-    multi(fn, args['width'], args['height'], args['shader_dir'], args['bit'],
-          args['skip_menus'], args['delete_failures'], output)
+    multi(in_files, args['width'], args['height'],
+          args['shader_dir'], args['bit'], skip_menus,
+          args['delete_failures'], output)
+elif mode == "encode":
+    encode_to_hevc(in_files, output, skip_menus)
 elif mode == "split":
     length = get_video_length(fn)
     split_by_seconds(filename=fn, split_length=args['split_length'],
                      video_length=length, split_dir=output)
 else:
-    print("Unknown option: {0}".format(mode))
+    print("Unknown mode: {0}".format(mode))