iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #21 from dwbuiten/srtgoto2 

srt: Factor out last goto
This commit is contained in:
Thomas Goyne 2014-11-08 07:59:46 -08:00
parent 3d228536f5 c871aaf153
commit ea9ee7effa
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/subtitle_format_srt.cpp
View File

@ -329,6 +329,7 @@ void SRTSubtitleFormat::ReadFile(AssFile *target, agi::fs::path const& filename,
boost::trim(text_line); boost::trim(text_line);
boost::smatch timestamp_match; boost::smatch timestamp_match;
bool found_timestamps = false;
switch (state) { switch (state) {
case ParseState::INITIAL: case ParseState::INITIAL:
// ignore leading blank lines // ignore leading blank lines
@ -338,29 +339,18 @@ void SRTSubtitleFormat::ReadFile(AssFile *target, agi::fs::path const& filename,
state = ParseState::TIMESTAMP; state = ParseState::TIMESTAMP;
break; break;
} }
if (regex_search(text_line, timestamp_match, timestamp_regex)) if (regex_search(text_line, timestamp_match, timestamp_regex)) {
goto found_timestamps; found_timestamps = true;
break;
}
throw SRTParseError(agi::format("Parsing SRT: Expected subtitle index at line %d", line_num)); throw SRTParseError(agi::format("Parsing SRT: Expected subtitle index at line %d", line_num));
case ParseState::TIMESTAMP: case ParseState::TIMESTAMP:
if (!regex_search(text_line, timestamp_match, timestamp_regex)) if (!regex_search(text_line, timestamp_match, timestamp_regex))
throw SRTParseError(agi::format("Parsing SRT: Expected timestamp pair at line %d", line_num)); throw SRTParseError(agi::format("Parsing SRT: Expected timestamp pair at line %d", line_num));
found_timestamps:
if (line) {
// finalize active line
line->Text = tag_parser.ToAss(text);
text.clear();
}
// create new subtitle found_timestamps = true;
line = new AssDialogue;
line->Start = timestamp_match.str(1);
line->End = timestamp_match.str(2);
// store pointer to subtitle, we'll continue working on it
target->Events.push_back(*line);
// next we're reading the text
state = ParseState::FIRST_LINE_OF_BODY;
break; break;
case ParseState::FIRST_LINE_OF_BODY: case ParseState::FIRST_LINE_OF_BODY:
@ -397,8 +387,10 @@ found_timestamps:
state = ParseState::TIMESTAMP; state = ParseState::TIMESTAMP;
break; break;
} }
if (regex_search(text_line, timestamp_match, timestamp_regex)) if (regex_search(text_line, timestamp_match, timestamp_regex)) {
goto found_timestamps; found_timestamps = true;
break;
}
// assume it's a continuation of the subtitle text // assume it's a continuation of the subtitle text
// resolve our line break debt and append the line text // resolve our line break debt and append the line text
@ -408,6 +400,22 @@ found_timestamps:
state = ParseState::REST_OF_BODY; state = ParseState::REST_OF_BODY;
break; break;
} }
if (found_timestamps) {
if (line) {
// finalize active line
line->Text = tag_parser.ToAss(text);
text.clear();
}
// create new subtitle
line = new AssDialogue;
line->Start = timestamp_match.str(1);
line->End = timestamp_match.str(2);
// store pointer to subtitle, we'll continue working on it
target->Events.push_back(*line);
// next we're reading the text
state = ParseState::FIRST_LINE_OF_BODY;
}
} }
if (state == ParseState::TIMESTAMP || state == ParseState::FIRST_LINE_OF_BODY) if (state == ParseState::TIMESTAMP || state == ParseState::FIRST_LINE_OF_BODY)