Append a number to make app shortcut name unique.

chrome/browser/download/download_manager.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/download/download_manager.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/callback.h"
 #include "base/file_util.h"
@@ skipping 61 matching lines @@
 
 // Update frequency (milliseconds).
 const int kUpdateTimeMs = 1000;
 
 // Our download table ID starts at 1, so we use 0 to represent a download that
 // has started, but has not yet had its data persisted in the table. We use fake
 // database handles in incognito mode starting at -1 and progressively getting
 // more negative.
 const int kUninitializedHandle = 0;
 
-// Appends the passed the number between parenthesis the path before the
-// extension.
-void AppendNumberToPath(FilePath* path, int number) {
-  file_util::InsertBeforeExtension(path,
-      StringPrintf(FILE_PATH_LITERAL(" (%d)"), number));
-}
-
-// Attempts to find a number that can be appended to that path to make it
-// unique. If |path| does not exist, 0 is returned.  If it fails to find such
-// a number, -1 is returned.
-int GetUniquePathNumber(const FilePath& path) {
-  const int kMaxAttempts = 100;
-
-  if (!file_util::PathExists(path))
-    return 0;
-
-  FilePath new_path;
-  for (int count = 1; count <= kMaxAttempts; ++count) {
-    new_path = FilePath(path);
-    AppendNumberToPath(&new_path, count);
-
-    if (!file_util::PathExists(new_path))
-      return count;
-  }
-
-  return -1;
-}
-
 // Used to sort download items based on descending start time.
 bool CompareStartTime(DownloadItem* first, DownloadItem* second) {
   return first->start_time() > second->start_time();
 }
 
 }  // namespace
 
 // DownloadItem implementation -------------------------------------------------
 
 // Constructor for reading from the history service.
@@ skipping 197 matching lines @@
   manager_->PauseDownload(id_, !is_paused_);
   is_paused_ = !is_paused_;
   UpdateObservers();
 }
 
 FilePath DownloadItem::GetFileName() const {
   if (safety_state_ == DownloadItem::SAFE)
     return file_name_;
   if (path_uniquifier_ > 0) {
     FilePath name(original_name_);
-    AppendNumberToPath(&name, path_uniquifier_);
+    download_util::AppendNumberToPath(&name, path_uniquifier_);
     return name;
   }
   return original_name_;
 }
 
 // DownloadManager implementation ----------------------------------------------
 
 // static
 void DownloadManager::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kPromptForDownload, false);
@@ skipping 354 matching lines @@
   FilePath dir = info->suggested_path.DirName();
   FilePath filename = info->suggested_path.BaseName();
   if (!file_util::PathIsWritable(dir)) {
     info->save_as = true;
     PathService::Get(chrome::DIR_USER_DOCUMENTS, &info->suggested_path);
     info->suggested_path = info->suggested_path.Append(filename);
   }
 
   // Do not add the path uniquifier if we are saving to a specific path as in
   // the drag-out case.
-  if (info->save_info.file_path.empty())
-    info->path_uniquifier = GetUniquePathNumber(info->suggested_path);
+  if (info->save_info.file_path.empty()) {
+    info->path_uniquifier = download_util::GetUniquePathNumber(
+        info->suggested_path);
+  }
 
   // If the download is deemed dangerous, we'll use a temporary name for it.
   if (info->is_dangerous) {
     info->original_name = FilePath(info->suggested_path).BaseName();
     // Create a temporary file to hold the file until the user approves its
     // download.
     FilePath::StringType file_name;
     FilePath path;
     while (path.empty()) {
       SStringPrintf(&file_name, FILE_PATH_LITERAL("unconfirmed %d.download"),
                     base::RandInt(0, 100000));
       path = dir.Append(file_name);
       if (file_util::PathExists(path))
         path = FilePath();
     }
     info->suggested_path = path;
   } else {
     // We know the final path, build it if necessary.
     if (info->path_uniquifier > 0) {
-      AppendNumberToPath(&(info->suggested_path), info->path_uniquifier);
+      download_util::AppendNumberToPath(&(info->suggested_path),
+                                        info->path_uniquifier);
       // Setting path_uniquifier to 0 to make sure we don't try to unique it
       // later on.
       info->path_uniquifier = 0;
     } else if (info->path_uniquifier == -1) {
       // We failed to find a unique path.  We have to prompt the user.
       info->save_as = true;
     }
   }
 
   if (!info->save_as && info->save_info.file_path.empty()) {
@@ skipping 275 matching lines @@
   bool success = false;
   FilePath new_path;
   int uniquifier = 0;
   if (file_util::PathExists(path)) {
     new_path = path.DirName().Append(original_name);
     // Make our name unique at this point, as if a dangerous file is downloading
     // and a 2nd download is started for a file with the same name, they would
     // have the same path.  This is because we uniquify the name on download
     // start, and at that time the first file does not exists yet, so the second
     // file gets the same name.
-    uniquifier = GetUniquePathNumber(new_path);
+    uniquifier = download_util::GetUniquePathNumber(new_path);
     if (uniquifier > 0)
-      AppendNumberToPath(&new_path, uniquifier);
+      download_util::AppendNumberToPath(&new_path, uniquifier);
     success = file_util::Move(path, new_path);
   } else {
     NOTREACHED();
   }
 
   ChromeThread::PostTask(
       ChromeThread::UI, FROM_HERE,
       NewRunnableMethod(this, &DownloadManager::DangerousDownloadRenamed,
                         download_handle, success, new_path, uniquifier));
 }
@@ skipping 775 matching lines @@
   observing_download_manager_->NotifyModelChanged();
 }
 
 void DownloadManager::OtherDownloadManagerObserver::SetDownloads(
     std::vector<DownloadItem*>& downloads) {
 }
 
 void DownloadManager::OtherDownloadManagerObserver::ManagerGoingDown() {
   observed_download_manager_ = NULL;
 }