sovonegr/TorrServerJellyfin
1
0
Fork 0
mirror of https://github.com/Ernous/TorrServerJellyfin.git synced 2025-12-19 21:46:11 +05:00
Code Issues Packages Projects Releases Wiki Activity

formatting

Browse Source
This commit is contained in:
YouROK
2021-04-06 10:43:18 +03:00
parent 323c81eca1
commit f1e6bc5982
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/web/api/m3u.go
View File

@@ -98,12 +98,12 @@ func getM3uList(tor *state.TorrentStatus, host string, fromLast bool) string {
fn = f.Path fn = f.Path
} }
m3u += "#EXTINF:0," + fn + "\n" m3u += "#EXTINF:0," + fn + "\n"
fileNamesakes := findFileNamesakes(tor.FileStats, f) //find external media with same name (audio/subtiles tracks) fileNamesakes := findFileNamesakes(tor.FileStats, f) //find external media with same name (audio/subtiles tracks)
if fileNamesakes != nil { if fileNamesakes != nil {
m3u+= "#EXTVLCOPT:input-slave=" //include VLC option for external media m3u += "#EXTVLCOPT:input-slave=" //include VLC option for external media
for _, namesake := range fileNamesakes { //include play-links to external media, with # splitter for _, namesake := range fileNamesakes { //include play-links to external media, with # splitter
sname := filepath.Base(namesake.Path) sname := filepath.Base(namesake.Path)
m3u += host + "/stream/" + url.PathEscape(sname) + "?link=" + tor.Hash + "&index=" + fmt.Sprint(namesake.Id) + "&play#" m3u += host + "/stream/" + url.PathEscape(sname) + "?link=" + tor.Hash + "&index=" + fmt.Sprint(namesake.Id) + "&play#"
} }
m3u += "\n" m3u += "\n"
} }
@@ -116,17 +116,17 @@ func getM3uList(tor *state.TorrentStatus, host string, fromLast bool) string {
} }
func findFileNamesakes(files []*state.TorrentFileStat, file *state.TorrentFileStat) []*state.TorrentFileStat { func findFileNamesakes(files []*state.TorrentFileStat, file *state.TorrentFileStat) []*state.TorrentFileStat {
//find files with the same name in torrent //find files with the same name in torrent
name := filepath.Base(strings.TrimSuffix(file.Path, filepath.Ext(file.Path))) name := filepath.Base(strings.TrimSuffix(file.Path, filepath.Ext(file.Path)))
var namesakes []*state.TorrentFileStat var namesakes []*state.TorrentFileStat
for _, f := range files { for _, f := range files {
if strings.Contains(f.Path, name) { //external tracks always include name of videofile if strings.Contains(f.Path, name) { //external tracks always include name of videofile
if (f != file) { //exclude itself if f != file { //exclude itself
namesakes = append(namesakes, f) namesakes = append(namesakes, f)
} }
} }
} }
return namesakes return namesakes
} }
func searchLastPlayed(tor *state.TorrentStatus) int { func searchLastPlayed(tor *state.TorrentStatus) int {