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

go fix for 1.26
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Nathan Coad
2026-02-11 12:53:35 +11:00
parent 339d2d0aa5
commit c5545cbf08
20 changed files with 656 additions and 660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/data.go
View File

@@ -59,7 +59,7 @@ func updateServerSettings(request RequestStruct) (settings SettingsStruct, err e
// Leerzeichen aus den Werten entfernen und Formatierung der Uhrzeit überprüfen (0000 - 2359)
var newUpdateTimes = make([]string, 0)
for _, v := range value.([]interface{}) {
for _, v := range value.([]any) {
v = strings.Replace(v.(string), " ", "", -1)
@@ -282,8 +282,8 @@ func updateServerSettings(request RequestStruct) (settings SettingsStruct, err e
// Providerdaten speichern (WebUI)
func saveFiles(request RequestStruct, fileType string) (err error) {
var filesMap = make(map[string]interface{})
var newData = make(map[string]interface{})
var filesMap = make(map[string]any)
var newData = make(map[string]any)
var indicator string
var reloadData = false
@@ -305,7 +305,7 @@ func saveFiles(request RequestStruct, fileType string) (err error) {
}
if len(filesMap) == 0 {
filesMap = make(map[string]interface{})
filesMap = make(map[string]any)
}
for dataID, data := range newData {
@@ -314,15 +314,15 @@ func saveFiles(request RequestStruct, fileType string) (err error) {
// Neue Providerdatei
dataID = indicator + randomString(19)
data.(map[string]interface{})["new"] = true
data.(map[string]any)["new"] = true
filesMap[dataID] = data
} else {
// Bereits vorhandene Providerdatei
for key, value := range data.(map[string]interface{}) {
for key, value := range data.(map[string]any) {
var oldData = filesMap[dataID].(map[string]interface{})
var oldData = filesMap[dataID].(map[string]any)
oldData[key] = value
}
@@ -343,11 +343,11 @@ func saveFiles(request RequestStruct, fileType string) (err error) {
}
// Neue Providerdatei
if _, ok := data.(map[string]interface{})["new"]; ok {
if _, ok := data.(map[string]any)["new"]; ok {
reloadData = true
err = getProviderData(fileType, dataID)
delete(data.(map[string]interface{}), "new")
delete(data.(map[string]any), "new")
if err != nil {
delete(filesMap, dataID)
@@ -356,7 +356,7 @@ func saveFiles(request RequestStruct, fileType string) (err error) {
}
if _, ok := data.(map[string]interface{})["delete"]; ok {
if _, ok := data.(map[string]any)["delete"]; ok {
deleteLocalProviderFiles(dataID, fileType)
reloadData = true
@@ -389,7 +389,7 @@ func saveFiles(request RequestStruct, fileType string) (err error) {
// Providerdaten manuell aktualisieren (WebUI)
func updateFile(request RequestStruct, fileType string) (err error) {
var updateData = make(map[string]interface{})
var updateData = make(map[string]any)
switch fileType {
@@ -419,7 +419,7 @@ func updateFile(request RequestStruct, fileType string) (err error) {
// Providerdaten löschen (WebUI)
func deleteLocalProviderFiles(dataID, fileType string) {
var removeData = make(map[string]interface{})
var removeData = make(map[string]any)
var fileExtension string
switch fileType {
@@ -448,8 +448,8 @@ func deleteLocalProviderFiles(dataID, fileType string) {
// Filtereinstellungen speichern (WebUI)
func saveFilter(request RequestStruct) (settings SettingsStruct, err error) {
var filterMap = make(map[int64]interface{})
var newData = make(map[int64]interface{})
var filterMap = make(map[int64]any)
var newData = make(map[int64]any)
var defaultFilter FilterStruct
var newFilter = false
@@ -482,15 +482,15 @@ func saveFilter(request RequestStruct) (settings SettingsStruct, err error) {
}
// Filter aktualisieren / löschen
for key, value := range data.(map[string]interface{}) {
for key, value := range data.(map[string]any) {
// Filter löschen
if _, ok := data.(map[string]interface{})["delete"]; ok {
if _, ok := data.(map[string]any)["delete"]; ok {
delete(filterMap, dataID)
break
}
if filter, ok := data.(map[string]interface{})["filter"].(string); ok {
if filter, ok := data.(map[string]any)["filter"].(string); ok {
if len(filter) == 0 {
@@ -504,7 +504,7 @@ func saveFilter(request RequestStruct) (settings SettingsStruct, err error) {
}
if oldData, ok := filterMap[dataID].(map[string]interface{}); ok {
if oldData, ok := filterMap[dataID].(map[string]any); ok {
oldData[key] = value
}
@@ -597,7 +597,7 @@ func saveUserData(request RequestStruct) (err error) {
var userData = request.UserData
var newCredentials = func(userID string, newUserData map[string]interface{}) (err error) {
var newCredentials = func(userID string, newUserData map[string]any) (err error) {
var newUsername, newPassword string
if username, ok := newUserData["username"].(string); ok {
@@ -617,7 +617,7 @@ func saveUserData(request RequestStruct) (err error) {
for userID, newUserData := range userData {
err = newCredentials(userID, newUserData.(map[string]interface{}))
err = newCredentials(userID, newUserData.(map[string]any))
if err != nil {
return
}
@@ -627,16 +627,16 @@ func saveUserData(request RequestStruct) (err error) {
return
}
delete(newUserData.(map[string]interface{}), "password")
delete(newUserData.(map[string]interface{}), "confirm")
delete(newUserData.(map[string]any), "password")
delete(newUserData.(map[string]any), "confirm")
if _, ok := newUserData.(map[string]interface{})["delete"]; ok {
if _, ok := newUserData.(map[string]any)["delete"]; ok {
authentication.RemoveUser(userID)
} else {
err = authentication.WriteUserData(userID, newUserData.(map[string]interface{}))
err = authentication.WriteUserData(userID, newUserData.(map[string]any))
if err != nil {
return
}
@@ -686,11 +686,11 @@ func saveWizard(request RequestStruct) (nextStep int, err error) {
case "m3u", "xmltv":
var filesMap = make(map[string]interface{})
var data = make(map[string]interface{})
var filesMap = make(map[string]any)
var data = make(map[string]any)
var indicator, dataID string
filesMap = make(map[string]interface{})
filesMap = make(map[string]any)
data["type"] = key
data["new"] = true
@@ -821,9 +821,9 @@ func buildDatabaseDVR() (err error) {
System.ScanInProgress = 1
Data.Streams.All = make([]interface{}, 0, System.UnfilteredChannelLimit)
Data.Streams.Active = make([]interface{}, 0, System.UnfilteredChannelLimit)
Data.Streams.Inactive = make([]interface{}, 0, System.UnfilteredChannelLimit)
Data.Streams.All = make([]any, 0, System.UnfilteredChannelLimit)
Data.Streams.Active = make([]any, 0, System.UnfilteredChannelLimit)
Data.Streams.Inactive = make([]any, 0, System.UnfilteredChannelLimit)
Data.Playlist.M3U.Groups.Text = []string{}
Data.Playlist.M3U.Groups.Value = []string{}
Data.StreamPreviewUI.Active = []string{}
@@ -844,7 +844,7 @@ func buildDatabaseDVR() (err error) {
for n, i := range playlistFile {
var channels []interface{}
var channels []any
var groupTitle, tvgID, uuid int = 0, 0, 0
var keys = []string{"group-title", "tvg-id", "uuid"}
var compatibility = make(map[string]int)
@@ -981,7 +981,7 @@ func buildDatabaseDVR() (err error) {
if len(Data.Streams.Active) == 0 && len(Data.Streams.All) <= System.UnfilteredChannelLimit && len(Settings.Filter) == 0 {
Data.Streams.Active = Data.Streams.All
Data.Streams.Inactive = make([]interface{}, 0)
Data.Streams.Inactive = make([]any, 0)
Data.StreamPreviewUI.Active = Data.StreamPreviewUI.Inactive
Data.StreamPreviewUI.Inactive = []string{}
@@ -1015,7 +1015,7 @@ func buildDatabaseDVR() (err error) {
func getLocalProviderFiles(fileType string) (localFiles []string) {
var fileExtension string
var dataMap = make(map[string]interface{})
var dataMap = make(map[string]any)
switch fileType {
@@ -1043,7 +1043,7 @@ func getLocalProviderFiles(fileType string) (localFiles []string) {
// Providerparameter anhand von dem Key ausgeben
func getProviderParameter(id, fileType, key string) (s string) {
var dataMap = make(map[string]interface{})
var dataMap = make(map[string]any)
switch fileType {
case "m3u":
@@ -1056,7 +1056,7 @@ func getProviderParameter(id, fileType, key string) (s string) {
dataMap = Settings.Files.XMLTV
}
if data, ok := dataMap[id].(map[string]interface{}); ok {
if data, ok := dataMap[id].(map[string]any); ok {
if v, ok := data[key].(string); ok {
s = v
@@ -1074,7 +1074,7 @@ func getProviderParameter(id, fileType, key string) (s string) {
// Provider Statistiken Kompatibilität aktualisieren
func setProviderCompatibility(id, fileType string, compatibility map[string]int) {
var dataMap = make(map[string]interface{})
var dataMap = make(map[string]any)
switch fileType {
case "m3u":
@@ -1087,7 +1087,7 @@ func setProviderCompatibility(id, fileType string, compatibility map[string]int)
dataMap = Settings.Files.XMLTV
}
if data, ok := dataMap[id].(map[string]interface{}); ok {
if data, ok := dataMap[id].(map[string]any); ok {
data["compatibility"] = compatibility