Mode

.github/workflows/test.yml

@@ -42,6 +42,7 @@ jobs:
         mycoffee --version
         mycoffee --method=chemex --water=20 --cups=3 --coffee-ratio=2 --water-ratio=37 --message="Temp: 92 C"
         mycoffee --method=chemex --water=20 --cups=3 --coffee-ratio=2 --water-ratio=37 --message="Temp: 92 C" --ignore-warnings
+        mycoffee --method=chemex --coffee=2 --cups=3 --coffee-ratio=2 --water-ratio=37 --message="Temp: 92 C" --mode="coffee-to-water"
     - name: Install dev-requirements
       run: |
         python otherfiles/requirements-splitter.py

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 	1. Clever dripper
 	2. Phin filter
 - `--coffee` argument
+- `--mode` argument
 ### Changed
 - Test system modified
 - `README.md` updated

mycoffee/__main__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """mycoffee main."""
-from mycoffee.params import METHODS_MAP, EXIT_MESSAGE, FILE_FORMATS_LIST
+from mycoffee.params import METHODS_MAP, EXIT_MESSAGE, FILE_FORMATS_LIST, MODES_LIST
 from mycoffee.params import COFFEE_UNITS_MAP, WATER_UNITS_MAP, TEMPERATURE_UNITS_MAP
 from mycoffee.functions import run, validate_positive_int, validate_positive_float
 import argparse
@@ -54,6 +54,7 @@ def main() -> None:
     parser.add_argument('--version', help='version', nargs="?", const=1)
     parser.add_argument('--info', help='info', nargs="?", const=1)
     parser.add_argument('--ignore-warnings', help='ignore warnings', nargs="?", const=1)
+    parser.add_argument('--mode', help='conversion mode', type=str.lower, choices=MODES_LIST, default="water-to-coffee")
     parser.add_argument('--save-path', help='file path to save', type=str)
     parser.add_argument('--save-format', help='file format', type=str.lower, choices=FILE_FORMATS_LIST, default="text")
     args = parser.parse_args()

mycoffee/functions.py

@@ -78,7 +78,8 @@
         message=params["message"],
         grind=params["grind"],
         temperature=params["temperature"],
-        strength=params["strength"])
+        strength=params["strength"],
+        mode=params["mode"])
     return result
 
 
@@ -320,6 +321,8 @@
             params[item] = getattr(args, item)
     if getattr(args, "water") is None:
         params["water"] = convert_water(params["water"], params["water_unit"])
+    if getattr(args, "coffee") is None:
+        params["coffee"] = convert_coffee(params["coffee"], params["coffee_unit"])
     if getattr(args, "temperature") is None:
         params["temperature"] = convert_temperature(
             params["temperature"],
@@ -441,14 +444,18 @@
     return True
 
 
-def convert_coffee(coffee: float, unit: str) -> Union[float, int]:
+def convert_coffee(coffee: float, unit: str, reverse: bool = False) -> Union[float, int]:
     """
     Convert and return the coffee amount as a float or int.
 
     :param coffee: coffee amount
     :param unit: coffee unit
+    :param reverse: reverse convert flag
     """
-    coffee = coffee * COFFEE_UNITS_MAP[unit]["rate"]
+    rate = COFFEE_UNITS_MAP[unit]["rate"]
+    if reverse:
+        rate = 1 / rate
+    coffee = coffee * rate
     if unit == "cb":
         coffee = math.ceil(coffee)
     return coffee
@@ -484,10 +491,25 @@
     return coffee
 
 
-def get_result(params: Dict[str, Union[str, int, float]],
-               enable_filter: bool = True) -> Dict[str, Union[str, int, float, dict]]:
+def calc_water(ratio: float, coffee: float, water_unit: str, coffee_unit: str) -> float:
     """
-    Get result.
+    Calculate water.
+
+    :param ratio: coffee/water ratio
+    :param coffee: coffee amount
+    :param water_unit: water unit
+    :param coffee_unit: coffee unit
+    """
+    coffee_gram = convert_coffee(coffee, coffee_unit, True)
+    water_gram = coffee_gram * (1 / ratio)
+    water = convert_water(water_gram, water_unit)
+    return water
+
+
+def get_result_by_water(params: Dict[str, Union[str, int, float]],
+                        enable_filter: bool = True) -> Dict[str, Union[str, int, float, dict]]:
+    """
+    Get result by water.
 
     :param params: parameters
     :param enable_filter: filter flag
@@ -527,6 +549,64 @@
     return result_params
 
 
+def get_result_by_coffee(params: Dict[str, Union[str, int, float]],
+                         enable_filter: bool = True) -> Dict[str, Union[str, int, float, dict]]:
+    """
+    Get result by coffee.
+
+    :param params: parameters
+    :param enable_filter: filter flag
+    """
+    result_params = params.copy()
+    result_params["ratio"] = params["coffee_ratio"] / params["water_ratio"]
+    result_params["coffee"] = {
+        "total": result_params["cups"] * params["coffee"],
+        "cup": params["coffee"],
+        "ratio": params["coffee_ratio"],
+        "unit": params["coffee_unit"]}
+    result_params["water"] = {
+        "total": None,
+        "cup": calc_water(
+            ratio=result_params["ratio"],
+            coffee=params["coffee"],
+            water_unit=params["water_unit"],
+            coffee_unit=params["coffee_unit"]),
+        "ratio": params["water_ratio"],
+        "unit": params["water_unit"]}
+    result_params["grind"] = {
+        "unit": "um",
+        "value": params["grind"],
+        "type": get_grind_type(params["grind"]),
+    }
+    result_params["temperature"] = {
+        "unit": params["temperature_unit"],
+        "value": params["temperature"]
+    }
+    for item in ["temperature_unit", "water_ratio", "coffee_ratio", "coffee_unit", "water_unit"]:
+        del result_params[item]
+    result_params["water"]["total"] = result_params["cups"] * result_params["water"]["cup"]
+    result_params["strength"] = get_brew_strength(ratio=result_params["ratio"])
+    if enable_filter:
+        result_params = filter_params(result_params)
+    result_params["warnings"] = get_warnings(result_params)
+    return result_params
+
+
+def get_result(params: Dict[str, Union[str, int, float]],
+               enable_filter: bool = True) -> Dict[str, Union[str, int, float, dict]]:
+    """
+    Get result.
+
+    :param params: parameters
+    :param enable_filter: filter flag
+    """
+    if params["mode"] == "water-to-coffee":
+        result_params = get_result_by_water(params=params, enable_filter=enable_filter)
+    else:
+        result_params = get_result_by_coffee(params=params, enable_filter=enable_filter)
+    return result_params
+
+
 def run(args: argparse.Namespace) -> None:
     """
     Run program.

mycoffee/params.py

@@ -44,6 +44,8 @@
 
 Temperature: {temperature[value]} {temperature[unit]}
 
+Mode: {mode}
+
 Message: {message}
 """
 
@@ -62,6 +64,7 @@
     "water_unit": "g",
     "temperature_unit": "C",
     "digits": 3,
+    "mode": "water-to-coffee",
     "message": ""
 
 }
@@ -427,3 +430,5 @@
 }
 
 FILE_FORMATS_LIST = ["text", "json"]
+
+MODES_LIST = ["water-to-coffee", "coffee-to-water"]