nathan/xTeVe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #16 0

Browse Source
This commit is contained in:
marmei
2019-08-31 20:39:39 +02:00
parent 717fa68b7e
commit efa55b39a9
3 changed files with 352 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/buffer.go
View File

@@ -205,7 +205,7 @@ func bufferingStream(playlistID, streamingURL, channelName string, w http.Respon
playlist.Streams[streamID] = stream playlist.Streams[streamID] = stream
BufferInformation.Store(playlistID, playlist) BufferInformation.Store(playlistID, playlist)
go connectToStreamingServer(streamID, playlist) go connectToStreamingServer(streamID, playlistID)
showInfo(fmt.Sprintf("Streaming Status:Playlist: %s - Tuner: %d / %d", playlist.PlaylistName, len(playlist.Streams), playlist.Tuner)) showInfo(fmt.Sprintf("Streaming Status:Playlist: %s - Tuner: %d / %d", playlist.PlaylistName, len(playlist.Streams), playlist.Tuner))
@@ -507,7 +507,11 @@ func clientConnection(stream ThisStream) (status bool) {
return return
} }
func connectToStreamingServer(streamID int, playlist Playlist) { func connectToStreamingServer(streamID int, playlistID string) {
if p, ok := BufferInformation.Load(playlistID); ok {
var playlist = p.(Playlist)
var timeOut = 0 var timeOut = 0
var debug string var debug string
@@ -548,11 +552,11 @@ func connectToStreamingServer(streamID int, playlist Playlist) {
var stream = playlist.Streams[streamID] var stream = playlist.Streams[streamID]
if c, ok := BufferClients.Load(stream.PlaylistID + stream.MD5); ok { if c, ok := BufferClients.Load(playlistID + stream.MD5); ok {
var clients = c.(ClientConnection) var clients = c.(ClientConnection)
clients.Error = err clients.Error = err
BufferClients.Store(stream.PlaylistID+stream.MD5, clients) BufferClients.Store(playlistID+stream.MD5, clients)
} }
@@ -650,7 +654,7 @@ InitBuffer:
addErrorToStream(err) addErrorToStream(err)
killClientConnection(streamID, stream.PlaylistID, true) killClientConnection(streamID, playlistID, true)
clientConnection(stream) clientConnection(stream)
return return
@@ -722,7 +726,7 @@ InitBuffer:
BufferInformation.Store(playlist.PlaylistID, playlist) BufferInformation.Store(playlist.PlaylistID, playlist)
addErrorToStream(err) addErrorToStream(err)
killClientConnection(streamID, stream.PlaylistID, true) killClientConnection(streamID, playlistID, true)
clientConnection(stream) clientConnection(stream)
resp.Body.Close() resp.Body.Close()
@@ -889,10 +893,9 @@ InitBuffer:
bufferFile.Close() bufferFile.Close()
if stream.Status == false {
stream.Status = true stream.Status = true
playlist.Streams[streamID] = stream playlist.Streams[streamID] = stream
} BufferInformation.Store(playlistID, playlist)
tmpSegment++ tmpSegment++
@@ -989,6 +992,8 @@ InitBuffer:
} // Ende for loop } // Ende for loop
} // Ende BufferInformation
} }
func parseM3U8(stream *ThisStream) (err error) { func parseM3U8(stream *ThisStream) (err error) {

1
src/data.go
View File

@@ -620,6 +620,7 @@ func saveWizard(request RequestStruct) (nextStep int, err error) {
} }
buildXEPG(false) buildXEPG(false)
System.ScanInProgress = 0
} }

2
xteve.go
View File

@@ -39,7 +39,7 @@ var GitHub = GitHubStruct{Branch: "master", User: "xteve-project", Repo: "xTeVe-
const Name = "xTeVe" const Name = "xTeVe"
// Version : Version, die Build Nummer wird in der main func geparst. // Version : Version, die Build Nummer wird in der main func geparst.
const Version = "2.0.2.0020" const Version = "2.0.2.0023"
// DBVersion : Datanbank Version // DBVersion : Datanbank Version
const DBVersion = "2.0.0" const DBVersion = "2.0.0"