Merge pull request feeluown#155 from cposture/dev

multithread message label bug
cosven · May 13, 2016 · 2852fd4 · 2852fd4
2 parents de6d118 + 6731b63
commit 2852fd4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/feeluown/app.py b/feeluown/app.py
@@ -67,6 +67,7 @@ def bind_signal(self):
         self.request.connected_signal.connect(self._on_network_connected)
         self.request.disconnected_signal.connect(self._on_network_disconnected)
         self.request.slow_signal.connect(self._on_network_slow)
+        self.request.server_error_signal.connect(self._on_network_server_error)
 
         top_panel.pc_panel.volume_slider.sliderMoved.connect(
             self.change_volume)
@@ -138,14 +139,19 @@ def _on_player_status_changed(self, status):
 
     def _on_network_slow(self):
         network_status_label = self.ui.status_panel.network_status_label
+        self.message('网络连接超时', error=True)
         network_status_label.set_state(0)
 
     def _on_network_connected(self):
         network_status_label = self.ui.status_panel.network_status_label
         network_status_label.set_state(1)
 
+    def _on_network_server_error(self):
+        self.message('服务端出现错误', error=True)
+
     def _on_network_disconnected(self):
         network_status_label = self.ui.status_panel.network_status_label
+        self.message('网络连接失败', error=True)
         network_status_label.set_state(0)
 
     def change_volume(self, value):

diff --git a/feeluown/request.py b/feeluown/request.py
@@ -8,6 +8,7 @@ class Request(QObject):
     connected_signal = pyqtSignal()
     disconnected_signal = pyqtSignal()
     slow_signal = pyqtSignal()
+    server_error_signal = pyqtSignal()
 
     def __init__(self, app):
         super().__init__(parent=app)
@@ -19,12 +20,10 @@ def get(self, *args, **kw):
             self.connected_signal.emit()
             return res
         except ConnectionError:
-            self._app.message('网络连接失败', error=True)
             self.disconnected_signal.emit()
         except HTTPError:
-            self._app.message('服务端出现错误', error=True)
+            self.server_error_signal.emit()
         except Timeout:
-            self._app.message('网络连接超时', error=True)
             self.slow_signal.emit()
         return None
 
@@ -33,9 +32,9 @@ def post(self, *args, **kw):
             res = requests.post(*args, **kw)
             return res
         except ConnectionError:
-            self._app.message('网络连接失败', error=True)
+            self.disconnected_signal.emit()
         except HTTPError:
-            self._app.message('服务端出现错误', error=True)
+            self.server_error_signal.emit()
         except Timeout:
-            self._app.message('网络连接超时', error=True)
+            self.slow_signal.emit()
         return None