Changeset 14566

Timestamp:

Oct 4, 2015, 6:16:59 AM (6 years ago)

Author:

mikedld

Message:

#5993: Improve magnets handling in main window

Disable "Open Folder" and "Verify Local Data" actions for magnets in
Torrent menu. If more than one torrent is selected, "Verify Local Data"
is enabled but only non-magnets are verified if activated.
Add a few sanity checks when opening folder, just in case.

Location:

trunk/qt

Files:

• MainWindow.cc (modified) (9 diffs)
• MainWindow.h (modified) (1 diff)

trunk/qt/MainWindow.cc

@@ -570 +570 @@
 MainWindow::openFolder ()
 {
-  const int torrentId (*getSelectedTorrents ().begin ());
+  const QSet<int> selectedTorrents = getSelectedTorrents ();
+  if (selectedTorrents.size () != 1)
+    return;
+
+  const int torrentId (*selectedTorrents.begin ());
   const Torrent * tor (myModel.getTorrentFromId (torrentId));
+  if (tor == nullptr)
+    return;
+
   QString path (tor->getPath ());
-  const FileList files = tor->files ();
+  const FileList& files = tor->files ();
+  if (files.isEmpty ())
+    return;
+
   const QString firstfile = files.at (0).filename;
   int slashIndex = firstfile.indexOf (QLatin1Char ('/'));
@@ -587 +597 @@
     }
 #endif
+
   QDesktopServices::openUrl (QUrl::fromLocalFile (path));
 }
@@ -735 +746 @@
   int selectedAndPaused (0);
   int selectedAndQueued (0);
+  int selectedWithMetadata (0);
   int canAnnounce (0);
   const QAbstractItemModel * model (ui.listView->model ());
@@ -756 +768 @@
           if (isSelected && isPaused) ++selectedAndPaused;
           if (isSelected && isQueued) ++selectedAndQueued;
+          if (isSelected && tor->hasMetadata ()) ++selectedWithMetadata;
           if (tor->canManualAnnounce ()) ++canAnnounce;
         }
@@ -761 +774 @@
 
   const bool haveSelection (selected > 0);
-  ui.action_Verify->setEnabled (haveSelection);
+  const bool haveSelectionWithMetadata = selectedWithMetadata > 0;
+  const bool oneSelection (selected == 1);
+
+  ui.action_Verify->setEnabled (haveSelectionWithMetadata);
   ui.action_Remove->setEnabled (haveSelection);
   ui.action_Delete->setEnabled (haveSelection);
@@ -768 +784 @@
   ui.action_SetLocation->setEnabled (haveSelection);
 
-  const bool oneSelection (selected == 1);
-  ui.action_OpenFolder->setEnabled (oneSelection && mySession.isLocal ());
+  ui.action_OpenFolder->setEnabled (oneSelection && haveSelectionWithMetadata && mySession.isLocal ());
   ui.action_CopyMagnetToClipboard->setEnabled (oneSelection);
 
@@ -800 +815 @@
 
 QSet<int>
-MainWindow::getSelectedTorrents () const
+MainWindow::getSelectedTorrents (bool withMetadataOnly) const
 {
   QSet<int> ids;
@@ -807 +822 @@
     {
       const Torrent * tor (index.data (TorrentModel::TorrentRole).value<const Torrent*> ());
-      ids.insert (tor->id ());
+      if (tor != nullptr && (!withMetadataOnly || tor->hasMetadata ()))
+        ids.insert (tor->id ());
     }
 
@@ -871 +887 @@
 MainWindow::verifySelected ()
 {
-  mySession.verifyTorrents (getSelectedTorrents ());
+  mySession.verifyTorrents (getSelectedTorrents (true));
 }
 void

trunk/qt/MainWindow.h

@@ -89 +89 @@
     QIcon getStockIcon (const QString&, int fallback = -1);
 
-    QSet<int> getSelectedTorrents () const;
+    QSet<int> getSelectedTorrents (bool withMetadataOnly = false) const;
     void updateNetworkIcon ();