🎉 Release of add-on TVHeadend 7.0.0b0

dfigus · Nov 19, 2024 · d616c5c · d616c5c
1 parent d12d92e
commit d616c5c
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -133,10 +133,10 @@ SOFTWARE.
 [solarflow-control-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [solarflow-control-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
 [solarflow-control-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
-[addon-tvheadend]: https://github.com/dfigus/addon-tvheadend/tree/v6.0.2
-[addon-doc-tvheadend]: https://github.com/dfigus/addon-tvheadend/blob/v6.0.2/README.md
+[addon-tvheadend]: https://github.com/dfigus/addon-tvheadend/tree/7.0.0b0
+[addon-doc-tvheadend]: https://github.com/dfigus/addon-tvheadend/blob/7.0.0b0/README.md
 [tvheadend-issue]: https://github.com/dfigus/addon-tvheadend/issues
-[tvheadend-version-shield]: https://img.shields.io/badge/version-v6.0.2-blue.svg
+[tvheadend-version-shield]: https://img.shields.io/badge/version-7.0.0b0-blue.svg
 [tvheadend-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [tvheadend-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [tvheadend-armhf-shield]: https://img.shields.io/badge/armhf-no-red.svg

diff --git a/tvheadend/CHANGELOG.md b/tvheadend/CHANGELOG.md
@@ -1,19 +1,25 @@
 ## What’s changed
 
+## 🚨 Breaking changes
+This addon NO longer supports `armhv`, `armv7` and `i386` architectures! The reason is that .NET is not available for those architectures and it's a prerequisite for WebGrab+Plus. @dfigus (#287) 
+
+## ✨ New features
+
+- Add WebGrab+Plus @dfigus (#287)
+- Enhance WG++ Integration @dfigus (#295)
+
 ## ⬆️ Dependency updates
 
-- ⬆️ Update picons/picons to v2024-09-28--20-50-07 @renovate (#265)
-- ⬆️ Update Add-on base image to v16.3.2 @renovate (#266)
-- ⬆️ Update alpine_3_20/curl to v8.10.1-r0 @renovate (#267)
-- ⬆️ Update streamlink to v6.11.0 @renovate (#268)
-- ⬆️ Update tvheadend digest to eee5cda @renovate (#269)
-- ⬆️ Update picons/picons to v2024-10-04--19-12-17 @renovate (#270)
-- ⬆️ Update Alpine packages to v3.12.7-r0 @renovate (#271)
-- ⬆️ Update tvheadend digest to 26ec161 @renovate (#272)
-- ⬆️ Update Add-on base image to v16.3.3 @renovate (#273)
-- ⬆️ Update picons/picons to v2024-10-12--22-12-05 @renovate (#274)
-- ⬆️ Update setuptools to v75.2.0 @renovate (#275)
-- ⬆️ Update alpine_3_20/openssl-dev to v3.3.2-r1 @renovate (#276)
-- ⬆️ Update picons/picons to v2024-10-19--21-18-53 @renovate (#277)
-- ⬆️ Update Add-on base image to v16.3.4 @renovate (#278)
-- ⬆️ Update picons/picons to v2024-10-24--22-16-09 @renovate (#279)
+- ⬆️ Update setuptools to v75.3.0 @renovate (#280)
+- ⬆️ Update picons/picons to v2024-10-31--22-20-37 @renovate (#281)
+- ⬆️ Update alpine_3_20/curl to v8.11.0-r0 @renovate (#283)
+- ⬆️ Update alpine_3_20/curl to v8.11.0-r1 @renovate (#284)
+- ⬆️ Update Add-on base image to v16.3.5 @renovate (#285)
+- ⬆️ Update picons/picons to v2024-11-08--23-41-52 @renovate (#286)
+- ⬆️ Update setuptools to v75.4.0 @renovate (#289)
+- ⬆️ Update alpine_3_20/curl to v8.11.0-r2 @renovate (#288)
+- ⬆️ Update Add-on base image to v16.3.6 @renovate (#290)
+- ⬆️ Update tvheadend digest to 653bd04 @renovate (#291)
+- ⬆️ Update setuptools to v75.5.0 @renovate (#292)
+- ⬆️ Update alpine_3_20/dotnet8-runtime to v8.0.11-r0 @renovate (#293)
+- ⬆️ Update picons/picons to v2024-11-14--16-55-04 @renovate (#294)
diff --git a/tvheadend/DOCS.md b/tvheadend/DOCS.md
@@ -14,6 +14,7 @@ This add-on has the following additional software preinstalled:
 - [Comskip][comskip]: A tool to mark commercials in recordings (autoskipped in Kodi)
 - [Comchap & Comcut][comchap]: Utilities to add chapters or cut commercials based on detected commercials from Comskip
 - [StreamLink][streamlink]
+- [WebGrab++][wg++]: A XMLTV EPG grabber for many sites. Useful in case OTA EPG is not sufficient.
 
 In order to use them, additional TVHeadend configuration need to be done, which are
 outlined in here.
@@ -83,6 +84,26 @@ Content that should be used for the `comskip.ini`, which will be stored at `/con
 The `comskip.ini` is required to tell Comskip how to detect commercials in the recording. See also the [Comskip section](Comskip).
 It is recommended to edit it in YAML and use the [YAML literal style][yaml-literal] to preserve newline.
 
+### Option: WebGrab+Plus Channels `wg_channels`
+
+A list of channels that shall be used by WebGrab+Plus. Example:
+
+```
+wg_channels:
+  - country: "Germany"
+    site: "tvtoday.de"
+    channel: "ard"
+  - country: "Germany"
+    site: "tvtoday.de"
+    channel: "zdf"
+```
+
+This will add two channels from the `siteini.pack` folder to the WebGrab+Plus XML config file. The country is translated to the folder name `Germany`, the site is used to find the `tvtoday.de.channels.xml` file and the `channel` is used to find the `<channel site_id="ard">` and `<channel site_id="zdf">` entries. All names are _case-sensitive_. The matching channels are copied over to the default WebGrab+Plus configuration XML (with the dummy channel removed).
+
+### Option: WebGrab+Plus Configuration XML `wg_config`
+
+As a more advanced user you might want to fully customize the WebGrab+Plus configuration file. This allows you to enter your WebGrab+Plus license or use decrypt keys. Do not use this configuration together with the simple `wg_channel` configuration.
+
 ## Additional Configuration
 
 ### Picons
@@ -124,6 +145,15 @@ them entirely (Comcut) from the recording. The scripts are located in `/usr/bin/
 
 Further information how to use them can be found [here][comchap].
 
+### WebGrab+Plus
+
+This addon comes with preinstalled WebGrab+Plus, a XMLTV EPG grabber. The TVHeadend integration is already done and the grabber runs every night at 0:00.
+In order to enable the WebGrab+Plus grabber, you need to enable it in TVHeadend Configuration -> Channel / EPG -> EPG Grabber Modules:
+
+![tvh_wg++][https://github.com/dfigus/addon-tvheadend/raw/main/images/tvh_wg++.png]
+
+Further information can be found [here][wg++]
+
 ### Additional Details
 
 - Config files are stored in `/config/tvheadend/` and will be backed up with the addon-on
@@ -191,6 +221,7 @@ SOFTWARE.
 [comchap]: https://github.com/BrettSheleski/comchap
 [comskip-forum]: https://www.kaashoek.com/comskip/
 [streamlink]: https://streamlink.github.io/
+[wg++]: http://www.webgrabplus.com/
 [tvheadend]: https://tvheadend.org/
 [alpine-packages]: https://pkgs.alpinelinux.org/packages
 [dockerfile]: https://github.com/dfigus/addon-tvheadend/blob/main/tvheadend/Dockerfile#L172-L206

diff --git a/tvheadend/README.md b/tvheadend/README.md
@@ -23,13 +23,15 @@ This add-on has the following additional software preinstalled:
 - [Comskip][comskip]: A tool to mark commercials in recordings (autoskipped in Kodi)
 - [Comchap & Comcut][comchap]: Utilities to add chapters or cut commercials based on detected commercials from Comskip
 - [StreamLink][streamlink]
+- [WebGrab++][wg++]: A XMLTV EPG grabber for many sites. Useful in case OTA EPG is not sufficient.
 
 [picons]: https://github.com/picons/picons
 [comskip]: https://github.com/erikkaashoek/Comskip
 [comchap]: https://github.com/BrettSheleski/comchap
 [streamlink]: https://streamlink.github.io/
+[wg++]: http://www.webgrabplus.com/
 [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
 [maintenance-shield]: https://img.shields.io/maintenance/yes/2024.svg
 [project-stage-shield]: https://img.shields.io/badge/project%20stage-production%20ready-brightgreen.svg
-[release-shield]: https://img.shields.io/badge/version-v6.0.2-blue.svg
-[release]: https://github.com/dfigus/addon-tvheadend/tree/v6.0.2
+[release-shield]: https://img.shields.io/badge/version-7.0.0b0-blue.svg
+[release]: https://github.com/dfigus/addon-tvheadend/tree/7.0.0b0
diff --git a/tvheadend/config.yaml b/tvheadend/config.yaml
@@ -1,5 +1,5 @@
 name: TVHeadend
-version: 6.0.2
+version: 7.0.0b0
 slug: tvheadend
 description: TV streaming server and recorder
 url: https://github.com/dfigus/addon-tvheadend
@@ -11,9 +11,7 @@ panel_icon: mdi:television
 arch:
 - aarch64
 - amd64
-- armhf
 - armv7
-- i386
 host_network: true
 video: true
 usb: true
@@ -71,11 +69,17 @@ options:
   init_commands: []
   args: ''
   comskip_ini: ''
+  wg_channels: []
 schema:
   system_packages:
   - str?
   init_commands:
   - str?
   args: str?
   comskip_ini: str?
+  wg_channels:
+  - country: str?
+    site: str?
+    channel: str?
+  wg_config: str?
 image: ghcr.io/dfigus/tvheadend/{arch}
diff --git a/tvheadend/translations/en.yaml b/tvheadend/translations/en.yaml
@@ -16,3 +16,12 @@ configuration:
     name: Comskip ini
     description: >-
       Content that shall be stored as comskip.ini.
+  wg_config:
+    name: WebGrab+Plus Configuration XML
+    description: >-
+      A full WebGrab+Plus configuration XML that shall be used unaltered. Do not use this option if you want to use
+      the WebGrab+Plus Channels option.
+  wg_channels:
+    name: WebGrab+Plus Channels
+    description: >-
+      A list of channels that shall be copied from the siteini.pack into the WebGrab+Plus configuration