diff options
Diffstat (limited to 'energyadder.pl')
| -rwxr-xr-x | energyadder.pl | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/energyadder.pl b/energyadder.pl index 730a953..e91a4b4 100755 --- a/energyadder.pl +++ b/energyadder.pl @@ -66,6 +66,12 @@ print "Goal energy: ", GOAL_ENERGY, " kJ\n\n"; my $energy = 0; +my $proteins = 0; +my $carbs = 0; +my $fats = 0; + +my $total_ingredient_weight = 0; + for my $ingredient ( @ingredients ) { my $sql = "SELECT * FROM LivsmedelsDatabas WHERE ". @@ -74,15 +80,24 @@ for my $ingredient ( @ingredients ) { if ($row->{'Livsmedelsnamn'}) { # print $row->{'Livsmedelsnamn'}; $energy += $ingredient->{quantity} * $row->{'Energi'} / 100; + + $proteins += $ingredient->{quantity} * $row->{'Protein'}; + $carbs += $ingredient->{quantity} * $row->{'Kolhydrater'}; + $fats += $ingredient->{quantity} * $row->{'Fett'}; + + $total_ingredient_weight += $ingredient->{quantity}; } else { $sql = "SELECT * FROM ingredients WHERE id=$ingredient->{ingredient}"; ( $row ) = $db->selectrow_hashref($sql); print "Could not find ingredient $ingredient->{ingredient} ". "($row->{'name'}) in LivsmedelsDatabas.\n"; } - printf "%5d%5d g|%-40s%10d kJ\n", $ingredient->{ingredient}, + printf "%5d%5d g|%-40s%10d kJ (P: %5.2f C: %5.2f F: %5.2f)\n", $ingredient->{ingredient}, $ingredient->{quantity}, $row->{'Livsmedelsnamn'}, - $ingredient->{quantity} * $row->{'Energi'} / 100; + $ingredient->{quantity} * $row->{'Energi'} / 100, + $row->{Protein}, + $row->{Kolhydrater}, + $row->{Fett}; # printf "%5d|%5d g|%-50s%10s kJ|%10s kJ\n", $ingredient->{ingredient}, # $ingredient->{quantity}, $row->{'Livsmedelsnamn'}, # $ingredient->{quantity} * $row->{'Energi'} / 100, $energy; @@ -96,6 +111,10 @@ my $specific_energy = $energy / $total_food_weight * 100; # kJ/100 g #my $reduced = $left / 2.980; +$proteins /= $total_ingredient_weight; +$carbs /= $total_ingredient_weight; +$fats /= $total_ingredient_weight; + print "\n"; printf "Total energy (all %d g): %d kJ\n", $total_food_weight, $energy; printf "Specific energi: %d kJ/100 g\n", $specific_energy; @@ -112,7 +131,7 @@ print $portions, " matlådor på ", int($total_food_weight/$portions), " g ger " print "\n"; my $database_path = (split(":", $Config{'database'}))[2]; -add_to_cooking($recipe_id, $specific_energy, $database_path); +add_to_cooking($recipe_id, $database_path, $specific_energy, $proteins, $carbs, $fats); print "echo \"INSERT INTO cookings VALUES ($recipe_id, '". DateTime->now()->ymd()."', ".int($specific_energy+0.5)."); \" | sqlite3 ". $database_path."\n"; |