mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #6983 from electron/download-item-prompt

Browse source 
Check DownloadItem save path before prompting
This commit is contained in:
Cheng Zhao 2016-08-26 20:41:03 +09:00 • committed by GitHub
commit cd469b5f31
3 changed files with 39 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

44
atom/browser/atom_download_manager_delegate.cc
View file

@ -35,6 +35,17 @@ AtomDownloadManagerDelegate::~AtomDownloadManagerDelegate() {
} }
} }
void AtomDownloadManagerDelegate::GetItemSavePath(content::DownloadItem* item,
base::FilePath* path) {
v8::Isolate* isolate = v8::Isolate::GetCurrent();
v8::Locker locker(isolate);
v8::HandleScope handle_scope(isolate);
api::DownloadItem* download = api::DownloadItem::FromWrappedClass(isolate,
item);
if (download)
*path = download->GetSavePath();
}
void AtomDownloadManagerDelegate::CreateDownloadPath( void AtomDownloadManagerDelegate::CreateDownloadPath(
const GURL& url, const GURL& url,
const std::string& content_disposition, const std::string& content_disposition,
@ -77,9 +88,12 @@ void AtomDownloadManagerDelegate::OnDownloadPathGenerated(
window = relay->window.get(); window = relay->window.get();
base::FilePath path; base::FilePath path;
if (file_dialog::ShowSaveDialog(window, item->GetURL().spec(), GetItemSavePath(item, &path);
"", default_path, // Show save dialog if save path was not set already on item
file_dialog::Filters(), &path)) { if (path.empty() && file_dialog::ShowSaveDialog(window, item->GetURL().spec(),
"", default_path,
file_dialog::Filters(),
&path)) {
// Remember the last selected download directory. // Remember the last selected download directory.
AtomBrowserContext* browser_context = static_cast<AtomBrowserContext*>( AtomBrowserContext* browser_context = static_cast<AtomBrowserContext*>(
download_manager_->GetBrowserContext()); download_manager_->GetBrowserContext());
@ -122,22 +136,14 @@ bool AtomDownloadManagerDelegate::DetermineDownloadTarget(
} }
// Try to get the save path from JS wrapper. // Try to get the save path from JS wrapper.
{ base::FilePath save_path;
v8::Isolate* isolate = v8::Isolate::GetCurrent(); GetItemSavePath(download, &save_path);
v8::Locker locker(isolate); if (!save_path.empty()) {
v8::HandleScope handle_scope(isolate); callback.Run(save_path,
api::DownloadItem* download_item = api::DownloadItem::FromWrappedClass( content::DownloadItem::TARGET_DISPOSITION_OVERWRITE,
isolate, download); content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
if (download_item) { save_path);
base::FilePath save_path = download_item->GetSavePath(); return true;
if (!save_path.empty()) {
callback.Run(save_path,
content::DownloadItem::TARGET_DISPOSITION_OVERWRITE,
content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
save_path);
return true;
}
}
} }
AtomBrowserContext* browser_context = static_cast<AtomBrowserContext*>( AtomBrowserContext* browser_context = static_cast<AtomBrowserContext*>(

3
atom/browser/atom_download_manager_delegate.h
View file

@ -46,6 +46,9 @@ class AtomDownloadManagerDelegate : public content::DownloadManagerDelegate {
void GetNextId(const content::DownloadIdCallback& callback) override; void GetNextId(const content::DownloadIdCallback& callback) override;
private: private:
// Get the save path set on the associated api::DownloadItem object
void GetItemSavePath(content::DownloadItem* item, base::FilePath* path);
content::DownloadManager* download_manager_; content::DownloadManager* download_manager_;
base::WeakPtrFactory<AtomDownloadManagerDelegate> weak_ptr_factory_; base::WeakPtrFactory<AtomDownloadManagerDelegate> weak_ptr_factory_;

11
spec/api-session-spec.js
View file

@ -319,6 +319,17 @@ describe('session module', function () {
}) })
}) })
}) })
describe('when a save path is specified and the URL is unavailable', function () {
it('does not display a save dialog and reports the done state as interrupted', function (done) {
ipcRenderer.sendSync('set-download-option', false, false)
ipcRenderer.once('download-done', (event, state) => {
assert.equal(state, 'interrupted')
done()
})
w.webContents.downloadURL('file://' + path.join(__dirname, 'does-not-exist.txt'))
})
})
}) })
describe('ses.protocol', function () { describe('ses.protocol', function () {