kitty/spotube
1
0
Fork 0
mirror of https://github.com/KRTirtho/spotube.git synced 2025-12-06 15:39:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge 50d729f8a0 into 0ec9f3535b

Browse Source
This commit is contained in:
Seungmin Kim 2025-03-24 15:48:28 +00:00 committed by GitHub
commit 2341e5ca06
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 75 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
lib/services/sourced_track/sources/youtube.dart
View File

@ -240,25 +240,65 @@ class YoutubeSourcedTrack extends SourcedTrack {
required Track track,
required Ref ref,
}) async {
List<SiblingType> siblings = [];
final isrc = track.externalIds?.isrc;
if (isrc != null && isrc.isNotEmpty) {
final isrcResults =
await ref.read(youtubeEngineProvider).searchVideos(isrc.toString());
if (isrcResults.isNotEmpty) {
final rankedResults = rankResults(
isrcResults.map(YoutubeVideoInfo.fromVideo).toList(), track);
final matchingResults = <YoutubeVideoInfo>[];
for (final video in rankedResults) {
final titleWords = video.title
.toLowerCase()
.replaceAll(RegExp(r'[^a-zA-Z0-9\s]+'), '')
.split(RegExp(r'\s+'))
.where((item) => item.isNotEmpty)
.toList();
final nameLower = track.name!
.toLowerCase()
.replaceAll(RegExp(r'[^a-zA-Z0-9\s]+'), '')
.split(RegExp(r'\s+'))
.where((item) => item.isNotEmpty)
.toList();
final matchCount =
titleWords.where((word) => nameLower.contains(word)).length;
if (matchCount > nameLower.length / 2) {
matchingResults.add(video);
}
}
if (matchingResults.isNotEmpty) {
final matchingSiblings =
await Future.wait(matchingResults.map((matchingResult) async {
try {
return await toSiblingType(0, matchingResult, ref);
} on VideoUnplayableException catch (e, stack) {
// Ignore this error and continue with the search
AppLogger.reportError(e, stack);
return null;
}
}));
siblings.addAll(matchingSiblings.whereType<SiblingType>());
}
}
}
final links = await SongLinkService.links(track.id!);
final ytLink = links.firstWhereOrNull((link) => link.platform == "youtube");
if (ytLink?.url != null
// allows to fetch siblings more results for already sourced track
&&
track is! SourcedTrack) {
if (ytLink?.url != null) {
try {
return [
await toSiblingType(
0,
YoutubeVideoInfo.fromVideo(
await ref.read(youtubeEngineProvider).getVideo(
Uri.parse(ytLink!.url!).queryParameters["v"]!,
),
),
ref,
)
];
siblings.add(await toSiblingType(
0,
YoutubeVideoInfo.fromVideo(
await ref.read(youtubeEngineProvider).getVideo(
Uri.parse(ytLink!.url!).queryParameters["v"]!,
),
),
ref,
));
} on VideoUnplayableException catch (e, stack) {
// Ignore this error and continue with the search
AppLogger.reportError(e, stack);
@ -271,20 +311,29 @@ class YoutubeSourcedTrack extends SourcedTrack {
await ref.read(youtubeEngineProvider).searchVideos(query);
if (ServiceUtils.onlyContainsEnglish(query)) {
return await Future.wait(searchResults
siblings.addAll(await Future.wait(searchResults
.map(YoutubeVideoInfo.fromVideo)
.mapIndexed((index, info) => toSiblingType(index, info, ref)));
.mapIndexed((index, info) => toSiblingType(index, info, ref))));
} else {
final rankedSiblings = rankResults(
searchResults.map(YoutubeVideoInfo.fromVideo).toList(),
track,
);
siblings.addAll(await Future.wait(
rankedSiblings
.mapIndexed((index, info) => toSiblingType(index, info, ref)),
));
}
final rankedSiblings = rankResults(
searchResults.map(YoutubeVideoInfo.fromVideo).toList(),
track,
);
return await Future.wait(
rankedSiblings
.mapIndexed((index, info) => toSiblingType(index, info, ref)),
);
final seenIds = <String>{};
// Deduplicate siblings by info.id, keeping the first occurrence
return await Future.wait(siblings.map((sibling) async {
if (!seenIds.contains(sibling.info.id)) {
seenIds.add(sibling.info.id);
return sibling;
}
return null;
})).then((s) => s.whereType<SiblingType>().toList());
}
@override