From 1110b9b50e61bf2663e2037ce9e28e74a8943919 Mon Sep 17 00:00:00 2001 From: Peter Varga Date: Thu, 28 Mar 2019 14:57:50 +0100 Subject: Fix timestamp deduplication for Windows Based on https://chromium-review.googlesource.com/c/chromium/src/+/1432882 Task-number: QTBUG-74764 Change-Id: I74b4711f5146d2d2261487f13ccac702b9aa969e Reviewed-by: Allan Sandfeld Jensen --- src/core/download_manager_delegate_qt.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/core/download_manager_delegate_qt.cpp') diff --git a/src/core/download_manager_delegate_qt.cpp b/src/core/download_manager_delegate_qt.cpp index f0f0c93b9..76b0bea74 100644 --- a/src/core/download_manager_delegate_qt.cpp +++ b/src/core/download_manager_delegate_qt.cpp @@ -175,8 +175,15 @@ bool DownloadManagerDelegateQt::DetermineDownloadTarget(download::DownloadItem* int uniquifier = base::GetUniquePathNumber(tmpFilePath, base::FilePath::StringType()); if (uniquifier > 0) suggestedFilePath = toQt(tmpFilePath.InsertBeforeExtensionASCII(base::StringPrintf(" (%d)", uniquifier)).AsUTF8Unsafe()); - else if (uniquifier == -1) - suggestedFilePath = toQt(tmpFilePath.InsertBeforeExtensionASCII(base::StringPrintf(" - %s", base::TimeToISO8601(item->GetStartTime()).c_str())).AsUTF8Unsafe()); + else if (uniquifier == -1) { + base::Time::Exploded exploded; + item->GetStartTime().LocalExplode(&exploded); + std::string suffix = base::StringPrintf( + " - %04d-%02d-%02dT%02d%02d%02d.%03d", exploded.year, exploded.month, + exploded.day_of_month, exploded.hour, exploded.minute, + exploded.second, exploded.millisecond); + suggestedFilePath = toQt(tmpFilePath.InsertBeforeExtensionASCII(suffix).AsUTF8Unsafe()); + } item->AddObserver(this); QList clients = m_profileAdapter->clients(); -- cgit v1.2.3 From a4deceac006cadf46123b07526e63750d44f0849 Mon Sep 17 00:00:00 2001 From: Peter Varga Date: Fri, 5 Apr 2019 11:18:51 +0200 Subject: Normalize download path on Windows Task-number: QTBUG-74698 Task-number: QTBUG-74251 Change-Id: I4358feb7fb28b226edb24ed10611e797fcd3c326 Reviewed-by: Allan Sandfeld Jensen --- src/core/download_manager_delegate_qt.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/download_manager_delegate_qt.cpp') diff --git a/src/core/download_manager_delegate_qt.cpp b/src/core/download_manager_delegate_qt.cpp index 76b0bea74..f39830ff2 100644 --- a/src/core/download_manager_delegate_qt.cpp +++ b/src/core/download_manager_delegate_qt.cpp @@ -170,7 +170,7 @@ bool DownloadManagerDelegateQt::DetermineDownloadTarget(download::DownloadItem* QFileInfo suggestedFile(defaultDownloadDirectory.absoluteFilePath(suggestedFilename)); QString suggestedFilePath = suggestedFile.absoluteFilePath(); - base::FilePath tmpFilePath(toFilePathString(suggestedFilePath)); + base::FilePath tmpFilePath(toFilePath(suggestedFilePath).NormalizePathSeparatorsTo('/')); int uniquifier = base::GetUniquePathNumber(tmpFilePath, base::FilePath::StringType()); if (uniquifier > 0) -- cgit v1.2.3