Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-26 05:02:36 +01:00
Code Issues Projects Releases Wiki Activity

Allow Timed Text 2006/04 without end/dur - thx thehulk :)

Browse Source
This commit is contained in:
Nikolaj Olsson 2021-06-02 07:19:03 +02:00
parent 9166cb569b
commit bb7cfa3500
1 changed files with 61 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
src/libse/SubtitleFormats/TimedText200604.cs
View File

@ -3,6 +3,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using System.Xml; using System.Xml;
using Nikse.SubtitleEdit.Core.Forms.FixCommonErrors;
namespace Nikse.SubtitleEdit.Core.SubtitleFormats namespace Nikse.SubtitleEdit.Core.SubtitleFormats
{ {
@ -18,7 +19,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
{ {
var sb = new StringBuilder(); var sb = new StringBuilder();
lines.ForEach(line => sb.AppendLine(line)); lines.ForEach(line => sb.AppendLine(line));
string xmlAsString = sb.ToString().Replace("http://www.w3.org/2006/04/ttaf1#styling\"xml:lang", "http://www.w3.org/2006/04/ttaf1#styling\" xml:lang").Trim(); var xmlAsString = sb.ToString().Replace("http://www.w3.org/2006/04/ttaf1#styling\"xml:lang", "http://www.w3.org/2006/04/ttaf1#styling\" xml:lang").Trim();
if (xmlAsString.Contains("http://www.w3.org/2006/10")) if (xmlAsString.Contains("http://www.w3.org/2006/10"))
{ {
@ -30,43 +31,43 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
return false; return false;
} }
if (xmlAsString.Contains("http://www.w3.org/") && if (!xmlAsString.Contains("http://www.w3.org/") || !xmlAsString.Contains("/ttaf1"))
xmlAsString.Contains("/ttaf1"))
{ {
var xml = new XmlDocument { XmlResolver = null }; return false;
try }
{
xml.LoadXml(xmlAsString.RemoveControlCharactersButWhiteSpace()); var xml = new XmlDocument { XmlResolver = null };
try
var nsmgr = new XmlNamespaceManager(xml.NameTable); {
nsmgr.AddNamespace("ttaf1", xml.DocumentElement.NamespaceURI); xml.LoadXml(xmlAsString.RemoveControlCharactersButWhiteSpace());
XmlNode div; var nsmgr = new XmlNamespaceManager(xml.NameTable);
var body = xml.DocumentElement.SelectSingleNode("//ttaf1:body", nsmgr); nsmgr.AddNamespace("ttaf1", xml.DocumentElement.NamespaceURI);
if (body == null)
{ XmlNode div;
div = xml.DocumentElement; var body = xml.DocumentElement.SelectSingleNode("//ttaf1:body", nsmgr);
} if (body == null)
else {
{ div = xml.DocumentElement;
div = xml.DocumentElement.SelectSingleNode("//ttaf1:body", nsmgr).SelectSingleNode("ttaf1:div", nsmgr); }
} else
{
if (div == null) div = xml.DocumentElement.SelectSingleNode("//ttaf1:body", nsmgr).SelectSingleNode("ttaf1:div", nsmgr);
{ }
div = xml.DocumentElement.SelectSingleNode("//ttaf1:body", nsmgr).FirstChild;
} if (div == null)
{
int numberOfParagraphs = div.ChildNodes.Count; div = xml.DocumentElement.SelectSingleNode("//ttaf1:body", nsmgr).FirstChild;
return numberOfParagraphs > 0; }
}
catch (Exception ex) var numberOfParagraphs = div.ChildNodes.Count;
{ return numberOfParagraphs > 0;
System.Diagnostics.Debug.WriteLine(ex.Message); }
return false; catch (Exception ex)
} {
System.Diagnostics.Debug.WriteLine(ex.Message);
return false;
} }
return false;
} }
private static string ConvertToTimeString(TimeCode time) private static string ConvertToTimeString(TimeCode time)
@ -76,7 +77,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
public override string ToText(Subtitle subtitle, string title) public override string ToText(Subtitle subtitle, string title)
{ {
string xmlStructure = var xmlStructure =
"<?xml version=\"1.0\" encoding=\"utf-8\" ?>" + Environment.NewLine + "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" + Environment.NewLine +
"<tt xmlns=\"http://www.w3.org/2006/04/ttaf1\" xmlns:tts=\"http://www.w3.org/2006/04/ttaf1#styling\">" + Environment.NewLine + "<tt xmlns=\"http://www.w3.org/2006/04/ttaf1\" xmlns:tts=\"http://www.w3.org/2006/04/ttaf1#styling\">" + Environment.NewLine +
" <head>" + Environment.NewLine + " <head>" + Environment.NewLine +
@ -161,7 +162,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
var nsmgr = new XmlNamespaceManager(xml.NameTable); var nsmgr = new XmlNamespaceManager(xml.NameTable);
nsmgr.AddNamespace("ttaf1", xml.DocumentElement.NamespaceURI); nsmgr.AddNamespace("ttaf1", xml.DocumentElement.NamespaceURI);
var fixOverlap = false;
foreach (XmlNode node in xml.DocumentElement.SelectNodes("//ttaf1:p", nsmgr)) foreach (XmlNode node in xml.DocumentElement.SelectNodes("//ttaf1:p", nsmgr))
{ {
try try
@ -214,22 +215,29 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
break; break;
} }
} }
string start = node.Attributes["begin"].InnerText; var start = node.Attributes["begin"].InnerText;
string text = pText.ToString(); var text = pText.ToString();
text = text.Replace(Environment.NewLine + "</i>", "</i>" + Environment.NewLine); text = text.Replace(Environment.NewLine + "</i>", "</i>" + Environment.NewLine);
text = text.Replace("<i></i>", string.Empty); text = text.Replace("<i></i>", string.Empty);
if (node.Attributes["end"] != null) if (node.Attributes["end"] != null)
{ {
string end = node.Attributes["end"].InnerText; var end = node.Attributes["end"].InnerText;
subtitle.Paragraphs.Add(new Paragraph(TimedText10.GetTimeCode(start, false), TimedText10.GetTimeCode(end, false), text)); subtitle.Paragraphs.Add(new Paragraph(TimedText10.GetTimeCode(start, false), TimedText10.GetTimeCode(end, false), text));
} }
else if (node.Attributes["dur"] != null) else if (node.Attributes["dur"] != null)
{ {
TimeCode duration = TimedText10.GetTimeCode(node.Attributes["dur"].InnerText, false); var duration = TimedText10.GetTimeCode(node.Attributes["dur"].InnerText, false);
TimeCode startTime = TimedText10.GetTimeCode(start, false); var startTime = TimedText10.GetTimeCode(start, false);
var endTime = new TimeCode(startTime.TotalMilliseconds + duration.TotalMilliseconds); var endTime = new TimeCode(startTime.TotalMilliseconds + duration.TotalMilliseconds);
subtitle.Paragraphs.Add(new Paragraph(startTime, endTime, text)); subtitle.Paragraphs.Add(new Paragraph(startTime, endTime, text));
} }
else
{
var startTimeCode = TimedText10.GetTimeCode(start, false);
var endTimeCode = new TimeCode(startTimeCode.TotalMilliseconds + Utilities.GetOptimalDisplayMilliseconds(text));
subtitle.Paragraphs.Add(new Paragraph(startTimeCode, endTimeCode, text));
fixOverlap = true;
}
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -237,8 +245,9 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
_errorCount++; _errorCount++;
} }
} }
bool allBelow100 = true;
foreach (Paragraph p in subtitle.Paragraphs) var allBelow100 = true;
foreach (var p in subtitle.Paragraphs)
{ {
p.Text = Utilities.RemoveUnneededSpaces(p.Text, null).Replace(Environment.NewLine + Environment.NewLine, Environment.NewLine); p.Text = Utilities.RemoveUnneededSpaces(p.Text, null).Replace(Environment.NewLine + Environment.NewLine, Environment.NewLine);
if (p.StartTime.Milliseconds >= 100 || p.EndTime.Milliseconds >= 100) if (p.StartTime.Milliseconds >= 100 || p.EndTime.Milliseconds >= 100)
@ -248,14 +257,19 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
} }
if (allBelow100) if (allBelow100)
{ {
foreach (Paragraph p in subtitle.Paragraphs) foreach (var p in subtitle.Paragraphs)
{ {
p.StartTime.Milliseconds *= 10; p.StartTime.Milliseconds *= 10;
p.EndTime.Milliseconds *= 10; p.EndTime.Milliseconds *= 10;
} }
} }
if (fixOverlap)
{
new FixOverlappingDisplayTimes().Fix(subtitle, new EmptyFixCallback());
}
subtitle.Renumber(); subtitle.Renumber();
} }
} }
} }