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
13 changes: 13 additions & 0 deletions src/.idea/.idea.AudioTagger/.idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/.idea/.idea.AudioTagger/.idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions src/.idea/.idea.AudioTagger/.idea/indexLayout.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions src/.idea/.idea.AudioTagger/.idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 23 additions & 9 deletions src/AudioTagger.Console/Operations/MediaFileRenamer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,22 @@ public void Start(
return;
}

var normalizationForm = settings.Renaming.NormalizationForm.Trim() switch
{
"D" => NormalizationForm.FormD,
"KD" => NormalizationForm.FormKD,
"KC" => NormalizationForm.FormKC,
_ => NormalizationForm.FormC
};
printer.Print($"Filename normalization form is {normalizationForm}.");

RenameFiles(
eligibleMediaFiles,
workingDirectory,
printer,
settings.Renaming.Patterns,
settings.Renaming.UseAlbumDirectories);
settings.Renaming.UseAlbumDirectories,
normalizationForm);

var deletedDirs = DeleteEmptySubDirectories(workingDirectory.FullName, printer);
PrintDeletedDirectories(deletedDirs, printer);
Expand Down Expand Up @@ -96,7 +106,8 @@ private static void RenameFiles(
DirectoryInfo workingDirectory,
IPrinter printer,
IEnumerable<string> renamePatterns,
bool useAlbumDirectories)
bool useAlbumDirectories,
NormalizationForm normalizationForm)
{
var isCancelRequested = false;
var doConfirm = true;
Expand All @@ -106,7 +117,7 @@ private static void RenameFiles(

for (int i = 0; i < mediaFiles.Count; i++)
{
MediaFile file = mediaFiles.ElementAt(i);
var file = mediaFiles.ElementAt(i);

if (file.Title.Length == 0)
{
Expand All @@ -131,6 +142,7 @@ private static void RenameFiles(
workingDirectory.FullName,
useArtistDirectory,
useAlbumDirectories,
normalizationForm,
ref doConfirm,
renamePatterns);
}
Expand Down Expand Up @@ -181,6 +193,7 @@ private static bool RenameSingleFile(
string workingPath,
bool useArtistDirectory,
bool useAlbumDirectory,
NormalizationForm normalizationForm,
ref bool doConfirm,
IEnumerable<string> renamePatterns)
{
Expand All @@ -207,16 +220,17 @@ private static bool RenameSingleFile(
return false;
}

MediaFilePathInfo oldPathInfo = new(workingPath, file.FileInfo.FullName);
var oldPathInfo = new MediaFilePathInfo(workingPath, file.FileInfo.FullName);

string newArtistDir = useArtistDirectory
? GenerateSafeDirectoryName(file)
? GenerateSafeDirectoryName(file).Normalize(normalizationForm)
: string.Empty;
string newAlbumDir = useAlbumDirectory && useArtistDirectory && file.Album.HasText()
? IoUtilities.SanitizePath(file.Album)
? IoUtilities.SanitizePath(file.Album).Normalize(normalizationForm)
: string.Empty;
string newFileName = GenerateFileNameUsingPattern(file, populatedTagNames, matchedRenamePattern);
MediaFilePathInfo newPathInfo = new(workingPath, [newArtistDir, newAlbumDir], newFileName);
string newFileName = GenerateFileName(file, populatedTagNames, matchedRenamePattern)
.Normalize(normalizationForm);
var newPathInfo = new MediaFilePathInfo(workingPath, [newArtistDir, newAlbumDir], newFileName);

if (oldPathInfo.FullFilePath(true) == newPathInfo.FullFilePath(true))
{
Expand Down Expand Up @@ -271,7 +285,7 @@ private static bool RenameSingleFile(
/// Generates and returns a new filename by replacing placeholders within the rename
/// pattern (e.g., `%ALBUM%`) with actual tag data from the `MediaFile`.
/// </summary>
static string GenerateFileNameUsingPattern(
static string GenerateFileName(
MediaFile file,
ICollection<string> fileTagNames,
string renamePattern)
Expand Down
11 changes: 11 additions & 0 deletions src/AudioTagger.Library/UserSettings/Settings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,17 @@ public sealed record Renaming
[JsonPropertyName("useAlbumDirectories")]
public bool UseAlbumDirectories { get; init; } = false;

/// <summary>
/// The Unicode normalization form to use for renamed filenames.
/// Valid values are `C`, `D`, `KC`, and `KD`.
/// `C` is used by default is no valid value is provided.
///
/// Reference: https://unicode.org/reports/tr15/
/// Reference: https://en.wikipedia.org/wiki/Unicode_equivalence
/// </summary>
[JsonPropertyName("normalizationForm")]
public string NormalizationForm { get; init; } = "C";

[JsonPropertyName("ignoredDirectories")]
public ImmutableList<string>? IgnoredDirectories { get; init; }
}