Dev (#44)

* Fixes #37 * Sync Names with Playlist per playlist (#43)
SenexCrenshaw · Sep 6, 2022 · f3a20ed · f3a20ed
1 parent d8287b3
commit f3a20ed
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 4 deletions.
diff --git a/html/lang/en.json b/html/lang/en.json
@@ -118,6 +118,11 @@
       "title": "Starting Channel Number",
       "placeholder": "",
       "description": ""
+    },
+    "syncWithPlaylist": {
+      "title": "Sync Names with Playlist",
+      "placeholder": "",
+      "description": ""
     }
   },
   "playlist": {

diff --git a/src/data.go b/src/data.go
@@ -265,6 +265,7 @@ func saveFiles(request RequestStruct, fileType string) (err error) {
 		filesMap = Settings.Files.M3U
 		newData = request.Files.M3U
 		indicator = "M"
+		reloadData = true
 
 	case "hdhr":
 		filesMap = Settings.Files.HDHR

diff --git a/src/struct-webserver.go b/src/struct-webserver.go
@@ -62,7 +62,8 @@ type RequestStruct struct {
 	LogLevel int    `json:"logLevelg,omitempty"`
 
 	// Upload Logo
-	Filename string `json:"filename,omitempty"`
+	Filename         string `json:"filename,omitempty"`
+	SyncWithPlaylist *bool  `json:"syncWithPlaylist,omitempty"`
 
 	// Filter
 	Filter map[int64]interface{} `json:"filter,omitempty"`

diff --git a/src/webUI.go b/src/webUI.go
diff --git a/src/xepg.go b/src/xepg.go
@@ -448,7 +448,15 @@ func createXEPGDatabase() (err error) {
 
 			// Update Channel Name, only possible with Channel ID's
 			if channelHasUUID {
-				if xepgChannel.XUpdateChannelName {
+				syncWithPlaylistDataConverted := false
+				syncWithPlaylist := false
+
+				m3u := Settings.Files.M3U[m3uChannel.FileM3UID]
+				if m3u != nil {
+					syncWithPlaylist, syncWithPlaylistDataConverted = m3u.(map[string]interface{})["syncWithPlaylist"].(bool)
+				}
+
+				if xepgChannel.XUpdateChannelName || (syncWithPlaylist && syncWithPlaylistDataConverted) {
 					xepgChannel.XName = m3uChannel.Name
 				}
 			}
@@ -477,6 +485,7 @@ func createXEPGDatabase() (err error) {
 					return getFreeChannelNumber(m3uChannel.StartingChannel)
 				}
 			}()
+
 			var newChannel XEPGChannelStruct
 			newChannel.FileM3UID = m3uChannel.FileM3UID
 			newChannel.FileM3UName = m3uChannel.FileM3UName

diff --git a/ts/menu_ts.ts b/ts/menu_ts.ts
@@ -1218,6 +1218,10 @@ function openPopUp(dataType, element) {
       m3uinput.setAttribute("onclick", 'javascript: uploadM3U();')
       content.appendRow("{{.playlist.fileM3U.title}}", m3uinput)
 
+      var dbKey: string = "syncWithPlaylist"
+      var input = content.createCheckbox(dbKey)
+      input.checked = data[dbKey]
+      content.appendRow("{{.filter.syncWithPlaylist.title}}", input)
 
       // Tuner
       if (SERVER["settings"]["buffer"] != "-") {