Skip to content

Commit

Permalink
pep8ified
Browse files Browse the repository at this point in the history
  • Loading branch information
wolph authored and ionelmc committed Dec 9, 2014
1 parent e7737c1 commit 2ac2b1c
Showing 1 changed file with 19 additions and 10 deletions.
29 changes: 19 additions & 10 deletions src/redisboard/views.py
Expand Up @@ -12,14 +12,17 @@

from .utils import LazySlicingIterable

REDISBOARD_ITEMS_PER_PAGE = getattr(settings, 'REDISBOARD_ITEMS_PER_PAGE', 100)
REDISBOARD_ITEMS_PER_PAGE = getattr(settings, 'REDISBOARD_ITEMS_PER_PAGE',
100)


def safeint(value):
try:
return int(value)
except ValueError:
return value


def _fixup_pair((a, b)):
return a, safeint(b)

Expand All @@ -31,6 +34,7 @@ def _fixup_pair((a, b)):
'hash': lambda conn, key: conn.hlen(key),
}


def _get_key_info(conn, key):
try:
details = conn.execute_command('DEBUG', 'OBJECT', key)
Expand All @@ -57,14 +61,17 @@ def _get_key_info(conn, key):
}

VALUE_GETTERS = {
'list': lambda conn, key, start=0, end=-1: [(pos+start, val) for pos, val in enumerate(conn.lrange(key, start, end))],
'list': lambda conn, key, start=0, end=-1: [(pos + start, val)
for (pos, val) in enumerate(conn.lrange(key, start, end))],
'string': lambda conn, key, *args: [('string', conn.get(key))],
'set': lambda conn, key, *args: list(enumerate(conn.smembers(key))),
'zset': lambda conn, key, start=0, end=-1: [(pos+start, val) for pos, val in enumerate(conn.zrange(key, start, end))],
'zset': lambda conn, key, start=0, end=-1: [(pos + start, val)
for (pos, val) in enumerate(conn.zrange(key, start, end))],
'hash': lambda conn, key, *args: conn.hgetall(key).items(),
'n/a': lambda conn, key, *args: (),
}


def _get_key_details(conn, db, key, page):
conn.execute_command('SELECT', db)
details = _get_key_info(conn, key)
Expand All @@ -80,14 +87,15 @@ def _get_key_details(conn, db, key, page):
else:
details['data'] = VALUE_GETTERS[details['type']](conn, key)


return details


def _get_db_summary(server, db):
conn = server.connection
conn.execute_command('SELECT', db)
return dict(size=conn.dbsize())


def _get_db_details(server, db):
conn = server.connection
conn.execute_command('SELECT', db)
Expand All @@ -104,12 +112,11 @@ def _get_db_details(server, db):
for key in keys:
key_details[key] = _get_key_info(conn, key)
return dict(
keys = key_details,
sampling = sampling,
keys=key_details,
sampling=sampling,
)



def inspect(request, server):
stats = server.stats
conn = server.connection
Expand All @@ -123,7 +130,8 @@ def inspect(request, server):
page = request.GET.get('page', 1)
key_details = _get_key_details(conn, db, key, page)
else:
databases = sorted(name[2:] for name in conn.info() if name.startswith('db'))
databases = sorted(name[2:] for name in conn.info()
if name.startswith('db'))
total_size = 0
for db in databases:
database_details[db] = summary = _get_db_summary(server, db)
Expand All @@ -132,15 +140,15 @@ def inspect(request, server):
for db in databases:
database_details[db].update(
_get_db_details(server, db),
active = True,
active=True,
)
else:
if 'db' in request.GET:
db = request.GET['db']
if db in database_details:
database_details[db].update(
_get_db_details(server, db),
active = True,
active=True,
)
else:
return HttpResponseNotFound("Unknown database.")
Expand All @@ -151,3 +159,4 @@ def inspect(request, server):
'stats': stats,
'app_label': 'redisboard',
})

0 comments on commit 2ac2b1c

Please sign in to comment.