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

Separate the archive cache out to ArchiveFactory.

Browse source
This commit is contained in:
Cheng Zhao 2014-09-23 22:31:45 +08:00
parent b6583635d4
commit 7081f7799b
5 changed files with 69 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

16
atom/browser/net/asar/asar_protocol_handler.cc
View file

@ -5,8 +5,6 @@
#include "atom/browser/net/asar/asar_protocol_handler.h"
#include "atom/browser/net/asar/url_request_asar_job.h"
#include "atom/common/asar/archive.h"
#include "base/stl_util.h"
#include "net/base/filename_util.h"
#include "net/base/net_errors.h"
#include "net/url_request/url_request_error_job.h"
@ -62,16 +60,12 @@ net::URLRequestJob* AsarProtocolHandler::MaybeCreateJob(
return new net::URLRequestFileJob(request, network_delegate, full_path,
file_task_runner_);
// Create a cache of Archive.
if (!ContainsKey(archives_, asar_path)) {
scoped_refptr<Archive> archive(new Archive(asar_path));
if (!archive->Init())
return new net::URLRequestErrorJob(request, network_delegate,
net::ERR_FILE_NOT_FOUND);
archives_[asar_path] = archive;
}
scoped_refptr<Archive> archive = archive_factory_.GetOrCreate(asar_path);
if (!archive)
return new net::URLRequestErrorJob(request, network_delegate,
net::ERR_FILE_NOT_FOUND);
return new URLRequestAsarJob(request, network_delegate, archives_[asar_path],
return new URLRequestAsarJob(request, network_delegate, archive,
relative_path, file_task_runner_);
}

9
atom/browser/net/asar/asar_protocol_handler.h
View file

@ -5,9 +5,7 @@
#ifndef ATOM_BROWSER_NET_ASAR_ASAR_PROTOCOL_HANDLER_H_
#define ATOM_BROWSER_NET_ASAR_ASAR_PROTOCOL_HANDLER_H_
#include "base/containers/hash_tables.h"
#include "base/files/file_path.h"
#include "base/memory/ref_counted.h"
#include "atom/common/asar/archive_factory.h"
#include "net/url_request/url_request_job_factory.h"
namespace base {
@ -16,8 +14,6 @@ class TaskRunner;
namespace asar {
class Archive;
class AsarProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler {
public:
explicit AsarProtocolHandler(
@ -33,8 +29,7 @@ class AsarProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler {
private:
const scoped_refptr<base::TaskRunner> file_task_runner_;
mutable base::hash_map<base::FilePath, // NOLINT
scoped_refptr<Archive> > archives_;
mutable ArchiveFactory archive_factory_;
DISALLOW_COPY_AND_ASSIGN(AsarProtocolHandler);
};