Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DevBase.Format/DevBase.Format.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Copyright>AlexanderDotH</Copyright>
<PackageProjectUrl>https://github.com/AlexanderDotH/DevBase.git</PackageProjectUrl>
<RepositoryUrl>https://github.com/AlexanderDotH/DevBase.git</RepositoryUrl>
<Version>1.7.3</Version>
<Version>1.7.4</Version>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
Expand Down
17 changes: 8 additions & 9 deletions DevBase.Format/Formats/ElrcFormat/ElrcParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public override bool TryRevert(AList<RichTimeStampedLyric> to, out string from)

private RichTimeStampedLyric ProcessBlock(AList<string> block)
{
string first = block.Get(0);
string first = block.Get(0).TrimStart();

if (!first.StartsWith("["))
return Error<object>("Invalid block at block position 0");
Expand All @@ -149,7 +149,7 @@ private RichTimeStampedLyric ProcessBlock(AList<string> block)
for (int i = 0; i < entries.Length; i++)
{
// A bit unclean but I'm too lazy for now
string bodyElement = entries.Get(i).Replace(this._indent, string.Empty);
string bodyElement = entries.Get(i).TrimStart();
head.Words.Add(ParseElement(bodyElement));
}

Expand All @@ -162,20 +162,19 @@ private AList<AList<string>> FindBlocks(AList<string> lines)

for (int i = 0; i < lines.Length; i++)
{
string current = lines.Get(i);
string current = lines.Get(i).TrimStart();
string next = string.Empty;

if (i + 1 < lines.Length)
next = lines.Get(i + 1);
next = lines.Get(i + 1).Trim();

if (current[0] == '[' &&
next.Length != 0 && next[0] == '[')
if (RegexHolder.RegexElrc.IsMatch(current) && next == "[")
{
for (int j = i + 1; j < lines.Length; j++)
{
string cSeek = lines.Get(j);
string cSeek = lines.Get(j).Trim();

if (cSeek[0] == ']')
if (cSeek == "]")
{
blocks.AddRange(lines.GetRangeAsAList(i, j));
break;
Expand Down Expand Up @@ -238,4 +237,4 @@ private RichTimeStampedWord ParseElement(string bodyElement)
Word = hWord
};
}
}
}
2 changes: 2 additions & 0 deletions DevBase.Format/Formats/EnvFormat/EnvParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ public override ATupleList<string, string> Parse(string from)

lines.ForEach(s =>
{
s = s.Trim();

if (s.Contains("="))
{
if (RegexHolder.RegexEnv.IsMatch(s))
Expand Down
6 changes: 3 additions & 3 deletions DevBase.Format/Formats/KLyricsFormat/KLyricsParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public override AList<RichTimeStampedLyric> Parse(string from)
AList<string> parsableLines = lines.GetRangeAsAList(firstLine, lines.Length - 1);

for (int i = 0; i < parsableLines.Length; i++)
richTimeStampedLyrics.Add(ParseSingleLine(parsableLines.Get(i)));
richTimeStampedLyrics.Add(ParseSingleLine(parsableLines.Get(i).Trim()));

return richTimeStampedLyrics;
}
Expand Down Expand Up @@ -61,7 +61,7 @@ private int FindFirstLine(AList<string> lines)
{
for (int i = 0; i < lines.Length; i++)
{
if (RegexHolder.RegexKlyricsWord.IsMatch(lines.Get(i)))
if (RegexHolder.RegexKlyricsWord.IsMatch(lines.Get(i).Trim()))
return i;
}

Expand Down Expand Up @@ -141,4 +141,4 @@ private TimeSpan GetTimeSpan(Match match, int group)
double data = Convert.ToDouble(rawData);
return TimeSpan.FromMilliseconds(data);
}
}
}
19 changes: 11 additions & 8 deletions DevBase.Format/Formats/LrcFormat/LrcParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ public override AList<TimeStampedLyric> Parse(string from)

for (int i = 0; i < linesAList.Length; i++)
{
string lineInList = linesAList.Get(i);
string lineInList = linesAList.Get(i).TrimStart();

TimeStampedLyric? lyricElement = ParseStringToLyrics(lineInList);

if (lyricElement != null)
{
lyricElements.Add(lyricElement);
}
if (lyricElement == null)
continue;

lyricElements.Add(lyricElement);
}

return lyricElements;
Expand All @@ -49,7 +49,7 @@ public override AList<TimeStampedLyric> Parse(string from)
public override bool TryParse(string from, out AList<TimeStampedLyric> parsed)
{
AList<TimeStampedLyric> p = Parse(from);

if (p == null || p.IsEmpty())
{
parsed = null;
Expand Down Expand Up @@ -103,12 +103,15 @@ public override bool TryRevert(AList<TimeStampedLyric> to, out string from)
if (lyricLine == null)
return null;

if (string.IsNullOrEmpty(lyricLine))
return null;

if (RegexHolder.RegexGarbage.IsMatch(lyricLine))
return null;

if (!RegexHolder.RegexLrc.IsMatch(lyricLine))
return Error<object>("LRC regex does not match");

Match match = RegexHolder.RegexLrc.Match(lyricLine);

string rawLine = match.Groups[9].Value;
Expand Down
4 changes: 2 additions & 2 deletions DevBase.Format/Formats/RlrcFormat/RlrcParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public override AList<RawLyric> Parse(string from)

for (int i = 0; i < lines.Length; i++)
{
string line = lines.Get(i);
string line = lines.Get(i).Trim();

RawLyric rawLyric = new RawLyric()
{
Expand Down Expand Up @@ -99,4 +99,4 @@ public override bool TryRevert(AList<RawLyric> to, out string from)
from = r;
return true;
}
}
}
16 changes: 10 additions & 6 deletions DevBase.Format/Formats/SrtFormat/SrtParser.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Text.RegularExpressions;
using System.Globalization;
using System.Text.RegularExpressions;
using DevBase.Format.Structure;
using DevBase.Generics;
using DevBase.IO;
Expand Down Expand Up @@ -30,16 +31,16 @@ public override AList<RichTimeStampedLyric> Parse(string from)

if (currentList.Length == 4)
{
Match match = RegexHolder.RegexSrtTimeStamps.Match(currentList.Get(1));
Match match = RegexHolder.RegexSrtTimeStamps.Match(currentList.Get(1).Trim());

TimeSpan startTime = TimeSpan.Parse(match.Groups[1].Value);
TimeSpan endTime = TimeSpan.Parse(match.Groups[4].Value);
TimeSpan startTime = ParseTimestamp(match.Groups[1].Value);
TimeSpan endTime = ParseTimestamp(match.Groups[4].Value);

RichTimeStampedLyric timeStampedLyric = new RichTimeStampedLyric()
{
StartTime = startTime,
EndTime = endTime,
Text = currentList.Get(2)
Text = currentList.Get(2).Trim()
};

richTimeStampedLyrics.Add(timeStampedLyric);
Expand All @@ -49,6 +50,9 @@ public override AList<RichTimeStampedLyric> Parse(string from)
return richTimeStampedLyrics;
}

private static TimeSpan ParseTimestamp(string timestamp) =>
TimeSpan.ParseExact(timestamp, @"hh\:mm\:ss\,fff", CultureInfo.InvariantCulture);

/// <summary>
/// Attempts to parse the SRT string content.
/// </summary>
Expand All @@ -68,4 +72,4 @@ public override bool TryParse(string from, out AList<RichTimeStampedLyric> parse
parsed = p;
return true;
}
}
}
Loading
Loading