Dymas/abogen
1
0
Fork 0
mirror of https://github.com/denizsafak/abogen.git synced 2026-07-18 13:40:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: replace _srt_time/_ass_time with _format_timestamp from infrastructure/subtitle_writer.py

Browse Source 
- Remove _srt_time() and _ass_time() methods from ConversionThread
- Use _format_timestamp() from infrastructure/subtitle_writer.py instead
- Supports both SRT (ass=False) and ASS (ass=True) formats
- All existing tests pass
This commit is contained in:
Artem Akymenko
2026-07-14 10:14:58 +00:00
parent 1499a3b426
commit 39eac9b032
1 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
abogen/pyqt/conversion.py
+9 -24
View File
@@ -21,6 +21,7 @@ from abogen.constants import (
SUPPORTED_SUBTITLE_FORMATS, SUPPORTED_SUBTITLE_FORMATS,
) )
from abogen.voice_formulas import get_new_voice from abogen.voice_formulas import get_new_voice
from abogen.infrastructure.subtitle_writer import _format_timestamp
from abogen.domain.split_pattern import get_split_pattern from abogen.domain.split_pattern import get_split_pattern
import abogen.hf_tracker as hf_tracker import abogen.hf_tracker as hf_tracker
import static_ffmpeg import static_ffmpeg
@@ -1220,8 +1221,8 @@ class ConversionThread(QThread):
) )
if "ass" in subtitle_format: if "ass" in subtitle_format:
for start, end, text in new_entries: for start, end, text in new_entries:
start_time = self._ass_time(start) start_time = _format_timestamp(start, ass=True)
end_time = self._ass_time(end) end_time = _format_timestamp(end, ass=True)
# Use karaoke effect for highlighting mode # Use karaoke effect for highlighting mode
effect = ( effect = (
"karaoke" "karaoke"
@@ -1236,7 +1237,7 @@ class ConversionThread(QThread):
for entry in new_entries: for entry in new_entries:
start, end, text = entry start, end, text = entry
merged_subtitle_file.write( merged_subtitle_file.write(
f"{merged_srt_index}\n{self._srt_time(start)} --> {self._srt_time(end)}\n{text}\n\n" f"{merged_srt_index}\n{_format_timestamp(start)} --> {_format_timestamp(end)}\n{text}\n\n"
) )
merged_srt_index += 1 merged_srt_index += 1
# Per-chapter subtitle processing for both file and ffmpeg_proc # Per-chapter subtitle processing for both file and ffmpeg_proc
@@ -1254,8 +1255,8 @@ class ConversionThread(QThread):
) )
if "ass" in subtitle_format: if "ass" in subtitle_format:
for start, end, text in new_chapter_entries: for start, end, text in new_chapter_entries:
start_time = self._ass_time(start) start_time = _format_timestamp(start, ass=True)
end_time = self._ass_time(end) end_time = _format_timestamp(end, ass=True)
# Use karaoke effect for highlighting mode # Use karaoke effect for highlighting mode
effect = ( effect = (
"karaoke" "karaoke"
@@ -1270,7 +1271,7 @@ class ConversionThread(QThread):
for entry in new_chapter_entries: for entry in new_chapter_entries:
start, end, text = entry start, end, text = entry
chapter_subtitle_file.write( chapter_subtitle_file.write(
f"{chapter_srt_index}\n{self._srt_time(start)} --> {self._srt_time(end)}\n{text}\n\n" f"{chapter_srt_index}\n{_format_timestamp(start)} --> {_format_timestamp(end)}\n{text}\n\n"
) )
chapter_srt_index += 1 chapter_srt_index += 1
if merge_chapters_at_end: if merge_chapters_at_end:
@@ -1900,11 +1901,11 @@ class ConversionThread(QThread):
else processed_text.replace("\n", "\\N") else processed_text.replace("\n", "\\N")
) )
subtitle_file.write( subtitle_file.write(
f"Dialogue: 0,{self._ass_time(start_time)},{self._ass_time(end_time)},Default,,{margin},{margin},0,{effect},{alignment}{ass_text}\n" f"Dialogue: 0,{_format_timestamp(start_time, ass=True)},{_format_timestamp(end_time, ass=True)},Default,,{margin},{margin},0,{effect},{alignment}{ass_text}\n"
) )
else: else:
subtitle_file.write( subtitle_file.write(
f"{srt_index}\n{self._srt_time(start_time)} --> {self._srt_time(end_time)}\n{processed_text}\n\n" f"{srt_index}\n{_format_timestamp(start_time)} --> {_format_timestamp(end_time)}\n{processed_text}\n\n"
) )
srt_index += 1 srt_index += 1
@@ -2066,22 +2067,6 @@ class ConversionThread(QThread):
# Add these to ffmpeg command # Add these to ffmpeg command
return metadata_options, cover_path return metadata_options, cover_path
def _srt_time(self, t):
"""Helper function to format time for SRT files"""
h = int(t // 3600)
m = int((t % 3600) // 60)
s = int(t % 60)
ms = int((t - int(t)) * 1000)
return f"{h:02d}:{m:02d}:{s:02d},{ms:03d}"
def _ass_time(self, t):
"""Helper function to format time for ASS files"""
h = int(t // 3600)
m = int((t % 3600) // 60)
s = int(t % 60)
cs = int((t - int(t)) * 100) # Centiseconds for ASS format
return f"{h:01d}:{m:02d}:{s:02d}.{cs:02d}"
def _process_subtitle_tokens( def _process_subtitle_tokens(
self, self,
tokens_with_timestamps, tokens_with_timestamps,