From c65f66e03af80b49b7002c98826023fa5a022dde Mon Sep 17 00:00:00 2001
From: Ilya Kreymer <ikreymer@gmail.com>
Date: Thu, 14 Feb 2019 19:52:46 -0800
Subject: [PATCH] acl optimize/fixes: - optimize 'wb-manager acl match' command
 to not load entire file before matching - acl match <coll_or_file): if
 'coll_or_file' exists as file, use it, don't check if auto-collection exist

---
 pywb/manager/aclmanager.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pywb/manager/aclmanager.py b/pywb/manager/aclmanager.py
index d533f16a..d5d8f37f 100644
--- a/pywb/manager/aclmanager.py
+++ b/pywb/manager/aclmanager.py
@@ -32,20 +32,24 @@ class ACLManager(CollectionsManager):
 
         super(ACLManager, self).__init__(coll_name, must_exist=False)
 
-        # if auto collection, use default file in ./collections/<coll>/acl/<DEFAULT_FILE>
-        if os.path.isdir(self.curr_coll_dir):
+        # if target exists as a file, use that
+        if os.path.isfile(self.target):
+            self.acl_file = self.target
+
+        # otherwise, if auto collection, use default file in ./collections/<coll>/acl/<DEFAULT_FILE>
+        elif os.path.isdir(self.curr_coll_dir):
             self.acl_file = os.path.join(self.acl_dir, self.DEFAULT_FILE)
 
-        # else, treat the 'r.coll_name' param as the filename
+        # else, assume filename (may not exist yet)
         else:
-            self.acl_file = r.coll_name
+            self.acl_file = self.target
 
         # for add/import, file doesn't have to exist
         if r.op in ('add', 'importtxt'):
             self.load_acl(False)
 
-        # otherwise, ensure file loaded successfully and log errors
-        else:
+        # for other ops (except matching), ensure entire file loads successfully, log errors
+        elif r.op not in ('match'):
             if not self.load_acl(True):
                 sys.exit(2)
                 return