orf on addon merge

.github/workflows/check.yml

@@ -0,0 +1,30 @@
+on: [push, pull_request]
+
+jobs:
+  kodi-addon-checker:
+    runs-on: ubuntu-latest
+    name: Kodi Addon-Checker
+    steps:
+    - name: checkout
+      uses: actions/checkout@v4
+    - name: Run Kodi Addon-Checker
+      id: kodi-addon-checker
+      uses: xbmc/[email protected]
+      with:
+        kodi-version: matrix
+        addon-id: ${{ github.event.repository.name }}
+
+  autopep8:
+    runs-on: ubuntu-latest
+    name: autopep8
+    steps:
+    - name: checkout
+      uses: actions/checkout@v4
+    - name: Run autopep8
+      id: autopep8
+      uses: peter-evans/autopep8@v2
+      with:
+        args: --aggressive --diff --exit-code --experimental --max-line-length 173 --recursive resources/lib
+    - name: Fail if autopep8 made changes
+      if: steps.autopep8.outputs.exit-code == 2
+      run: exit 1

README.md

@@ -1,83 +1,92 @@
-ORF TVthek KODI Addon
-=======
-ORF TVthek is an addon that gives you access to the ORF TVthek Video Platform.
+# ORF ON Addon for Kodi (plugin.video.orftvthek)
 
+ORF ON is an addon that provides access to the ORF ON Video Platform (Austrian Television, formerly ORF TVthek)
 
-Supported platforms
--------------------
-Windows, Linux , Android and OSX
+[![Kodi version](https://img.shields.io/badge/kodi%20versions-20--21-blue)](https://kodi.tv/)
 
 
 Current Features
 ----------------
 * Livestream
-* All Shows
-* Schedule Search
-* HTTP Stream H264 (Stable)
-* Search Function
-* Missed Shows
-* Blacklist Shows
-* JSON(Service API V3) or HTML Scraper
-* Restart Livestream - inputstream.adaptive needed
+* Shows
+* Schedule
+* Search
+* DRM Streams
+* Accessibility Broadcasts
+* Simple IPTV Integration
+
+Todos
+----------------
+- [X] Subtitles
+- [X] Add Settings
+- [X] Add option to show related content
+- [X] Add a main menu entry for latest uploads
+- [X] Kodi translation still missing
+- [X] Accessibility
 
 
 Known Issues
 ------------
-* you tell me
+* A curl bug (http2) on KODI 19 prevents the streaming therefore the Addon is only supported on KODI 20+ (A workaround on the advancedsettings.xml seems to fix the issue, but further testing will be required)
 
+```
+<advancedsettings version="1.0">
+<network>
+  <disablehttp2>true</disablehttp2>
+</network>
+</advancedsettings>
+```
 
 Simple IPTV Integration
 -----------------
 
 Playlist Content
 ```
 #EXTINF:-1 tvg-name="ORF 1" tvg-id="orf1" group-title="ORF",ORF 1
-plugin://plugin.video.orftvthek/?channel=orf1&mode=pvr
+plugin://plugin.video.orftvthek/pvr/orf1
 
 #EXTINF:-1 tvg-name="ORF 2" tvg-id="orf2" group-title="ORF",ORF 2
-plugin://plugin.video.orftvthek/?channel=orf2&mode=pvr
+plugin://plugin.video.orftvthek/pvr/orf2
 
 #EXTINF:-1 tvg-name="ORF 3" tvg-id="orf3" group-title="ORF",ORF 3
-plugin://plugin.video.orftvthek/?channel=orf3&mode=pvr
+plugin://plugin.video.orftvthek/pvr/orf3
 
 #EXTINF:-1 tvg-name="ORF Sport+" tvg-id="orfs" group-title="ORF",ORF Sport+
-plugin://plugin.video.orftvthek/?channel=orfs&mode=pvr
+plugin://plugin.video.orftvthek/pvr/orfs
 
+#EXTINF:-1 tvg-name="ORF Kids" tvg-id="orfkids" group-title="ORF",ORF Kids
+plugin://plugin.video.orftvthek/pvr/orfkids
 
 #EXTINF:-1 tvg-name="ORF 2 Burgenland" tvg-id="orf2b" group-title="ORF",ORF 2 Burgenland
-plugin://plugin.video.orftvthek/?channel=orf2b&mode=pvr
+plugin://plugin.video.orftvthek/pvr/orf2b
 
 #EXTINF:-1 tvg-name="ORF 2 Steiermark" tvg-id="orf2stmk" group-title="ORF",ORF 2 Steiermark
-plugin://plugin.video.orftvthek/?channel=orf2stmk&mode=pvr
+plugin://plugin.video.orftvthek/pvr/orf2stmk
 
 #EXTINF:-1 tvg-name="ORF 2 Wien" tvg-id="orf2w" group-title="ORF",ORF 2 Wien
-plugin://plugin.video.orftvthek/?channel=orf2w&mode=pvr
+plugin://plugin.video.orftvthek/pvr/orf2w
 
 #EXTINF:-1 tvg-name="ORF 2 Oberösterreich" tvg-id="orf2ooe" group-title="ORF",ORF 2 Oberösterreich
-plugin://plugin.video.orftvthek/?channel=orf2ooe&mode=pvr
+plugin://plugin.video.orftvthek/pvr/orf2ooe
 
 #EXTINF:-1 tvg-name="ORF 2 Kärnten" tvg-id="orf2k" group-title="ORF",ORF 2 Kärnten
-plugin://plugin.video.orftvthek/?channel=orf2k&mode=pvr
+plugin://plugin.video.orftvthek/pvr/orf2k
 
 #EXTINF:-1 tvg-name="ORF 2 Niederösterreich" tvg-id="orf2n" group-title="ORF",ORF 2 Niederösterreich
-plugin://plugin.video.orftvthek/?channel=orf2n&mode=pvr
+plugin://plugin.video.orftvthek/pvr/orf2n
 
 #EXTINF:-1 tvg-name="ORF 2 Salzburg" tvg-id="orf2s" group-title="ORF",ORF 2 Salzburg
-plugin://plugin.video.orftvthek/?channel=orf2s&mode=pvr
+plugin://plugin.video.orftvthek/pvr/orf2s
 
 #EXTINF:-1 tvg-name="ORF 2 Vorarlberg" tvg-id="orf2v" group-title="ORF",ORF 2 Vorarlberg
-plugin://plugin.video.orftvthek/?channel=orf2v&mode=pvr
+plugin://plugin.video.orftvthek/pvr/orf2v
 
 #EXTINF:-1 tvg-name="ORF 2 Tirol" tvg-id="orf2t" group-title="ORF",ORF 2 Tirol
-plugin://plugin.video.orftvthek/?channel=orf2t&mode=pvr
+plugin://plugin.video.orftvthek/pvr/orf2t
 
 ```
 
 
 Legal
 -----
-This addon provides access to videos on the ORF TVthek Website but is not endorsed, certified or otherwise approved in any way by ORF.
-
-Icons
------
-https://uxwing.com
+This addon provides access to videos on the ORF ON Website but is not endorsed, certified or otherwise approved in any way by ORF.

addon.xml

@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.orftvthek" name="ORF TVthek" version="0.12.12+matrix.1" provider-name="sofaking">
+<addon id="plugin.video.orftvthek" name="ORF ON" version="1.0.2" provider-name="s0fak1ng">
     <requires>
         <import addon="xbmc.python" version="3.0.0"/>
-        <import addon="script.module.future" version="0.16.0"/>
-        <import addon="script.module.kodi-six" version="0.1.3.1"/>
-        <import addon="script.module.simplejson" version="2.0.10" optional="false"/>
-        <import addon="script.module.inputstreamhelper" version="0.3.5" optional="true"/>
+        <import addon="script.module.routing" version="0.2.3"/>
+        <import addon="script.module.inputstreamhelper" version="0.5.0"/>
     </requires>
-    <extension point="xbmc.python.pluginsource" library="default.py">
+    <extension point="xbmc.python.pluginsource" library="resources/lib/default.py">
         <provides>video</provides>
     </extension>
+    <extension point="xbmc.python.module" library="resources/lib/"/>
     <extension point="xbmc.addon.metadata">
         <platform>all</platform>
         <language>de en</language>
-        <summary lang="de_DE">ORF TVthek</summary>
-        <summary lang="en_GB">ORF TVthek</summary>
-        <description lang="de_DE">ORF TVthek - Ermöglicht Ihnen den Zugriff auf die ORF TVthek Video Platform</description>
-        <description lang="en_GB">ORF TVthek - This plugin provides access to the Austrian "ORF TVthek"</description>
+        <summary lang="de_DE">ORF ON</summary>
+        <summary lang="en_GB">ORF ON</summary>
+        <description lang="de_DE">ORF ON - Dieses Plugin ermöglicht den Zugriff auf den österreichischen Streamingdienst ORF ON</description>
+        <description lang="en_GB">ORF ON - This plugin provides access to the Austrian ORF ON streaming service</description>
         <license>GPL-2.0-only</license>
-        <forum>https://forum.kodi.tv/showthread.php?tid=159835</forum>
+        <forum>https://forum.kodi.tv/</forum>
         <email>[email protected]</email>
-        <website>https://tvthek.orf.at</website>
+        <website>https://on.orf.at</website>
         <source>https://github.com/s0faking/plugin.video.orftvthek</source>
         <assets>
             <icon>resources/icon.png</icon>
             <fanart>resources/fanart.jpg</fanart>
         </assets>
-        <news>v0.12.12 (23/05/2024)
-            [info] ORF TVthek is down and replaced by ORF On
-            [fix] ServiceAPI is forced on this version
+        <news>v1.0.2
+            - new Livestream (timeshift)
+            - added setting to use old livestream format
+            - LF conversion
         </news>
     </extension>
 </addon>

changelog.txt

@@ -1,3 +1,23 @@
+v1.0.2 (2024-06-08)
+- new Livestream (timeshift)
+- added setting to use old livestream format
+- LF conversion
+
+v1.0.1 beta (2024-06-05)
+- fix routing requirement
+- show segment option added
+- cache reload fix
+- related video option
+- fix UA stream errors (#6)
+- orf tvthek has been disabled
+
+v1.0.0 beta (2024-01-06)
+- inital ORF ON addon
+- beta version
+- most stuff is working but everything needs to be tested a little more
+- orf on is still in beta so stuff might change until the final release in april 2024
+- translation stuff is still missing
+
 * 0.12.12
  - ORF TVthek is down and replaced by ORF On
  - ServiceAPI is forced on this version
@@ -250,4 +270,4 @@
 - Streaming Video from http://tvthek.orf.at (mms)
 - Experimental High Quality MP4 Streaming from http://tvthek.orf.at (rtmp)
 - Livestream
-- Missed Shows
+- Missed Shows