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

Fix missing track labeling and add external manual mapping support

Browse Source 
- Fixed syntax errors in AdminController.cs (missing braces, duplicate code)
- Implemented proper track status logic to distinguish between:
  * Local tracks: isLocal=true, externalProvider=null
  * External matched tracks: isLocal=false, externalProvider='SquidWTF'
  * Missing tracks: isLocal=null, externalProvider=null
- Added external manual mapping support for SquidWTF/Deezer/Qobuz IDs
- Updated frontend UI with dual mapping modes (Jellyfin vs External)
- Extended ManualMappingRequest class with ExternalProvider + ExternalId fields
- Updated SpotifyTrackMatchingService to handle external manual mappings
- Fixed variable name conflicts and dynamic argument casting issues
- All tests passing (225/225)

Resolves issue where missing tracks incorrectly showed provider name instead of 'Missing' status.
This commit is contained in:
Josh Patra
2026-02-05 00:15:23 -05:00
parent b1cab0ddfc
commit 400ea31477
3 changed files with 209 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
allstarr/Controllers/AdminController.cs
View File

@@ -535,7 +535,7 @@ public class AdminController : ControllerBase
isLocal = false;
externalProvider = provider;
_logger.LogDebug("✓ Manual external mapping found for {Title}: {Provider} {ExternalId}",
track.Title, provider, externalId);
track.Title, (object)provider, (object)externalId);
}
}
catch (Exception ex)
@@ -544,29 +544,30 @@ public class AdminController : ControllerBase
}
}
else if (localTracks.Count > 0)
{
// SECOND: No manual mapping, try fuzzy matching
var bestMatch = localTracks
.Select(local => new
{
Local = local,
TitleScore = FuzzyMatcher.CalculateSimilarity(track.Title, local.Title),
ArtistScore = FuzzyMatcher.CalculateSimilarity(track.PrimaryArtist, local.Artist)
})
.Select(x => new
{
x.Local,
x.TitleScore,
x.ArtistScore,
TotalScore = (x.TitleScore * 0.7) + (x.ArtistScore * 0.3)
})
.OrderByDescending(x => x.TotalScore)
.FirstOrDefault();
// Use 70% threshold (same as playback matching)
if (bestMatch != null && bestMatch.TotalScore >= 70)
{
isLocal = true;
// SECOND: No manual mapping, try fuzzy matching
var bestMatch = localTracks
.Select(local => new
{
Local = local,
TitleScore = FuzzyMatcher.CalculateSimilarity(track.Title, local.Title),
ArtistScore = FuzzyMatcher.CalculateSimilarity(track.PrimaryArtist, local.Artist)
})
.Select(x => new
{
x.Local,
x.TitleScore,
x.ArtistScore,
TotalScore = (x.TitleScore * 0.7) + (x.ArtistScore * 0.3)
})
.OrderByDescending(x => x.TotalScore)
.FirstOrDefault();
// Use 70% threshold (same as playback matching)
if (bestMatch != null && bestMatch.TotalScore >= 70)
{
isLocal = true;
}
}
}
@@ -575,14 +576,13 @@ public class AdminController : ControllerBase
{
if (matchedSpotifyIds.Contains(track.SpotifyId))
{
// Track is externally matched
// Track is externally matched (search succeeded)
isLocal = false;
externalProvider = _configuration.GetValue<string>("Subsonic:MusicService") ??
_configuration.GetValue<string>("Jellyfin:MusicService") ?? "Deezer";
externalProvider = "SquidWTF"; // Default to SquidWTF for external matches
}
else
{
// Track is missing (not local and not externally matched)
// Track is missing (search failed)
isLocal = null;
externalProvider = null;
}
@@ -621,13 +621,10 @@ public class AdminController : ControllerBase
// If we get here, we couldn't get local tracks from Jellyfin
// Just return tracks with basic external/missing status based on cache
var tracksWithStatus = new List<object>();
// Get matched external tracks cache
var matchedTracksKey = $"spotify:matched:ordered:{decodedName}";
var matchedTracks = await _cache.GetAsync<List<MatchedTrack>>(matchedTracksKey);
var matchedSpotifyIds = new HashSet<string>(
matchedTracks?.Select(m => m.SpotifyId) ?? Enumerable.Empty<string>()
var fallbackMatchedTracksKey = $"spotify:matched:ordered:{decodedName}";
var fallbackMatchedTracks = await _cache.GetAsync<List<MatchedTrack>>(fallbackMatchedTracksKey);
var fallbackMatchedSpotifyIds = new HashSet<string>(
fallbackMatchedTracks?.Select(m => m.SpotifyId) ?? Enumerable.Empty<string>()
);
foreach (var track in spotifyTracks)
@@ -665,16 +662,15 @@ public class AdminController : ControllerBase
_logger.LogWarning(ex, "Failed to process external manual mapping for {Title}", track.Title);
}
}
else if (matchedSpotifyIds.Contains(track.SpotifyId))
else if (fallbackMatchedSpotifyIds.Contains(track.SpotifyId))
{
// Track is externally matched
// Track is externally matched (search succeeded)
isLocal = false;
externalProvider = _configuration.GetValue<string>("Subsonic:MusicService") ??
_configuration.GetValue<string>("Jellyfin:MusicService") ?? "Deezer";
externalProvider = "SquidWTF"; // Default to SquidWTF for external matches
}
else
{
// Track is missing
// Track is missing (search failed)
isLocal = null;
externalProvider = null;
}
@@ -702,26 +698,6 @@ public class AdminController : ControllerBase
trackCount = spotifyTracks.Count,
tracks = tracksWithStatus
});
// Fallback: return tracks without local/external status
return Ok(new
{
name = decodedName,
trackCount = spotifyTracks.Count,
tracks = spotifyTracks.Select(t => new
{
position = t.Position,
title = t.Title,
artists = t.Artists,
album = t.Album,
isrc = t.Isrc,
spotifyId = t.SpotifyId,
durationMs = t.DurationMs,
albumArtUrl = t.AlbumArtUrl,
isLocal = (bool?)null, // Unknown
externalProvider = _configuration.GetValue<string>("Subsonic:MusicService") ?? _configuration.GetValue<string>("Jellyfin:MusicService") ?? "Deezer",
searchQuery = $"{t.Title} {t.PrimaryArtist}"
})
}
/// <summary>
@@ -1066,14 +1042,6 @@ public class AdminController : ControllerBase
}
}
public class ManualMappingRequest
{
public string SpotifyId { get; set; } = "";
public string? JellyfinId { get; set; }
public string? ExternalProvider { get; set; }
public string? ExternalId { get; set; }
}
/// <summary>
/// Trigger track matching for all playlists
/// </summary>
@@ -2461,6 +2429,14 @@ public class AdminController : ControllerBase
#endregion
}
public class ManualMappingRequest
{
public string SpotifyId { get; set; } = "";
public string? JellyfinId { get; set; }
public string? ExternalProvider { get; set; }
public string? ExternalId { get; set; }
}
public class ConfigUpdateRequest
{
public Dictionary<string, string> Updates { get; set; } = new();