From 3b3a025ed445c99bf2a429222ffd1b845e51540e Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 12 Feb 2015 17:23:49 +0800
Subject: [PATCH 1/5] Move GetsOrCreateAsarArchive to asar_util.h

---
 atom.gyp                                      |  2 ++
 .../browser/net/asar/asar_protocol_handler.cc | 16 ++-------
 atom/browser/net/asar/asar_protocol_handler.h |  8 -----
 atom/browser/net/asar/url_request_asar_job.cc |  2 +-
 atom/browser/net/asar/url_request_asar_job.h  |  5 +--
 atom/common/asar/asar_util.cc                 | 35 +++++++++++++++++++
 atom/common/asar/asar_util.h                  | 23 ++++++++++++
 7 files changed, 66 insertions(+), 25 deletions(-)
 create mode 100644 atom/common/asar/asar_util.cc
 create mode 100644 atom/common/asar/asar_util.h

diff --git a/atom.gyp b/atom.gyp
index a01d89fa9c7d..826248c54d37 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -216,6 +216,8 @@
       'atom/common/api/object_life_monitor.h',
       'atom/common/asar/archive.cc',
       'atom/common/asar/archive.h',
+      'atom/common/asar/asar_util.cc',
+      'atom/common/asar/asar_util.h',
       'atom/common/asar/scoped_temporary_file.cc',
       'atom/common/asar/scoped_temporary_file.h',
       'atom/common/common_message_generator.cc',
diff --git a/atom/browser/net/asar/asar_protocol_handler.cc b/atom/browser/net/asar/asar_protocol_handler.cc
index b2c16b896e1a..1e600feaa4fb 100644
--- a/atom/browser/net/asar/asar_protocol_handler.cc
+++ b/atom/browser/net/asar/asar_protocol_handler.cc
@@ -6,6 +6,7 @@
 
 #include "atom/browser/net/asar/url_request_asar_job.h"
 #include "atom/common/asar/archive.h"
+#include "atom/common/asar/asar_util.h"
 #include "net/base/filename_util.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request_error_job.h"
@@ -49,19 +50,6 @@ AsarProtocolHandler::AsarProtocolHandler(
 AsarProtocolHandler::~AsarProtocolHandler() {
 }
 
-Archive* AsarProtocolHandler::GetOrCreateAsarArchive(
-    const base::FilePath& path) const {
-  if (!archives_.contains(path)) {
-    scoped_ptr<Archive> archive(new Archive(path));
-    if (!archive->Init())
-      return nullptr;
-
-    archives_.set(path, archive.Pass());
-  }
-
-  return archives_.get(path);
-}
-
 net::URLRequestJob* AsarProtocolHandler::MaybeCreateJob(
     net::URLRequest* request,
     net::NetworkDelegate* network_delegate) const {
@@ -75,7 +63,7 @@ net::URLRequestJob* AsarProtocolHandler::MaybeCreateJob(
     return new net::URLRequestFileJob(request, network_delegate, full_path,
                                       file_task_runner_);
 
-  Archive* archive = GetOrCreateAsarArchive(asar_path);
+  std::shared_ptr<Archive> archive = GetOrCreateAsarArchive(asar_path);
   if (!archive)
     return new net::URLRequestErrorJob(request, network_delegate,
                                        net::ERR_FILE_NOT_FOUND);
diff --git a/atom/browser/net/asar/asar_protocol_handler.h b/atom/browser/net/asar/asar_protocol_handler.h
index cbfc95b8f778..e0cb74d5d1bf 100644
--- a/atom/browser/net/asar/asar_protocol_handler.h
+++ b/atom/browser/net/asar/asar_protocol_handler.h
@@ -5,8 +5,6 @@
 #ifndef ATOM_BROWSER_NET_ASAR_ASAR_PROTOCOL_HANDLER_H_
 #define ATOM_BROWSER_NET_ASAR_ASAR_PROTOCOL_HANDLER_H_
 
-#include "base/containers/scoped_ptr_hash_map.h"
-#include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "net/url_request/url_request_job_factory.h"
 
@@ -16,16 +14,12 @@ class TaskRunner;
 
 namespace asar {
 
-class Archive;
-
 class AsarProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler {
  public:
   explicit AsarProtocolHandler(
       const scoped_refptr<base::TaskRunner>& file_task_runner);
   virtual ~AsarProtocolHandler();
 
-  Archive* GetOrCreateAsarArchive(const base::FilePath& path) const;
-
   // net::URLRequestJobFactory::ProtocolHandler:
   net::URLRequestJob* MaybeCreateJob(
       net::URLRequest* request,
@@ -35,8 +29,6 @@ class AsarProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler {
  private:
   const scoped_refptr<base::TaskRunner> file_task_runner_;
 
-  mutable base::ScopedPtrHashMap<base::FilePath, Archive> archives_;
-
   DISALLOW_COPY_AND_ASSIGN(AsarProtocolHandler);
 };
 
diff --git a/atom/browser/net/asar/url_request_asar_job.cc b/atom/browser/net/asar/url_request_asar_job.cc
index aeaab646a9d4..82cade53c6f7 100644
--- a/atom/browser/net/asar/url_request_asar_job.cc
+++ b/atom/browser/net/asar/url_request_asar_job.cc
@@ -17,7 +17,7 @@ namespace asar {
 URLRequestAsarJob::URLRequestAsarJob(
     net::URLRequest* request,
     net::NetworkDelegate* network_delegate,
-    Archive* archive,
+    std::shared_ptr<Archive> archive,
     const base::FilePath& file_path,
     const scoped_refptr<base::TaskRunner>& file_task_runner)
     : net::URLRequestJob(request, network_delegate),
diff --git a/atom/browser/net/asar/url_request_asar_job.h b/atom/browser/net/asar/url_request_asar_job.h
index 899976471f0e..dc23e327cdff 100644
--- a/atom/browser/net/asar/url_request_asar_job.h
+++ b/atom/browser/net/asar/url_request_asar_job.h
@@ -5,6 +5,7 @@
 #ifndef ATOM_BROWSER_NET_ASAR_URL_REQUEST_ASAR_JOB_H_
 #define ATOM_BROWSER_NET_ASAR_URL_REQUEST_ASAR_JOB_H_
 
+#include <memory>
 #include <string>
 
 #include "atom/common/asar/archive.h"
@@ -27,7 +28,7 @@ class URLRequestAsarJob : public net::URLRequestJob {
  public:
   URLRequestAsarJob(net::URLRequest* request,
                     net::NetworkDelegate* network_delegate,
-                    Archive* archive,
+                    std::shared_ptr<Archive> archive,
                     const base::FilePath& file_path,
                     const scoped_refptr<base::TaskRunner>& file_task_runner);
 
@@ -53,7 +54,7 @@ class URLRequestAsarJob : public net::URLRequestJob {
   // Callback after data is asynchronously read from the file into |buf|.
   void DidRead(scoped_refptr<net::IOBuffer> buf, int result);
 
-  Archive* archive_;
+  std::shared_ptr<Archive> archive_;
   Archive::FileInfo file_info_;
   base::FilePath file_path_;
 
diff --git a/atom/common/asar/asar_util.cc b/atom/common/asar/asar_util.cc
new file mode 100644
index 000000000000..256992c95899
--- /dev/null
+++ b/atom/common/asar/asar_util.cc
@@ -0,0 +1,35 @@
+// Copyright (c) 2015 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "atom/common/asar/asar_util.h"
+
+#include <map>
+
+#include "atom/common/asar/archive.h"
+#include "base/files/file_path.h"
+#include "base/lazy_instance.h"
+#include "base/stl_util.h"
+
+namespace asar {
+
+typedef std::map<base::FilePath, std::shared_ptr<Archive>> ArchiveMap;
+
+namespace {
+
+static base::LazyInstance<ArchiveMap> g_archive_map = LAZY_INSTANCE_INITIALIZER;
+
+}  // namespace
+
+std::shared_ptr<Archive> GetOrCreateAsarArchive(const base::FilePath& path) {
+  ArchiveMap& archive_map = *g_archive_map.Pointer();
+  if (!ContainsKey(archive_map, path)) {
+    std::shared_ptr<Archive> archive(new Archive(path));
+    if (!archive->Init())
+      return nullptr;
+    archive_map[path] = archive;
+  }
+  return archive_map[path];
+}
+
+}  // namespace asar
diff --git a/atom/common/asar/asar_util.h b/atom/common/asar/asar_util.h
new file mode 100644
index 000000000000..f44204b2f763
--- /dev/null
+++ b/atom/common/asar/asar_util.h
@@ -0,0 +1,23 @@
+// Copyright (c) 2015 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ATOM_COMMON_ASAR_ASAR_UTIL_H_
+#define ATOM_COMMON_ASAR_ASAR_UTIL_H_
+
+#include <memory>
+
+namespace base {
+class FilePath;
+}
+
+namespace asar {
+
+class Archive;
+
+// Gets or creates a new Archive from the path.
+std::shared_ptr<Archive> GetOrCreateAsarArchive(const base::FilePath& path);
+
+}  // namespace asar
+
+#endif  // ATOM_COMMON_ASAR_ASAR_UTIL_H_

From 98a7f08be2ca7aaeb2ebdcea49811dc1ec19771a Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 12 Feb 2015 17:31:14 +0800
Subject: [PATCH 2/5] Move GetAsarArchivePath to asar_util.h

---
 .../browser/net/asar/asar_protocol_handler.cc | 31 +------------------
 atom/common/asar/asar_util.cc                 | 25 +++++++++++++++
 atom/common/asar/asar_util.h                  |  5 +++
 3 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/atom/browser/net/asar/asar_protocol_handler.cc b/atom/browser/net/asar/asar_protocol_handler.cc
index 1e600feaa4fb..0daa6f427e8f 100644
--- a/atom/browser/net/asar/asar_protocol_handler.cc
+++ b/atom/browser/net/asar/asar_protocol_handler.cc
@@ -14,35 +14,6 @@
 
 namespace asar {
 
-namespace {
-
-const base::FilePath::CharType kAsarExtension[] = FILE_PATH_LITERAL(".asar");
-
-// Get the relative path in asar archive.
-bool GetAsarPath(const base::FilePath& full_path,
-                 base::FilePath* asar_path,
-                 base::FilePath* relative_path) {
-  base::FilePath iter = full_path;
-  while (true) {
-    base::FilePath dirname = iter.DirName();
-    if (iter.MatchesExtension(kAsarExtension))
-      break;
-    else if (iter == dirname)
-      return false;
-    iter = dirname;
-  }
-
-  base::FilePath tail;
-  if (!iter.AppendRelativePath(full_path, &tail))
-    return false;
-
-  *asar_path = iter;
-  *relative_path = tail;
-  return true;
-}
-
-}  // namespace
-
 AsarProtocolHandler::AsarProtocolHandler(
     const scoped_refptr<base::TaskRunner>& file_task_runner)
     : file_task_runner_(file_task_runner) {}
@@ -59,7 +30,7 @@ net::URLRequestJob* AsarProtocolHandler::MaybeCreateJob(
   // Create asar:// job when the path contains "xxx.asar/", otherwise treat the
   // URL request as file://.
   base::FilePath asar_path, relative_path;
-  if (!GetAsarPath(full_path, &asar_path, &relative_path))
+  if (!GetAsarArchivePath(full_path, &asar_path, &relative_path))
     return new net::URLRequestFileJob(request, network_delegate, full_path,
                                       file_task_runner_);
 
diff --git a/atom/common/asar/asar_util.cc b/atom/common/asar/asar_util.cc
index 256992c95899..241f230c55b3 100644
--- a/atom/common/asar/asar_util.cc
+++ b/atom/common/asar/asar_util.cc
@@ -17,8 +17,11 @@ typedef std::map<base::FilePath, std::shared_ptr<Archive>> ArchiveMap;
 
 namespace {
 
+// The global instance of ArchiveMap, will be destroyed on exit.
 static base::LazyInstance<ArchiveMap> g_archive_map = LAZY_INSTANCE_INITIALIZER;
 
+const base::FilePath::CharType kAsarExtension[] = FILE_PATH_LITERAL(".asar");
+
 }  // namespace
 
 std::shared_ptr<Archive> GetOrCreateAsarArchive(const base::FilePath& path) {
@@ -32,4 +35,26 @@ std::shared_ptr<Archive> GetOrCreateAsarArchive(const base::FilePath& path) {
   return archive_map[path];
 }
 
+bool GetAsarArchivePath(const base::FilePath& full_path,
+                        base::FilePath* asar_path,
+                        base::FilePath* relative_path) {
+  base::FilePath iter = full_path;
+  while (true) {
+    base::FilePath dirname = iter.DirName();
+    if (iter.MatchesExtension(kAsarExtension))
+      break;
+    else if (iter == dirname)
+      return false;
+    iter = dirname;
+  }
+
+  base::FilePath tail;
+  if (!iter.AppendRelativePath(full_path, &tail))
+    return false;
+
+  *asar_path = iter;
+  *relative_path = tail;
+  return true;
+}
+
 }  // namespace asar
diff --git a/atom/common/asar/asar_util.h b/atom/common/asar/asar_util.h
index f44204b2f763..9df55da5f3cd 100644
--- a/atom/common/asar/asar_util.h
+++ b/atom/common/asar/asar_util.h
@@ -18,6 +18,11 @@ class Archive;
 // Gets or creates a new Archive from the path.
 std::shared_ptr<Archive> GetOrCreateAsarArchive(const base::FilePath& path);
 
+// Separates the path to Archive out.
+bool GetAsarArchivePath(const base::FilePath& full_path,
+                        base::FilePath* asar_path,
+                        base::FilePath* relative_path);
+
 }  // namespace asar
 
 #endif  // ATOM_COMMON_ASAR_ASAR_UTIL_H_

From 3678f13dfb0e1266f06b247535039393b820fa5c Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 12 Feb 2015 19:34:21 +0800
Subject: [PATCH 3/5] Make NativeImage work with asar archive

---
 atom/common/api/atom_api_native_image.cc |  4 ++--
 atom/common/asar/asar_util.cc            | 23 +++++++++++++++++++++++
 atom/common/asar/asar_util.h             |  3 +++
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/atom/common/api/atom_api_native_image.cc b/atom/common/api/atom_api_native_image.cc
index 6b873fa7f55a..a57ff221a424 100644
--- a/atom/common/api/atom_api_native_image.cc
+++ b/atom/common/api/atom_api_native_image.cc
@@ -7,11 +7,11 @@
 #include <string>
 #include <vector>
 
+#include "atom/common/asar/asar_util.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
 #include "atom/common/native_mate_converters/gfx_converter.h"
 #include "atom/common/native_mate_converters/gurl_converter.h"
 #include "base/base64.h"
-#include "base/files/file_util.h"
 #include "base/strings/string_util.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
@@ -86,7 +86,7 @@ bool AddImageSkiaRep(gfx::ImageSkia* image,
                      const base::FilePath& path,
                      double scale_factor) {
   std::string file_contents;
-  if (!base::ReadFileToString(path, &file_contents))
+  if (!asar::ReadFileToString(path, &file_contents))
     return false;
 
   const unsigned char* data =
diff --git a/atom/common/asar/asar_util.cc b/atom/common/asar/asar_util.cc
index 241f230c55b3..7c35ddcc5c2c 100644
--- a/atom/common/asar/asar_util.cc
+++ b/atom/common/asar/asar_util.cc
@@ -8,6 +8,7 @@
 
 #include "atom/common/asar/archive.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/stl_util.h"
 
@@ -57,4 +58,26 @@ bool GetAsarArchivePath(const base::FilePath& full_path,
   return true;
 }
 
+bool ReadFileToString(const base::FilePath& path, std::string* contents) {
+  base::FilePath asar_path, relative_path;
+  if (!GetAsarArchivePath(path, &asar_path, &relative_path))
+    return base::ReadFileToString(path, contents);
+
+  std::shared_ptr<Archive> archive = GetOrCreateAsarArchive(asar_path);
+  if (!archive)
+    return false;
+
+  Archive::FileInfo info;
+  if (!archive->GetFileInfo(relative_path, &info))
+    return false;
+
+  base::File src(asar_path, base::File::FLAG_OPEN | base::File::FLAG_READ);
+  if (!src.IsValid())
+    return false;
+
+  contents->resize(info.size);
+  return static_cast<int>(info.size) == src.Read(
+      info.offset, const_cast<char*>(contents->data()), contents->size());
+}
+
 }  // namespace asar
diff --git a/atom/common/asar/asar_util.h b/atom/common/asar/asar_util.h
index 9df55da5f3cd..b3c60f679b52 100644
--- a/atom/common/asar/asar_util.h
+++ b/atom/common/asar/asar_util.h
@@ -23,6 +23,9 @@ bool GetAsarArchivePath(const base::FilePath& full_path,
                         base::FilePath* asar_path,
                         base::FilePath* relative_path);
 
+// Same with base::ReadFileToString but supports asar Archive.
+bool ReadFileToString(const base::FilePath& path, std::string* contents);
+
 }  // namespace asar
 
 #endif  // ATOM_COMMON_ASAR_ASAR_UTIL_H_

From 9646c28a4151299a176a88202a1e3dde8b8117c9 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 12 Feb 2015 19:34:39 +0800
Subject: [PATCH 4/5] spec: native-image should read asar archive

---
 spec/asar-spec.coffee        |   6 ++++++
 spec/fixtures/asar/logo.asar | Bin 0 -> 16134 bytes
 2 files changed, 6 insertions(+)
 create mode 100644 spec/fixtures/asar/logo.asar

diff --git a/spec/asar-spec.coffee b/spec/asar-spec.coffee
index ab96d7ee3d6f..222faf9a5e2e 100644
--- a/spec/asar-spec.coffee
+++ b/spec/asar-spec.coffee
@@ -430,3 +430,9 @@ describe 'asar package', ->
 
     it 'does not touch global fs object', ->
       assert.notEqual fs.readdir, gfs.readdir
+
+  describe 'native-image', ->
+    it 'reads image from asar archive', ->
+      p = path.join fixtures, 'asar', 'logo.asar', 'logo.png'
+      logo = require('native-image').createFromPath p
+      assert.deepEqual logo.getSize(), {width: 55, height: 55}
diff --git a/spec/fixtures/asar/logo.asar b/spec/fixtures/asar/logo.asar
new file mode 100644
index 0000000000000000000000000000000000000000..fe21fd9ab7b3c9f5eaf822ca0fe2c719026f30da
GIT binary patch
literal 16134
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
F{cnFYJ2e0R

literal 0
HcmV?d00001


From a8c227d5f51665decbafb3bb72c3431484016247 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 12 Feb 2015 19:50:28 +0800
Subject: [PATCH 5/5] Fix cpplint warnings

---
 atom/common/asar/asar_util.cc | 4 ++--
 atom/common/asar/asar_util.h  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/atom/common/asar/asar_util.cc b/atom/common/asar/asar_util.cc
index 7c35ddcc5c2c..43e2601ac456 100644
--- a/atom/common/asar/asar_util.cc
+++ b/atom/common/asar/asar_util.cc
@@ -5,6 +5,7 @@
 #include "atom/common/asar/asar_util.h"
 
 #include <map>
+#include <string>
 
 #include "atom/common/asar/archive.h"
 #include "base/files/file_path.h"
@@ -14,11 +15,10 @@
 
 namespace asar {
 
-typedef std::map<base::FilePath, std::shared_ptr<Archive>> ArchiveMap;
-
 namespace {
 
 // The global instance of ArchiveMap, will be destroyed on exit.
+typedef std::map<base::FilePath, std::shared_ptr<Archive>> ArchiveMap;
 static base::LazyInstance<ArchiveMap> g_archive_map = LAZY_INSTANCE_INITIALIZER;
 
 const base::FilePath::CharType kAsarExtension[] = FILE_PATH_LITERAL(".asar");
diff --git a/atom/common/asar/asar_util.h b/atom/common/asar/asar_util.h
index b3c60f679b52..4cb5b88e0483 100644
--- a/atom/common/asar/asar_util.h
+++ b/atom/common/asar/asar_util.h
@@ -6,6 +6,7 @@
 #define ATOM_COMMON_ASAR_ASAR_UTIL_H_
 
 #include <memory>
+#include <string>
 
 namespace base {
 class FilePath;