From 6c5d1e75065d54ba31db087c2d13be4e41b834ed Mon Sep 17 00:00:00 2001
From: Bastian Kleinschmidt <debaschdi@googlemail.com>
Date: Fri, 30 Jun 2023 04:09:16 +0200
Subject: [PATCH] Update Addon to 1.1.6 - Fix Zattoo Login

---
 .idea/workspace.xml           | 10 +++++-----
 addon.xml                     |  4 ++--
 resources/providers/zattoo.py | 14 +++++++-------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 95f1903..a9805d8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,9 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="62d550e6-cdae-4fd2-be49-e45b650829bf" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/addon.xml" beforeDir="false" afterPath="$PROJECT_DIR$/addon.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/providers/horizon.py" beforeDir="false" afterPath="$PROJECT_DIR$/resources/providers/horizon.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resources/providers/zattoo.py" beforeDir="false" afterPath="$PROJECT_DIR$/resources/providers/zattoo.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -27,6 +25,9 @@
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
     <option name="UPDATE_TYPE" value="MERGE" />
   </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
   <component name="ProjectId" id="1b9dwEOljsx9AjwLfL8s8O2z2Qf" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectViewState">
@@ -40,7 +41,7 @@
     <property name="last_opened_file_path" value="$PROJECT_DIR$/../plugin.video.telerising-cloudcontrol" />
     <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
   </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="false" />
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -408,7 +409,6 @@
         </entry>
       </map>
     </option>
-    <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="Update Addon to 0.1.9&#10;-Add new Provider Horizon (GB)&#10;-New Auto Download, now its possible to download 3x Daily&#10;-Some more Bugfixes" />
diff --git a/addon.xml b/addon.xml
index 0f95da1..0853349 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="service.takealug.epg-grabber" name="Takealug EPG Grabber" version="1.1.5+matrix" provider-name="DeBaschdi">
+<addon id="service.takealug.epg-grabber" name="Takealug EPG Grabber" version="1.1.6+matrix" provider-name="DeBaschdi">
     <requires>
         <import addon="xbmc.python" version="3.0.0"/>
         <import addon="script.module.requests"/>
@@ -20,6 +20,6 @@
             <screenshot>screenshot1.png</screenshot>
             <screenshot>screenshot2.png</screenshot>
         </assets>
-        <news lang="en">1.1.5 Fix Zattoo XML Creation</news>
+        <news lang="en">1.1.6+ Fix Zattoo Login</news>
     </extension>
 </addon>
diff --git a/resources/providers/zattoo.py b/resources/providers/zattoo.py
index e9a569a..6b5b50e 100644
--- a/resources/providers/zattoo.py
+++ b/resources/providers/zattoo.py
@@ -72,13 +72,13 @@ def get_settings(grabber):
 
     provider = zttdict[grabber][0]
     lang = zttdict[grabber][1]
-    ztt_header = {'Host': '{}'.format(zttdict[grabber][12]),
-                  'User-Agent': 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:75.0) Gecko/20100101 Firefox/75.0',
-                  'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8',
-                  'Accept-Language': 'de,en-US;q=0.7,en;q=0.3',
-                  'Accept-Encoding': 'gzip, deflate, br',
-                  'Connection': 'keep-alive',
-                  'Upgrade-Insecure-Requests': '1'}
+    ztt_header =   {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) '
+                           'Chrome/114.0.0.0 Safari/537.36',
+            'dnt': '1', 'origin': 'https://zattoo.com', 'pragma': 'no-cache', 'referer': 'https://zattoo.com/client',
+            'sec-ch-ua': '"Not.A/Brand";v="8", "Chromium";v="114", "Google Chrome";v="114"',
+            'sec-ch-ua-mobile': '?0', 'sec-ch-ua-platform': '"Windows"',
+            'sec-fetch-dest': 'empty', 'sec-fetch-mode': 'same-origin',
+            'sec-fetch-site': 'same-origin'}
 
     return provider_temppath, ztt_genres_json, ztt_channels_json, ztt_genres_warnings_tmp, ztt_genres_warnings, ztt_channels_warnings_tmp, ztt_channels_warnings, days_to_grab, episode_format, channel_format, genre_format, ztt_chlist_provider_tmp, ztt_chlist_provider, ztt_chlist_selected, provider, lang, ztt_header, ztt_session, username, password