Stats processing: don`t count hidden fields for the maximal filter nesting level

sitescripts/stats/bin/logprocessor.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2013 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
@@ skipping 412 matching lines @@
   if "application" in info:
     info["fullApplication"] = "%s %s" % (info["application"], info["applicationVersion"])
   if "platform" in info:
     info["fullPlatform"] = "%s %s" % (info["platform"], info["platformVersion"])
   return info
 
 def add_record(info, section, ignore_fields=()):
   section["hits"] = section.get("hits", 0) + 1
   section["bandwidth"] = section.get("bandwidth", 0) + info["size"]
 
-  if len(ignore_fields) < 2:
+  def is_visible(name):
+    from ..common import fields
+    for field in fields:
+      if field["name"] == name:
+        return "hidden" not in field or not field["hidden"]

[Sebastian Noack, 2014/01/28 13:30:14]

In Python you would do that preferable with one lookup:

  not field.get("hidden", False)

+    return False
+
+  # Allow nesting filters two levels deep but only consider visible fields,
+  # fields that aren't displayed on the web can be nested deeper.
+  filter_level = len(filter(is_visible, ignore_fields))
+  if filter_level < 2:
     for field in map(lambda f: f["name"], common.fields):
       if field in ignore_fields or field not in info:
         continue
 
       value = info[field]
       if field not in section:
         section[field] = {}
       if value not in section[field]:
         section[field][value] = {}
 
@@ skipping 93 matching lines @@
   parser.add_argument("mirror_name", nargs="?", help="Name of the mirror server that the file belongs to")
   parser.add_argument("server_type", nargs="?", help="Server type like download, update or subscription")
   parser.add_argument("log_file", nargs="?", help="Log file path, can be a local file path, http:// or ssh:// URL")
   args = parser.parse_args()
 
   if args.mirror_name and args.server_type and args.log_file:
     sources = [(args.mirror_name, args.server_type, args.log_file)]
   else:
     sources = get_stats_files()
   parse_sources(sources, args.factor, args.verbose)