API improvements

admin.py

@@ -101,8 +101,19 @@ def UpdateManufacturers(self):
     manufacturers_to_delete = []
     # invalidate the cache now
     memcache.delete(memcache_keys.MANUFACTURER_CACHE_KEY)
-    memcache.delete(memcache_keys.MANUFACTURER_MODEL_COUNTS)
+    memcache.delete(memcache_keys.MANUFACTURER_CACHE_KEY_2)
+    # This is linked to manufacturer PIDs, so invalidate
     memcache.delete(memcache_keys.MANUFACTURER_PID_COUNT_KEY)
+    # These need invalidating as they display manufacturer names
+    memcache.delete(memcache_keys.MANUFACTURER_MODEL_COUNTS)
+    memcache.delete(memcache_keys.MANUFACTURER_CONTROLLER_COUNTS)
+    memcache.delete(memcache_keys.MANUFACTURER_NODE_COUNTS)
+    memcache.delete(memcache_keys.MANUFACTURER_SOFTWARE_COUNTS)
+    memcache.delete(memcache_keys.MANUFACTURER_SPLITTER_COUNTS)
+    memcache.delete(memcache_keys.MANUFACTURER_CONTROLLER_COUNTS_2)
+    memcache.delete(memcache_keys.MANUFACTURER_NODE_COUNTS_2)
+    memcache.delete(memcache_keys.MANUFACTURER_SOFTWARE_COUNTS_2)
+    memcache.delete(memcache_keys.MANUFACTURER_SPLITTER_COUNTS_2)
     added = removed = updated = errors = 0
 
     for manufacturer in Manufacturer.all():
@@ -147,13 +158,20 @@ def UpdateManufacturers(self):
 
   def UpdateManufacturerLinks(self):
     # TODO(Peter): Add ability to remove links if not present in data?
+    # TODO(Peter): Only clear caches if we've done something
     new_data = {}
     for id, name in MANUFACTURER_LINKS:
       new_data[id] = name
 
     present_manufacturers = set()
     # invalidate the cache now
     memcache.delete(memcache_keys.MANUFACTURER_CACHE_KEY)
+    memcache.delete(memcache_keys.MANUFACTURER_CACHE_KEY_2)
+    # These need invalidating as they display manufacturer links
+    memcache.delete(memcache_keys.MANUFACTURER_CONTROLLER_COUNTS_2)
+    memcache.delete(memcache_keys.MANUFACTURER_NODE_COUNTS_2)
+    memcache.delete(memcache_keys.MANUFACTURER_SOFTWARE_COUNTS_2)
+    memcache.delete(memcache_keys.MANUFACTURER_SPLITTER_COUNTS_2)
     added = updated = missing = errors = 0
 
     for manufacturer in Manufacturer.all():
@@ -164,8 +182,6 @@ def UpdateManufacturerLinks(self):
         if not(manufacturer.link) or (new_link != manufacturer.link):
           try:
             # add/update if required
-            manufacturer.link = new_link
-            manufacturer.put()
             if manufacturer.link:
               logging.info('Updating link for %d (%s) %s -> %s' %
                            (id, manufacturer.name, manufacturer.link, new_link))
@@ -174,6 +190,8 @@ def UpdateManufacturerLinks(self):
               logging.info('Adding link for %d (%s) - %s' %
                            (id, manufacturer.name, new_link))
               added += 1
+            manufacturer.link = new_link
+            manufacturer.put()
           except BadValueError as e:
             logging.error('Failed to add link for 0x%hx (%s) - %s: %s' %
                           (id, manufacturer.name, new_link, e))
@@ -455,6 +473,7 @@ def UpdateControllers(self):
         CONTROLLER_DATA,
         Controller,
         [memcache_keys.MANUFACTURER_CONTROLLER_COUNTS,
+         memcache_keys.MANUFACTURER_CONTROLLER_COUNTS_2,
          memcache_keys.TAG_CONTROLLER_COUNTS],
         timestamp_keys.CONTROLLERS)
 
@@ -466,6 +485,7 @@ def UpdateNodes(self):
         NODE_DATA,
         Node,
         [memcache_keys.MANUFACTURER_NODE_COUNTS,
+         memcache_keys.MANUFACTURER_NODE_COUNTS_2,
          memcache_keys.TAG_NODE_COUNTS],
         timestamp_keys.NODES)
 
@@ -477,6 +497,7 @@ def UpdateSplitters(self):
         SPLITTER_DATA,
         Splitter,
         [memcache_keys.MANUFACTURER_SPLITTER_COUNTS,
+         memcache_keys.MANUFACTURER_SPLITTER_COUNTS_2,
          memcache_keys.TAG_SPLITTER_COUNTS],
         timestamp_keys.SPLITTERS)
 
@@ -488,6 +509,7 @@ def UpdateSoftware(self):
         SOFTWARE_DATA,
         Software,
         [memcache_keys.MANUFACTURER_SOFTWARE_COUNTS,
+         memcache_keys.MANUFACTURER_SOFTWARE_COUNTS_2,
          memcache_keys.TAG_SOFTWARE_COUNTS],
         timestamp_keys.SOFTWARE)