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

Handle all download events from AutoUpdater::CheckForUpdates

Browse source
This commit is contained in:
probablycorey 2014-02-01 15:55:57 -08:00
parent a8913f5ea0
commit 5da1e9ed10
1 changed files with 26 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
browser/auto_updater_mac.mm
View file

@ -43,29 +43,6 @@ void AutoUpdater::SetFeedURL(const std::string& feed) {
if (!delegate)
return;
__block SQRLUpdate* update = nil;
// Subscribe to events.
[g_updater.updates subscribeNext:^(SQRLDownloadedUpdate* downloadedUpdate) {
update = downloadedUpdate.update;
} completed:^() {
if (update) {
// There is a new update that has been downloaded.
delegate->OnUpdateDownloaded(
base::SysNSStringToUTF8(update.releaseNotes),
base::SysNSStringToUTF8(update.releaseName),
base::Time::FromDoubleT(update.releaseDate.timeIntervalSince1970),
base::SysNSStringToUTF8(update.updateURL.absoluteString),
base::Bind(RelaunchToInstallUpdate));
}
else {
// When the completed event is sent with no update, then we know there
// is no update available.
delegate->OnUpdateNotAvailable();
}
update = nil;
}];
[[g_updater rac_valuesForKeyPath:@"state" observer:g_updater]
subscribeNext:^(NSNumber *stateNumber) {
int state = [stateNumber integerValue];
@ -81,14 +58,34 @@ void AutoUpdater::SetFeedURL(const std::string& feed) {
// static
void AutoUpdater::CheckForUpdates() {
RACSignal* signal = [g_updater.checkForUpdatesCommand execute:nil];
AutoUpdaterDelegate* delegate = GetDelegate();
if (!delegate)
return;
[signal subscribeError:^(NSError* error) {
// Something wrong happened.
[[[[g_updater.checkForUpdatesCommand
execute:nil]
// Send a `nil` after everything...
concat:[RACSignal return:nil]]
// But only take the first value. If an update is sent, we'll get that.
// Otherwise, we'll get our inserted `nil` value.
take:1]
subscribeNext:^(SQRLDownloadedUpdate *downloadedUpdate) {
if (downloadedUpdate) {
SQRLUpdate* update = downloadedUpdate.update;
// There is a new update that has been downloaded.
delegate->OnUpdateDownloaded(
base::SysNSStringToUTF8(update.releaseNotes),
base::SysNSStringToUTF8(update.releaseName),
base::Time::FromDoubleT(update.releaseDate.timeIntervalSince1970),
base::SysNSStringToUTF8(update.updateURL.absoluteString),
base::Bind(RelaunchToInstallUpdate));
}
else {
// When the completed event is sent with no update, then we know there
// is no update available.
delegate->OnUpdateNotAvailable();
}
} error:^(NSError *error) {
delegate->OnError(base::SysNSStringToUTF8(error.localizedDescription));
}];
}