Merge pull request ua-parser#26 from mattrobenolt/cache

elsigh · elsigh · commit e5445f670961 · 2015-10-15T09:29:09.000-07:00
Cache Parse() results
diff --git a/Makefile b/Makefile
@@ -1,11 +1,9 @@
-PWD = $(shell pwd)
-
-all: prep test 
+all: prep test
 
 prep:
 	#git submodule update --init
 	#sudo apt-get install python-yaml
-	
+
 test:
 	@#test ! -d tmp && mkdir tmp
 	@export PYTHONPATH=tmp && python setup.py develop -d tmp
@@ -23,4 +21,4 @@ clean:
 	   dist\
 	   build
 
-.PHONY: all clean
+.PHONY: all prep test clean
diff --git a/ua_parser/user_agent_parser.py b/ua_parser/user_agent_parser.py
@@ -196,6 +196,10 @@ def Parse(self, user_agent_string):
         return device, brand, model
 
 
+MAX_CACHE_SIZE = 20
+_parse_cache = {}
+
+
 def Parse(user_agent_string, **jsParseBits):
     """ Parse all the things
     Args:
@@ -205,12 +209,20 @@ def Parse(user_agent_string, **jsParseBits):
       A dictionary containing all parsed bits
     """
     jsParseBits = jsParseBits or {}
-    return {
+    key = (user_agent_string, repr(jsParseBits))
+    cached = _parse_cache.get(key)
+    if cached is not None:
+        return cached
+    if len(_parse_cache) > MAX_CACHE_SIZE:
+        _parse_cache.clear()
+    v = {
         'user_agent': ParseUserAgent(user_agent_string, **jsParseBits),
         'os': ParseOS(user_agent_string, **jsParseBits),
         'device': ParseDevice(user_agent_string, **jsParseBits),
         'string': user_agent_string
     }
+    _parse_cache[key] = v
+    return v
 
 
 def ParseUserAgent(user_agent_string, **jsParseBits):
