emma/synthale
1
0
Fork 0
mirror of https://github.com/shouptech/synthale.git synced 2026-02-03 07:29:42 +00:00
Code Issues Releases Wiki Activity

Fix #1

Browse source 
Updates so that dry hop time is displayed in time.
This commit is contained in:
Emma 2019-01-04 08:41:37 -07:00
parent 9e1ad56ae7
commit dae353ce72
3 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/synthale/recipes.py
View file

@ -185,6 +185,7 @@ class MarkdownRecipe:
headers = ('Name', 'Origin', 'Alpha', 'Amount', 'Time', 'Use') headers = ('Name', 'Origin', 'Alpha', 'Amount', 'Time', 'Use')
rows = [] rows = []
for hop in self.recipe.hops: for hop in self.recipe.hops:
# Determine hop unit
if self.hop_unit == 'pounds': if self.hop_unit == 'pounds':
amt = convert.pounds(hop.amount, '.2f') amt = convert.pounds(hop.amount, '.2f')
elif self.hop_unit == 'grams': elif self.hop_unit == 'grams':
@ -193,12 +194,19 @@ class MarkdownRecipe:
amt = convert.kilograms(hop.amount, '.2f') amt = convert.kilograms(hop.amount, '.2f')
else: else:
amt = convert.ounces(hop.amount, '.1f') amt = convert.ounces(hop.amount, '.1f')
# Determine hop timing
if hop.use == 'Dry Hop':
# 1 day = 1440 minutes
time = '{:.1f} days'.format(hop.time / 1440.0)
else:
time = '{} min'.format(int(round(hop.time)))
rows.append(( rows.append((
hop.name, hop.name,
hop.origin, hop.origin,
'{:.1f} %'.format(hop.alpha), '{:.1f} %'.format(hop.alpha),
amt, amt,
'{}'.format(int(round(hop.time))), time,
hop.use, hop.use,
)) ))
return ( return (

13
tests/recipes/weizen.xml
View file

@ -76,6 +76,19 @@
<DISPLAY_TIME>60.0 min</DISPLAY_TIME> <DISPLAY_TIME>60.0 min</DISPLAY_TIME>
<NOTES></NOTES> <NOTES></NOTES>
</HOP> </HOP>
<HOP>
<NAME>Cascade</NAME>
<ORIGIN>U.S.</ORIGIN>
<ALPHA>5.5</ALPHA>
<BETA></BETA>
<AMOUNT>0.0141747</AMOUNT>
<DISPLAY_AMOUNT>0.5 oz</DISPLAY_AMOUNT>
<USE>Dry Hop</USE>
<FORM>Pellet</FORM>
<TIME>7200</TIME>
<DISPLAY_TIME>5 days</DISPLAY_TIME>
<NOTES></NOTES>
</HOP>
</HOPS> </HOPS>
<YEASTS> <YEASTS>
<YEAST> <YEAST>

11
tests/test_recipes.py
View file

@ -128,9 +128,14 @@ def test_recipe_hops(md_weizen):
assert md_weizen.hops == ( assert md_weizen.hops == (
'Hops\n' 'Hops\n'
'----\n' '----\n'
'| Name | Origin | Alpha | Amount | Time | Use |\n' '| Name | Origin | Alpha | Amount | Time |'
'| -------------------- | ------- | ----- | ------ | ---- | ---- |\n' ' Use |\n'
'| Northern Brewer (DE) | Germany | 4.9 % | 1.0 oz | 60 | Boil |' '| -------------------- | ------- | ----- | ------ | -------- |'
' ------- |\n'
'| Northern Brewer (DE) | Germany | 4.9 % | 1.0 oz | 60 min |'
' Boil |\n'
'| Cascade | U.S. | 5.5 % | 0.5 oz | 5.0 days |'
' Dry Hop |'
) )