Skip to content

Commit 8b2138e

Browse files
authored
Add files via upload
1 parent 82bf387 commit 8b2138e

File tree

1 file changed

+11
-28
lines changed

1 file changed

+11
-28
lines changed

linux/autosrt.py

Lines changed: 11 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import shlex
2828
import shutil
2929

30-
VERSION = "1.3.8"
30+
VERSION = "1.3.9"
3131

3232
def stop_ffmpeg_windows(error_messages_callback=None):
3333
try:
@@ -2198,7 +2198,6 @@ def main():
21982198

21992199
for media_filepath in media_filepaths:
22002200
ffmpeg_src_language_code = language.ffmpeg_code_of_code[args.src_language]
2201-
#print("Checking existing '{}' subtites streams in {}".format(ffmpeg_src_language_code, media_filepath))
22022201
print("Checking %s" %media_filepath)
22032202

22042203
subtitle_stream_parser = SubtitleStreamParser(error_messages_callback=show_error_messages)
@@ -2209,7 +2208,6 @@ def main():
22092208
src_subtitle_stream_timed_subtitles = subtitle_stream_parser.timed_subtitles_of_language(ffmpeg_src_language_code)
22102209

22112210
if ffmpeg_src_language_code in subtitle_stream_parser.languages():
2212-
#print(f"'{ffmpeg_src_language_code}' subtitle stream already existed in {media_filepath}")
22132211
print("Is '%s' subtitle stream exist : Yes" %(ffmpeg_src_language_code.center(3)))
22142212
subtitle_stream_regions = []
22152213
subtitle_stream_transcripts = []
@@ -2224,7 +2222,6 @@ def main():
22242222
removed_media_filepaths.append(media_filepath)
22252223

22262224
else:
2227-
#print(f"No '{ffmpeg_src_language_code}' subtitle stream found in {media_filepath}")
22282225
print("Is '%s' subtitle stream exist : No" %(ffmpeg_src_language_code.center(3)))
22292226

22302227
print("")
@@ -2237,12 +2234,10 @@ def main():
22372234
print("Nothing else to do, exiting")
22382235
sys.exit(0)
22392236

2240-
22412237
elif do_translate == True:
22422238

22432239
for media_filepath in media_filepaths:
22442240
ffmpeg_src_language_code = language.ffmpeg_code_of_code[args.src_language]
2245-
#print("Checking existing '{}' subtites streams in {}".format(ffmpeg_src_language_code, media_filepath))
22462241
print("Checking %s" %media_filepath)
22472242

22482243
subtitle_stream_parser = SubtitleStreamParser(error_messages_callback=show_error_messages)
@@ -2253,7 +2248,6 @@ def main():
22532248
src_subtitle_stream_timed_subtitles = subtitle_stream_parser.timed_subtitles_of_language(ffmpeg_src_language_code)
22542249

22552250
if ffmpeg_src_language_code in subtitle_stream_parser.languages():
2256-
#print(f"'{ffmpeg_src_language_code}' subtitle stream already existed in {media_filepath}")
22572251
print("Is '%s' subtitle stream exist : Yes" %(ffmpeg_src_language_code.center(3)))
22582252
subtitle_stream_regions = []
22592253
subtitle_stream_transcripts = []
@@ -2267,12 +2261,10 @@ def main():
22672261
writer.write(src_subtitle_filepath)
22682262

22692263
else:
2270-
#print(f"No '{ffmpeg_src_language_code}' subtitle stream found in {media_filepath}")
22712264
print("Is '%s' subtitle stream exist : No" %(ffmpeg_src_language_code.center(3)))
22722265

22732266
for media_filepath in media_filepaths:
22742267
ffmpeg_dst_language_code = language.ffmpeg_code_of_code[args.dst_language]
2275-
#print("Checking existing '{}' subtites streams in {}".format(ffmpeg_dst_language_code, media_filepath))
22762268
print("Checking %s" %media_filepath)
22772269

22782270
subtitle_stream_parser = SubtitleStreamParser(error_messages_callback=show_error_messages)
@@ -2284,7 +2276,6 @@ def main():
22842276
dst_subtitle_stream_timed_subtitles = subtitle_stream_parser.timed_subtitles_of_language(ffmpeg_dst_language_code)
22852277

22862278
if ffmpeg_dst_language_code in subtitle_stream_parser.languages():
2287-
#print(f"'{ffmpeg_dst_language_code}' subtitle stream already existed in {media_filepath}")
22882279
print("Is '%s' subtitle stream exist : Yes" %(ffmpeg_dst_language_code.center(3)))
22892280
subtitle_stream_regions = []
22902281
subtitle_stream_transcripts = []
@@ -2299,7 +2290,6 @@ def main():
22992290
removed_media_filepaths.append(media_filepath)
23002291

23012292
else:
2302-
#print(f"No '{ffmpeg_dst_language_code}' subtitle stream found in {media_filepath}")
23032293
print("Is '%s' subtitle stream exist : No" %(ffmpeg_dst_language_code.center(3)))
23042294

23052295
if src_subtitle_stream_timed_subtitles and src_subtitle_stream_timed_subtitles != []:
@@ -2325,22 +2315,17 @@ def main():
23252315
if args.embed and src_subtitle_stream_timed_subtitles and src_subtitle_stream_timed_subtitles != []:
23262316
base, ext = os.path.splitext(media_filepath)
23272317
tmp_embedded_media_filepath_1 = "{base}.embedded1.{format}".format(base=base, format=ext[1:])
2328-
tmp_embedded_media_filepath_2 = "{base}.embedded2.{format}".format(base=base, format=ext[1:])
23292318
embedded_media_filepath = "{base}.embedded.{format}".format(base=base, format=ext[1:])
2330-
ffmpeg_src_language_code = language.ffmpeg_code_of_code[args.src_language]
23312319
ffmpeg_dst_language_code = language.ffmpeg_code_of_code[args.dst_language]
2332-
result = embed_subtitle_to_media(media_filepath, media_type, src_subtitle_filepath, ffmpeg_src_language_code, tmp_embedded_media_filepath_1)
2333-
if os.path.isfile(tmp_embedded_media_filepath_1):
2334-
result = embed_subtitle_to_media(tmp_embedded_media_filepath_1, media_type, dst_subtitle_filepath, ffmpeg_dst_language_code, tmp_embedded_media_filepath_2)
2335-
else:
2336-
result = embed_subtitle_to_media(media_filepath, media_type, dst_subtitle_filepath, ffmpeg_dst_language_code, tmp_embedded_media_filepath_2)
23372320

2338-
if os.path.isfile(tmp_embedded_media_filepath_2):
2339-
shutil.copy(tmp_embedded_media_filepath_2, embedded_media_filepath)
2321+
widgets = [f"Embedding \'{ffmpeg_dst_language_code}\' subtitles into {media_type} : ", Percentage(), ' ', Bar(marker="#"), ' ', ETA()]
2322+
pbar = ProgressBar(widgets=widgets, maxval=100).start()
2323+
subtitle_embedder = MediaSubtitleEmbedder(subtitle_path=dst_subtitle_filepath, language=ffmpeg_dst_language_code, output_path=tmp_embedded_media_filepath_1, progress_callback=show_progress, error_messages_callback=show_error_messages)
2324+
result = subtitle_embedder(media_filepath)
2325+
pbar.finish()
2326+
23402327
if os.path.isfile(tmp_embedded_media_filepath_1):
2341-
os.remove(tmp_embedded_media_filepath_1)
2342-
if os.path.isfile(tmp_embedded_media_filepath_2):
2343-
os.remove(tmp_embedded_media_filepath_2)
2328+
shutil.copy(tmp_embedded_media_filepath_1, embedded_media_filepath)
23442329
if os.path.isfile(embedded_media_filepath):
23452330
print("Subtitle embedded {} file saved as : {}".format(media_type, embedded_media_filepath))
23462331

@@ -2351,7 +2336,6 @@ def main():
23512336
if removed_media_filepath in media_filepaths:
23522337
media_filepaths.remove(removed_media_filepath)
23532338

2354-
#print("Left media_filepaths = {}".format(media_filepaths))
23552339
if not media_filepaths:
23562340
print("Nothing else to do, exiting")
23572341
sys.exit(0)
@@ -2454,14 +2438,14 @@ def main():
24542438
'''
24552439

24562440
# USING CLASS
2457-
widgets = [f"Embedding \'{ffmpeg_src_language_code}\' subtitles into {media_type} : ", Percentage(), ' ', Bar(marker="#"), ' ', ETA()]
2441+
widgets = [f"Embedding \'{ffmpeg_src_language_code}\' subtitles into {media_type} : ", Percentage(), ' ', Bar(marker="#"), ' ', ETA()]
24582442
pbar = ProgressBar(widgets=widgets, maxval=100).start()
24592443
subtitle_embedder = MediaSubtitleEmbedder(subtitle_path=src_subtitle_filepath, language=ffmpeg_src_language_code, output_path=tmp_embedded_media_filepath_1, progress_callback=show_progress, error_messages_callback=show_error_messages)
24602444
result = subtitle_embedder(media_filepath)
24612445
pbar.finish()
24622446

24632447
if os.path.isfile(tmp_embedded_media_filepath_1) and os.path.isfile(dst_subtitle_filepath):
2464-
widgets = [f"Embedding \'{ffmpeg_dst_language_code}\' subtitles into {media_type} : ", Percentage(), ' ', Bar(marker="#"), ' ', ETA()]
2448+
widgets = [f"Embedding \'{ffmpeg_dst_language_code}\' subtitles into {media_type} : ", Percentage(), ' ', Bar(marker="#"), ' ', ETA()]
24652449
pbar = ProgressBar(widgets=widgets, maxval=100).start()
24662450
subtitle_embedder = MediaSubtitleEmbedder(subtitle_path=dst_subtitle_filepath, language=ffmpeg_dst_language_code, output_path=tmp_embedded_media_filepath_2, progress_callback=show_progress, error_messages_callback=show_error_messages)
24672451
result = subtitle_embedder(tmp_embedded_media_filepath_1)
@@ -2473,7 +2457,6 @@ def main():
24732457
result = subtitle_embedder(media_filepath)
24742458
pbar.finish()
24752459

2476-
24772460
if os.path.isfile(tmp_embedded_media_filepath_2):
24782461
shutil.copy(tmp_embedded_media_filepath_2, embedded_media_filepath)
24792462

@@ -2487,7 +2470,7 @@ def main():
24872470

24882471
#result = embed_subtitle_to_media(media_filepath, media_type, src_subtitle_filepath, ffmpeg_src_language_code, tmp_embedded_media_filepath_1)
24892472

2490-
widgets = [f"Embedding \'{ffmpeg_src_language_code}\' subtitles into {media_type} : ", Percentage(), ' ', Bar(marker="#"), ' ', ETA()]
2473+
widgets = [f"Embedding \'{ffmpeg_src_language_code}\' subtitles into {media_type} : ", Percentage(), ' ', Bar(marker="#"), ' ', ETA()]
24912474
pbar = ProgressBar(widgets=widgets, maxval=100).start()
24922475
subtitle_embedder = MediaSubtitleEmbedder(subtitle_path=src_subtitle_filepath, language=ffmpeg_src_language_code, output_path=tmp_embedded_media_filepath_1, progress_callback=show_progress, error_messages_callback=show_error_messages)
24932476
result = subtitle_embedder(media_filepath)

0 commit comments

Comments
 (0)