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

revert accidental overbeautification

Browse source
This commit is contained in:
Shelley Vohr 2017-07-26 18:41:25 -07:00
parent 24ab5075e7
commit ed717a9b45
1 changed files with 60 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

130
atom/browser/api/atom_api_auto_updater.cc
View file

@ -18,15 +18,15 @@ namespace mate {
template<> template<>
struct Converter<base::Time> { struct Converter<base::Time> {
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
const base::Time& val) { const base::Time& val) {
v8::MaybeLocal<v8::Value> date = v8::Date::New( v8::MaybeLocal<v8::Value> date = v8::Date::New(
isolate->GetCurrentContext(), val.ToJsTime()); isolate->GetCurrentContext(), val.ToJsTime());
if (date.IsEmpty()) if (date.IsEmpty())
return v8::Null(isolate); return v8::Null(isolate);
else else
return date.ToLocalChecked(); return date.ToLocalChecked();
} }
}; };
} // namespace mate } // namespace mate
@ -36,108 +36,99 @@ namespace atom {
namespace api { namespace api {
AutoUpdater::AutoUpdater(v8::Isolate* isolate) { AutoUpdater::AutoUpdater(v8::Isolate* isolate) {
auto_updater::AutoUpdater::SetDelegate(this); auto_updater::AutoUpdater::SetDelegate(this);
Init(isolate); Init(isolate);
} }
AutoUpdater::~AutoUpdater() { AutoUpdater::~AutoUpdater() {
auto_updater::AutoUpdater::SetDelegate(nullptr); auto_updater::AutoUpdater::SetDelegate(nullptr);
} }
void AutoUpdater::OnError(const std::string& message) { void AutoUpdater::OnError(const std::string& message) {
v8::Locker locker(isolate()); v8::Locker locker(isolate());
v8::HandleScope handle_scope(isolate()); v8::HandleScope handle_scope(isolate());
auto error = v8::Exception::Error(mate::StringToV8(isolate(), message)); auto error = v8::Exception::Error(mate::StringToV8(isolate(), message));
mate::EmitEvent( mate::EmitEvent(
isolate(), isolate(),
GetWrapper(), GetWrapper(),
"error", "error",
error->ToObject( error->ToObject(isolate()->GetCurrentContext()).ToLocalChecked(),
isolate()->GetCurrentContext()).ToLocalChecked(), message);
message);
} }
void AutoUpdater::OnError(const std::string& message, void AutoUpdater::OnError(const std::string& message,
const int code, const std::string& domain) { const int code, const std::string& domain) {
v8::Locker locker(isolate()); v8::Locker locker(isolate());
v8::HandleScope handle_scope(isolate()); v8::HandleScope handle_scope(isolate());
auto error = v8::Exception::Error( auto error = v8::Exception::Error(mate::StringToV8(isolate(), message));
mate::StringToV8(isolate(), message)); auto errorObject = error->ToObject(
auto errorObject = error->ToObject( isolate()->GetCurrentContext()).ToLocalChecked();
isolate()->GetCurrentContext()).ToLocalChecked();
// add two new params for better error handling // add two new params for better error handling
errorObject->Set(mate::StringToV8(isolate(), "code"), errorObject->Set(mate::StringToV8(isolate(), "code"),
v8::Integer::New(isolate(), code)); v8::Integer::New(isolate(), code));
errorObject->Set(mate::StringToV8(isolate(), "domain"), errorObject->Set(mate::StringToV8(isolate(), "domain"),
mate::StringToV8(isolate(), domain)); mate::StringToV8(isolate(), domain));
mate::EmitEvent( mate::EmitEvent(isolate(), GetWrapper(), "error", errorObject, message);
isolate(),
GetWrapper(),
"error",
errorObject,
message);
} }
void AutoUpdater::OnCheckingForUpdate() { void AutoUpdater::OnCheckingForUpdate() {
Emit("checking-for-update"); Emit("checking-for-update");
} }
void AutoUpdater::OnUpdateAvailable() { void AutoUpdater::OnUpdateAvailable() {
Emit("update-available"); Emit("update-available");
} }
void AutoUpdater::OnUpdateNotAvailable() { void AutoUpdater::OnUpdateNotAvailable() {
Emit("update-not-available"); Emit("update-not-available");
} }
void AutoUpdater::OnUpdateDownloaded(const std::string& release_notes, void AutoUpdater::OnUpdateDownloaded(const std::string& release_notes,
const std::string& release_name, const std::string& release_name,
const base::Time& release_date, const base::Time& release_date,
const std::string& url) { const std::string& url) {
Emit("update-downloaded", release_notes, release_name, release_date, Emit("update-downloaded", release_notes, release_name, release_date,
url, base::Bind(&AutoUpdater::QuitAndInstall, url, base::Bind(&AutoUpdater::QuitAndInstall, base::Unretained(this)));
base::Unretained(this)));
} }
void AutoUpdater::OnWindowAllClosed() { void AutoUpdater::OnWindowAllClosed() {
QuitAndInstall(); QuitAndInstall();
} }
void AutoUpdater::SetFeedURL(const std::string& url, mate::Arguments* args) { void AutoUpdater::SetFeedURL(const std::string& url, mate::Arguments* args) {
auto_updater::AutoUpdater::HeaderMap headers; auto_updater::AutoUpdater::HeaderMap headers;
args->GetNext(&headers); args->GetNext(&headers);
auto_updater::AutoUpdater::SetFeedURL(url, headers); auto_updater::AutoUpdater::SetFeedURL(url, headers);
} }
void AutoUpdater::QuitAndInstall() { void AutoUpdater::QuitAndInstall() {
// If we don't have any window then quitAndInstall immediately. // If we don't have any window then quitAndInstall immediately.
if (WindowList::IsEmpty()) { if (WindowList::IsEmpty()) {
auto_updater::AutoUpdater::QuitAndInstall(); auto_updater::AutoUpdater::QuitAndInstall();
return; return;
} }
// Otherwise do the restart after all windows have been closed. // Otherwise do the restart after all windows have been closed.
WindowList::AddObserver(this); WindowList::AddObserver(this);
WindowList::CloseAllWindows(); WindowList::CloseAllWindows();
} }
// static // static
mate::Handle<AutoUpdater> AutoUpdater::Create(v8::Isolate* isolate) { mate::Handle<AutoUpdater> AutoUpdater::Create(v8::Isolate* isolate) {
return mate::CreateHandle(isolate, new AutoUpdater(isolate)); return mate::CreateHandle(isolate, new AutoUpdater(isolate));
} }
// static // static
void AutoUpdater::BuildPrototype( void AutoUpdater::BuildPrototype(
v8::Isolate* isolate, v8::Local<v8::FunctionTemplate> prototype) { v8::Isolate* isolate, v8::Local<v8::FunctionTemplate> prototype) {
prototype->SetClassName(mate::StringToV8(isolate, "AutoUpdater")); prototype->SetClassName(mate::StringToV8(isolate, "AutoUpdater"));
mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate()) mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
.SetMethod("checkForUpdates", .SetMethod("checkForUpdates", &auto_updater::AutoUpdater::CheckForUpdates)
&auto_updater::AutoUpdater::CheckForUpdates) .SetMethod("getFeedURL", &auto_updater::AutoUpdater::GetFeedURL)
.SetMethod("getFeedURL", &auto_updater::AutoUpdater::GetFeedURL) .SetMethod("setFeedURL", &AutoUpdater::SetFeedURL)
.SetMethod("setFeedURL", &AutoUpdater::SetFeedURL) .SetMethod("quitAndInstall", &AutoUpdater::QuitAndInstall);
.SetMethod("quitAndInstall", &AutoUpdater::QuitAndInstall);
} }
} // namespace api } // namespace api
@ -151,11 +142,10 @@ using atom::api::AutoUpdater;
void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused, void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
v8::Local<v8::Context> context, void* priv) { v8::Local<v8::Context> context, void* priv) {
v8::Isolate* isolate = context->GetIsolate(); v8::Isolate* isolate = context->GetIsolate();
mate::Dictionary dict(isolate, exports); mate::Dictionary dict(isolate, exports);
dict.Set("autoUpdater", AutoUpdater::Create(isolate)); dict.Set("autoUpdater", AutoUpdater::Create(isolate));
dict.Set("AutoUpdater", dict.Set("AutoUpdater", AutoUpdater::GetConstructor(isolate)->GetFunction());
AutoUpdater::GetConstructor(isolate)->GetFunction());
} }
} // namespace } // namespace