Generate stats independent of exporters.

librestash/cmd.py

@@ -57,7 +57,7 @@ def stats():
     """ Command for all kinds of statistics """
 
     parser = ArgumentParser(parents=[_PARENT_PARSER])
-    parser.add_argument('--found-by', help='limit caches found by cacher name', default=None)
+    parser.add_argument('--geocacher', help='name of geocacher to produce stats for', default=None)
     parser.add_argument('--format', help='output format', default='json')
     args = parser.parse_args()
 
@@ -66,8 +66,7 @@ def stats():
     config = get_config(args.config)
     database = get_db(config)
 
-    exporter = CacheExporter(config, database)
-    data = all_stats(exporter.export(found_by=args.found_by))
+    data = all_stats(database, geocacher_name=args.geocacher)
 
     if args.format == 'json':
         print(stats_to_json(data))

librestash/lib/stats/__init__.py

+from ..model import Geocacher
+
 STATS_PLUGINS = []
 
 def stats_plugin(func):
     STATS_PLUGINS.append(func)
     return func
 
-def all_stats(data):
+def all_stats(db, geocacher_name):
+    geocacher = db.Session().query(Geocacher).filter_by(name=geocacher_name).one()
+
     res = {}
     for plugin in STATS_PLUGINS:
-        res[plugin.__name__] = plugin(data)
+        res[plugin.__name__] = plugin(geocacher)
     return res
 
 from .basic import *

librestash/lib/stats/basic.py

 from . import stats_plugin
 
-def _field_count(data, field):
+def _field_count(geocacher, field):
     res = {}
 
-    for cache in data:
-        if not cache[field] in res:
-            res[cache[field]] = 0
-        res[cache[field]] += 1
+    for cache in geocacher.found_geocaches:
+        value = getattr(cache, field)
+        if not value in res:
+            res[value] = 0
+        res[value] += 1
 
     return res
 
 @stats_plugin
-def type_count(data):
-    return _field_count(data, 'type')
+def type_count(geocacher):
+    return _field_count(geocacher, 'type')
 @stats_plugin
-def size_count(data):
-    return _field_count(data, 'size')
+def size_count(geocacher):
+    return _field_count(geocacher, 'size')
 @stats_plugin
-def difficulty_count(data):
-    return _field_count(data, 'difficulty')
+def difficulty_count(geocacher):
+    return _field_count(geocacher, 'difficulty')
 @stats_plugin
-def terrain_count(data):
-    return _field_count(data, 'terrain')
+def terrain_count(geocacher):
+    return _field_count(geocacher, 'terrain')