mkarolin
c869c58dff
Chromium change: https://source.chromium.org/chromium/chromium/src/+/989852ed58f849453d062bcd3f3eecb5ccc14df0 commit 989852ed58f849453d062bcd3f3eecb5ccc14df0 Author: Greg Thompson <grt@chromium.org> Date: Mon Nov 23 22:32:27 2020 +0000 [FilePathWatcher] Use an enum rather than a bool for the type of watch. No functional changes. This is in preparation for adding a new type for macOS. An overload of the Watch method that takes a bool is left behind for compatibility reasons. As a consequence, necessary casting is introduced to pick the correct overload when using base::Bind*. BUG=1147071
106 lines
3.9 KiB
C++
106 lines
3.9 KiB
C++
/* Copyright (c) 2020 The Brave Authors. All rights reserved.
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
|
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "brave/components/speedreader/speedreader_component.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "base/bind.h"
|
|
#include "base/command_line.h"
|
|
#include "base/logging.h"
|
|
#include "brave/components/speedreader/speedreader_switches.h"
|
|
#include "url/gurl.h"
|
|
|
|
namespace speedreader {
|
|
|
|
namespace {
|
|
|
|
constexpr base::FilePath::CharType kDatFileVersion[] = FILE_PATH_LITERAL("1");
|
|
|
|
constexpr base::FilePath::CharType kDatFileName[] =
|
|
FILE_PATH_LITERAL("speedreader-updater.dat");
|
|
|
|
constexpr base::FilePath::CharType kStylesheetFileName[] =
|
|
FILE_PATH_LITERAL("content-stylesheet.css");
|
|
|
|
constexpr char kComponentName[] = "Brave SpeedReader Updater";
|
|
constexpr char kComponentId[] = "jicbkmdloagakknpihibphagfckhjdih";
|
|
constexpr char kComponentPublicKey[] =
|
|
"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3j/+grwCsrYVA99oDHa+E9z5edPIV"
|
|
"3J+lzld3X7K8wfJXbSauGf2DSxW0UEh+MqkkcIK/66Kkd4veuWqnUCAGXUzrHVy/N6kksDkrS"
|
|
"cOlpKT9zfyIvLc/4nmiyPCSc5c7UrDVUwZnIUBBpEHiwkpiM4pujeJkZSl5783RWIDRN92GDB"
|
|
"dHMdD97JH3bPp3SCTmfAAHzzYUAHUSrOAfodD8qWkfWT19VigseIqwK6dH30uFgaZIOwU9uJV"
|
|
"2Ts/TDEddNv8eV7XbwQdL1HUEoFj+RXDq1CuQJjvQdc7YRmy0WGV0GIXu0lAFOQ6D/Z/rjtOe"
|
|
"//2uc4zIkviMcUlrvHaJwIDAQAB";
|
|
|
|
} // namespace
|
|
|
|
SpeedreaderComponent::SpeedreaderComponent(Delegate* delegate)
|
|
: brave_component_updater::BraveComponent(delegate) {
|
|
const auto* cmd_line = base::CommandLine::ForCurrentProcess();
|
|
if (!cmd_line->HasSwitch(speedreader::kSpeedreaderWhitelistPath)) {
|
|
// Register component
|
|
Register(kComponentName, kComponentId, kComponentPublicKey);
|
|
} else {
|
|
const base::FilePath whitelist_path(
|
|
cmd_line->GetSwitchValuePath(speedreader::kSpeedreaderWhitelistPath));
|
|
VLOG(2) << "Speedreader whitelist from " << whitelist_path;
|
|
|
|
// Notify the `OnWhitelistFileReady` method asynchronously.
|
|
whitelist_path_ = whitelist_path;
|
|
OnWhitelistFileReady(whitelist_path, false /* no error */);
|
|
|
|
// Watch the provided file for changes.
|
|
whitelist_path_watcher_ = std::make_unique<base::FilePathWatcher>();
|
|
if (!whitelist_path_watcher_->Watch(
|
|
whitelist_path, base::FilePathWatcher::Type::kNonRecursive,
|
|
base::Bind(&SpeedreaderComponent::OnWhitelistFileReady,
|
|
weak_factory_.GetWeakPtr()))) {
|
|
LOG(ERROR) << "SpeedReader could not watch filesystem for changes"
|
|
<< " at path " << whitelist_path.LossyDisplayName();
|
|
}
|
|
}
|
|
}
|
|
|
|
SpeedreaderComponent::~SpeedreaderComponent() = default;
|
|
|
|
void SpeedreaderComponent::AddObserver(Observer* observer) {
|
|
observers_.AddObserver(observer);
|
|
}
|
|
|
|
void SpeedreaderComponent::RemoveObserver(Observer* observer) {
|
|
observers_.RemoveObserver(observer);
|
|
}
|
|
|
|
void SpeedreaderComponent::OnWhitelistFileReady(const base::FilePath& path,
|
|
bool error) {
|
|
if (error) {
|
|
LOG(ERROR) << "SpeedReader got an error watching for file changes."
|
|
<< " Stopping watching.";
|
|
whitelist_path_watcher_.reset();
|
|
return;
|
|
}
|
|
|
|
whitelist_path_ = path;
|
|
for (Observer& observer : observers_)
|
|
observer.OnWhitelistReady(whitelist_path_);
|
|
}
|
|
|
|
void SpeedreaderComponent::OnComponentReady(const std::string& component_id,
|
|
const base::FilePath& install_dir,
|
|
const std::string& manifest) {
|
|
stylesheet_path_ =
|
|
install_dir.Append(kDatFileVersion).Append(kStylesheetFileName);
|
|
whitelist_path_ =
|
|
install_dir.Append(kDatFileVersion).Append(kDatFileName);
|
|
|
|
for (Observer& observer : observers_) {
|
|
observer.OnWhitelistReady(whitelist_path_);
|
|
observer.OnStylesheetReady(stylesheet_path_);
|
|
}
|
|
}
|
|
|
|
} // namespace speedreader
|