From 374ec4961449739f40bdaf1fd045711b118c1ebb Mon Sep 17 00:00:00 2001
From: Mike Shoup <mike@shoup.io>
Date: Thu, 11 Jul 2019 14:11:32 -0600
Subject: [PATCH] Refactor filter

---
 src/humulus/filters.py | 50 +++++++++---------------------------------
 1 file changed, 10 insertions(+), 40 deletions(-)

diff --git a/src/humulus/filters.py b/src/humulus/filters.py
index aafc495..01f8c6a 100644
--- a/src/humulus/filters.py
+++ b/src/humulus/filters.py
@@ -123,47 +123,17 @@ def sort_hops(hops, form=False):
             by_use[hop['use']].append(hop)
 
     if form:
-        hops_sorted = sorted(
-            by_use['FWH'],
-            key=lambda hop: float(hop.duration.data),
-            reverse=True
-        )
-        hops_sorted.extend(
-            sorted(by_use['Boil'],
-            key=lambda hop: float(hop.duration.data),
-            reverse=True)
-        )
-        hops_sorted.extend(
-            sorted(by_use['Whirlpool'],
-            key=lambda hop: float(hop.duration.data),
-            reverse=True)
-        )
-        hops_sorted.extend(
-            sorted(by_use['Dry-Hop'],
-            key=lambda hop: float(hop.duration.data),
-            reverse=True)
-        )
+        key = lambda hop: float(hop.duration.data)
+        hops_sorted = sorted(by_use['FWH'], key=key, reverse=True)
+        hops_sorted.extend(sorted(by_use['Boil'], key=key, reverse=True))
+        hops_sorted.extend(sorted(by_use['Whirlpool'], key=key, reverse=True))
+        hops_sorted.extend(sorted(by_use['Dry-Hop'], key=key, reverse=True))
     else:
-        hops_sorted = sorted(
-            by_use['FWH'],
-            key=lambda hop: float(hop['duration']),
-            reverse=True
-        )
-        hops_sorted.extend(
-            sorted(by_use['Boil'],
-            key=lambda hop: float(hop['duration']),
-            reverse=True)
-        )
-        hops_sorted.extend(
-            sorted(by_use['Whirlpool'],
-            key=lambda hop: float(hop['duration']),
-            reverse=True)
-        )
-        hops_sorted.extend(
-            sorted(by_use['Dry-Hop'],
-            key=lambda hop: float(hop['duration']),
-            reverse=True)
-        )
+        key = lambda hop: float(hop['duration'])
+        hops_sorted = sorted(by_use['FWH'], key=key, reverse=True)
+        hops_sorted.extend(sorted(by_use['Boil'], key=key, reverse=True))
+        hops_sorted.extend(sorted(by_use['Whirlpool'], key=key, reverse=True))
+        hops_sorted.extend(sorted(by_use['Dry-Hop'], key=key, reverse=True))
     return hops_sorted