fHDHR/fHDHR_NextPVR
1
0
Fork 0
mirror of https://github.com/fHDHR/fHDHR_NextPVR.git synced 2025-12-06 12:16:58 -05:00
Code Issues Releases Wiki Activity

Update Conf

Browse Source
This commit is contained in:
deathbybandaid 2020-12-08 15:16:35 -05:00
parent 10311a767e
commit b75d4284d0
9 changed files with 23 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
data/internal_config/epg.json
View File

@ -11,9 +11,14 @@
"config_web": true "config_web": true
}, },
"update_frequency":{ "update_frequency":{
"value": 14400, "value": 43200,
"config_file": true, "config_file": true,
"config_web": true "config_web": true
},
"valid_epg_methods":{
"value": "None,blocks",
"config_file": false,
"config_web": false
} }
} }
} }

5
data/internal_config/main.json
View File

@ -30,11 +30,6 @@
"config_file": false, "config_file": false,
"config_web": false "config_web": false
}, },
"valid_epg_methods":{
"value": "None,blocks",
"config_file": false,
"config_web": false
},
"required":{ "required":{
"value": "none", "value": "none",
"config_file": false, "config_file": false,

4
fHDHR/config/__init__.py
View File

@ -243,8 +243,8 @@ class Config():
self.dict["origin"] = self.dict.pop(self.dict["main"]["dictpopname"]) self.dict["origin"] = self.dict.pop(self.dict["main"]["dictpopname"])
if isinstance(self.dict["main"]["valid_epg_methods"], str): if isinstance(self.dict["epg"]["valid_epg_methods"], str):
self.dict["main"]["valid_epg_methods"] = [self.dict["main"]["valid_epg_methods"]] self.dict["epg"]["valid_epg_methods"] = [self.dict["epg"]["valid_epg_methods"]]
if self.dict["epg"]["method"] and self.dict["epg"]["method"] not in ["None"]: if self.dict["epg"]["method"] and self.dict["epg"]["method"] not in ["None"]:
if isinstance(self.dict["epg"]["method"], str): if isinstance(self.dict["epg"]["method"], str):

10
fHDHR/device/epg/__init__.py
View File

@ -18,7 +18,7 @@ class EPG():
self.epgdict = {} self.epgdict = {}
self.epg_methods = self.fhdhr.config.dict["epg"]["method"] self.epg_methods = self.fhdhr.config.dict["epg"]["method"]
self.valid_epg_methods = [x for x in self.fhdhr.config.dict["main"]["valid_epg_methods"] if x and x not in [None, "None"]] self.valid_epg_methods = [x for x in self.fhdhr.config.dict["epg"]["valid_epg_methods"] if x and x not in [None, "None"]]
self.blocks = blocksEPG(self.fhdhr, self.channels) self.blocks = blocksEPG(self.fhdhr, self.channels)
self.epg_handling = { self.epg_handling = {
@ -43,7 +43,7 @@ class EPG():
if not method: if not method:
method = self.def_method method = self.def_method
if (method == self.fhdhr.config.dict["main"]["dictpopname"] or if (method == self.fhdhr.config.dict["main"]["dictpopname"] or
method not in self.fhdhr.config.dict["main"]["valid_epg_methods"]): method not in self.fhdhr.config.dict["epg"]["valid_epg_methods"]):
method = "origin" method = "origin"
epgtypename = method epgtypename = method
@ -78,7 +78,7 @@ class EPG():
if not method: if not method:
method = self.def_method method = self.def_method
if (method == self.fhdhr.config.dict["main"]["dictpopname"] or if (method == self.fhdhr.config.dict["main"]["dictpopname"] or
method not in self.fhdhr.config.dict["main"]["valid_epg_methods"]): method not in self.fhdhr.config.dict["epg"]["valid_epg_methods"]):
method = "origin" method = "origin"
channel_guide_list = [] channel_guide_list = []
@ -95,7 +95,7 @@ class EPG():
if not method: if not method:
method = self.def_method method = self.def_method
if (method == self.fhdhr.config.dict["main"]["dictpopname"] or if (method == self.fhdhr.config.dict["main"]["dictpopname"] or
method not in self.fhdhr.config.dict["main"]["valid_epg_methods"]): method not in self.fhdhr.config.dict["epg"]["valid_epg_methods"]):
method = "origin" method = "origin"
if method not in list(self.epgdict.keys()): if method not in list(self.epgdict.keys()):
@ -147,7 +147,7 @@ class EPG():
def update(self, method=None): def update(self, method=None):
if (not method or if (not method or
method not in self.fhdhr.config.dict["main"]["valid_epg_methods"]): method not in self.fhdhr.config.dict["epg"]["valid_epg_methods"]):
method = self.def_method method = self.def_method
if method == self.fhdhr.config.dict["main"]["dictpopname"]: if method == self.fhdhr.config.dict["main"]["dictpopname"]:

2
fHDHR_web/api/epg.py
View File

@ -20,7 +20,7 @@ class EPG():
method = request.args.get('method', default="get", type=str) method = request.args.get('method', default="get", type=str)
source = request.args.get('source', default=self.fhdhr.config.dict["epg"]["def_method"], type=str) source = request.args.get('source', default=self.fhdhr.config.dict["epg"]["def_method"], type=str)
if source not in self.fhdhr.config.dict["main"]["valid_epg_methods"]: if source not in self.fhdhr.config.dict["epg"]["valid_epg_methods"]:
return "%s Invalid xmltv method" % source return "%s Invalid xmltv method" % source
redirect_url = request.args.get('redirect', default=None, type=str) redirect_url = request.args.get('redirect', default=None, type=str)

2
fHDHR_web/api/images.py
View File

@ -26,7 +26,7 @@ class Images():
elif method == "get": elif method == "get":
source = request.args.get('source', default=self.fhdhr.config.dict["epg"]["method"], type=str) source = request.args.get('source', default=self.fhdhr.config.dict["epg"]["method"], type=str)
if source in self.fhdhr.config.dict["main"]["valid_epg_methods"]: if source in self.fhdhr.config.dict["epg"]["valid_epg_methods"]:
image_type = request.args.get('type', default="content", type=str) image_type = request.args.get('type', default="content", type=str)
if image_type in ["content", "channel"]: if image_type in ["content", "channel"]:
image_id = request.args.get('id', default=None, type=str) image_id = request.args.get('id', default=None, type=str)

2
fHDHR_web/api/xmltv.py
View File

@ -30,7 +30,7 @@ class xmlTV():
method = request.args.get('method', default="get", type=str) method = request.args.get('method', default="get", type=str)
source = request.args.get('source', default=self.fhdhr.config.dict["epg"]["def_method"], type=str) source = request.args.get('source', default=self.fhdhr.config.dict["epg"]["def_method"], type=str)
if source not in self.fhdhr.config.dict["main"]["valid_epg_methods"]: if source not in self.fhdhr.config.dict["epg"]["valid_epg_methods"]:
return "%s Invalid xmltv method" % source return "%s Invalid xmltv method" % source
redirect_url = request.args.get('redirect', default=None, type=str) redirect_url = request.args.get('redirect', default=None, type=str)

2
fHDHR_web/templates/xmltv.html
View File

@ -12,7 +12,7 @@
<th>Options</th> <th>Options</th>
</tr> </tr>
{% for epg_method in fhdhr.config.dict["main"]["valid_epg_methods"] %} {% for epg_method in fhdhr.config.dict["epg"]["valid_epg_methods"] %}
{% if epg_method not in [None, "None"] %} {% if epg_method not in [None, "None"] %}
{% set epg_method_name = epg_method %} {% set epg_method_name = epg_method %}
{% if epg_method == "origin" %} {% if epg_method == "origin" %}

23
origin/origin_conf.json
View File

@ -15,11 +15,6 @@
"config_file": false, "config_file": false,
"config_web": false "config_web": false
}, },
"valid_epg_methods":{
"value": "None,blocks,origin,zap2it",
"config_file": false,
"config_web": false
},
"required":{ "required":{
"value": "nextpvr/pin", "value": "nextpvr/pin",
"config_file": false, "config_file": false,
@ -32,16 +27,6 @@
"config_file": true, "config_file": true,
"config_web": true "config_web": true
}, },
"stream_type":{
"value": "direct",
"config_file": true,
"config_web": true
},
"tuner_count":{
"value": 4,
"config_file": true,
"config_web": true
},
"reporting_firmware_name":{ "reporting_firmware_name":{
"value": "fHDHR_NextPVR", "value": "fHDHR_NextPVR",
"config_file": true, "config_file": true,
@ -54,10 +39,10 @@
"config_file": true, "config_file": true,
"config_web": true "config_web": true
}, },
"update_frequency":{ "valid_epg_methods":{
"value": 43200, "value": "None,blocks,origin,zap2it",
"config_file": true, "config_file": false,
"config_web": true "config_web": false
} }
}, },
"nextpvr":{ "nextpvr":{