From cd65a9398901f2ede2d002acd12ac0724fe13ee8 Mon Sep 17 00:00:00 2001
From: tomkat83 <kathriner.thomas@gmail.com>
Date: Mon, 17 Oct 2016 22:34:15 +0200
Subject: [PATCH] Fix Kodi crashing on low powered devices

- Fixes #126
---
 resources/language/English/strings.xml |  2 +-
 resources/language/German/strings.xml  |  2 +-
 resources/lib/artwork.py               | 11 +++++++++--
 resources/lib/initialsetup.py          | 12 ++++++++----
 resources/settings.xml                 |  8 ++++----
 service.py                             |  2 ++
 6 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
index a55487aa..d1c01c2c 100644
--- a/resources/language/English/strings.xml
+++ b/resources/language/English/strings.xml
@@ -306,7 +306,7 @@
     <string id="30540">Download movie set/collection art from FanArtTV</string>
     <string id="30541">Don't ask to pick a certain stream/quality</string>
     <string id="30542">Always pick best quality for trailers</string>
-    <string id="30543">Sleep between art downloads [ms]</string>
+    <string id="30543">Kodi runs on a low-power device (e.g. Raspberry Pi)</string>
     <string id="30544">Artwork</string>
 
     <!-- service add-on -->
diff --git a/resources/language/German/strings.xml b/resources/language/German/strings.xml
index cef530e7..c6f13372 100644
--- a/resources/language/German/strings.xml
+++ b/resources/language/German/strings.xml
@@ -32,7 +32,7 @@
     <string id="30540">FanArtTV Film-Sets/Collections Bilder herunterladen</string>
     <string id="30541">Nicht fragen, welcher Stream/Qualität gespielt wird</string>
     <string id="30542">Trailer immer in der besten Qualität abspielen</string>
-    <string id="30543">Wartezeit zwischen Bilder downloads [ms]</string>
+    <string id="30543">Kodi läuft auf langsamer Hardware (z.B. Raspberry Pi)</string>
     <string id="30544">Artwork</string>
 
     <string id="30014">Verbindung</string>
diff --git a/resources/lib/artwork.py b/resources/lib/artwork.py
index b226e82c..28f99b6e 100644
--- a/resources/lib/artwork.py
+++ b/resources/lib/artwork.py
@@ -132,7 +132,14 @@ def double_urldecode(text):
 class Image_Cache_Thread(Thread):
     xbmc_host = 'localhost'
     xbmc_port, xbmc_username, xbmc_password = setKodiWebServerDetails()
-    sleep_between = int(settings('sleep_between_art_downloads'))
+    sleep_between = 50
+    if settings('low_powered_device') == 'true':
+        # Low CPU, potentially issues with limited number of threads
+        # Hence let Kodi wait till download is successful
+        timeout = (35.1, 35.1)
+    else:
+        # High CPU, no issue with limited number of threads
+        timeout = (0.01, 0.01)
 
     def __init__(self, queue):
         self.queue = queue
@@ -164,7 +171,7 @@ class Image_Cache_Thread(Thread):
                         url="http://%s:%s/image/image://%s"
                             % (self.xbmc_host, self.xbmc_port, url),
                         auth=(self.xbmc_username, self.xbmc_password),
-                        timeout=(0.01, 0.01))
+                        timeout=self.timeout)
                 except requests.Timeout:
                     # We don't need the result, only trigger Kodi to start the
                     # download. All is well
diff --git a/resources/lib/initialsetup.py b/resources/lib/initialsetup.py
index 0ceab110..e931adcf 100644
--- a/resources/lib/initialsetup.py
+++ b/resources/lib/initialsetup.py
@@ -417,6 +417,14 @@ class InitialSetup():
         if settings('InstallQuestionsAnswered') == 'true':
             return
 
+        # Is your Kodi installed on a low-powered device like a Raspberry Pi?
+        # If yes, then we will reduce the strain on Kodi to prevent it from
+        # crashing.
+        if dialog.yesno(heading=addonName, line1=lang(39072)):
+            settings('low_powered_device', value="true")
+        else:
+            settings('low_powered_device', value="false")
+
         # Additional settings where the user needs to choose
         # Direct paths (\\NAS\mymovie.mkv) or addon (http)?
         goToSettings = False
@@ -463,10 +471,6 @@ class InitialSetup():
             log.debug("User opted to use FanArtTV")
             settings('FanartTV', value="true")
 
-        # Is your Kodi installed on a low-powered device like a Raspberry Pi?
-        # If yes, then we will reduce the strain on Kodi to prevent it from
-        # crashing.
-
         # Make sure that we only ask these questions upon first installation
         settings('InstallQuestionsAnswered', value='true')
 
diff --git a/resources/settings.xml b/resources/settings.xml
index f12684ad..21e16774 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -43,11 +43,11 @@
 	<category label="30506"><!-- Sync Options -->
 		<setting type="lsep" label="30537" /><!-- Restart if you make changes -->
 		<setting id="syncEmptyShows" type="bool" label="30508" default="false" visible="false"/>
-		<setting id="dbSyncIndicator" label="30507" type="bool" default="true" />
-		<setting type="sep" /><!-- show syncing progress -->
-		<setting id="limitindex" type="number" label="30515" default="200" option="int" /><!-- Maximum items to request from the server at once -->
+		<setting id="dbSyncIndicator" label="30507" type="bool" default="true" /><!-- show syncing progress -->
+		<setting type="sep" />
+        <setting id="low_powered_device" type="bool" label="30543" default="true" /> <!-- Installation on low-powered device? (e.g. Raspberry Pi) -->
         <setting id="syncThreadNumber" type="slider" label="39003" default="5" option="int" range="1,1,20"/>
-        <setting id="sleep_between_art_downloads" type="slider" label="30543" default="50" option="int" range="100,100,5000" visible="eq(-1,true)"/> <!-- Sleep between art downloads [ms] -->
+		<setting id="limitindex" type="number" label="30515" default="200" option="int" /><!-- Maximum items to request from the server at once -->
 		<setting type="lsep" label="39052" /><!-- Background Sync -->
 		<setting id="enableBackgroundSync" type="bool" label="39026" default="true" visible="true"/>
 		<setting id="saftyMargin" type="slider" label="39051" default="60" option="int" range="10,1,300" visible="eq(-1,true)"/>
diff --git a/service.py b/service.py
index a68d42e0..efdbd2d8 100644
--- a/service.py
+++ b/service.py
@@ -85,6 +85,8 @@ class Service():
         log.warn("%s Version: %s" % (addonName, self.clientInfo.getVersion()))
         log.warn("Using plugin paths: %s"
                  % (settings('useDirectPaths') != "true"))
+        log.warn("Using a low powered device: %s"
+                 % settings('low_powered_device'))
         log.warn("Log Level: %s" % logLevel)
 
         # Reset window props for profile switch