Skip to content

Commit 9040e94

Browse files
botbahlulbotbahlul
authored
Add files via upload
1 parent 8460543 commit 9040e94

File tree

1 file changed

+55
-56
lines changed

1 file changed

+55
-56
lines changed

‎pyautosrt/__init__.py‎

Lines changed: 55 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
#sys.tracebacklimit = 0
4343

4444

45-
VERSION = "0.2.8"
45+
VERSION = "0.2.9"
4646

4747

4848
class Language:
@@ -799,10 +799,10 @@ def __call__(self, media_filepath):
799799

800800
if not os.path.isfile(media_filepath):
801801
if self.error_messages_callback:
802-
self.error_messages_callback(f"The given file does not exist: {media_filepath}")
802+
self.error_messages_callback(f"The given file does not exist: '{media_filepath}'")
803803
else:
804-
print(f"The given file does not exist: {media_filepath}")
805-
raise Exception(f"Invalid file: {media_filepath}")
804+
print(f"The given file does not exist: '{media_filepath}'")
805+
raise Exception(f"Invalid file: '{media_filepath}'")
806806

807807
if not self.ffprobe_check():
808808
if self.error_messages_callback:
@@ -1065,7 +1065,7 @@ def __call__(self, region):
10651065

10661066

10671067
class SpeechRecognizer(object):
1068-
def __init__(self, language="en", rate=44100, retries=3, api_key="AIzaSyBOti4mM-6x9WDnZIjIeyEU21OpBXqWBgw", timeout=30, error_messages_callback=None):
1068+
def __init__(self, language="en", rate=48000, retries=3, api_key="AIzaSyBOti4mM-6x9WDnZIjIeyEU21OpBXqWBgw", timeout=30, error_messages_callback=None):
10691069
self.language = language
10701070
self.rate = rate
10711071
self.api_key = api_key
@@ -1076,8 +1076,8 @@ def __init__(self, language="en", rate=44100, retries=3, api_key="AIzaSyBOti4mM-
10761076
def __call__(self, data):
10771077
try:
10781078
for i in range(self.retries):
1079-
url = "http://www.google.com/speech-api/v2/recognize?client=chromium&lang={lang}&key={key}".format(lang=self.language, key=self.api_key)
1080-
headers = {"Content-Type": "audio/x-flac rate=%d" % self.rate}
1079+
url = f"http://www.google.com/speech-api/v2/recognize?client=chromium&lang={self.language}&key={self.api_key}"
1080+
headers = {"Content-Type": "audio/x-flac rate=%d" %self.rate}
10811081

10821082
try:
10831083
resp = requests.post(url, data=data, headers=headers, timeout=self.timeout)
@@ -1295,7 +1295,7 @@ def write(self, declared_subtitle_filepath):
12951295
if saved_subtitle_filepath:
12961296
subtitle_file_base, subtitle_file_ext = os.path.splitext(saved_subtitle_filepath)
12971297
if not subtitle_file_ext:
1298-
saved_subtitle_filepath = "{base}.{format}".format(base=subtitle_file_base, format=self.format)
1298+
saved_subtitle_filepath = f"{subtitle_file_base}.{self.format}"
12991299
else:
13001300
saved_subtitle_filepath = declared_subtitle_filepath
13011301
with open(saved_subtitle_filepath, 'wb') as f:
@@ -1640,10 +1640,10 @@ def __call__(self, media_filepath):
16401640

16411641
if not os.path.isfile(media_filepath):
16421642
if self.error_messages_callback:
1643-
self.error_messages_callback(f"The given file does not exist: {media_filepath}")
1643+
self.error_messages_callback(f"The given file does not exist: '{media_filepath}'")
16441644
else:
1645-
print(f"The given file does not exist: {media_filepath}")
1646-
raise Exception(f"Invalid file: {media_filepath}")
1645+
print(f"The given file does not exist: '{media_filepath}'")
1646+
raise Exception(f"Invalid file: '{media_filepath}'")
16471647

16481648
if not self.ffprobe_check():
16491649
if self.error_messages_callback:
@@ -1827,10 +1827,10 @@ def __call__(self, media_filepath):
18271827

18281828
if not os.path.isfile(media_filepath):
18291829
if self.error_messages_callback:
1830-
self.error_messages_callback(f"The given file does not exist: {media_filepath}")
1830+
self.error_messages_callback(f"The given file does not exist: '{media_filepath}'")
18311831
else:
1832-
print(f"The given file does not exist: {media_filepath}")
1833-
raise Exception(f"Invalid file: {media_filepath}")
1832+
print(f"The given file does not exist: '{media_filepath}'")
1833+
raise Exception(f"Invalid file: '{media_filepath}'")
18341834

18351835
if not self.ffprobe_check():
18361836
if self.error_messages_callback:
@@ -1850,7 +1850,7 @@ def __call__(self, media_filepath):
18501850
existing_languages = self.get_existing_subtitle_language(media_filepath)
18511851
if self.language in existing_languages:
18521852
# THIS 'print' THINGS WILL MAKE progresbar screwed up!
1853-
#msg = (f"'{self.language}' subtitle stream already existed in {media_filepath}")
1853+
#msg = (f"'{self.language}' subtitle stream already existed in '{media_filepath}'")
18541854
#if self.error_messages_callback:
18551855
# self.error_messages_callback(msg)
18561856
#else:
@@ -1997,10 +1997,10 @@ def __call__(self, media_filepath):
19971997

19981998
if not os.path.isfile(media_filepath):
19991999
if self.error_messages_callback:
2000-
self.error_messages_callback(f"The given file does not exist: {media_filepath}")
2000+
self.error_messages_callback(f"The given file does not exist: '{media_filepath}'")
20012001
else:
2002-
print(f"The given file does not exist: {media_filepath}")
2003-
raise Exception(f"Invalid file: {media_filepath}")
2002+
print(f"The given file does not exist: '{media_filepath}'")
2003+
raise Exception(f"Invalid file: '{media_filepath}'")
20042004

20052005
if not self.ffprobe_check():
20062006
if self.error_messages_callback:
@@ -2216,10 +2216,10 @@ def ffprobe_check():
22162216

22172217
if not os.path.isfile(media_filepath):
22182218
if error_messages_callback:
2219-
error_messages_callback(f"The given file does not exist: {media_filepath}")
2219+
error_messages_callback(f"The given file does not exist: '{media_filepath}'")
22202220
else:
2221-
print(f"The given file does not exist: {media_filepath}")
2222-
raise Exception(f"Invalid file: {media_filepath}")
2221+
print(f"The given file does not exist: '{media_filepath}'")
2222+
raise Exception(f"Invalid file: '{media_filepath}'")
22232223
if not ffprobe_check():
22242224
if error_messages_callback:
22252225
error_messages_callback("Cannot find ffprobe executable")
@@ -2335,9 +2335,6 @@ def scroll_to_last_line(window, element):
23352335

23362336
def set_right_click_menu(element, enabled):
23372337
if enabled:
2338-
#print("element = {}".format(element))
2339-
#print("enabled = {}".format(enabled))
2340-
23412338
if isinstance(element, sg.Input):
23422339
widget = element.Widget
23432340
elif isinstance(element, sg.Multiline):
@@ -2379,67 +2376,54 @@ def is_streaming_url(url, error_messages_callback=None):
23792376
streamlink = Streamlink()
23802377

23812378
if is_valid_url(url):
2382-
#print("is_valid_url(url) = {}".format(is_valid_url(url)))
23832379
try:
23842380
os.environ['STREAMLINK_DIR'] = './streamlink/'
23852381
os.environ['STREAMLINK_PLUGINS'] = './streamlink/plugins/'
23862382
os.environ['STREAMLINK_PLUGIN_DIR'] = './streamlink/plugins/'
23872383

23882384
streams = streamlink.streams(url)
23892385
if streams:
2390-
#print("is_streams = {}".format(True))
23912386
return True
23922387
else:
2393-
#print("is_streams = {}".format(False))
23942388
return False
23952389

23962390
except OSError:
2397-
#print("is_streams = OSError")
23982391
if error_messages_callback:
23992392
error_messages_callback("OSError")
24002393
return False
24012394
except ValueError:
2402-
#print("is_streams = ValueError")
24032395
if error_messages_callback:
24042396
error_messages_callback("ValueError")
24052397
return False
24062398
except KeyError:
2407-
#print("is_streams = KeyError")
24082399
if error_messages_callback:
24092400
error_messages_callback("KeyError")
24102401
return False
24112402
except RuntimeError:
2412-
#print("is_streams = RuntimeError")
24132403
if error_messages_callback:
24142404
error_messages_callback("RuntimeError")
24152405
return False
24162406
except NoPluginError:
2417-
#print("is_streams = NoPluginError")
24182407
if error_messages_callback:
24192408
error_messages_callback("NoPluginError")
24202409
return False
24212410
except StreamlinkError:
24222411
return False
2423-
#print("is_streams = StreamlinkError")
24242412
if error_messages_callback:
24252413
error_messages_callback("StreamlinkError")
24262414
except StreamError:
24272415
return False
2428-
#print("is_streams = StreamlinkError")
24292416
if error_messages_callback:
24302417
error_messages_callback("StreamError")
24312418
except NotImplementedError:
2432-
#print("is_streams = NotImplementedError")
24332419
if error_messages_callback:
24342420
error_messages_callback("NotImplementedError")
24352421
return False
24362422
except Exception as e:
2437-
#print("is_streams = {}".format(e))
24382423
if error_messages_callback:
24392424
error_messages_callback(e)
24402425
return False
24412426
else:
2442-
#print("is_valid_url(url) = {}".format(is_valid_url(url)))
24432427
return False
24442428

24452429

@@ -2568,10 +2552,10 @@ def run_ffmpeg():
25682552

25692553
if i == 0:
25702554
ffmpeg_start_write_time = datetime.now()
2571-
#print("ffmpeg_start_write_time = {}".format(ffmpeg_start_write_time))
2555+
#print(f"ffmpeg_start_write_time = {ffmpeg_start_write_time}")
25722556

25732557
first_streaming_duration_recorded = datetime.strptime(str(time_value), "%H:%M:%S.%f") - datetime(1900, 1, 1)
2574-
#print("first_streaming_duration_recorded = {}".format(first_streaming_duration_recorded))
2558+
#print(f"first_streaming_duration_recorded = {first_streaming_duration_recorded}")
25752559

25762560
# MAKE SURE THAT first_streaming_duration_recorded EXECUTED ONLY ONCE
25772561
i += 1
@@ -2582,10 +2566,10 @@ def run_ffmpeg():
25822566
time_value_file = open(time_value_filepath, "w")
25832567
time_value_file.write(str(time_value))
25842568
time_value_file.close()
2585-
#print("time_value = {}".format(time_value))
2569+
#print(f"time_value = {time_value}")
25862570

25872571
streaming_duration_recorded = datetime.strptime(str(time_value), "%H:%M:%S.%f") - datetime(1900, 1, 1)
2588-
#print("streaming_duration_recorded = {}".format(streaming_duration_recorded))
2572+
#print(f"streaming_duration_recorded = {streaming_duration_recorded}")
25892573
main_window.write_event_value('-EVENT-STREAMING-DURATION-RECORDED-', streaming_duration_recorded)
25902574

25912575
# Restart the timer to check for new output
@@ -3050,10 +3034,15 @@ def transcribe(src, dst, media_filepath, media_type, subtitle_format, embed_src,
30503034

30513035
base, ext = os.path.splitext(media_filepath)
30523036

3053-
src_tmp_embedded_media_filepath = f"{base}.{ffmpeg_src_language_code}.tmp.embedded.{ext[1:]}"
3037+
if ext[1:] == "ts":
3038+
media_format = "mp4"
3039+
else:
3040+
media_format = ext[1:]
3041+
3042+
src_tmp_embedded_media_filepath = f"{base}.{ffmpeg_src_language_code}.tmp.embedded.{media_format}"
30543043
src_tmp_embedded_media_file_display_name = os.path.basename(src_tmp_embedded_media_filepath).split('/')[-1]
30553044

3056-
src_embedded_media_filepath = f"{base}.{ffmpeg_src_language_code}.embedded.{ext[1:]}"
3045+
src_embedded_media_filepath = f"{base}.{ffmpeg_src_language_code}.embedded.{media_format}"
30573046
src_embedded_media_file_display_name = os.path.basename(src_embedded_media_filepath).split('/')[-1]
30583047

30593048
window_key = '-PROGRESS-LOG-'
@@ -3238,10 +3227,15 @@ def transcribe(src, dst, media_filepath, media_type, subtitle_format, embed_src,
32383227

32393228
base, ext = os.path.splitext(media_filepath)
32403229

3241-
dst_tmp_embedded_media_filepath = f"{base}.{ffmpeg_dst_language_code}.tmp.embedded.{ext[1:]}"
3230+
if ext[1:] == "ts":
3231+
media_format = "mp4"
3232+
else:
3233+
media_format = ext[1:]
3234+
3235+
dst_tmp_embedded_media_filepath = f"{base}.{ffmpeg_dst_language_code}.tmp.embedded.{media_format}"
32423236
dst_tmp_embedded_media_file_display_name = os.path.basename(dst_tmp_embedded_media_filepath).split('/')[-1]
32433237

3244-
dst_embedded_media_filepath = f"{base}.{ffmpeg_dst_language_code}.embedded.{ext[1:]}"
3238+
dst_embedded_media_filepath = f"{base}.{ffmpeg_dst_language_code}.embedded.{media_format}"
32453239
dst_embedded_media_file_display_name = os.path.basename(dst_embedded_media_filepath).split('/')[-1]
32463240

32473241
window_key = '-PROGRESS-LOG-'
@@ -3722,22 +3716,27 @@ def transcribe(src, dst, media_filepath, media_type, subtitle_format, embed_src,
37223716

37233717
base, ext = os.path.splitext(media_filepath)
37243718

3725-
src_tmp_embedded_media_filepath = f"{base}.{ffmpeg_src_language_code}.tmp.embedded.{ext[1:]}"
3719+
if ext[1:] == "ts":
3720+
media_format = "mp4"
3721+
else:
3722+
media_format = ext[1:]
3723+
3724+
src_tmp_embedded_media_filepath = f"{base}.{ffmpeg_src_language_code}.tmp.embedded.{media_format}"
37263725
src_tmp_embedded_media_file_display_name = os.path.basename(src_tmp_embedded_media_filepath).split('/')[-1]
37273726

3728-
dst_tmp_embedded_media_filepath = f"{base}.{ffmpeg_dst_language_code}.tmp.embedded.{ext[1:]}"
3727+
dst_tmp_embedded_media_filepath = f"{base}.{ffmpeg_dst_language_code}.tmp.embedded.{media_format}"
37293728
dst_tmp_embedded_media_file_display_name = os.path.basename(dst_tmp_embedded_media_filepath).split('/')[-1]
37303729

3731-
src_dst_tmp_embedded_media_filepath = f"{base}.{ffmpeg_src_language_code}.{ffmpeg_dst_language_code}.tmp.embedded.{ext[1:]}"
3730+
src_dst_tmp_embedded_media_filepath = f"{base}.{ffmpeg_src_language_code}.{ffmpeg_dst_language_code}.tmp.embedded.{media_format}"
37323731
src_dst_tmp_embedded_media_file_display_name = os.path.basename(src_dst_tmp_embedded_media_filepath).split('/')[-1]
37333732

3734-
src_embedded_media_filepath = f"{base}.{ffmpeg_src_language_code}.embedded.{ext[1:]}"
3733+
src_embedded_media_filepath = f"{base}.{ffmpeg_src_language_code}.embedded.{media_format}"
37353734
src_embedded_media_file_display_name = os.path.basename(src_embedded_media_filepath).split('/')[-1]
37363735

3737-
dst_embedded_media_filepath = f"{base}.{ffmpeg_dst_language_code}.embedded.{ext[1:]}"
3736+
dst_embedded_media_filepath = f"{base}.{ffmpeg_dst_language_code}.embedded.{media_format}"
37383737
dst_embedded_media_file_display_name = os.path.basename(dst_embedded_media_filepath).split('/')[-1]
37393738

3740-
src_dst_embedded_media_filepath = f"{base}.{ffmpeg_src_language_code}.{ffmpeg_dst_language_code}.embedded.{ext[1:]}"
3739+
src_dst_embedded_media_filepath = f"{base}.{ffmpeg_src_language_code}.{ffmpeg_dst_language_code}.embedded.{media_format}"
37413740
src_dst_embedded_media_file_display_name = os.path.basename(src_dst_embedded_media_filepath).split('/')[-1]
37423741

37433742

@@ -4140,7 +4139,7 @@ def main():
41404139
if args.list_formats:
41414140
print("Supported subtitle formats :")
41424141
for subtitle_format in SubtitleFormatter.supported_formats:
4143-
print("{format}".format(format=subtitle_format))
4142+
print(f"{subtitle_format}")
41444143
parser.exit(0)
41454144

41464145
if args.list_languages:
@@ -4829,11 +4828,11 @@ def main():
48294828

48304829
else:
48314830
if sys.platform == "win32":
4832-
#print("thread_record_streaming.is_alive() = {}".format(thread_record_streaming.is_alive()))
4831+
#print(f"thread_record_streaming.is_alive() = {thread_record_streaming.is_alive()}")
48334832
stop_record_streaming_windows()
48344833

48354834
elif sys.platform == "linux":
4836-
#print("thread_record_streaming.is_alive() = {}".format(thread_record_streaming.is_alive()))
4835+
#print(f"thread_record_streaming.is_alive() = {thread_record_streaming.is_alive()}")
48374836
stop_record_streaming_linux()
48384837

48394838

@@ -4855,8 +4854,8 @@ def main():
48554854
sg.Popup(msg, title="Info", line_width=50, any_key_closes=True)
48564855

48574856

4858-
#print("event = {}".format(event))
4859-
#print("values = {}".format(values))
4857+
#print(f"event = {event}")
4858+
#print(f"values = {values}")
48604859

48614860
if thread_transcribe and thread_transcribe.is_alive():
48624861
stop_thread(thread_transcribe)

0 commit comments

Comments
 (0)