From c23fe6ad8fe28e087117a7b6f79b690259dd1724 Mon Sep 17 00:00:00 2001
From: Peter Marheine <peter@taricorp.net>
Date: Thu, 15 Oct 2015 23:20:11 -0600
Subject: [PATCH] Perform player probing in a non-UI thread.

Network operations tend to be extremely slow when checking all user
inputs for player path, so perform those checks in a non-UI thread so
the GUI remains responsive. While queries are ongoing, the icon is a
"busy" spinner.
---
 resources/spinner.mng           | Bin 0 -> 7279 bytes
 syncplay/constants.py           |   2 +-
 syncplay/ui/GuiConfiguration.py |  51 ++++++++++++++++++++++++++++----
 3 files changed, 46 insertions(+), 7 deletions(-)
 create mode 100755 resources/spinner.mng

diff --git a/resources/spinner.mng b/resources/spinner.mng
new file mode 100755
index 0000000000000000000000000000000000000000..435d749797b248f87bfa07c835337c329804fd1d
GIT binary patch
literal 7279
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

literal 0
HcmV?d00001

diff --git a/syncplay/constants.py b/syncplay/constants.py
index a39ec6a..5cc9e6a 100644
--- a/syncplay/constants.py
+++ b/syncplay/constants.py
@@ -181,4 +181,4 @@ SYNCPLAY_UPDATE_URL = u"http://syncplay.pl/checkforupdate?{}" # Params
 SYNCPLAY_DOWNLOAD_URL = "http://syncplay.pl/download/"
 SYNCPLAY_PUBLIC_SERVER_LIST_URL = u"http://syncplay.pl/listpublicservers?{}" # Params
 
-PRIVATE_FILE_FIELDS = ["path"]
\ No newline at end of file
+PRIVATE_FILE_FIELDS = ["path"]
diff --git a/syncplay/ui/GuiConfiguration.py b/syncplay/ui/GuiConfiguration.py
index bfa92ec..e8dc98c 100644
--- a/syncplay/ui/GuiConfiguration.py
+++ b/syncplay/ui/GuiConfiguration.py
@@ -6,6 +6,7 @@ from datetime import datetime
 from syncplay import utils
 import os
 import sys
+import threading
 from syncplay.messages import getMessage, getLanguages, setLanguage, getInitialLanguage
 from syncplay import constants
 
@@ -140,15 +141,52 @@ class ConfigDialog(QtGui.QDialog):
             settings.endGroup()
         return foundpath
 
-    def updateExecutableIcon(self):
-        currentplayerpath = unicode(self.executablepathCombobox.currentText())
-        iconpath = PlayerFactory().getPlayerIconByPath(currentplayerpath)
+    class _GetIconPath(threading.Thread, QtCore.QObject):
+        daemon = True
+        done = QtCore.Signal(int, str, str)
+
+        def __init__(self, playerpath, seqnum):
+            threading.Thread.__init__(self)
+            QtCore.QObject.__init__(self)
+            self.playerpath = playerpath
+            self.seqnum = seqnum
+
+        def run(self):
+            iconpath = PlayerFactory().getPlayerIconByPath(self.playerpath)
+            self.done.emit(self.seqnum, iconpath, self.playerpath)
+
+    @QtCore.Slot(int, str, str)
+    def _updateExecutableIcon(self, seqnum, iconpath, playerpath):
+        if seqnum < self._lastThreadSeqnum:
+            return
         if iconpath != None and iconpath != "":
-            self.executableiconImage.load(self.resourcespath + iconpath)
-            self.executableiconLabel.setPixmap(QtGui.QPixmap.fromImage(self.executableiconImage))
+            if iconpath.endswith('.mng'):
+                movie = QtGui.QMovie(self.resourcespath + iconpath)
+                movie.setCacheMode(QtGui.QMovie.CacheMode.CacheAll)
+                self.executableiconLabel.setMovie(movie)
+                movie.start()
+            else:
+                self.executableiconImage.load(self.resourcespath + iconpath)
+                self.executableiconLabel.setPixmap(QtGui.QPixmap.fromImage(self.executableiconImage))
         else:
             self.executableiconLabel.setPixmap(QtGui.QPixmap.fromImage(QtGui.QImage()))
-        self.updatePlayerArguments(currentplayerpath)
+        self.updatePlayerArguments(playerpath)
+
+    def updateExecutableIcon(self):
+        """
+        Start getting the icon path in another thread, which will set the GUI
+        icon if valid.
+
+        This is performed outside the main thread because networked players may
+        take a long time to perform their checks and hang the GUI while doing
+        so.
+        """
+        currentplayerpath = unicode(self.executablepathCombobox.currentText())
+        self._lastThreadSeqnum += 1
+        thread = self._GetIconPath(currentplayerpath, self._lastThreadSeqnum)
+        thread.done.connect(self._updateExecutableIcon)
+        thread.done.emit(self._lastThreadSeqnum, 'spinner.mng', '')
+        thread.start()
 
     def updatePlayerArguments(self, currentplayerpath):
         argumentsForPath = utils.getPlayerArgumentsByPathAsText(self.perPlayerArgs, currentplayerpath)
@@ -924,6 +962,7 @@ class ConfigDialog(QtGui.QDialog):
                 self.hostCombobox.setEditText(currentServer)
         
     def __init__(self, config, playerpaths, error, defaultConfig):
+        self._lastThreadSeqnum = 0
 
         self.config = config
         self.defaultConfig = defaultConfig