Merge pull request #29 from DoobyDouglas/develop

Develop

Author: DoobyDouglas

ReaperScript.exe

@@ -156,7 +156,7 @@ def on_fix_check_click(master: tkinter.Tk, BUTTONS: List):
 master = tkinter.Tk(className='REAPERSCRIPT.main')
 master.geometry(set_geometry(master))
 master.resizable(False, False)
-master.title('REAPERSCRIPT v3.25')
+master.title('REAPERSCRIPT v3.27')
 master.iconbitmap(default=resource_path('ico.ico'))
 master.protocol('WM_DELETE_WINDOW', on_closing)
 style = ttk.Style()

ReaperScript.py

@@ -304,32 +304,30 @@ def file_works(folder: str) -> (
                 subs_edit(ass_subs, 'ass')
             ass_sub_convert(folder, ass_subs)
         elif not ass_subs and video:
-            if os.path.splitext(video[0])[-1] == '.mkv':
-                subs_extract(folder, video, 'ass', try_sub)
+            subs_extract(folder, video, 'ass', try_sub)
+            ass_subs = glob_path(folder, '*.ass')
+            if not ass_subs:
+                subs_extract(folder, video, 'ass', eng_sub)
                 ass_subs = glob_path(folder, '*.ass')
-                if not ass_subs:
-                    subs_extract(folder, video, 'ass', eng_sub)
-                    ass_subs = glob_path(folder, '*.ass')
-                if not ass_subs:
-                    subs_extract(folder, video, 'ass', any_sub)
-                    ass_subs = glob_path(folder, '*.ass')
-                if ass_subs:
-                    if get_option('subs_cleaner'):
-                        subs_edit(ass_subs, 'ass')
-                    ass_sub_convert(folder, ass_subs)
+            if not ass_subs:
+                subs_extract(folder, video, 'ass', any_sub)
+                ass_subs = glob_path(folder, '*.ass')
+            if ass_subs:
+                if get_option('subs_cleaner'):
+                    subs_edit(ass_subs, 'ass')
+                ass_sub_convert(folder, ass_subs)
         srt_subs = glob_path(folder, '*.srt')
         if srt_subs:
             subs = subs_rename(folder, srt_subs, number)
             if get_option('subs_cleaner'):
                 subs_edit(subs, 'srt')
         else:
             try:
-                if os.path.splitext(video[0])[-1] == '.mkv':
-                    subs_extract(folder, video, 'srt', '0:s:m:language:?')
-                    subs = glob_path(folder, '*.srt')
-                    subs = subs_rename(folder, subs, number)
-                    if get_option('subs_cleaner'):
-                        subs_edit(subs, 'srt')
+                subs_extract(folder, video, 'srt', '0:s:m:language:?')
+                subs = glob_path(folder, '*.srt')
+                subs = subs_rename(folder, subs, number)
+                if get_option('subs_cleaner'):
+                    subs_edit(subs, 'srt')
             except IndexError:
                 pass
             except TypeError:

file_works.py

@@ -65,7 +65,7 @@
     'Например:\n'
     'Файл с расширением ".flac420BPM" станет обычным ".flac".\n'
     '\n'
-    'Если внутри видео с расширением ".mkv" есть субтитры,\n'
+    'Если внутри видео есть субтитры,\n'
     'REAPERSCRIPT их достанет и добавит в проект.\n'
     'Сначала извлекаются субтитры из меню '
     '"Select subtitles to extract:",\n'