Update app.py

app.py

@@ -1,4 +1,4 @@
-from flask import Flask, request, render_template_string, jsonify
+from flask import Flask, request, render_template_string
 from decimal import Decimal, ROUND_HALF_UP
 import re
 from datetime import datetime
@@ -79,25 +79,33 @@ def calculate_expression(expression):
     # 最初の項目を取得
     value1, unit1 = parse_value_unit(terms[0])
     total_value = value1
+    total_unit = unit1
     decimal_places_list = [len(str(value1).replace('.', '').replace('-', ''))]  # 有効数字のリストを保存
     
     for i in range(1, len(terms)):
         value2, unit2 = parse_value_unit(terms[i])
+        decimal_places_list.append(len(str(value2).replace('.', '').replace('-', '')))
         
-        # 単位変換
-        if unit1 != unit2:
+        if unit1 != unit2 and ('*' not in expression and '/' not in expression):
             value2 = convert_to_common_unit(value2, unit2, unit1)
         
-        total_value += value2
-        decimal_places_list.append(len(str(value2).replace('.', '').replace('-', '')))
+        if '*' in expression:
+            total_value *= value2
+            total_unit = f"{total_unit}*{unit2}"
+        elif '/' in expression:
+            total_value /= value2
+            total_unit = f"{total_unit}/{unit2}"
+        else:
+            total_value += value2
+
         log(f"Current total: {total_value}, current significant figures list: {decimal_places_list}")
     
     # 最も少ない有効数字に基づいて丸める
     min_sig_figs = min(decimal_places_list)
     rounded_result = total_value.quantize(Decimal('1e{0}'.format(-(min_sig_figs - 1))), rounding=ROUND_HALF_UP)
-    log(f"Final result: {rounded_result} [{unit1}]")
+    log(f"Final result: {rounded_result} [{total_unit}]")
     
-    return f"{rounded_result} [{unit1}]"
+    return f"{rounded_result} [{total_unit}]"
 
 # HTMLテンプレート（バイト列でエンコード）
 template = b"""
@@ -185,4 +193,4 @@ def calculate():
         return f"Error: {str(e)}", 400
 
 if __name__ == '__main__':
-    app.run(debug=True,host="0.0.0.0",port=7860)
+    app.run(debug=True, host="0.0.0.0", port=7860)