deathbybandaid/fHDHR_LocalNow
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

test

Browse Source
This commit is contained in:
deathbybandaid 2021-01-15 14:00:11 -05:00
parent 0b4b5ac3a3
commit e1e096aeb5
10 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,4 +1,4 @@
<p align="center">fHDHR_NewsOn <img src="docs/images/logo.ico" alt="Logo"/></p> <p align="center">fHDHR_LocalNow <img src="docs/images/logo.ico" alt="Logo"/></p>
Welcome to the world of streaming content as a DVR device! We use some fancy python here to achieve a system of: Welcome to the world of streaming content as a DVR device! We use some fancy python here to achieve a system of:

10
config.all.ini
View File

@ -1,8 +1,8 @@
[main] [main]
# uuid = # uuid =
# cache_dir = # cache_dir =
# servicename = NewsOn # servicename = LocalNow
# reponame = fHDHR_NewsOn # reponame = fHDHR_LocalNow
[fhdhr] [fhdhr]
# address = 0.0.0.0 # address = 0.0.0.0
@ -10,8 +10,8 @@
# port = 5004 # port = 5004
# stream_type = direct # stream_type = direct
# tuner_count = 4 # tuner_count = 4
# friendlyname = fHDHR-NewsOn # friendlyname = fHDHR-LocalNow
# reporting_firmware_name = fHDHR_NewsOn # reporting_firmware_name = fHDHR_LocalNow
# reporting_manufacturer = BoronDust # reporting_manufacturer = BoronDust
# reporting_model = fHDHR # reporting_model = fHDHR
# reporting_firmware_ver = 20201001 # reporting_firmware_ver = 20201001
@ -41,5 +41,5 @@
# type = sqlite # type = sqlite
# driver = None # driver = None
[newson] [localnow]
# force_best = False # force_best = False

14
docs/ADV_Config.md
View File

@ -1,7 +1,7 @@
<p align="center">fHDHR <img src="images/logo.ico" alt="Logo"/></p> <p align="center">fHDHR <img src="images/logo.ico" alt="Logo"/></p>
--- ---
[Main](README.md) | [Setup and Usage](Usage.md) | [NewsOn](Origin.md) | [Credits/Related Projects](Related-Projects.md) [Main](README.md) | [Setup and Usage](Usage.md) | [LocalNow](Origin.md) | [Credits/Related Projects](Related-Projects.md)
--- ---
**f**un **f**un
**H**ome **H**ome
@ -45,8 +45,8 @@ The `fhdhr` contains all the configuration options for interfacing between this
# port = 5004 # port = 5004
# stream_type = direct # stream_type = direct
# tuner_count = 4 # tuner_count = 4
# friendlyname = fHDHR-NewsOn # friendlyname = fHDHR-LocalNow
# reporting_firmware_name = fHDHR_NewsOn # reporting_firmware_name = fHDHR_LocalNow
# reporting_manufacturer = BoronDust # reporting_manufacturer = BoronDust
# reporting_model = fHDHR # reporting_model = fHDHR
# reporting_firmware_ver = 20201001 # reporting_firmware_ver = 20201001
@ -56,7 +56,7 @@ The `fhdhr` contains all the configuration options for interfacing between this
# EPG # EPG
* `images` can be set to `proxy` or `pass`. If you choose `proxy`, images will be reverse proxied through fHDHR. * `images` can be set to `proxy` or `pass`. If you choose `proxy`, images will be reverse proxied through fHDHR.
* `method` defaults to `origin` and will pull the xmltv data from NewsOn. Other Options include `blocks` which is an hourly schedule with minimal channel information. Another option is `zap2it`, which is another source of EPG information. Channel Numbers may need to be manually mapped. * `method` defaults to `origin` and will pull the xmltv data from LocalNow. Other Options include `blocks` which is an hourly schedule with minimal channel information. Another option is `zap2it`, which is another source of EPG information. Channel Numbers may need to be manually mapped.
* `update_frequency` * `epg_update_frequency` determines how often we check for new scheduling information. In Seconds. * `update_frequency` * `epg_update_frequency` determines how often we check for new scheduling information. In Seconds.
```` ````
@ -119,11 +119,11 @@ TODO: improve documentation here.
# driver = None # driver = None
```` ````
## NewsOn ## LocalNow
The `newson` section The `localnow` section
```` ````
[newson] [localnow]
# username = # username =
# password = # password =
```` ````

8
docs/Config.md
View File

@ -1,7 +1,7 @@
<p align="center">fHDHR <img src="images/logo.ico" alt="Logo"/></p> <p align="center">fHDHR <img src="images/logo.ico" alt="Logo"/></p>
--- ---
[Main](README.md) | [Setup and Usage](Usage.md) | [NewsOn](Origin.md) | [Credits/Related Projects](Related-Projects.md) [Main](README.md) | [Setup and Usage](Usage.md) | [LocalNow](Origin.md) | [Credits/Related Projects](Related-Projects.md)
--- ---
**f**un **f**un
**H**ome **H**ome
@ -30,12 +30,12 @@ Under `fhdhr`, you'll find 2 addresses listed. `0.0.0.0` works great for a liste
# discovery_address = 0.0.0.0 # discovery_address = 0.0.0.0
```` ````
## NewsOn ## LocalNow
NewsOn requires signin credentials, so add those. LocalNow requires signin credentials, so add those.
```` ````
[newson] [localnow]
# username = # username =
# password = # password =
```` ````

4
docs/Origin.md
View File

@ -1,7 +1,7 @@
<p align="center">fHDHR <img src="images/logo.ico" alt="Logo"/></p> <p align="center">fHDHR <img src="images/logo.ico" alt="Logo"/></p>
--- ---
[Main](README.md) | [Setup and Usage](Usage.md) | [NewsOn](Origin.md) | [Credits/Related Projects](Related-Projects.md) [Main](README.md) | [Setup and Usage](Usage.md) | [LocalNow](Origin.md) | [Credits/Related Projects](Related-Projects.md)
--- ---
**f**un **f**un
**H**ome **H**ome
@ -12,4 +12,4 @@
--- ---
This varient of fHDHR connects to [NewsOn](https://newson.us/about). This varient of fHDHR connects to [LocalNow](https://localnow.us/about).

2
docs/README.md
View File

@ -1,7 +1,7 @@
<p align="center">fHDHR <img src="images/logo.ico" alt="Logo"/></p> <p align="center">fHDHR <img src="images/logo.ico" alt="Logo"/></p>
--- ---
[Main](README.md) | [Setup and Usage](Usage.md) | [NewsOn](Origin.md) | [Credits/Related Projects](Related-Projects.md) [Main](README.md) | [Setup and Usage](Usage.md) | [LocalNow](Origin.md) | [Credits/Related Projects](Related-Projects.md)
--- ---
**f**un **f**un
**H**ome **H**ome

2
docs/Related-Projects.md
View File

@ -1,7 +1,7 @@
<p align="center">fHDHR <img src="images/logo.ico" alt="Logo"/></p> <p align="center">fHDHR <img src="images/logo.ico" alt="Logo"/></p>
--- ---
[Main](README.md) | [Setup and Usage](Usage.md) | [NewsOn](Origin.md) | [Credits/Related Projects](Related-Projects.md) [Main](README.md) | [Setup and Usage](Usage.md) | [LocalNow](Origin.md) | [Credits/Related Projects](Related-Projects.md)
--- ---
**f**un **f**un
**H**ome **H**ome

50
docs/Usage.md
View File

@ -1,7 +1,7 @@
<p align="center">fHDHR <img src="images/logo.ico" alt="Logo"/></p> <p align="center">fHDHR <img src="images/logo.ico" alt="Logo"/></p>
--- ---
[Main](README.md) | [Setup and Usage](Usage.md) | [NewsOn](Origin.md) | [Credits/Related Projects](Related-Projects.md) [Main](README.md) | [Setup and Usage](Usage.md) | [LocalNow](Origin.md) | [Credits/Related Projects](Related-Projects.md)
--- ---
**f**un **f**un
**H**ome **H**ome
@ -50,72 +50,72 @@ fHDHR uses direct connections with video sources by default. Alternatively, you
## Docker ## Docker
This portion of the guide assumes you are using a Linux system with both docker and docker-compose installed. This (or some variation thereof) may work on Mac or Windows, but has not been tested. This portion of the guide assumes you are using a Linux system with both docker and docker-compose installed. This (or some variation thereof) may work on Mac or Windows, but has not been tested.
* this guide assumes we wish to use the `~/fhdhr` directory for our install (you can use whatever directory you like, just make the appropriate changes elsewhere in this guide) and that we are installing for NewsOn support * this guide assumes we wish to use the `~/fhdhr` directory for our install (you can use whatever directory you like, just make the appropriate changes elsewhere in this guide) and that we are installing for LocalNow support
* run the following commands to clone the repo into `~/fhdhr/fHDHR_NewsOn` * run the following commands to clone the repo into `~/fhdhr/fHDHR_LocalNow`
``` ```
cd ~/fhdhr cd ~/fhdhr
git clone https://github.com/fHDHR/fHDHR_NewsOn.git git clone https://github.com/fHDHR/fHDHR_LocalNow.git
``` ```
* create your config.ini file (as described earlier in this guide) in the `~/fhdhr/fHDHR_NewsOn` directory * create your config.ini file (as described earlier in this guide) in the `~/fhdhr/fHDHR_LocalNow` directory
* while still in the `~/fhdhr` directory, create the following `docker-compose.yml` file * while still in the `~/fhdhr` directory, create the following `docker-compose.yml` file
``` ```
version: '3' version: '3'
services: services:
newson: localnow:
build: ./fHDHR_NewsOn build: ./fHDHR_LocalNow
container_name: newson container_name: localnow
network_mode: host network_mode: host
volumes: volumes:
- ./fHDHR_NewsOn/config.ini:/app/config/config.ini - ./fHDHR_LocalNow/config.ini:/app/config/config.ini
``` ```
* run the following command to build and launch the container * run the following command to build and launch the container
``` ```
docker-compose up --build -d newson docker-compose up --build -d localnow
``` ```
After a short period of time (during which docker will build your new fHDHR container), you should now have a working build of fHDHR running inside a docker container. After a short period of time (during which docker will build your new fHDHR container), you should now have a working build of fHDHR running inside a docker container.
As the code changes and new versions / bug fixes are released, at any point you can pull the latest version of the code and rebuild your container with the following commands: As the code changes and new versions / bug fixes are released, at any point you can pull the latest version of the code and rebuild your container with the following commands:
``` ```
cd ~/fhdhr/fHDHR_NewsOn cd ~/fhdhr/fHDHR_LocalNow
git checkout master git checkout master
git pull git pull
cd ~/fhdhr cd ~/fhdhr
docker-compose up --build -d newson docker-compose up --build -d localnow
``` ```
<hr /> <hr />
You can also run multiple instances of fHDHR to support additional sources by cloning the appropriate repo into your `~/fhdhr` directory and adding the necessary services to the docker-compose file we created above. You can also run multiple instances of fHDHR to support additional sources by cloning the appropriate repo into your `~/fhdhr` directory and adding the necessary services to the docker-compose file we created above.
* for example, if we also wanted NewsOn support, you would clone the NewsOn repository: * for example, if we also wanted LocalNow support, you would clone the LocalNow repository:
``` ```
cd ~/fhdhr cd ~/fhdhr
git clone https://github.com/fHDHR/fHDHR_NewsOn.git git clone https://github.com/fHDHR/fHDHR_LocalNow.git
``` ```
* **NOTE**: if you are running multiple services on the same machine, you must change the port in your config.ini file for each one. For example, if NewsOn was using the default port of 5004, NewsOn cannot also use that port. You must change the port in your NewsOn config.ini file to something else (5005, for example). * **NOTE**: if you are running multiple services on the same machine, you must change the port in your config.ini file for each one. For example, if LocalNow was using the default port of 5004, LocalNow cannot also use that port. You must change the port in your LocalNow config.ini file to something else (5005, for example).
* add newson as a service in your `docker-compose.yml` file * add localnow as a service in your `docker-compose.yml` file
``` ```
version: '3' version: '3'
services: services:
newson: localnow:
build: ./fHDHR_NewsOn build: ./fHDHR_LocalNow
container_name: newson container_name: localnow
network_mode: host network_mode: host
volumes: volumes:
- ./fHDHR_NewsOn/config.ini:/app/config/config.ini - ./fHDHR_LocalNow/config.ini:/app/config/config.ini
newson: localnow:
build: ./fHDHR_NewsOn build: ./fHDHR_LocalNow
container_name: newson container_name: localnow
network_mode: host network_mode: host
volumes: volumes:
- ./fHDHR_NewsOn/config.ini:/app/config/config.ini - ./fHDHR_LocalNow/config.ini:/app/config/config.ini
``` ```
* run the following command to build and launch the container * run the following command to build and launch the container
``` ```
docker-compose up --build -d newson docker-compose up --build -d localnow
``` ```
You can repeat these instructions for as many fHDHR containers as your system resources will allow. You can repeat these instructions for as many fHDHR containers as your system resources will allow.

4
docs/WebUI.md
View File

@ -1,7 +1,7 @@
<p align="center">fHDHR <img src="images/logo.ico" alt="Logo"/></p> <p align="center">fHDHR <img src="images/logo.ico" alt="Logo"/></p>
--- ---
[Main](README.md) | [Setup and Usage](Usage.md) | [NewsOn](Origin.md) | [Credits/Related Projects](Related-Projects.md) [Main](README.md) | [Setup and Usage](Usage.md) | [LocalNow](Origin.md) | [Credits/Related Projects](Related-Projects.md)
--- ---
**f**un **f**un
**H**ome **H**ome
@ -27,7 +27,7 @@ Below is the main landing page with basic information.
<img src="screenshots/webui_main.PNG" alt="Main Page"/> <img src="screenshots/webui_main.PNG" alt="Main Page"/>
# NewsOn # LocalNow
Here you will have access to some basic information about the service we are proxying. Here you will have access to some basic information about the service we are proxying.

12
origin/origin_conf.json
View File

@ -1,29 +1,29 @@
{ {
"main":{ "main":{
"servicename":{ "servicename":{
"value": "NewsOn", "value": "LocalNow",
"config_file": false, "config_file": false,
"config_web": false "config_web": false
}, },
"dictpopname":{ "dictpopname":{
"value": "newson", "value": "localnow",
"config_file": false, "config_file": false,
"config_web": false "config_web": false
}, },
"reponame":{ "reponame":{
"value": "fHDHR_NewsOn", "value": "fHDHR_LocalNow",
"config_file": false, "config_file": false,
"config_web": false "config_web": false
} }
}, },
"fhdhr":{ "fhdhr":{
"friendlyname":{ "friendlyname":{
"value": "fHDHR-NewsOn", "value": "fHDHR-LocalNow",
"config_file": true, "config_file": true,
"config_web": true "config_web": true
}, },
"reporting_firmware_name":{ "reporting_firmware_name":{
"value": "fHDHR_NewsOn", "value": "fHDHR_LocalNow",
"config_file": true, "config_file": true,
"config_web": true "config_web": true
} }
@ -40,7 +40,7 @@
"config_web": false "config_web": false
} }
}, },
"newson":{ "localnow":{
"force_best":{ "force_best":{
"value": false, "value": false,
"config_file": true, "config_file": true,