extern/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2025-01-03 12:59:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

dlna: associate subtitles with all possible media nodes

Browse Source 
When there was a .nfo and a .mp4, they were being associated only with
the .nfo.
This commit is contained in:
Dan Walters 2019-10-08 16:29:09 -05:00 committed by Nick Craig-Wood
parent 3f40849343
commit 8950b586c4
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/serve/dlna/cds.go
View File

@ -192,14 +192,14 @@ func mediaWithResources(nodes vfs.Nodes) (vfs.Nodes, map[vfs.Node]vfs.Nodes) {
media, mediaResources := vfs.Nodes{}, make(map[vfs.Node]vfs.Nodes)
// First, separate out the subtitles and media into maps, keyed by their lowercase base names.
mediaByName, subtitlesByName := make(map[string]vfs.Node), make(map[string]vfs.Node)
mediaByName, subtitlesByName := make(map[string]vfs.Nodes), make(map[string]vfs.Node)
for _, node := range nodes {
baseName, ext := splitExt(strings.ToLower(node.Name()))
switch ext {
case ".srt":
subtitlesByName[baseName] = node
default:
mediaByName[baseName] = node
mediaByName[baseName] = append(mediaByName[baseName], node)
media = append(media, node)
}
}
@ -207,11 +207,11 @@ func mediaWithResources(nodes vfs.Nodes) (vfs.Nodes, map[vfs.Node]vfs.Nodes) {
// Find the associated media file for each subtitle
for baseName, node := range subtitlesByName {
// Find a media file with the same basename (video.mp4 for video.srt)
mediaNode, found := mediaByName[baseName]
mediaNodes, found := mediaByName[baseName]
if !found {
// Or basename of the basename (video.mp4 for video.en.srt)
baseName, _ = splitExt(baseName)
mediaNode, found = mediaByName[baseName]
mediaNodes, found = mediaByName[baseName]
}
// Just advise if no match found
@ -220,8 +220,11 @@ func mediaWithResources(nodes vfs.Nodes) (vfs.Nodes, map[vfs.Node]vfs.Nodes) {
continue
}
fs.Debugf(mediaNode, "associating subtitle: %s", node.Name())
mediaResources[mediaNode] = append(mediaResources[mediaNode], node)
// Associate with all potential media nodes
fs.Debugf(mediaNodes, "associating subtitle: %s", node.Name())
for _, mediaNode := range mediaNodes {
mediaResources[mediaNode] = append(mediaResources[mediaNode], node)
}
}
return media, mediaResources

0
cmd/serve/dlna/testdata/files/video.nfo vendored Normal file
View File