summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/download/download_manager.cc70
-rw-r--r--chrome/browser/download/download_manager.h13
-rw-r--r--chrome/browser/download/save_package.cc2
-rw-r--r--chrome/browser/history/download_types.h6
-rw-r--r--chrome/browser/views/download_tab_view.cc4
5 files changed, 70 insertions, 25 deletions
diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc
index 2faef41..766d214 100644
--- a/chrome/browser/download/download_manager.cc
+++ b/chrome/browser/download/download_manager.cc
@@ -60,27 +60,31 @@ static const int kUpdateTimeMs = 1000;
// negative.
static const int kUninitializedHandle = 0;
-// Attempts to modify |path| to be a non-existing path.
-// Returns true if |path| points to a non-existing path upon return.
-static bool UniquifyPath(std::wstring* path) {
- DCHECK(path);
+// Appends the passed the number between parenthesis the path before the
+// extension.
+static void AppendNumberToPath(std::wstring* path, int number) {
+ file_util::InsertBeforeExtension(path, StringPrintf(L" (%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.
+static int GetUniquePathNumber(const std::wstring& path) {
const int kMaxAttempts = 100;
- if (!file_util::PathExists(*path))
- return true;
+ if (!file_util::PathExists(path))
+ return 0;
std::wstring new_path;
for (int count = 1; count <= kMaxAttempts; ++count) {
- new_path.assign(*path);
- file_util::InsertBeforeExtension(&new_path, StringPrintf(L" (%d)", count));
+ new_path.assign(path);
+ AppendNumberToPath(&new_path, count);
- if (!file_util::PathExists(new_path)) {
- path->swap(new_path);
- return true;
- }
+ if (!file_util::PathExists(new_path))
+ return count;
}
- return false;
+ return -1;
}
static bool DownloadPathIsDangerous(const std::wstring& download_path) {
@@ -120,6 +124,7 @@ DownloadItem::DownloadItem(const DownloadCreateInfo& info)
// Constructor for DownloadItem created via user action in the main thread.
DownloadItem::DownloadItem(int32 download_id,
const std::wstring& path,
+ int path_uniquifier,
const std::wstring& url,
const std::wstring& original_name,
const Time start_time,
@@ -129,6 +134,7 @@ DownloadItem::DownloadItem(int32 download_id,
bool is_dangerous)
: id_(download_id),
full_path_(path),
+ path_uniquifier_(path_uniquifier),
url_(url),
original_name_(original_name),
total_bytes_(download_size),
@@ -267,6 +273,11 @@ void DownloadItem::TogglePause() {
std::wstring DownloadItem::GetFileName() const {
if (safety_state_ == DownloadItem::SAFE)
return file_name_;
+ if (path_uniquifier_ > 0) {
+ std::wstring name(original_name_);
+ AppendNumberToPath(&name, path_uniquifier_);
+ return name;
+ }
return original_name_;
}
@@ -537,7 +548,7 @@ void DownloadManager::CheckIfSuggestedPathExists(DownloadCreateInfo* info) {
file_util::AppendToPath(&info->suggested_path, filename);
}
- info->suggested_path_exists = !UniquifyPath(&info->suggested_path);
+ info->path_uniquifier = GetUniquePathNumber(info->suggested_path);
// If the download is deemmed dangerous, we'll use a temporary name for it.
if (!info->save_as && IsDangerous(filename)) {
@@ -556,6 +567,14 @@ void DownloadManager::CheckIfSuggestedPathExists(DownloadCreateInfo* info) {
}
info->suggested_path = path;
info->is_dangerous = true;
+ } else {
+ // We know the final path, build it if necessary.
+ if (info->path_uniquifier > 0) {
+ 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;
+ }
}
// Now we return to the UI thread.
@@ -569,7 +588,7 @@ void DownloadManager::OnPathExistenceAvailable(DownloadCreateInfo* info) {
DCHECK(MessageLoop::current() == ui_loop_);
DCHECK(info);
- if (*prompt_for_download_ || info->save_as || info->suggested_path_exists) {
+ if (*prompt_for_download_ || info->save_as || info->path_uniquifier == -1) {
// We must ask the user for the place to put the download.
if (!select_file_dialog_.get())
select_file_dialog_ = SelectFileDialog::Create(this);
@@ -597,6 +616,7 @@ void DownloadManager::ContinueStartDownload(DownloadCreateInfo* info,
if (it == in_progress_.end()) {
download = new DownloadItem(info->download_id,
info->path,
+ info->path_uniquifier,
info->url,
info->original_name,
info->start_time,
@@ -766,9 +786,18 @@ void DownloadManager::ProceedWithFinishedDangerousDownload(
const std::wstring& original_name) {
bool success = false;
std::wstring new_path = path;
+ int uniquifier = 0;
if (file_util::PathExists(path)) {
new_path = file_util::GetDirectoryFromPath(new_path);
file_util::AppendToPath(&new_path, 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);
+ if (uniquifier > 0)
+ AppendNumberToPath(&new_path, uniquifier);
success = file_util::Move(path, new_path);
} else {
NOTREACHED();
@@ -776,13 +805,14 @@ void DownloadManager::ProceedWithFinishedDangerousDownload(
ui_loop_->PostTask(FROM_HERE,
NewRunnableMethod(this, &DownloadManager::DangerousDownloadRenamed,
- download_handle, success, new_path));
+ download_handle, success, new_path, uniquifier));
}
// Call from the file thread when the finished dangerous download was renamed.
void DownloadManager::DangerousDownloadRenamed(int64 download_handle,
bool success,
- const std::wstring& new_path) {
+ const std::wstring& new_path,
+ int new_path_uniquifier) {
DownloadMap::iterator it = downloads_.find(download_handle);
if (it == downloads_.end()) {
NOTREACHED();
@@ -791,8 +821,12 @@ void DownloadManager::DangerousDownloadRenamed(int64 download_handle,
DownloadItem* download = it->second;
// If we failed to rename the file, we'll just keep the name as is.
- if (success)
+ if (success) {
+ // We need to update the path uniquifier so that the UI shows the right
+ // name when calling GetFileName().
+ download->set_path_uniquifier(new_path_uniquifier);
RenameDownload(download, new_path);
+ }
// Continue the download finished sequence.
ContinueDownloadFinished(download);
diff --git a/chrome/browser/download/download_manager.h b/chrome/browser/download/download_manager.h
index 6e78fb6..cbae765 100644
--- a/chrome/browser/download/download_manager.h
+++ b/chrome/browser/download/download_manager.h
@@ -99,6 +99,7 @@ class DownloadItem {
// Constructing from user action:
DownloadItem(int32 download_id,
const std::wstring& path,
+ int path_uniquifier,
const std::wstring& url,
const std::wstring& original_name,
const Time start_time,
@@ -170,6 +171,8 @@ class DownloadItem {
void set_file_name(const std::wstring& name) { file_name_ = name; }
std::wstring full_path() const { return full_path_; }
void set_full_path(const std::wstring& path) { full_path_ = path; }
+ int path_uniquifier() const { return path_uniquifier_; }
+ void set_path_uniquifier(int uniquifier) { path_uniquifier_ = uniquifier; }
std::wstring url() const { return url_; }
int64 total_bytes() const { return total_bytes_; }
void set_total_bytes(int64 total_bytes) { total_bytes_ = total_bytes; }
@@ -194,7 +197,8 @@ class DownloadItem {
void set_original_name(const std::wstring& name) { original_name_ = name; }
// Returns the file-name that should be reported to the user, which is
- // file_name_ for safe downloads and original_name_ for dangerous ones.
+ // file_name_ for safe downloads and original_name_ for dangerous ones with
+ // the uniquifier number.
std::wstring GetFileName() const;
private:
@@ -207,6 +211,10 @@ class DownloadItem {
// Full path to the downloaded file
std::wstring full_path_;
+ // A number that should be appended to the path to make it unique, or 0 if the
+ // path should be used as is.
+ int path_uniquifier_;
+
// Short display version of the file
std::wstring file_name_;
@@ -456,7 +464,8 @@ class DownloadManager : public base::RefCountedThreadSafe<DownloadManager>,
// Invoked on the UI thread when a dangerous downloaded file has been renamed.
void DangerousDownloadRenamed(int64 download_handle,
bool success,
- const std::wstring& new_path);
+ const std::wstring& new_path,
+ int new_path_uniquifier);
// Checks whether a file represents a risk if downloaded.
bool IsDangerous(const std::wstring& file_name);
diff --git a/chrome/browser/download/save_package.cc b/chrome/browser/download/save_package.cc
index ff56be2..e0dcc0b 100644
--- a/chrome/browser/download/save_package.cc
+++ b/chrome/browser/download/save_package.cc
@@ -174,7 +174,7 @@ bool SavePackage::Init() {
}
// Create the fake DownloadItem and display the view.
- download_ = new DownloadItem(1, saved_main_file_path_, page_url_,
+ download_ = new DownloadItem(1, saved_main_file_path_, 0, page_url_,
std::wstring(), Time::Now(), 0, -1, -1, false);
download_->set_manager(web_contents_->profile()->GetDownloadManager());
DownloadShelfView* shelf = web_contents_->GetDownloadShelfView();
diff --git a/chrome/browser/history/download_types.h b/chrome/browser/history/download_types.h
index 5b6e5b4..7a8258d 100644
--- a/chrome/browser/history/download_types.h
+++ b/chrome/browser/history/download_types.h
@@ -27,7 +27,7 @@ struct DownloadCreateInfo {
int32 download_id)
: path(path),
url(url),
- suggested_path_exists(false),
+ path_uniquifier(0),
start_time(start_time),
received_bytes(received_bytes),
total_bytes(total_bytes),
@@ -47,7 +47,9 @@ struct DownloadCreateInfo {
std::wstring path;
std::wstring url;
std::wstring suggested_path;
- bool suggested_path_exists;
+ // A number that should be added to the suggested path to make it unique.
+ // 0 means no number should be appended. Not actually stored in the db.
+ int path_uniquifier;
Time start_time;
int64 received_bytes;
int64 total_bytes;
diff --git a/chrome/browser/views/download_tab_view.cc b/chrome/browser/views/download_tab_view.cc
index fe3d692..15b43b6 100644
--- a/chrome/browser/views/download_tab_view.cc
+++ b/chrome/browser/views/download_tab_view.cc
@@ -280,7 +280,7 @@ void DownloadItemTabView::LayoutComplete() {
download_util::kBigProgressIconSize + kInfoPadding;
// File name and URL
- file_name_->SetText(model_->file_name());
+ file_name_->SetText(model_->GetFileName());
gfx::Size file_name_size = file_name_->GetPreferredSize();
file_name_->SetBounds(dx, download_util::kBigProgressIconOffset,
std::min(kFilenameSize,
@@ -330,7 +330,7 @@ void DownloadItemTabView::LayoutCancelled() {
download_util::kBigProgressIconSize + kInfoPadding;
// File name and URL, truncated to show cancelled status
- file_name_->SetText(model_->file_name());
+ file_name_->SetText(model_->GetFileName());
gfx::Size file_name_size = file_name_->GetPreferredSize();
file_name_->SetBounds(dx, download_util::kBigProgressIconOffset,
kFilenameSize - kProgressSize - kSpacer,
generated by cgit v1.1 at 2025-02-19 05:13:06 +0000