1 files changed, 31 insertions, 5 deletions
diff --git a/deluge/ui/gtk3/menubar.py b/deluge/ui/gtk3/menubar.py
index e09f394fc..a812a8cac 100644
--- a/deluge/ui/gtk3/menubar.py
+++ b/deluge/ui/gtk3/menubar.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2007, 2008 Andrew Resch <andrewresch@gmail.com>
 # Copyright (C) 2011 Pedro Algarvio <pedro@algarvio.me>
@@ -9,8 +8,6 @@
 #
 
 
-from __future__ import unicode_literals
-
 import logging
 import os.path
 
@@ -21,7 +18,7 @@ import deluge.component as component
 from deluge.configmanager import ConfigManager
 from deluge.ui.client import client
 
-from .dialogs import ErrorDialog, OtherDialog
+from .dialogs import CopyMagnetDialog, ErrorDialog, OtherDialog
 from .path_chooser import PathChooser
 
 log = logging.getLogger(__name__)
@@ -34,6 +31,7 @@ class MenuBar(component.Component):
         self.mainwindow = component.get('MainWindow')
         self.main_builder = self.mainwindow.get_builder()
         self.config = ConfigManager('gtk3ui.conf')
+        self._magnet_copied = False
 
         self.builder = Gtk.Builder()
         # Get the torrent menu from the gtk builder file
@@ -142,6 +140,19 @@ class MenuBar(component.Component):
 
         self.change_sensitivity = ['menuitem_addtorrent']
 
+    def magnet_copied(self):
+        """
+        lets the caller know whether a magnet was copied internally
+
+        the `mainwindow` checks every time the data in the clipboard,
+        so it will automatically open the AddTorrentURL dialog in case it
+        contains a valid link (URL to a torrent or a magnet URI).
+
+        """
+        val = self._magnet_copied
+        self._magnet_copied = False
+        return val
+
     def start(self):
         for widget in self.change_sensitivity:
             self.main_builder.get_object(widget).set_sensitive(True)
@@ -282,6 +293,21 @@ class MenuBar(component.Component):
             component.get('TorrentView').get_selected_torrents()
         )
 
+    def on_menuitem_copymagnet_activate(self, data=None):
+        log.debug('on_menuitem_copymagnet_activate')
+        torrent_ids = component.get('TorrentView').get_selected_torrents()
+        if torrent_ids:
+
+            def _on_magnet_uri(magnet_uri):
+                def update_copied(response_id):
+                    if dialog.copied:
+                        self._magnet_copied = True
+
+                dialog = CopyMagnetDialog(magnet_uri)
+                dialog.run().addCallback(update_copied)
+
+            client.core.get_magnet_uri(torrent_ids[0]).addCallback(_on_magnet_uri)
+
     def on_menuitem_updatetracker_activate(self, data=None):
         log.debug('on_menuitem_updatetracker_activate')
         client.core.force_reannounce(
@@ -541,7 +567,7 @@ class MenuBar(component.Component):
             account_to_log = {}
             for key, value in account.copy().items():
                 if key == 'password':
-                    value = '*' * len(value)
+                    value = '*' * 10
                 account_to_log[key] = value
             known_accounts_to_log.append(account_to_log)
         log.debug('_on_known_accounts: %s', known_accounts_to_log)