disabled htmlscraper

orf tvthek EOL
Rechi · May 23, 2024 · b76d8e2 · b76d8e2
1 parent 1889c61
commit b76d8e2
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 9 deletions.
diff --git a/addon.xml b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.orftvthek" name="ORF TVthek" version="0.12.11+matrix.1" provider-name="sofaking">
+<addon id="plugin.video.orftvthek" name="ORF TVthek" version="0.12.12+matrix.1" provider-name="sofaking">
     <requires>
         <import addon="xbmc.python" version="3.0.0"/>
         <import addon="script.module.future" version="0.16.0"/>
@@ -26,8 +26,9 @@
             <icon>resources/icon.png</icon>
             <fanart>resources/fanart.jpg</fanart>
         </assets>
-        <news>v0.12.11 (16/05/2024)
-            [fix] Major API Change on ServiceAPI regarding assets and json structure
+        <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>
     </extension>
 </addon>
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,7 @@
+* 0.12.12
+ - ORF TVthek is down and replaced by ORF On
+ - ServiceAPI is forced on this version
+
 * 0.12.11
  - Major API Change on ServiceAPI regarding assets and json structure (#137)
 

diff --git a/resources/language/resource.language.de_de/strings.po b/resources/language/resource.language.de_de/strings.po
@@ -255,4 +255,12 @@ msgstr ""
 
 msgctxt "#30067"
 msgid "Inputstream Helper ist nicht aktiviert. DRM Inhalte können nicht abgespielt werden."
+msgstr "
+
+msgctxt "#30068"
+msgid "ORF TVthek offline"
+msgstr "
+
+msgctxt "#30069"
+msgid "Die ORF TVthek wurde eingestellt und wird von ORF ON ersetzt. Das Addon funktioniert ab sofort nur mehr mit der ServiceAPI."
 msgstr "
diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po
@@ -255,4 +255,12 @@ msgstr ""
 
 msgctxt "#30067"
 msgid "Inputstream Helper not installed. Cant play DRM content."
-msgstr ""
+msgstr ""
+
+msgctxt "#30068"
+msgid "ORF TVthek offline"
+msgstr "
+
+msgctxt "#30069"
+msgid "The ORF TVthek has been discontinued and is being replaced by ORF ON. From now on the addon only works with the ServiceAPI."
+msgstr "
diff --git a/resources/lib/Addon.py b/resources/lib/Addon.py
@@ -48,9 +48,10 @@
 defaultbackdrop = os.path.join(media_path, "fanart_v2.jpg")
 
 # load settings
-useServiceAPI = Settings.serviceAPI()
+useServiceAPI = True
 autoPlayPrompt = Settings.autoPlayPrompt()
 usePlayAllPlaylist = Settings.playAllPlaylist()
+showWarning = Settings.showWarning()
 
 # init scrapers
 if useServiceAPI:
@@ -62,6 +63,10 @@
 
 
 def getMainMenu():
+    if showWarning:
+        d = xbmcgui.Dialog()
+        d.ok((translation(30068)).encode("utf-8"), (translation(30069)).encode("utf-8"))
+        xbmcaddon.Addon('plugin.video.orftvthek').setSettingBool('showWarning', 0)
     debugLog("Building Main Menu")
     addDirectory((translation(30001)).encode("utf-8"), news_banner, defaultbackdrop, "", "", "getAktuelles", pluginhandle)
     addDirectory((translation(30000)).encode("utf-8"), recently_added_banner, defaultbackdrop, "", "", "getNewShows", pluginhandle)

diff --git a/resources/lib/Settings.py b/resources/lib/Settings.py
@@ -33,3 +33,6 @@ def autoPlayPrompt():
 
 def playAllPlaylist():
     return __addon__.getSetting('usePlayAllPlaylist') == 'true'
+
+def showWarning():
+    return __addon__.getSetting('showWarning') == 'true'
diff --git a/resources/settings.xml b/resources/settings.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings>
     <category label="30062">
-        <setting id="autoPlayPrompt" type="bool" label="30028" visible="eq(3,false)" default="false" />
+        <setting id="autoPlayPrompt" type="bool" label="30028" visible="false" default="false" />
         <setting id="useSubtitles" type="bool" label="30029" default="false" />
-        <setting id="enableBlacklist" type="bool" label="30043" visible="eq(1,false)" default="false" />
-        <setting id="useServiceAPI" type="bool" label="30026" default="false" />
-        <setting id="showLiveStreamSchedule" label="30061" type="bool" visible="eq(-1,true)" default="false" />
+        <setting id="enableBlacklist" visible="false" type="bool" label="30043" default="false" />
+        <setting id="useServiceAPI" type="bool" visible="false" label="30026" default="false" />
+        <setting id="showLiveStreamSchedule" label="30061" type="bool" visible="true" default="false" />
         <setting id="usePlayAllPlaylist" label="30058" type="bool" default="true" />
+        <setting id="showWarning" type="bool" visible="false" default="true" />
         <setting id="userAgent" default="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.181 Safari/537.36" visible="false" />
     </category>
 </settings>