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

Add optional requestHeaders argument to autoUpdater.setFeedURL + allow calling mulitple times

Browse source
This commit is contained in:
Milan Burda 2016-06-10 15:55:42 +02:00
parent c68ca16148
commit c89d8b19b6
10 changed files with 70 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,6 +9,7 @@
#include "atom/browser/native_window.h"
#include "atom/browser/window_list.h"
#include "atom/common/native_mate_converters/callback.h"
#include "atom/common/native_mate_converters/string_map_converter.h"
#include "atom/common/node_includes.h"
#include "native_mate/dictionary.h"
#include "native_mate/object_template_builder.h"
@ -102,7 +103,7 @@ mate::Handle<AutoUpdater> AutoUpdater::Create(v8::Isolate* isolate) {
void AutoUpdater::BuildPrototype(
v8::Isolate* isolate, v8::Local<v8::ObjectTemplate> prototype) {
mate::ObjectTemplateBuilder(isolate, prototype)
.SetMethod("setFeedURL", &auto_updater::AutoUpdater::SetFeedURL)
.SetMethod("_setFeedURL", &auto_updater::AutoUpdater::SetFeedURL)
.SetMethod("checkForUpdates", &auto_updater::AutoUpdater::CheckForUpdates)
.SetMethod("quitAndInstall", &AutoUpdater::QuitAndInstall);
}

3
atom/browser/auto_updater.cc
View file

@ -17,7 +17,8 @@ void AutoUpdater::SetDelegate(Delegate* delegate) {
}
#if !defined(OS_MACOSX) || defined(MAS_BUILD)
void AutoUpdater::SetFeedURL(const std::string& url) {
void AutoUpdater::SetFeedURL(const std::string& url,
const HeaderMap& requestHeaders) {
}
void AutoUpdater::CheckForUpdates() {

6
atom/browser/auto_updater.h
View file

@ -5,6 +5,7 @@
#ifndef ATOM_BROWSER_AUTO_UPDATER_H_
#define ATOM_BROWSER_AUTO_UPDATER_H_
#include <map>
#include <string>
#include "base/macros.h"
@ -42,11 +43,14 @@ class Delegate {
class AutoUpdater {
public:
typedef std::map<std::string, std::string> HeaderMap;
// Gets/Sets the delegate.
static Delegate* GetDelegate();
static void SetDelegate(Delegate* delegate);
static void SetFeedURL(const std::string& url);
static void SetFeedURL(const std::string& url,
const HeaderMap& requestHeaders);
static void CheckForUpdates();
static void QuitAndInstall();

24
atom/browser/auto_updater_mac.mm
View file

@ -29,16 +29,22 @@ bool g_update_available = false;
}
// static
void AutoUpdater::SetFeedURL(const std::string& feed) {
void AutoUpdater::SetFeedURL(const std::string& feed,
const HeaderMap& requestHeaders) {
Delegate* delegate = GetDelegate();
if (!delegate)
return;
NSURL* url = [NSURL URLWithString:base::SysUTF8ToNSString(feed)];
NSMutableURLRequest* urlRequest = [NSMutableURLRequest requestWithURL:url];
for (auto&& it : requestHeaders) {
[urlRequest setValue:base::SysUTF8ToNSString(it.second)
forHTTPHeaderField:base::SysUTF8ToNSString(it.first)];
}
if (g_updater == nil) {
Delegate* delegate = GetDelegate();
if (!delegate)
return;
// Initialize the SQRLUpdater.
NSURL* url = [NSURL URLWithString:base::SysUTF8ToNSString(feed)];
NSURLRequest* urlRequest = [NSURLRequest requestWithURL:url];
@try {
g_updater = [[SQRLUpdater alloc] initWithUpdateRequest:urlRequest];
} @catch (NSException* error) {
@ -57,6 +63,8 @@ void AutoUpdater::SetFeedURL(const std::string& feed) {
delegate->OnUpdateAvailable();
});
}];
} else {
g_updater.updateRequest = urlRequest;
}
}