emma/humulus
1
0
Fork 0
mirror of https://github.com/shouptech/humulus.git synced 2026-02-03 16:09:44 +00:00
Code Issues Releases Wiki Activity

Refactor filter

Browse source
This commit is contained in:
Emma 2019-07-11 14:11:32 -06:00
parent 673303a7bd
commit 374ec49614
No known key found for this signature in database
GPG key ID: 68434BFE85360755
1 changed files with 10 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/humulus/filters.py
View file

@ -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