Merge pull request #2942 from devos50/fix_gui_freeze

Fix gui freeze

Author: qstokkink

TriblerGUI/tribler_request_manager.py

@@ -20,13 +20,17 @@ class TriblerRequestManager(QNetworkAccessManager):
     window = None
 
     received_json = pyqtSignal(object, int)
-    received_file = pyqtSignal(str, object)
+    received_file = pyqtSignal(object)
 
     def __init__(self):
         QNetworkAccessManager.__init__(self)
-        self.request_id = ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(10))
+        self.request_id = None
         self.base_url = "http://localhost:%d/" % API_PORT
         self.reply = None
+        self.generate_request_id()
+
+    def generate_request_id(self):
+        self.request_id = ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(10))
 
     def perform_request(self, endpoint, read_callback, data="", method='GET', capture_errors=True):
         """
@@ -110,16 +114,23 @@ def on_finished(self, reply, capture_errors):
             self.received_json.emit(None, reply.error())
             logging.error("No json object could be decoded from data: %s" % data)
 
+        # We disconnect the slot since we want the finished only to be emitted once. This allows us to reuse the
+        # request manager.
+        try:
+            self.finished.disconnect()
+            self.received_json.disconnect()
+        except TypeError:
+            pass  # We probably didn't have any connected slots.
+
     def download_file(self, endpoint, read_callback):
         url = self.base_url + endpoint
         self.reply = self.get(QNetworkRequest(QUrl(url)))
         self.received_file.connect(read_callback)
         self.finished.connect(self.on_file_download_finished)
 
     def on_file_download_finished(self, reply):
-        content_header = str(reply.rawHeader("Content-Disposition"))
         data = reply.readAll()
-        self.received_file.emit(content_header.split("=")[1], data)
+        self.received_file.emit(data)
 
     def show_error(self, error_text):
         main_text = "An error occurred during the request:\n\n%s" % error_text

TriblerGUI/widgets/downloadspage.py

@@ -32,7 +32,7 @@ def __init__(self):
         self.downloads_timeout_timer = QTimer()
         self.selected_item = None
         self.dialog = None
-        self.downloads_request_mgr = None
+        self.downloads_request_mgr = TriblerRequestManager()
         self.request_mgr = None
 
     def initialize_downloads_page(self):
@@ -90,7 +90,7 @@ def load_downloads(self):
         if self.window().download_details_widget.currentIndex() == 3:
             url = "downloads?get_peers=1&get_pieces=1"
 
-        self.downloads_request_mgr = TriblerRequestManager()
+        self.downloads_request_mgr.generate_request_id()
         self.downloads_request_mgr.perform_request(url, self.on_received_downloads)
 
     def on_received_downloads(self, downloads):
@@ -289,9 +289,27 @@ def on_export_download(self):
                                                            QFileDialog.ShowDirsOnly)
 
         if len(self.export_dir) > 0:
+            # Show confirmation dialog where we specify the name of the file
+            infohash = self.selected_item.download_info['infohash']
+            self.dialog = ConfirmationDialog(self, "Export torrent file",
+                                             "Please enter the name of the torrent file:",
+                                             [('SAVE', BUTTON_TYPE_NORMAL), ('CANCEL', BUTTON_TYPE_CONFIRM)],
+                                             show_input=True)
+            self.dialog.dialog_widget.dialog_input.setPlaceholderText('Torrent file name')
+            self.dialog.dialog_widget.dialog_input.setText("%s.torrent" % infohash)
+            self.dialog.dialog_widget.dialog_input.setFocus()
+            self.dialog.button_clicked.connect(self.on_export_download_dialog_done)
+            self.dialog.show()
+
+    def on_export_download_dialog_done(self, action):
+        if action == 0:
+            filename = self.dialog.dialog_widget.dialog_input.text()
             self.request_mgr = TriblerRequestManager()
             self.request_mgr.download_file("downloads/%s/torrent" % self.selected_item.download_info['infohash'],
-                                           self.on_export_download_request_done)
+                                           lambda data: self.on_export_download_request_done(filename, data))
+
+        self.dialog.setParent(None)
+        self.dialog = None
 
     def on_export_download_request_done(self, filename, data):
         dest_path = os.path.join(self.export_dir, filename)
@@ -304,7 +322,8 @@ def on_export_download_request_done(self, filename, data):
                                           "Error when exporting file",
                                           "An error occurred when exporting the torrent file: %s" % str(exc))
         else:
-            self.window().tray_icon.showMessage("Torrent file exported", "Torrent file exported to %s" % dest_path)
+            if QSystemTrayIcon.isSystemTrayAvailable():
+                self.window().tray_icon.showMessage("Torrent file exported", "Torrent file exported to %s" % dest_path)
 
     def on_right_click_item(self, pos):
         item_clicked = self.window().downloads_list.itemAt(pos)