From e1e096aeb514f60ad6c1d61b583c5158745f33e3 Mon Sep 17 00:00:00 2001
From: deathbybandaid <github@deathbybandaid.net>
Date: Fri, 15 Jan 2021 14:00:11 -0500
Subject: [PATCH] test

---
 README.md                |  2 +-
 config.all.ini           | 10 ++++----
 docs/ADV_Config.md       | 14 +++++------
 docs/Config.md           |  8 +++----
 docs/Origin.md           |  4 ++--
 docs/README.md           |  2 +-
 docs/Related-Projects.md |  2 +-
 docs/Usage.md            | 50 ++++++++++++++++++++--------------------
 docs/WebUI.md            |  4 ++--
 origin/origin_conf.json  | 12 +++++-----
 10 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/README.md b/README.md
index 1b60105..b6ea32b 100644
--- a/README.md
+++ b/README.md
@@ -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:
diff --git a/config.all.ini b/config.all.ini
index b5496b4..e0d1ee9 100644
--- a/config.all.ini
+++ b/config.all.ini
@@ -1,8 +1,8 @@
 [main]
 # uuid =
 # cache_dir =
-# servicename = NewsOn
-# reponame = fHDHR_NewsOn
+# servicename = LocalNow
+# reponame = fHDHR_LocalNow
 
 [fhdhr]
 # address = 0.0.0.0
@@ -10,8 +10,8 @@
 # port = 5004
 # stream_type = direct
 # tuner_count =  4
-# friendlyname = fHDHR-NewsOn
-# reporting_firmware_name = fHDHR_NewsOn
+# friendlyname = fHDHR-LocalNow
+# reporting_firmware_name = fHDHR_LocalNow
 # reporting_manufacturer = BoronDust
 # reporting_model = fHDHR
 # reporting_firmware_ver = 20201001
@@ -41,5 +41,5 @@
 # type = sqlite
 # driver = None
 
-[newson]
+[localnow]
 # force_best = False
diff --git a/docs/ADV_Config.md b/docs/ADV_Config.md
index 3696168..ab57d9b 100644
--- a/docs/ADV_Config.md
+++ b/docs/ADV_Config.md
@@ -1,7 +1,7 @@
 <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
 **H**ome
@@ -45,8 +45,8 @@ The `fhdhr` contains all the configuration options for interfacing between this
 # port = 5004
 # stream_type = direct
 # tuner_count =  4
-# friendlyname = fHDHR-NewsOn
-# reporting_firmware_name = fHDHR_NewsOn
+# friendlyname = fHDHR-LocalNow
+# reporting_firmware_name = fHDHR_LocalNow
 # reporting_manufacturer = BoronDust
 # reporting_model = fHDHR
 # reporting_firmware_ver = 20201001
@@ -56,7 +56,7 @@ The `fhdhr` contains all the configuration options for interfacing between this
 
 # EPG
 * `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.
 
 ````
@@ -119,11 +119,11 @@ TODO: improve documentation here.
 # driver = None
 ````
 
-## NewsOn
-The `newson` section
+## LocalNow
+The `localnow` section
 
 ````
-[newson]
+[localnow]
 # username =
 # password =
 ````
diff --git a/docs/Config.md b/docs/Config.md
index e90a3f5..1e2f79c 100644
--- a/docs/Config.md
+++ b/docs/Config.md
@@ -1,7 +1,7 @@
 <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
 **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
 ````
 
-## NewsOn
+## LocalNow
 
-NewsOn requires signin credentials, so add those.
+LocalNow requires signin credentials, so add those.
 
 ````
-[newson]
+[localnow]
 # username =
 # password =
 ````
diff --git a/docs/Origin.md b/docs/Origin.md
index 7582705..f868dc1 100644
--- a/docs/Origin.md
+++ b/docs/Origin.md
@@ -1,7 +1,7 @@
 <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
 **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).
diff --git a/docs/README.md b/docs/README.md
index 7528b06..0dd1701 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,7 +1,7 @@
 <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
 **H**ome
diff --git a/docs/Related-Projects.md b/docs/Related-Projects.md
index e7e1254..fa6b00e 100644
--- a/docs/Related-Projects.md
+++ b/docs/Related-Projects.md
@@ -1,7 +1,7 @@
 <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
 **H**ome
diff --git a/docs/Usage.md b/docs/Usage.md
index d419084..38f8f54 100644
--- a/docs/Usage.md
+++ b/docs/Usage.md
@@ -1,7 +1,7 @@
 <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
 **H**ome
@@ -50,72 +50,72 @@ fHDHR uses direct connections with video sources by default. Alternatively, you
 ## 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 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
-* run the following commands to clone the repo into `~/fhdhr/fHDHR_NewsOn`
+* 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_LocalNow`
 ```
 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
 ```
 version: '3'
 
 services:
-  newson:
-    build: ./fHDHR_NewsOn
-    container_name: newson
+  localnow:
+    build: ./fHDHR_LocalNow
+    container_name: localnow
     network_mode: host
     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
 ```
-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.
 
 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 pull
 cd ~/fhdhr
-docker-compose up --build -d newson
+docker-compose up --build -d localnow
 ```
 <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.
 
-* 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
-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).
-* add newson as a service in your `docker-compose.yml` file
+* **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 localnow as a service in your `docker-compose.yml` file
 ```
 version: '3'
 
 services:
-  newson:
-    build: ./fHDHR_NewsOn
-    container_name: newson
+  localnow:
+    build: ./fHDHR_LocalNow
+    container_name: localnow
     network_mode: host
     volumes:
-      - ./fHDHR_NewsOn/config.ini:/app/config/config.ini
+      - ./fHDHR_LocalNow/config.ini:/app/config/config.ini
 
-  newson:
-    build: ./fHDHR_NewsOn
-    container_name: newson
+  localnow:
+    build: ./fHDHR_LocalNow
+    container_name: localnow
     network_mode: host
     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
 ```
-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.
diff --git a/docs/WebUI.md b/docs/WebUI.md
index 5387043..f7fa448 100644
--- a/docs/WebUI.md
+++ b/docs/WebUI.md
@@ -1,7 +1,7 @@
 <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
 **H**ome
@@ -27,7 +27,7 @@ Below is the main landing page with basic information.
 
 <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.
 
diff --git a/origin/origin_conf.json b/origin/origin_conf.json
index 8a97d97..b86c0d3 100644
--- a/origin/origin_conf.json
+++ b/origin/origin_conf.json
@@ -1,29 +1,29 @@
 {
   "main":{
           "servicename":{
-                "value": "NewsOn",
+                "value": "LocalNow",
                 "config_file": false,
                 "config_web": false
                 },
           "dictpopname":{
-                      "value": "newson",
+                      "value": "localnow",
                       "config_file": false,
                       "config_web": false
                     },
           "reponame":{
-                          "value": "fHDHR_NewsOn",
+                          "value": "fHDHR_LocalNow",
                           "config_file": false,
                           "config_web": false
                         }
   },
   "fhdhr":{
           "friendlyname":{
-                    "value": "fHDHR-NewsOn",
+                    "value": "fHDHR-LocalNow",
                     "config_file": true,
                     "config_web": true
                 },
           "reporting_firmware_name":{
-                                    "value": "fHDHR_NewsOn",
+                                    "value": "fHDHR_LocalNow",
                                     "config_file": true,
                                     "config_web": true
                                   }
@@ -40,7 +40,7 @@
                           "config_web": false
                         }
   },
-  "newson":{
+  "localnow":{
           "force_best":{
                     "value": false,
                     "config_file": true,