Changeset 14077

Timestamp:

May 22, 2013, 8:35:38 PM (9 years ago)

Author:

jordan

Message:

(trunk, libT) #4682 'Add return id from duplicate torrent torrent-add rpc' -- added.

Location:

trunk

Files:

• cli/cli.c (modified) (2 diffs)
• daemon/daemon.c (modified) (1 diff)
• extras/rpc-spec.txt (modified) (2 diffs)
• gtk/open-dialog.c (modified) (3 diffs)
• gtk/tr-core.c (modified) (3 diffs)
• gtk/util.c (modified) (1 diff)
• gtk/util.h (modified) (1 diff)
• libtransmission/libtransmission-test.c (modified) (1 diff)
• libtransmission/quark.c (modified) (1 diff)
• libtransmission/quark.h (modified) (1 diff)
• libtransmission/rename-test.c (modified) (1 diff)
• libtransmission/rpcimpl.c (modified) (1 diff)
• libtransmission/session.c (modified) (1 diff)
• libtransmission/torrent.c (modified) (3 diffs)
• libtransmission/transmission.h (modified) (1 diff)
• macosx/Torrent.m (modified) (1 diff)

trunk/cli/cli.c

@@ -223 +223 @@
 main (int argc, char ** argv)
 {
-  int           error;
   tr_session  * h;
   tr_ctor     * ctor;
@@ -311 +310 @@
   tr_free (fileContents);
 
-  tor = tr_torrentNew (ctor, &error);
+  tor = tr_torrentNew (ctor, NULL, NULL);
   tr_ctorFree (ctor);
   if (!tor)

trunk/daemon/daemon.c

@@ -264 +264 @@
     if (!err)
     {
-        tr_torrentNew (ctor, &err);
+        tr_torrentNew (ctor, &err, NULL);
 
         if (err == TR_PARSE_ERR)

trunk/extras/rpc-spec.txt

@@ -383 +383 @@
    <http://curl.haxx.se/libcurl/c/curl_easy_setopt.html#CURLOPTCOOKIE>
 
-   Response arguments: on success, a "torrent-added" object in the
+   Response arguments: On success, a "torrent-added" object in the
                        form of one of 3.3's tr_info objects with the
                        fields for id, name, and hashString.
+
+                       On failure due to a duplicate torrent existing,
+                       a "torrent-duplicate" object in the same form.
 
 3.5.  Removing a Torrent
@@ -762 +765 @@
          |         | yes       | torrent-rename-path  | new method
          |         | yes       | free-space           | new method
+         |         | yes       | torrent-add          | new return return arg "torrent-duplicate"
 
 5.1.  Upcoming Breakage

trunk/gtk/open-dialog.c

@@ -187 +187 @@
         int err = 0;
         int new_file = 0;
+        int duplicate_id = 0;
         tr_torrent * torrent;
 
@@ -201 +202 @@
         tr_ctorSetDeleteSource (o->ctor, FALSE);
 
-        if ((torrent = tr_torrentNew (o->ctor, &err)))
+        if ((torrent = tr_torrentNew (o->ctor, &err, &duplicate_id)))
         {
             removeOldTorrent (o);
@@ -208 +209 @@
         else if (new_file)
         {
-            gtr_add_torrent_error_dialog (GTK_WIDGET (b), err, o->filename);
+            tr_torrent * tor;
+
+            if (duplicate_id)
+              tor = gtr_core_find_torrent (o->core, duplicate_id);
+            else
+              tor = NULL;
+
+            gtr_add_torrent_error_dialog (GTK_WIDGET (b), err, tor, o->filename);
         }
 

trunk/gtk/tr-core.c

@@ -1103 +1103 @@
 core_create_new_torrent (TrCore * core, tr_ctor * ctor)
 {
-  int errcode = 0;
   tr_torrent * tor;
   bool do_trash = false;
@@ -1112 +1111 @@
   tr_ctorGetDeleteSource (ctor, &do_trash);
   tr_ctorSetDeleteSource (ctor, FALSE);
-  tor = tr_torrentNew (ctor, &errcode);
+  tor = tr_torrentNew (ctor, NULL, NULL);
 
   if (tor && do_trash)
@@ -1128 +1127 @@
     }
 
-    return tor;
+  return tor;
 }
 

trunk/gtk/util.c

@@ -218 +218 @@
 
 void
-gtr_add_torrent_error_dialog (GtkWidget * child, int err, const char * file)
+gtr_add_torrent_error_dialog (GtkWidget   * child,
+                              int           err,
+                              tr_torrent  * duplicate_torrent,
+                              const char  * filename)
 {
   char * secondary;
-  const char * fmt;
   GtkWidget * w;
   GtkWindow * win = getWindow (child);
 
-  switch (err)
-    {
-      case TR_PARSE_ERR: fmt = _("The torrent file \"%s\" contains invalid data."); break;
-      case TR_PARSE_DUPLICATE: fmt = _("The torrent file \"%s\" is already in use."); break;
-      default: fmt = _("The torrent file \"%s\" encountered an unknown error."); break;
-    }
-
-  secondary = g_strdup_printf (fmt, file);
+  if (err == TR_PARSE_ERR)
+    secondary = g_strdup_printf (_("The torrent file \"%s\" contains invalid data."), filename);
+  else if (err == TR_PARSE_DUPLICATE)
+    secondary = g_strdup_printf (_("The torrent file \"%s\" is already in use by \"%s.\""), filename, tr_torrentName (duplicate_torrent));
+  else
+    secondary = g_strdup_printf (_("The torrent file \"%s\" encountered an unknown error."), filename);
 
   w = gtk_message_dialog_new (win,

trunk/gtk/util.h

@@ -126 +126 @@
 void gtr_add_torrent_error_dialog (GtkWidget  * window_or_child,
                                    int          err,
+                                   tr_torrent * duplicate_torrent,
                                    const char * filename);
 

trunk/libtransmission/libtransmission-test.c

@@ -328 +328 @@
   /* create the torrent */
   err = 0;
-  tor = tr_torrentNew (ctor, &err);
+  tor = tr_torrentNew (ctor, &err, NULL);
   assert (!err);
 

trunk/libtransmission/quark.c

@@ -345 +345 @@
   { "torrent-complete-sound-command", 30 },
   { "torrent-complete-sound-enabled", 30 },
+  { "torrent-duplicate", 17 },
   { "torrent-get", 11 },
   { "torrent-set", 11 },

trunk/libtransmission/quark.h

@@ -355 +355 @@
   TR_KEY_torrent_complete_sound_command,
   TR_KEY_torrent_complete_sound_enabled,
+  TR_KEY_torrent_duplicate,
   TR_KEY_torrent_get,
   TR_KEY_torrent_set,

trunk/libtransmission/rename-test.c

@@ -134 +134 @@
   /* create the torrent */
   err = 0;
-  tor = tr_torrentNew (ctor, &err);
+  tor = tr_torrentNew (ctor, &err, NULL);
   assert (!err);
 

trunk/libtransmission/rpcimpl.c

@@ -1516 +1516 @@
 addTorrentImpl (struct tr_rpc_idle_data * data, tr_ctor * ctor)
 {
-    int err = 0;
-    const char * result = NULL;
-    tr_torrent * tor = tr_torrentNew (ctor, &err);
-
-    tr_ctorFree (ctor);
-
-    if (tor)
-    {
-        tr_variant fields;
-        tr_variantInitList (&fields, 3);
-        tr_variantListAddStr (&fields, "id");
-        tr_variantListAddStr (&fields, "name");
-        tr_variantListAddStr (&fields, "hashString");
-        addInfo (tor, tr_variantDictAdd (data->args_out, TR_KEY_torrent_added), &fields);
-        notify (data->session, TR_RPC_TORRENT_ADDED, tor);
-        tr_variantFree (&fields);
-    }
-    else if (err == TR_PARSE_DUPLICATE)
-    {
-        result = "duplicate torrent";
-    }
-    else if (err == TR_PARSE_ERR)
-    {
-        result = "invalid or corrupt torrent file";
-    }
-
-    tr_idle_function_done (data, result);
+  int err;
+  int duplicate_id;
+  const char * result;
+  tr_torrent * tor;
+  tr_quark key;
+
+  err = 0;
+  duplicate_id = 0;
+  tor = tr_torrentNew (ctor, &err, &duplicate_id);
+  tr_ctorFree (ctor);
+
+  if (!err)
+    {
+      key = TR_KEY_torrent_added;
+      result = NULL;
+    }
+  else if (err == TR_PARSE_ERR)
+    {
+      result = "invalid or corrupt torrent file";
+    }
+  else if (err == TR_PARSE_DUPLICATE)
+    {
+      tor = tr_torrentFindFromId (data->session, duplicate_id);
+      key = TR_KEY_torrent_duplicate;
+      result = "duplicate torrent";
+    }
+
+  if (tor != NULL)
+    {
+      tr_variant fields;
+      tr_variantInitList (&fields, 3);
+      tr_variantListAddStr (&fields, "id");
+      tr_variantListAddStr (&fields, "name");
+      tr_variantListAddStr (&fields, "hashString");
+      addInfo (tor, tr_variantDictAdd (data->args_out, key), &fields);
+      notify (data->session, TR_RPC_TORRENT_ADDED, tor);
+      tr_variantFree (&fields);
+    }
+
+  tr_idle_function_done (data, result);
 }
 

trunk/libtransmission/session.c

@@ -1938 +1938 @@
                 char * path = tr_buildPath (dirname, d->d_name, NULL);
                 tr_ctorSetMetainfoFromFile (data->ctor, path);
-                if ((tor = tr_torrentNew (data->ctor, NULL)))
+                if ((tor = tr_torrentNew (data->ctor, NULL, NULL)))
                 {
                     tr_list_prepend (&list, tor);

trunk/libtransmission/torrent.c

@@ -972 +972 @@
 
 static tr_parse_result
-torrentParseImpl (const tr_ctor * ctor, tr_info * setmeInfo,
-                  bool * setmeHasInfo, int * dictLength)
-{
-    int             doFree;
-    bool            didParse;
-    bool            hasInfo = false;
-    tr_info         tmp;
+torrentParseImpl (const tr_ctor  * ctor,
+                  tr_info        * setmeInfo,
+                  bool           * setmeHasInfo,
+                  int            * dictLength,
+                  int            * setme_duplicate_id)
+{
+    bool doFree;
+    bool didParse;
+    bool hasInfo = false;
+    tr_info tmp;
     const tr_variant * metainfo;
-    tr_session    * session = tr_ctorGetSession (ctor);
+    tr_session * session = tr_ctorGetSession (ctor);
     tr_parse_result result = TR_PARSE_OK;
 
@@ -1000 +1003 @@
         result = TR_PARSE_ERR;
 
-    if (didParse && session && tr_torrentExists (session, setmeInfo->hash))
-        result = TR_PARSE_DUPLICATE;
+    if (didParse && session && (result == TR_PARSE_OK))
+      {
+        const tr_torrent * const tor = tr_torrentFindFromHash (session, setmeInfo->hash);
+
+        if (tor != NULL)
+          {
+            result = TR_PARSE_DUPLICATE;
+
+            if (setme_duplicate_id != NULL)
+              *setme_duplicate_id = tr_torrentId (tor);
+          }
+      }
 
     if (doFree)
@@ -1015 +1028 @@
 tr_torrentParse (const tr_ctor * ctor, tr_info * setmeInfo)
 {
-    return torrentParseImpl (ctor, setmeInfo, NULL, NULL);
+    return torrentParseImpl (ctor, setmeInfo, NULL, NULL, NULL);
 }
 
 tr_torrent *
-tr_torrentNew (const tr_ctor * ctor, int * setmeError)
-{
-    int len;
-    bool hasInfo;
-    tr_info tmpInfo;
-    tr_parse_result r;
-    tr_torrent * tor = NULL;
-
-    assert (ctor != NULL);
-    assert (tr_isSession (tr_ctorGetSession (ctor)));
-
-    r = torrentParseImpl (ctor, &tmpInfo, &hasInfo, &len);
-    if (r == TR_PARSE_OK)
-    {
-        tor = tr_new0 (tr_torrent, 1);
-        tor->info = tmpInfo;
-        if (hasInfo)
-            tor->infoDictLength = len;
-        torrentInit (tor, ctor);
+tr_torrentNew (const tr_ctor * ctor, int * setme_error, int * setme_duplicate_id)
+{
+  int len;
+  bool hasInfo;
+  tr_info tmpInfo;
+  tr_parse_result r;
+  tr_torrent * tor = NULL;
+
+  assert (ctor != NULL);
+  assert (tr_isSession (tr_ctorGetSession (ctor)));
+
+  r = torrentParseImpl (ctor, &tmpInfo, &hasInfo, &len, setme_duplicate_id);
+  if (r == TR_PARSE_OK)
+    {
+      tor = tr_new0 (tr_torrent, 1);
+      tor->info = tmpInfo;
+
+      if (hasInfo)
+        tor->infoDictLength = len;
+
+      torrentInit (tor, ctor);
     }
     else
     {
-        if (r == TR_PARSE_DUPLICATE)
-            tr_metainfoFree (&tmpInfo);
-
-        if (setmeError)
-            *setmeError = r;
-    }
-
-    return tor;
+      if (r == TR_PARSE_DUPLICATE)
+        tr_metainfoFree (&tmpInfo);
+
+      if (setme_error != NULL)
+        *setme_error = r;
+    }
+
+  return tor;
 }
 

trunk/libtransmission/transmission.h

@@ -1062 +1062 @@
 
 
-/** Instantiate a single torrent.
-    @return 0 on success,
-            TR_EINVALID if the torrent couldn't be parsed, or
-            TR_EDUPLICATE if there's already a matching torrent object. */
+/**
+ * Instantiate a single torrent.
+ *
+ * Returns a pointer to the torrent on success, or NULL on failure.
+ *
+ * @param setme_error: TR_PARSE_ERR if the parsing failed;
+ *                     TR_PARSE_OK if parsing succeeded and it's not a duplicate;
+ *                     TR_PARSE_DUPLICATE if parsing succeeded but it's a duplicate.
+ *
+ * @param setme_duplicate_id: when setmeError is TR_PARSE_DUPLICATE,
+ *                            this field is set to the duplicate torrent's id.
+ */
 tr_torrent * tr_torrentNew (const tr_ctor   * ctor,
-                            int             * setmeError);
+                            int             * setme_error,
+                            int             * setme_duplicate_id);
 
 /** @} */

trunk/macosx/Torrent.m

@@ -1667 +1667 @@
         
         if (result == TR_PARSE_OK)
-            fHandle = tr_torrentNew(ctor, NULL);
+            fHandle = tr_torrentNew(ctor, NULL, NULL);
         
         tr_ctorFree(ctor);