Skip to content

Commit

Permalink
Change some indentation and eliminate some unneeded ifs
Browse files Browse the repository at this point in the history
  • Loading branch information
tobami committed Jan 17, 2011
1 parent be59020 commit 831dc08
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 11 deletions.
2 changes: 1 addition & 1 deletion speedcenter/codespeed/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def save(self, *args, **kwargs):

# Get default threshold values
change_threshold = 3.0
trend_threshold = 4.0
trend_threshold = 5.0
if hasattr(settings, 'change_threshold') and settings.change_threshold != None:
change_threshold = settings.change_threshold
if hasattr(settings, 'trend_threshold') and settings.trend_threshold:
Expand Down
31 changes: 21 additions & 10 deletions speedcenter/codespeed/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,8 @@ def changes(request):


def reports(request):
if request.method != 'GET': return HttpResponseNotAllowed('GET')
if request.method != 'GET':
return HttpResponseNotAllowed('GET')

return render_to_response('codespeed/reports.html', {
'reports': Report.objects.order_by('-revision')[:10],
Expand All @@ -592,8 +593,12 @@ def displaylogs(request):
startrev = Revision.objects.filter(
project=rev.project
).filter(date__lt=rev.date).order_by('-date')[:1]
if not len(startrev): startrev = rev
else: startrev = startrev[0]

if not len(startrev):
startrev = rev
else:
startrev = startrev[0]

remotelogs = getcommitlogs(rev, startrev)
if len(remotelogs):
try:
Expand All @@ -602,7 +607,8 @@ def displaylogs(request):
except KeyError:
pass#no errors
logs = remotelogs
else: error = 'no logs found'
else:
error = 'no logs found'
except Exception, e:
error = str(e)
return render_to_response('codespeed/changes_logs.html', { 'error': error, 'logs': logs })
Expand Down Expand Up @@ -672,7 +678,8 @@ def addresult(request):
project=p,
)
if created:
if 'revision_date' in data: rev.date = data["revision_date"]
if 'revision_date' in data:
rev.date = data["revision_date"]
else:
try:
saverevisioninfo(rev)
Expand All @@ -693,12 +700,16 @@ def addresult(request):
r = Result.objects.get(revision=rev,executable=exe,benchmark=b,environment=e)
except Result.DoesNotExist:
r = Result(revision=rev,executable=exe,benchmark=b,environment=e)

r.value = data["result_value"]
if 'result_date' in data: r.date = data["result_date"]
else: r.date = rev.date
if 'std_dev' in data: r.std_dev = data['std_dev']
if 'min' in data: r.val_min = data['min']
if 'max' in data: r.val_max = data['max']
if 'result_date' in data:
r.date = data["result_date"]
else:
r.date = rev.date

r.std_dev = data.get('std_dev')
r.val_min = data.get('min')
r.val_max = data.get('max')
r.save()

# Trigger Report creation when there are enough results
Expand Down

0 comments on commit 831dc08

Please sign in to comment.