Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-27 22:42:38 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #629 from ivandrofly/refact/patch-2

Browse Source 
Refact | Optimization
This commit is contained in:
Nikolaj Olsson 2015-03-09 20:52:59 +01:00
commit c71bd0e38b
5 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Forms/Main.cs
View File

@ -14561,7 +14561,7 @@ namespace Nikse.SubtitleEdit.Forms
if (files.Length == 1)
{
string fileName = files[0];
string ext = Path.GetExtension(fileName).ToLower();
string ext = Path.GetExtension(fileName).ToLowerInvariant();
if (Utilities.GetVideoFileFilter(true).Contains(ext))
{
if (string.IsNullOrEmpty(_fileName))
@ -19290,4 +19290,4 @@ namespace Nikse.SubtitleEdit.Forms
}
}
}
}

8
src/Forms/Styles/SubStationAlphaStyles.cs
View File

@ -135,7 +135,6 @@ namespace Nikse.SubtitleEdit.Forms.Styles
using (Graphics g = Graphics.FromImage(bmp))
{
// Draw background
const int rectangleSize = 9;
for (int y = 0; y < bmp.Height; y += rectangleSize)
@ -326,7 +325,7 @@ namespace Nikse.SubtitleEdit.Forms.Styles
foreach (var line in _header.Split(Utilities.NewLineChars, StringSplitOptions.None))
{
string s = line.Trim().ToLower();
if (s.StartsWith("format:"))
if (s.StartsWith("format:", StringComparison.Ordinal))
{
if (line.Length > 10)
{
@ -342,7 +341,7 @@ namespace Nikse.SubtitleEdit.Forms.Styles
}
sb.AppendLine(line);
}
else if (s.Replace(" ", string.Empty).StartsWith("style:"))
else if (s.Replace(" ", string.Empty).StartsWith("style:", StringComparison.Ordinal))
{
if (line.Length > 10)
{
@ -402,9 +401,8 @@ namespace Nikse.SubtitleEdit.Forms.Styles
format = new AdvancedSubStationAlpha();
var sub = new Subtitle();
string text = format.ToText(sub, string.Empty);
string[] lineArray = text.Replace(Environment.NewLine, "\n").Split('\n');
var lines = new List<string>();
foreach (string line in lineArray)
foreach (string line in text.SplitToLines())
lines.Add(line);
format.LoadSubtitle(sub, lines, string.Empty);
_header = sub.Header;

3
src/Logic/NoBreakAfterItem.cs
View File

@ -28,7 +28,6 @@ namespace Nikse.SubtitleEdit.Logic
return true;
return false;
}
public override string ToString()
@ -54,4 +53,4 @@ namespace Nikse.SubtitleEdit.Logic
return string.Compare(this.Text, o.Text, StringComparison.Ordinal);
}
}
}
}

2
src/Logic/Paragraph.cs
View File

@ -144,7 +144,7 @@ namespace Nikse.SubtitleEdit.Logic
{
if (string.IsNullOrEmpty(Text))
return 0;
int wordCount = HtmlUtil.RemoveHtmlTags(Text).Split((" ,.!?;:()[]" + Environment.NewLine).ToCharArray(), StringSplitOptions.RemoveEmptyEntries).Length;
int wordCount = HtmlUtil.RemoveHtmlTags(Text, true).Split(new[] { ' ', ',', '.', '!', '?', ';', ':', '(', ')', '[', ']', '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries).Length;
return (60.0 / Duration.TotalSeconds) * wordCount;
}
}

2
src/Logic/Utilities.cs
View File

@ -3451,7 +3451,7 @@ namespace Nikse.SubtitleEdit.Logic
lines.Add(cp.Text);
}
foreach (string l in footer.ToString().Replace(Environment.NewLine, "\n").Split('\n'))
foreach (string l in footer.ToString().SplitToLines())
lines.Add(l);
format.LoadSubtitle(subtitle, lines, fileName);