joshpatra/allstarr
1
0
Fork 0
mirror of https://github.com/SoPat712/allstarr.git synced 2026-02-09 23:55:10 -05:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

refactor: extract PathHelper to Services/Common for reusability

Browse Source 
Moved PathHelper from DeezerDownloadService to Services/Common/ to:
- Remove awkward dependency of Qobuz on Deezer namespace
- Make path utilities reusable by all services
- Improve code organization and clarify dependencies

Updated imports in DeezerDownloadService, QobuzDownloadService,
BaseDownloadService, and DeezerDownloadServiceTests.
This commit is contained in:
V1ck3s
2026-01-08 20:00:05 +01:00
parent ce779b3c8a
commit 09ee618ac8
5 changed files with 126 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
octo-fiesta/Services/Deezer/DeezerDownloadService.cs
View File

@@ -523,112 +523,3 @@ public class DeezerDownloadService : BaseDownloadService
public string Artist { get; set; } = string.Empty;
}
}
/// <summary>
/// Helper class for path building and sanitization.
/// Extracted for testability.
/// </summary>
public static class PathHelper
{
/// <summary>
/// Builds the output path for a downloaded track following the Artist/Album/Track structure.
/// </summary>
public static string BuildTrackPath(string downloadPath, string artist, string album, string title, int? trackNumber, string extension)
{
var safeArtist = SanitizeFolderName(artist);
var safeAlbum = SanitizeFolderName(album);
var safeTitle = SanitizeFileName(title);
var artistFolder = Path.Combine(downloadPath, safeArtist);
var albumFolder = Path.Combine(artistFolder, safeAlbum);
var trackPrefix = trackNumber.HasValue ? $"{trackNumber:D2} - " : "";
var fileName = $"{trackPrefix}{safeTitle}{extension}";
return Path.Combine(albumFolder, fileName);
}
/// <summary>
/// Sanitizes a file name by removing invalid characters.
/// </summary>
public static string SanitizeFileName(string fileName)
{
if (string.IsNullOrWhiteSpace(fileName))
{
return "Unknown";
}
var invalidChars = Path.GetInvalidFileNameChars();
var sanitized = new string(fileName
.Select(c => invalidChars.Contains(c) ? '_' : c)
.ToArray());
if (sanitized.Length > 100)
{
sanitized = sanitized[..100];
}
return sanitized.Trim();
}
/// <summary>
/// Sanitizes a folder name by removing invalid path characters.
/// </summary>
public static string SanitizeFolderName(string folderName)
{
if (string.IsNullOrWhiteSpace(folderName))
{
return "Unknown";
}
var invalidChars = Path.GetInvalidFileNameChars()
.Concat(Path.GetInvalidPathChars())
.Distinct()
.ToArray();
var sanitized = new string(folderName
.Select(c => invalidChars.Contains(c) ? '_' : c)
.ToArray());
// Remove leading/trailing dots and spaces (Windows folder restrictions)
sanitized = sanitized.Trim().TrimEnd('.');
if (sanitized.Length > 100)
{
sanitized = sanitized[..100].TrimEnd('.');
}
// Ensure we have a valid name
if (string.IsNullOrWhiteSpace(sanitized))
{
return "Unknown";
}
return sanitized;
}
/// <summary>
/// Resolves a unique file path by appending a counter if the file already exists.
/// </summary>
public static string ResolveUniquePath(string basePath)
{
if (!IOFile.Exists(basePath))
{
return basePath;
}
var directory = Path.GetDirectoryName(basePath)!;
var extension = Path.GetExtension(basePath);
var fileNameWithoutExt = Path.GetFileNameWithoutExtension(basePath);
var counter = 1;
string uniquePath;
do
{
uniquePath = Path.Combine(directory, $"{fileNameWithoutExt} ({counter}){extension}");
counter++;
} while (IOFile.Exists(uniquePath));
return uniquePath;
}
}