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

Merge branch 'pr/136' into beta

Browse Source
This commit is contained in:
marmei
2020-05-16 09:19:04 +02:00
parent 2b3fe6a09d a09eca59a7
commit a6a9b90937
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/xepg.go
View File

@@ -9,6 +9,8 @@ import (
"path" "path"
"runtime" "runtime"
"crypto/md5"
"encoding/hex"
"strconv" "strconv"
"strings" "strings"
"time" "time"
@@ -300,6 +302,11 @@ func createXEPGDatabase() (err error) {
return return
} }
var generateHashForChannel = func(m3uID string, groupTitle string, tvgID string, tvgName string, uuidKey string, uuidValue string) string {
hash := md5.Sum([]byte(m3uID + groupTitle + tvgID + tvgName + uuidKey + uuidValue))
return hex.EncodeToString(hash[:])
}
showInfo("XEPG:" + "Update database") showInfo("XEPG:" + "Update database")
// Kanal mit fehlenden Kanalnummern löschen. Delete channel with missing channel numbers // Kanal mit fehlenden Kanalnummern löschen. Delete channel with missing channel numbers
@@ -329,8 +336,8 @@ func createXEPGDatabase() (err error) {
if err != nil { if err != nil {
return return
} }
channelHash := generateHashForChannel(channel.FileM3UID, channel.GroupTitle, channel.TvgID, channel.TvgName, channel.UUIDKey, channel.UUIDValue)
xepgChannelsValuesMap[channel.FileM3UID+channel.Name+channel.GroupTitle+channel.TvgID+channel.TvgName+channel.TvgLogo] = channel xepgChannelsValuesMap[channelHash] = channel
} }
for _, dsa := range Data.Streams.Active { for _, dsa := range Data.Streams.Active {
@@ -349,10 +356,13 @@ func createXEPGDatabase() (err error) {
Data.Cache.Streams.Active = append(Data.Cache.Streams.Active, m3uChannel.Name) Data.Cache.Streams.Active = append(Data.Cache.Streams.Active, m3uChannel.Name)
// Try to find the channel based on matching all known values. If that fails, then move to full channel scan // Try to find the channel based on matching all known values. If that fails, then move to full channel scan
if val, ok := xepgChannelsValuesMap[m3uChannel.FileM3UID+m3uChannel.Name+m3uChannel.GroupTitle+m3uChannel.TvgID+m3uChannel.TvgName+m3uChannel.TvgLogo]; ok { m3uChannelHash := generateHashForChannel(m3uChannel.FileM3UID, m3uChannel.GroupTitle, m3uChannel.TvgID, m3uChannel.TvgName, m3uChannel.UUIDKey, m3uChannel.UUIDValue)
if val, ok := xepgChannelsValuesMap[m3uChannelHash]; ok {
channelExists = true channelExists = true
channelHasUUID = false
currentXEPGID = val.XEPG currentXEPGID = val.XEPG
if len(m3uChannel.UUIDValue) > 0 {
channelHasUUID = true
}
} else { } else {
// XEPG Datenbank durchlaufen um nach dem Kanal zu suchen. Run through the XEPG database to search for the channel (full scan) // XEPG Datenbank durchlaufen um nach dem Kanal zu suchen. Run through the XEPG database to search for the channel (full scan)