Merge remote-tracking branch 'origin/master'

# Conflicts: # Movie_Data_Capture.py
2022-02-18 00:05:24 +08:00
parent c1568cd64a e24535418c
commit 950a4dce13
7 changed files with 82 additions and 44 deletions
--- a/Movie_Data_Capture.py
+++ b/Movie_Data_Capture.py
@@ -467,7 +467,7 @@ def create_data_and_move_with_custom_number(file_path: str, custom_number, oCC):


 def main():
-    version = '6.0.1'
+    version = '6.0.2'
    urllib3.disable_warnings()  # Ignore http proxy warning

    # Read config.ini first, in argparse_function() need conf.failed_folder()
@@ -476,6 +476,8 @@ def main():
    # Parse command line args
    single_file_path, custom_number, logdir, regexstr, zero_op = argparse_function(version)

+
+
    main_mode = conf.main_mode()
    folder_path = ""
    if main_mode not in (1, 2, 3):