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

fix: prevent duplicate downloads from concurrent stream requests

Browse Source
This commit is contained in:
V1ck3s
2026-01-12 18:40:45 +01:00
committed by Vickes
parent 1d4c46b4f3
commit 7a08f15523
1 changed files with 87 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

169
octo-fiesta/Services/Common/BaseDownloadService.cs
View File

@@ -139,49 +139,54 @@ public abstract class BaseDownloadService : IDownloadService
var songId = $"ext-{externalProvider}-{externalId}"; var songId = $"ext-{externalProvider}-{externalId}";
var isCache = SubsonicSettings.StorageMode == StorageMode.Cache; var isCache = SubsonicSettings.StorageMode == StorageMode.Cache;
// Check if already downloaded (skip for cache mode as we want to check cache folder) // Acquire lock BEFORE checking existence to prevent race conditions with concurrent requests
if (!isCache)
{
var existingPath = await LocalLibraryService.GetLocalPathForExternalSongAsync(externalProvider, externalId);
if (existingPath != null && IOFile.Exists(existingPath))
{
Logger.LogInformation("Song already downloaded: {Path}", existingPath);
return existingPath;
}
}
else
{
// For cache mode, check if file exists in cache directory
var cachedPath = GetCachedFilePath(externalProvider, externalId);
if (cachedPath != null && IOFile.Exists(cachedPath))
{
Logger.LogInformation("Song found in cache: {Path}", cachedPath);
// Update file access time for cache cleanup logic
IOFile.SetLastAccessTime(cachedPath, DateTime.UtcNow);
return cachedPath;
}
}
// Check if download in progress
if (ActiveDownloads.TryGetValue(songId, out var activeDownload) && activeDownload.Status == DownloadStatus.InProgress)
{
Logger.LogInformation("Download already in progress for {SongId}", songId);
while (ActiveDownloads.TryGetValue(songId, out activeDownload) && activeDownload.Status == DownloadStatus.InProgress)
{
await Task.Delay(500, cancellationToken);
}
if (activeDownload?.Status == DownloadStatus.Completed && activeDownload.LocalPath != null)
{
return activeDownload.LocalPath;
}
throw new Exception(activeDownload?.ErrorMessage ?? "Download failed");
}
await DownloadLock.WaitAsync(cancellationToken); await DownloadLock.WaitAsync(cancellationToken);
try try
{ {
// Check if already downloaded (skip for cache mode as we want to check cache folder)
if (!isCache)
{
var existingPath = await LocalLibraryService.GetLocalPathForExternalSongAsync(externalProvider, externalId);
if (existingPath != null && IOFile.Exists(existingPath))
{
Logger.LogInformation("Song already downloaded: {Path}", existingPath);
return existingPath;
}
}
else
{
// For cache mode, check if file exists in cache directory
var cachedPath = GetCachedFilePath(externalProvider, externalId);
if (cachedPath != null && IOFile.Exists(cachedPath))
{
Logger.LogInformation("Song found in cache: {Path}", cachedPath);
// Update file access time for cache cleanup logic
IOFile.SetLastAccessTime(cachedPath, DateTime.UtcNow);
return cachedPath;
}
}
// Check if download in progress
if (ActiveDownloads.TryGetValue(songId, out var activeDownload) && activeDownload.Status == DownloadStatus.InProgress)
{
Logger.LogInformation("Download already in progress for {SongId}, waiting...", songId);
// Release lock while waiting
DownloadLock.Release();
while (ActiveDownloads.TryGetValue(songId, out activeDownload) && activeDownload.Status == DownloadStatus.InProgress)
{
await Task.Delay(500, cancellationToken);
}
if (activeDownload?.Status == DownloadStatus.Completed && activeDownload.LocalPath != null)
{
return activeDownload.LocalPath;
}
throw new Exception(activeDownload?.ErrorMessage ?? "Download failed");
}
// Get metadata // Get metadata
// In Album mode, fetch the full album first to ensure AlbumArtist is correctly set // In Album mode, fetch the full album first to ensure AlbumArtist is correctly set
Song? song = null; Song? song = null;
@@ -227,60 +232,60 @@ public abstract class BaseDownloadService : IDownloadService
}; };
ActiveDownloads[songId] = downloadInfo; ActiveDownloads[songId] = downloadInfo;
try var localPath = await DownloadTrackAsync(externalId, song, cancellationToken);
downloadInfo.Status = DownloadStatus.Completed;
downloadInfo.LocalPath = localPath;
downloadInfo.CompletedAt = DateTime.UtcNow;
song.LocalPath = localPath;
// Only register and scan if NOT in cache mode
if (!isCache)
{ {
var localPath = await DownloadTrackAsync(externalId, song, cancellationToken); await LocalLibraryService.RegisterDownloadedSongAsync(song, localPath);
downloadInfo.Status = DownloadStatus.Completed; // Trigger a Subsonic library rescan (with debounce)
downloadInfo.LocalPath = localPath; _ = Task.Run(async () =>
downloadInfo.CompletedAt = DateTime.UtcNow;
song.LocalPath = localPath;
// Only register and scan if NOT in cache mode
if (!isCache)
{ {
await LocalLibraryService.RegisterDownloadedSongAsync(song, localPath); try
// Trigger a Subsonic library rescan (with debounce)
_ = Task.Run(async () =>
{ {
try await LocalLibraryService.TriggerLibraryScanAsync();
{ }
await LocalLibraryService.TriggerLibraryScanAsync(); catch (Exception ex)
}
catch (Exception ex)
{
Logger.LogWarning(ex, "Failed to trigger library scan after download");
}
});
// If download mode is Album and triggering is enabled, start background download of remaining tracks
if (triggerAlbumDownload && SubsonicSettings.DownloadMode == DownloadMode.Album && !string.IsNullOrEmpty(song.AlbumId))
{ {
var albumExternalId = ExtractExternalIdFromAlbumId(song.AlbumId); Logger.LogWarning(ex, "Failed to trigger library scan after download");
if (!string.IsNullOrEmpty(albumExternalId)) }
{ });
Logger.LogInformation("Download mode is Album, triggering background download for album {AlbumId}", albumExternalId);
DownloadRemainingAlbumTracksInBackground(externalProvider, albumExternalId, externalId); // If download mode is Album and triggering is enabled, start background download of remaining tracks
} if (triggerAlbumDownload && SubsonicSettings.DownloadMode == DownloadMode.Album && !string.IsNullOrEmpty(song.AlbumId))
{
var albumExternalId = ExtractExternalIdFromAlbumId(song.AlbumId);
if (!string.IsNullOrEmpty(albumExternalId))
{
Logger.LogInformation("Download mode is Album, triggering background download for album {AlbumId}", albumExternalId);
DownloadRemainingAlbumTracksInBackground(externalProvider, albumExternalId, externalId);
} }
} }
else
{
Logger.LogInformation("Cache mode: skipping library registration and scan");
}
Logger.LogInformation("Download completed: {Path}", localPath);
return localPath;
} }
catch (Exception ex) else
{
Logger.LogInformation("Cache mode: skipping library registration and scan");
}
Logger.LogInformation("Download completed: {Path}", localPath);
return localPath;
}
catch (Exception ex)
{
if (ActiveDownloads.TryGetValue(songId, out var downloadInfo))
{ {
downloadInfo.Status = DownloadStatus.Failed; downloadInfo.Status = DownloadStatus.Failed;
downloadInfo.ErrorMessage = ex.Message; downloadInfo.ErrorMessage = ex.Message;
Logger.LogError(ex, "Download failed for {SongId}", songId);
throw;
} }
Logger.LogError(ex, "Download failed for {SongId}", songId);
throw;
} }
finally finally
{ {