Changeset 13829

Timestamp:

Jan 22, 2013, 12:25:42 AM (8 years ago)

Author:

jordan

Message:

(libT) #1220 'change top folder names' -- when the root file/folder is changed, update tr_info.name too.

Location:

trunk

Files:

• libtransmission/metainfo.c (modified) (4 diffs)
• libtransmission/rename-test.c (modified) (4 diffs)
• libtransmission/resume.c (modified) (3 diffs)
• libtransmission/resume.h (modified) (2 diffs)
• libtransmission/torrent-magnet.c (modified) (1 diff)
• libtransmission/torrent.c (modified) (3 diffs)
• libtransmission/transmission.h (modified) (5 diffs)
• qt/session.cc (modified) (1 diff)

trunk/libtransmission/metainfo.c

@@ -37 +37 @@
 {
   size_t i;
-  const size_t name_len = strlen (inf->name);
-  char * ret = tr_strdup_printf ("%s.%16.16s", inf->name, inf->hashString);
+  const char * name = inf->originalName;
+  const size_t name_len = strlen (name);
+  char * ret = tr_strdup_printf ("%s.%16.16s", name, inf->hashString);
 
   for (i=0; i<name_len; ++i)
@@ -406 +407 @@
             {
               tr_free (inf->name);
+              tr_free (inf->originalName);
               inf->name = tr_strndup (str, len);
+              inf->originalName = tr_strndup (str, len);
             }
 
           if (!inf->name)
-            inf->name = tr_strdup (inf->hashString);
+              inf->name = tr_strdup (inf->hashString);
+          if (!inf->originalName)
+              inf->originalName = tr_strdup (inf->hashString);
         }
       else /* not a magnet link and has no info dict... */
@@ -440 +445 @@
         return "name";
       tr_free (inf->name);
+      tr_free (inf->originalName);
       inf->name = tr_utf8clean (str, len);
+      inf->originalName = tr_strdup (inf->name);
     }
 
@@ -561 +568 @@
   tr_free (inf->creator);
   tr_free (inf->torrent);
+  tr_free (inf->originalName);
   tr_free (inf->name);
 

trunk/libtransmission/rename-test.c

@@ -155 +155 @@
 test_single_filename_torrent (void)
 {
+  uint64_t loaded;
   tr_torrent * tor;
   char * tmpstr;
@@ -208 +209 @@
   tmpstr = tr_buildPath (tor->downloadDir, "hello-world.txt", NULL); 
   check (tr_fileExists (tmpstr, NULL));
+  check_streq ("hello-world.txt", tr_torrentName(tor));
   check_int_eq (0, torrentRenameAndWait (tor, "hello-world.txt", "foobar"));
   check (!tr_fileExists (tmpstr, NULL));
   check (tor->info.files[0].is_renamed);
   check_streq ("foobar", tor->info.files[0].name);
+  check_streq ("foobar", tr_torrentName(tor));
+  check (strstr (tor->info.torrent, "foobar") == NULL);
+  check (testFileExistsAndConsistsOfThisString (tor, 0, "hello, world!\n"));
   tr_free (tmpstr);
-  check (testFileExistsAndConsistsOfThisString (tor, 0, "hello, world!\n"));
+
+  /* (while it's renamed: confirm that the .resume file remembers the changes) */
+  tr_torrentSaveResume (tor);
+  sync ();
+  loaded = tr_torrentLoadResume (tor, ~0, ctor);
+  check_streq ("foobar", tr_torrentName(tor));
+  check ((loaded & TR_FR_NAME) != 0);
 
   /***
@@ -225 +236 @@
   check (tor->info.files[0].is_renamed);
   check_streq ("hello-world.txt", tor->info.files[0].name);
+  check_streq ("hello-world.txt", tr_torrentName(tor));
   tr_free (tmpstr);
   check (testFileExistsAndConsistsOfThisString (tor, 0, "hello, world!\n"));
@@ -266 +278 @@
 test_multifile_torrent (void)
 {
-  //tr_file_stat * file_stats;
-  //tr_file_index_t n;
   tr_file_index_t i;
   uint64_t loaded;
   tr_torrent * tor;
-  //tr_file_index_t i;
   tr_ctor * ctor;
   char * str;

trunk/libtransmission/resume.c

@@ -335 +335 @@
 
     return ret;
+}
+
+/***
+****
+***/
+
+static void
+saveName (tr_variant * dict, const tr_torrent * tor)
+{
+  tr_variantDictAddStr (dict, TR_KEY_name, tr_torrentName(tor));
+}
+
+static uint64_t
+loadName (tr_variant * dict, tr_torrent * tor)
+{
+  uint64_t ret = 0;
+  const char * name;
+
+  if (tr_variantDictFindStr (dict, TR_KEY_name, &name, NULL))
+    {
+      ret = TR_FR_NAME;
+
+      if (tr_strcmp0 (tr_torrentName(tor), name))
+        {
+          tr_free (tor->info.name);
+          tor->info.name = tr_strdup (name);
+        }
+    }
+
+  return ret;
 }
 
@@ -651 +681 @@
     saveIdleLimits (&top, tor);
     saveFilenames (&top, tor);
+    saveName (&top, tor);
 
     filename = getResumeFilename (tor);
@@ -806 +837 @@
         fieldsLoaded |= loadFilenames (&top, tor);
 
+    if (fieldsToLoad & TR_FR_NAME)
+        fieldsLoaded |= loadName (&top, tor);
+
     /* loading the resume file triggers of a lot of changes,
      * but none of them needs to trigger a re-saving of the

trunk/libtransmission/resume.h

@@ -40 +40 @@
     TR_FR_TIME_SEEDING        = (1 << 18),
     TR_FR_TIME_DOWNLOADING    = (1 << 19),
-    TR_FR_FILENAMES           = (1 << 20)
+    TR_FR_FILENAMES           = (1 << 20),
+    TR_FR_NAME                = (1 << 21),
 };
 
@@ -54 +55 @@
 void     tr_torrentRemoveResume (const tr_torrent * tor);
 
+int      tr_torrentRenameResume (const tr_torrent * tor,
+                                 const char       * newname);
+
 #endif

trunk/libtransmission/torrent-magnet.c

@@ -375 +375 @@
 }
 
+/* FIXME: this should be renamed tr_metainfoGetMagnetLink() and moved to metainfo.c for consistency */
 char *
 tr_torrentInfoGetMagnetLink (const tr_info * inf)

trunk/libtransmission/torrent.c

@@ -3442 +3442 @@
 
 static void
+torrentRenameDone (tr_torrent * tor UNUSED,
+                   const char * oldpath UNUSED,
+                   const char * newname UNUSED,
+                   int          error,
+                   void       * user_data)
+{
+  *(int*)user_data = error;
+}
+
+static void
 torrentRenamePath (void * vdata)
 {
@@ -3478 +3488 @@
           if (!error)
             {
+              /* update tr_info.files */
               for (i=0; i<n; ++i)
                 renameTorrentFileString(tor, oldpath, newname, file_indices[i]);
+
+              /* update tr_info.name if user changed the toplevel */
+              if ((n == tor->info.fileCount) && (strchr(oldpath,'/')==NULL))
+                tr_torrentRename (tor, newname, torrentRenameDone, &error);
+
               tr_torrentSetDirty (tor);
             }
@@ -3522 +3538 @@
   tr_runInEventThread (tor->session, torrentRenamePath, data);
 }
+
+/**
+***
+**/
+
+static void
+torrentRename (void * vdata)
+{
+  int error = 0;
+  struct rename_data * data = vdata;
+  tr_torrent * const tor = data->tor;
+
+  tr_free (tor->info.name);
+  tor->info.name = data->newname;
+  tr_torrentSetDirty (tor);
+  tor->anyDate = tr_time ();
+
+  /* callback */
+  if (data->callback != NULL)
+    (*data->callback)(tor, data->oldpath, data->newname, error, data->callback_user_data);
+
+  /* cleanup */
+  tr_free (data);
+}
+
+void
+tr_torrentRename (tr_torrent                   * tor,
+                  const char                   * newname,
+                  tr_torrent_rename_done_func    callback,
+                  void                         * callback_user_data)
+{
+  struct rename_data * data;
+
+  data = tr_new0 (struct rename_data, 1);
+  data->tor = tor;
+  data->newname = tr_strdup (newname);
+  data->callback = callback;
+  data->callback_user_data = callback_user_data;
+
+  tr_runInEventThread (tor->session, torrentRename, data);
+}

trunk/libtransmission/transmission.h

@@ -1110 +1110 @@
  * @callback_data: the pointer to pass in the callback's user_data arg
  *
+ * As a special case, renaming the root file in a torrent will call
+ * tr_torrentRename (tor, newname).
+ *
  * EXAMPLES
  *
@@ -1117 +1120 @@
  *
  *   1. tr_torrentRenamePath (tor, "frobnitz-linux", "foo") will rename
- *      the "frotbnitz-linux" folder as "foo" and update files[*].name.
+ *      the "frotbnitz-linux" folder as "foo", update info.files[*].name,
+ *      and also call tr_torrentRename(tor,"foo").
  *
  *   2. tr_torrentRenamePath (tor, "frobnitz-linux/checksum", "foo") will
@@ -1126 +1130 @@
  *
  *   Changing tr_info's contents requires a session lock, so this function
- *   returns asynchronously to avoid blocking. If you don't care about error
- *   checking, you can pass NULL as the callback and callback_user_data arg.
+ *   returns asynchronously to avoid blocking. If you don't want to be notified
+ *   when the function has finished, you can pass NULL as the callback arg.
  *
  *   On success, the callback's error argument will be 0.
@@ -1144 +1148 @@
                            void                        * callback_user_data);
 
+
+/**
+ * @brief Changes the torrent's name.
+ * @see-also tr_torrentRenamePath
+ *
+ * This function changes tr_info.name.
+ *
+ * Changing tr_info's contents requires a session lock, so this function
+ * returns asynchronously to avoid blocking. If you don't want to be notified
+ * when the function has finished, you can pass NULL as the callback arg.
+ */
+void tr_torrentRename (tr_torrent                   * tor,
+                       const char                   * newname,
+                       tr_torrent_rename_done_func    callback,
+                       void                         * callback_user_data);
 
 enum
@@ -1758 +1777 @@
     uint64_t           totalSize;
 
-    /* the torrent's name */
+    /* The original name that came in this torrent's metainfo.
+     * This may differ from "name" if tr_torrentRename() is called.
+     * CLIENT CODE: NOT USE THIS FIELD. */
+    char             * originalName;
+
+    /* The torrent's name. */
     char             * name;
 

trunk/qt/session.cc

@@ -828 +828 @@
                       {
                         // let's get the updated file list
-                        char * req = tr_strdup_printf ("{ \"arguments\": { \"fields\": [ \"files\", \"id\" ], \"ids\": %d }, \"method\": \"torrent-get\", \"tag\": %d }",
+                        char * req = tr_strdup_printf ("{ \"arguments\": { \"fields\": [ \"files\", \"id\", \"name\" ], \"ids\": %d }, \"method\": \"torrent-get\", \"tag\": %d }",
                                                        int(id),
                                                        int(TAG_SOME_TORRENTS));