Skip to content

Commit 1769b1e

Browse files
committed
v2.0.0.0009-beta
1 parent 0f37835 commit 1769b1e

File tree

5 files changed

+44
-35
lines changed

5 files changed

+44
-35
lines changed

html/js/menu_ts.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1252,6 +1252,7 @@ function openPopUp(dataType, element) {
12521252
input.setAttribute("readonly", "true");
12531253
}
12541254
content.appendRow("{{.mapping.channelName.title}}", input);
1255+
content.description(data["name"]);
12551256
// Aktualisierung des Kanalnamens
12561257
if (data.hasOwnProperty("_uuid.key")) {
12571258
if (data["_uuid.key"] != "") {

src/webUI.go

Lines changed: 30 additions & 30 deletions
Large diffs are not rendered by default.

src/webserver.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -597,8 +597,12 @@ func Web(w http.ResponseWriter, r *http.Request) {
597597

598598
if getFilenameFromPath(requestFile) == "html" {
599599

600-
if len(Data.Streams.All) == 0 && System.ScanInProgress == 0 {
601-
System.ConfigurationWizard = true
600+
if System.ScanInProgress == 0 {
601+
602+
if len(Settings.Files.M3U) == 0 || len(Settings.Files.HDHR) == 0 {
603+
System.ConfigurationWizard = true
604+
}
605+
602606
}
603607

604608
switch System.ConfigurationWizard {

src/xepg.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,9 @@ func createDummyProgram(xepgChannel XEPGChannelStruct) (dummyXMLTV XMLTV) {
760760
epg.Poster = append(epg.Poster, poster)
761761
}
762762

763-
epg.EpisodeNum = append(epg.EpisodeNum, &EpisodeNum{Value: epgStartTime.Format("2006-01-02 15:04:05"), System: "original-air-date"})
763+
if xepgChannel.XCategory != "Movie" {
764+
epg.EpisodeNum = append(epg.EpisodeNum, &EpisodeNum{Value: epgStartTime.Format("2006-01-02 15:04:05"), System: "original-air-date"})
765+
}
764766

765767
epg.New = &New{Value: ""}
766768

@@ -823,10 +825,10 @@ func getEpisodeNum(program *Program, xmltvProgram *Program, xepgChannel XEPGChan
823825

824826
program.EpisodeNum = xmltvProgram.EpisodeNum
825827

826-
if len(xepgChannel.XCategory) > 0 {
828+
if len(xepgChannel.XCategory) > 0 && xepgChannel.XCategory != "Movie" {
827829

828830
if len(xmltvProgram.EpisodeNum) == 0 {
829-
program.EpisodeNum = append(program.EpisodeNum, &EpisodeNum{Value: time.Now().Format("2006-01-02"), System: "original-air-date"})
831+
program.EpisodeNum = append(program.EpisodeNum, &EpisodeNum{Value: time.Now().Format("2006-01-02 15:04:05"), System: "original-air-date"})
830832
}
831833

832834
}

ts/menu_ts.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1530,6 +1530,8 @@ function openPopUp(dataType, element) {
15301530
}
15311531
content.appendRow("{{.mapping.channelName.title}}", input)
15321532

1533+
content.description(data["name"])
1534+
15331535
// Aktualisierung des Kanalnamens
15341536
if (data.hasOwnProperty("_uuid.key")) {
15351537
if (data["_uuid.key"] != "") {

0 commit comments

Comments
 (0)