Merge branch 'master' into dev

.github/stale.yml

@@ -0,0 +1,20 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 21
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - bug
+  - documentation
+  - enhancement
+  - pinned
+  - security
+# Label to use when marking an issue as stale
+staleLabel: inactive
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.gitignore

@@ -15,11 +15,11 @@ config_future.ini
 dev/
 data/
 cache/
+plugins_ext/
 *.ts
 lib/tvheadend/development/
 lib/web/htdocs/temp/*
 !lib/web/htdocs/temp/__init__.py
-plugins_ext/provider*
 build/*/cabernet*.exe
 ffmpeg/
 misc/

Dockerfile_tvh_crypt.alpine

@@ -2,13 +2,15 @@ FROM python:3.8-alpine
 #RUN apk add --no-cache --update bash tzdata ffmpeg py3-cryptography py-requests && \
 RUN apk add --no-cache --update bash tzdata ffmpeg curl && \
     apk add --no-cache --virtual builddeps gcc musl-dev python3-dev libffi-dev openssl-dev cargo && \
-    pip3 install requests && \
-    pip install cryptography --no-binary=cryptography && \
+    pip3 install httpx[http2] && \
+    pip3 install streamlink && \
+    pip3 install cryptography --no-binary=cryptography && \
     apk del builddeps
 
+COPY requirements.txt /app/requirements.txt
+
 COPY *.py /app/
 COPY lib/ /app/lib/
 COPY plugins /app/plugins
-COPY plugins_ext /app/plugins_ext
 RUN touch /app/is_container
 ENTRYPOINT ["python3", "/app/tvh_main.py"]

Dockerfile_tvh_crypt.slim-buster

@@ -28,6 +28,5 @@ RUN apt-get update \
 COPY *.py /app/
 COPY lib/ /app/lib/
 COPY plugins /app/plugins
-COPY plugins_ext /app/plugins_ext
 RUN touch /app/is_container
 ENTRYPOINT ["python3", "/app/tvh_main.py"]

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 ROCKY4546 (https://github.com/rocky4546)
+Copyright (c) 2023 ROCKY4546 (https://github.com/rocky4546)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,41 +1,76 @@
+## NOTICE: 
+By default this app doesn't provide any video sources, only the plugins access the providers streams for personal use.
 
 ## Installation
 ### 1. Requirements
-- Python 3.7+
+- Python 3.8+
 - python cryptography module
-- ffmpeg
+- python httpx[http2] module
+- (optional) streamlink module
+- ffmpeg and ffprobe
 
 ### 2. Installation
 - Download source
 - Unzip source in the installation folder
-- Create a data folder inside the installation folder and create a config.ini file inside the data folder
-- Edit the config.ini and add the following lines
+- Launch the app by running the command "python3 tvh_main.py". This should create a data folder and a config.ini inside that folder
+- Bring up browser and go to http://ip address:6077/
+- From Plugins, install PlutoTV plugin
+- Stop the app
+- Edit the data/config.ini and add the following lines (Update: This is suppose to automatically happen in 0.9.14)
 <pre>
 [plutotv_default]
 label = PlutoTV Instance
 </pre>
 - Launch the app by running the command "python3 tvh_main.py"
-- Bring up browser and go to http://ipaddress:6077/
+- Bring up browser and go to http://ip address:6077/
 - Go to settings and make changes you want.
     - Logging: Change log level from warning to info if needed
-    - Under Providers > PlutoTV enable
-        - URL Filtering
-        - PTS/DTS Resync
+- Enable the PlutoTV instance in the Settings page
+- Restart the app (from the Scheduler/Applications) to have the plugin fully activate
 - From XML/JSON Links try some of the links
 
-### 3. Docker
+### 3. Services
+- MS Windows
+    - Services for MS Windows is auto-created using the installer provided for each release.
+- Unix/Linux
+    - Services for CoreELEC and Debian/Ubuntu are found here. Follow the instructions found in the files.
+    - https://github.com/cabernetwork/cabernet/tree/master/lib/tvheadend/service
+
+### 4. Docker
 See http://ghcr.io/cabernetwork/cabernet:latest
+- Use or Review ports and remote mount points at docker-compose.yml
+- Note: it requires unzipping the cabernet source into ./docker/cabernet/config/app to run
+- Recommended Docker file: Dockerfile_tvh_crypt.alpine
+- Bring up browser and go to http://ip address:6077/
+- From Plugins, install PlutoTV plugin
+- Stop the app
+- Edit the data/config.ini and add the following lines
+<pre>
+[plutotv_default]
+label = PlutoTV Instance
+</pre>
+- Restart the app (from the Scheduler/Applications) to have the plugin fully activate
+- From XML/JSON Links try some of the links
 
-### 4. Notes
+### 5. Default Ports
+- 6007 Web UI
+- 5004 Stream port
+- 1900 SSDP (if enabled)
+- 65001 HDHomeRun (if enabled)
+
+### 6. Notes
 - URL used can include plugin and instance levels to filter down to a specific set of data
-    - http://ipaddress:6077/channels.m3u
-    - http://ipaddress:6077/pLuToTv/channels.m3u
-    - http://ipaddress:6077/PlutoTV/Default/channels.m3u
-- config.ini group tag requirements
+    - http://ip address:6077/channels.m3u
+    - http://ip address:6077/pLuToTv/channels.m3u
+    - http://ip address:6077/PlutoTV/Default/channels.m3u
+- config.ini group tag requirements when creating an instance
     - All lower case
-    - Underscore separates the plugin name from the instance name
-    - Use a single word if possible for the instance name or use underlines between words
-    - Do not change the instance name.  It is used throughout the system and is difficult to change.
+    - Underscore is a key character in section tags and separates the plugin name from the instance name
+    - Use a single word if possible for the instance name
+    - Do not change the instance name unless you go into data management and remove the instance first.
     - [plutotv_mychannels]
 
+### 7. Forum
+https://tvheadend.org/boards/5/topics/43052
+
 Enjoy