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

Dummy new times

Browse Source 
Fixed searching for XMLTV file (Mapping)
This commit is contained in:
xteve-project
2020-11-20 22:13:52 +01:00
parent 0310b7e738
commit 014f5b7218
7 changed files with 64 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
html/js/base_ts.js
View File

@@ -226,7 +226,7 @@ function createSearchObj() {
SEARCH_MAPPING = new Object(); SEARCH_MAPPING = new Object();
var data = SERVER["xepg"]["epgMapping"]; var data = SERVER["xepg"]["epgMapping"];
var channels = getObjKeys(data); var channels = getObjKeys(data);
var channelKeys = ["x-active", "x-channelID", "x-name", "_file.m3u.name", "x-group-title"]; var channelKeys = ["x-active", "x-channelID", "x-name", "_file.m3u.name", "x-group-title", "x-xmltv-file"];
channels.forEach(function (id) { channels.forEach(function (id) {
channelKeys.forEach(function (key) { channelKeys.forEach(function (key) {
if (key == "x-active") { if (key == "x-active") {
@@ -240,7 +240,15 @@ function createSearchObj() {
} }
} }
else { else {
SEARCH_MAPPING[id] = SEARCH_MAPPING[id] + data[id][key] + " "; if (key == "x-xmltv-file") {
var xmltvFile = getValueFromProviderFile(data[id][key], "xmltv", "name");
if (xmltvFile != undefined) {
SEARCH_MAPPING[id] = SEARCH_MAPPING[id] + xmltvFile + " ";
}
}
else {
SEARCH_MAPPING[id] = SEARCH_MAPPING[id] + data[id][key] + " ";
}
} }
}); });
}); });

2
html/js/configuration_ts.js
View File

@@ -2,7 +2,7 @@ var __extends = (this && this.__extends) || (function () {
var extendStatics = function (d, b) { var extendStatics = function (d, b) {
extendStatics = Object.setPrototypeOf || extendStatics = Object.setPrototypeOf ||
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
return extendStatics(d, b); return extendStatics(d, b);
}; };
return function (d, b) { return function (d, b) {

2
html/js/menu_ts.js
View File

@@ -2,7 +2,7 @@ var __extends = (this && this.__extends) || (function () {
var extendStatics = function (d, b) { var extendStatics = function (d, b) {
extendStatics = Object.setPrototypeOf || extendStatics = Object.setPrototypeOf ||
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
return extendStatics(d, b); return extendStatics(d, b);
}; };
return function (d, b) { return function (d, b) {

2
html/js/settings_ts.js
View File

@@ -2,7 +2,7 @@ var __extends = (this && this.__extends) || (function () {
var extendStatics = function (d, b) { var extendStatics = function (d, b) {
extendStatics = Object.setPrototypeOf || extendStatics = Object.setPrototypeOf ||
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
return extendStatics(d, b); return extendStatics(d, b);
}; };
return function (d, b) { return function (d, b) {

76
src/webUI.go
View File

File diff suppressed because one or more lines are too long

2
src/xepg.go
View File

@@ -283,7 +283,7 @@ func createXEPGMapping() {
// Auswahl für den Dummy erstellen // Auswahl für den Dummy erstellen
var dummy = make(map[string]interface{}) var dummy = make(map[string]interface{})
var times = []string{"30", "60", "90", "120"} var times = []string{"30", "60", "90", "120", "180", "240", "360"}
for _, i := range times { for _, i := range times {

14
ts/base_ts.ts
View File

@@ -309,7 +309,7 @@ function createSearchObj() {
var data = SERVER["xepg"]["epgMapping"] var data = SERVER["xepg"]["epgMapping"]
var channels = getObjKeys(data) var channels = getObjKeys(data)
var channelKeys:string[] = ["x-active", "x-channelID", "x-name", "_file.m3u.name", "x-group-title"] var channelKeys:string[] = ["x-active", "x-channelID", "x-name", "_file.m3u.name", "x-group-title", "x-xmltv-file"]
channels.forEach(id => { channels.forEach(id => {
@@ -330,7 +330,17 @@ function createSearchObj() {
} else { } else {
SEARCH_MAPPING[id] = SEARCH_MAPPING[id] + data[id][key] + " " if (key == "x-xmltv-file") {
var xmltvFile = getValueFromProviderFile(data[id][key], "xmltv", "name")
if (xmltvFile != undefined) {
SEARCH_MAPPING[id] = SEARCH_MAPPING[id] + xmltvFile + " "
}
} else {
SEARCH_MAPPING[id] = SEARCH_MAPPING[id] + data[id][key] + " "
}
} }