mirror/FileFlowsPlugins
1
0
Fork 0
mirror of https://github.com/revenz/FileFlowsPlugins.git synced 2025-12-31 04:04:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

added taglib-sharp to music nodes for better metadata than ffmpeg

Browse Source
This commit is contained in:
reven
2022-02-01 17:24:25 +13:00
parent b873952ab7
commit 112177efb8
4 changed files with 81 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
BasicNodes/File/Renamer.cs
View File

@@ -62,12 +62,21 @@
newFile = Regex.Replace(newFile, @"\s(\.[\w\d]+)$", "$1");
newFile = newFile.Replace(" \\", "\\");
string destFolder = args.ReplaceVariables(DestinationPath ?? string.Empty, stripMissing: true, cleanSpecialCharacters: true);
if (string.IsNullOrEmpty(destFolder))
destFolder = new FileInfo(args.WorkingFile).Directory?.FullName ?? "";
var dest = args.GetSafeName(Path.Combine(destFolder, newFile));
if (string.IsNullOrEmpty(dest.Extension) == false)
{
// just ensures extensions are lowercased
dest = new FileInfo(dest.FullName.Substring(0, dest.FullName.LastIndexOf(dest.Extension)) + dest.Extension.ToLower());
}
args.Logger?.ILog("Renaming file to: " + dest.FullName);
if (string.IsNullOrEmpty(CsvFile) == false)

77
MusicNodes/MusicInfoHelper.cs
View File

@@ -31,6 +31,8 @@ namespace FileFlows.MusicNodes
return mi;
}
mi = ReadMetaData(filename);
try
{
using (var process = new Process())
@@ -90,9 +92,12 @@ namespace FileFlows.MusicNodes
mi.Language = line.Substring(colonIndex + 1).Trim();
else if (lowLine.StartsWith("track") && lowLine.Contains("total") == false)
{
var trackMatch = Regex.Match(line.Substring(colonIndex + 1).Trim(), @"^[\d]+");
if (trackMatch.Success && int.TryParse(trackMatch.Value, out int value))
mi.Track = value;
if (mi.Track < 1)
{
var trackMatch = Regex.Match(line.Substring(colonIndex + 1).Trim(), @"^[\d]+");
if (trackMatch.Success && int.TryParse(trackMatch.Value, out int value))
mi.Track = value;
}
}
else if (lowLine.StartsWith("artist") || lowLine.StartsWith("album_artist"))
{
@@ -101,11 +106,14 @@ namespace FileFlows.MusicNodes
}
else if (lowLine.StartsWith("title") && lowLine.Contains(".jpg") == false)
{
if(string.IsNullOrWhiteSpace(mi.Title))
if (string.IsNullOrWhiteSpace(mi.Title))
mi.Title = line.Substring(colonIndex + 1).Trim();
}
else if (lowLine.StartsWith("album"))
mi.Album = line.Substring(colonIndex + 1).Trim();
{
if (string.IsNullOrWhiteSpace(mi.Album))
mi.Album = line.Substring(colonIndex + 1).Trim();
}
else if (lowLine.StartsWith("disc"))
{
if (int.TryParse(line.Substring(colonIndex + 1).Trim(), out int value))
@@ -116,28 +124,34 @@ namespace FileFlows.MusicNodes
if (int.TryParse(line.Substring(colonIndex + 1).Trim(), out int value))
mi.TotalDiscs = value;
}
else if (lowLine.StartsWith("date") && mi.Date < new DateTime(1900, 1, 1))
else if (lowLine.StartsWith("date") || lowLine.StartsWith("retail date") || lowLine.StartsWith("retaildate") || lowLine.StartsWith("originaldate") || lowLine.StartsWith("original date"))
{
if (int.TryParse(line.Substring(colonIndex + 1).Trim(), out int value))
mi.Date = new DateTime(value, 1, 1);
}
else if (lowLine.StartsWith("retail date"))
{
if (DateTime.TryParse(line.Substring(colonIndex + 1).Trim(), out DateTime value))
mi.Date = value;
{
if(mi.Date < new DateTime(1900, 1, 1))
mi.Date = new DateTime(value, 1, 1);
}
else if(DateTime.TryParse(line.Substring(colonIndex + 1).Trim(), out DateTime dtValue) && dtValue.Year > 1900)
mi.Date = dtValue;
}
else if (lowLine.StartsWith("genre"))
mi.Genres = line.Substring(colonIndex + 1).Trim().Split(' ');
{
if(mi.Genres?.Any() != true)
mi.Genres = line.Substring(colonIndex + 1).Trim().Split(' ');
}
else if (lowLine.StartsWith("encoder"))
mi.Encoder = line.Substring(colonIndex + 1).Trim();
else if (lowLine.StartsWith("duration"))
{
string temp = line.Substring(colonIndex + 1).Trim();
if (temp.IndexOf(",") > 0)
if (mi.Duration < 1)
{
temp = temp.Substring(0, temp.IndexOf(","));
if (TimeSpan.TryParse(temp, out TimeSpan value))
mi.Duration = (long)value.TotalSeconds;
string temp = line.Substring(colonIndex + 1).Trim();
if (temp.IndexOf(",") > 0)
{
temp = temp.Substring(0, temp.IndexOf(","));
if (TimeSpan.TryParse(temp, out TimeSpan value))
mi.Duration = (long)value.TotalSeconds;
}
}
}
@@ -174,5 +188,32 @@ namespace FileFlows.MusicNodes
return mi;
}
public MusicInfo ReadMetaData(string file)
{
using var tfile = TagLib.File.Create(file);
MusicInfo info = new MusicInfo();
try
{
info.Title = tfile.Tag.Title;
info.Duration = (long)tfile.Properties.Duration.TotalSeconds;
info.TotalDiscs = Convert.ToInt32(tfile.Tag.DiscCount);
if (info.TotalDiscs < 1)
info.TotalDiscs = 1;
info.Disc = Convert.ToInt32(tfile.Tag.Disc);
if (info.Disc < 1)
info.Disc = 1;
info.Artist = String.Join(", ", tfile.Tag.AlbumArtists);
info.Album = tfile.Tag.Album;
info.Track = Convert.ToInt32(tfile.Tag.Track);
if(tfile.Tag.Year > 1900)
{
info.Date = new DateTime(Convert.ToInt32(tfile.Tag.Year), 1, 1);
}
info.Genres = tfile.Tag.Genres.SelectMany(x => x.Split(new[] { ";", "," }, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim())).ToArray();
}
catch (Exception) { }
return info;
}
}
}

BIN
MusicNodes/MusicNodes.csproj
View File

Binary file not shown.

13
MusicNodes/Tests/MusicInfoTests.cs
View File

@@ -45,6 +45,19 @@ namespace FileFlows.MusicNodes.Tests
Assert.AreEqual(8, musicInfo.Track);
}
[TestMethod]
public void MusicInfo_GetMetaData()
{
const string ffmpegExe = @"C:\utils\ffmpeg\ffmpeg.exe";
var logger = new TestLogger();
foreach (string file in Directory.GetFiles(@"D:\videos\music"))
{
var args = new FileFlows.Plugin.NodeParameters(file, logger, false, string.Empty);
var info = new MusicInfoHelper(ffmpegExe, logger).Read(file);
Assert.IsNotNull(info);
}
}
}
}