Add session.setDownloadPath
API.
This commit is contained in:
parent
2aa17debc8
commit
fef53d18c4
6 changed files with 28 additions and 1 deletions
|
@ -10,8 +10,11 @@
|
||||||
#include "atom/browser/api/atom_api_cookies.h"
|
#include "atom/browser/api/atom_api_cookies.h"
|
||||||
#include "atom/browser/atom_browser_context.h"
|
#include "atom/browser/atom_browser_context.h"
|
||||||
#include "atom/common/native_mate_converters/gurl_converter.h"
|
#include "atom/common/native_mate_converters/gurl_converter.h"
|
||||||
#include "base/thread_task_runner_handle.h"
|
#include "base/files/file_path.h"
|
||||||
|
#include "base/prefs/pref_service.h"
|
||||||
#include "base/strings/string_util.h"
|
#include "base/strings/string_util.h"
|
||||||
|
#include "base/thread_task_runner_handle.h"
|
||||||
|
#include "chrome/common/pref_names.h"
|
||||||
#include "content/public/browser/browser_thread.h"
|
#include "content/public/browser/browser_thread.h"
|
||||||
#include "content/public/browser/storage_partition.h"
|
#include "content/public/browser/storage_partition.h"
|
||||||
#include "native_mate/callback.h"
|
#include "native_mate/callback.h"
|
||||||
|
@ -251,6 +254,11 @@ void Session::SetProxy(const std::string& proxy,
|
||||||
base::Bind(&SetProxyInIO, base::Unretained(getter), proxy, callback));
|
base::Bind(&SetProxyInIO, base::Unretained(getter), proxy, callback));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Session::SetDownloadPath(const std::string& path) {
|
||||||
|
browser_context_->prefs()->SetFilePath(prefs::kDownloadDefaultDirectory,
|
||||||
|
base::FilePath(path));
|
||||||
|
}
|
||||||
|
|
||||||
v8::Local<v8::Value> Session::Cookies(v8::Isolate* isolate) {
|
v8::Local<v8::Value> Session::Cookies(v8::Isolate* isolate) {
|
||||||
if (cookies_.IsEmpty()) {
|
if (cookies_.IsEmpty()) {
|
||||||
auto handle = atom::api::Cookies::Create(isolate, browser_context_);
|
auto handle = atom::api::Cookies::Create(isolate, browser_context_);
|
||||||
|
@ -266,6 +274,7 @@ mate::ObjectTemplateBuilder Session::GetObjectTemplateBuilder(
|
||||||
.SetMethod("clearCache", &Session::ClearCache)
|
.SetMethod("clearCache", &Session::ClearCache)
|
||||||
.SetMethod("clearStorageData", &Session::ClearStorageData)
|
.SetMethod("clearStorageData", &Session::ClearStorageData)
|
||||||
.SetMethod("setProxy", &Session::SetProxy)
|
.SetMethod("setProxy", &Session::SetProxy)
|
||||||
|
.SetMethod("setDownloadPath", &Session::SetDownloadPath)
|
||||||
.SetProperty("cookies", &Session::Cookies);
|
.SetProperty("cookies", &Session::Cookies);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -46,6 +46,7 @@ class Session: public mate::TrackableObject<Session> {
|
||||||
void ClearCache(const net::CompletionCallback& callback);
|
void ClearCache(const net::CompletionCallback& callback);
|
||||||
void ClearStorageData(mate::Arguments* args);
|
void ClearStorageData(mate::Arguments* args);
|
||||||
void SetProxy(const std::string& proxy, const base::Closure& callback);
|
void SetProxy(const std::string& proxy, const base::Closure& callback);
|
||||||
|
void SetDownloadPath(const std::string& path);
|
||||||
v8::Local<v8::Value> Cookies(v8::Isolate* isolate);
|
v8::Local<v8::Value> Cookies(v8::Isolate* isolate);
|
||||||
|
|
||||||
v8::Global<v8::Value> cookies_;
|
v8::Global<v8::Value> cookies_;
|
||||||
|
|
|
@ -152,6 +152,8 @@ content::BrowserPluginGuestManager* AtomBrowserContext::GetGuestManager() {
|
||||||
void AtomBrowserContext::RegisterPrefs(PrefRegistrySimple* pref_registry) {
|
void AtomBrowserContext::RegisterPrefs(PrefRegistrySimple* pref_registry) {
|
||||||
pref_registry->RegisterFilePathPref(prefs::kSelectFileLastDirectory,
|
pref_registry->RegisterFilePathPref(prefs::kSelectFileLastDirectory,
|
||||||
base::FilePath());
|
base::FilePath());
|
||||||
|
pref_registry->RegisterFilePathPref(prefs::kDownloadDefaultDirectory,
|
||||||
|
base::FilePath());
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace atom
|
} // namespace atom
|
||||||
|
|
|
@ -6,10 +6,13 @@
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
|
#include "atom/browser/atom_browser_context.h"
|
||||||
#include "atom/browser/native_window.h"
|
#include "atom/browser/native_window.h"
|
||||||
#include "atom/browser/ui/file_dialog.h"
|
#include "atom/browser/ui/file_dialog.h"
|
||||||
#include "base/bind.h"
|
#include "base/bind.h"
|
||||||
#include "base/files/file_util.h"
|
#include "base/files/file_util.h"
|
||||||
|
#include "base/prefs/pref_service.h"
|
||||||
|
#include "chrome/common/pref_names.h"
|
||||||
#include "content/public/browser/browser_context.h"
|
#include "content/public/browser/browser_context.h"
|
||||||
#include "content/public/browser/browser_thread.h"
|
#include "content/public/browser/browser_thread.h"
|
||||||
#include "content/public/browser/download_manager.h"
|
#include "content/public/browser/download_manager.h"
|
||||||
|
@ -77,6 +80,11 @@ void AtomDownloadManagerDelegate::OnDownloadPathGenerated(
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Remeber the last selected download directory.
|
||||||
|
AtomBrowserContext* browser_context = static_cast<AtomBrowserContext*>(
|
||||||
|
download_manager_->GetBrowserContext());
|
||||||
|
browser_context->prefs()->SetFilePath(prefs::kDownloadDefaultDirectory,
|
||||||
|
path.DirName());
|
||||||
callback.Run(path,
|
callback.Run(path,
|
||||||
content::DownloadItem::TARGET_DISPOSITION_PROMPT,
|
content::DownloadItem::TARGET_DISPOSITION_PROMPT,
|
||||||
content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, path);
|
content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, path);
|
||||||
|
@ -92,6 +100,11 @@ bool AtomDownloadManagerDelegate::DetermineDownloadTarget(
|
||||||
const content::DownloadTargetCallback& callback) {
|
const content::DownloadTargetCallback& callback) {
|
||||||
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
||||||
|
|
||||||
|
AtomBrowserContext* browser_context = static_cast<AtomBrowserContext*>(
|
||||||
|
download_manager_->GetBrowserContext());
|
||||||
|
default_download_path_ = browser_context->prefs()->GetFilePath(
|
||||||
|
prefs::kDownloadDefaultDirectory);
|
||||||
|
// If users didn't set download path, use 'Downloads' directory by default.
|
||||||
if (default_download_path_.empty()) {
|
if (default_download_path_.empty()) {
|
||||||
auto path = download_manager_->GetBrowserContext()->GetPath();
|
auto path = download_manager_->GetBrowserContext()->GetPath();
|
||||||
default_download_path_ = path.Append(FILE_PATH_LITERAL("Downloads"));
|
default_download_path_ = path.Append(FILE_PATH_LITERAL("Downloads"));
|
||||||
|
|
|
@ -7,5 +7,6 @@
|
||||||
namespace prefs {
|
namespace prefs {
|
||||||
|
|
||||||
const char kSelectFileLastDirectory[] = "selectfile.last_directory";
|
const char kSelectFileLastDirectory[] = "selectfile.last_directory";
|
||||||
|
const char kDownloadDefaultDirectory[] = "download.default_directory";
|
||||||
|
|
||||||
} // namespace prefs
|
} // namespace prefs
|
||||||
|
|
|
@ -7,5 +7,6 @@
|
||||||
namespace prefs {
|
namespace prefs {
|
||||||
|
|
||||||
extern const char kSelectFileLastDirectory[];
|
extern const char kSelectFileLastDirectory[];
|
||||||
|
extern const char kDownloadDefaultDirectory[];
|
||||||
|
|
||||||
} // namespace prefs
|
} // namespace prefs
|
||||||
|
|
Loading…
Reference in a new issue