Changeset 14349 for trunk/qt/session.cc

Timestamp:

Dec 1, 2014, 7:24:07 PM (8 years ago)

Author:

mikedld

Message:

#5077: Remove torrent file from watch directory even if "show options dialog" is not set (patch from rb07 + some improvements)

Refactor Session::addTorrent (add new method) to eliminate duplicate
code in options.cc and ensure that FileAdded? object is being created
on torrent addition even with non-interactive workflow.
Move FileAdded? class from options.{h,cc} to session.{h,cc}.

File:

• trunk/qt/session.cc (modified) (4 diffs)

trunk/qt/session.cc

@@ -16 +16 @@
 #include <QCoreApplication>
 #include <QDesktopServices>
+#include <QFile>
 #include <QMessageBox>
 #include <QNetworkProxy>
@@ -82 +83 @@
       tr_variantListAddQuark (list, key);
   }
+}
+
+/***
+****
+***/
+
+void
+FileAdded :: executed (int64_t tag, const QString& result, struct tr_variant * arguments)
+{
+  Q_UNUSED (arguments);
+
+  if (tag != myTag)
+    return;
+
+  if (result == "success")
+    {
+      if (!myDelFile.isEmpty ())
+        {
+          QFile file (myDelFile);
+          file.setPermissions (QFile::ReadOwner | QFile::WriteOwner);
+          file.remove ();
+        }
+    }
+  else
+    {
+      QString text = result;
+
+      for (int i=0, n=text.size (); i<n; ++i)
+        if (!i || text[i-1].isSpace ())
+          text[i] = text[i].toUpper ();
+
+      QMessageBox::warning (QApplication::activeWindow (),
+                            tr ("Error Adding Torrent"),
+                            QString ("<p><b>%1</b></p><p>%2</p>").arg (text).arg (myName));
+    }
+
+  deleteLater ();
 }
 
@@ -1022 +1060 @@
 
 void
-Session :: addTorrent (const AddData& addMe)
-{
-  const QByteArray b64 = addMe.toBase64 ();
-
-  tr_variant top, *args;
-  tr_variantInitDict (&top, 2);
+Session :: addTorrent (const AddData& addMe, tr_variant& top, bool trashOriginal)
+{
+  assert (tr_variantDictFind (&top, TR_KEY_method) == nullptr);
+  assert (tr_variantDictFind (&top, TR_KEY_tag) == nullptr);
+
   tr_variantDictAddStr (&top, TR_KEY_method, "torrent-add");
-  args = tr_variantDictAddDict (&top, TR_KEY_arguments, 2);
-  tr_variantDictAddBool (args, TR_KEY_paused, !myPrefs.getBool (Prefs::START));
+
+  const int64_t tag = getUniqueTag ();
+  tr_variantDictAddInt (&top, TR_KEY_tag, tag);
+
+  tr_variant * args;
+  if (!tr_variantDictFindDict (&top, TR_KEY_arguments, &args))
+    args = tr_variantDictAddDict (&top, TR_KEY_arguments, 2);
+
+  assert (tr_variantDictFind (args, TR_KEY_filename) == nullptr);
+  assert (tr_variantDictFind (args, TR_KEY_metainfo) == nullptr);
+
+  if (tr_variantDictFind (args, TR_KEY_paused) == nullptr)
+    tr_variantDictAddBool (args, TR_KEY_paused, !myPrefs.getBool (Prefs::START));
 
   switch (addMe.type)
@@ -1044 +1092 @@
       case AddData::FILENAME: /* fall-through */
       case AddData::METAINFO:
-        tr_variantDictAddRaw (args, TR_KEY_metainfo, b64.constData (), b64.size ());
-        break;
+        {
+          const QByteArray b64 = addMe.toBase64 ();
+          tr_variantDictAddRaw (args, TR_KEY_metainfo, b64.constData (), b64.size ());
+          break;
+        }
 
       default:
-        std::cerr << "Unhandled AddData type: " << addMe.type << std::endl;
-        break;
-    }
-
-  exec (&top);
+        qWarning() << "Unhandled AddData type: " << addMe.type;
+        break;
+    }
+
+  // maybe delete the source .torrent
+  FileAdded * fileAdded = new FileAdded (tag, addMe.readableName ());
+  if (trashOriginal && addMe.type == AddData::FILENAME)
+    fileAdded->setFileToDelete (addMe.filename);
+  connect (this, SIGNAL (executed (int64_t, QString, struct tr_variant *)),
+           fileAdded, SLOT (executed (int64_t, QString, struct tr_variant *)));
+
+  exec (&top);
+}
+
+void
+Session :: addTorrent (const AddData& addMe)
+{
+  tr_variant top;
+  tr_variantInitDict (&top, 3);
+
+  addTorrent (addMe, top, myPrefs.getBool (Prefs::TRASH_ORIGINAL));
+
   tr_variantFree (&top);
 }