diff --git a/gen_zip.sh b/gen_zip.sh index 6c3318e..2f9c1c8 100755 --- a/gen_zip.sh +++ b/gen_zip.sh @@ -2,5 +2,4 @@ rm -rf scripts.zip scripts.md5 zip -r scripts.zip -j main/*.lua ru/*.lua -ls -1 main/*.lua ru/*.lua > scripts.index md5sum scripts.zip | cut -d " " -f 1 > scripts.md5 diff --git a/main/unit-converter.lua b/main/unit-converter.lua index ffaa58d..0ac9854 100644 --- a/main/unit-converter.lua +++ b/main/unit-converter.lua @@ -183,127 +183,127 @@ function f.kf(x) end units = { -length = { - kilometer_km = 1e3, - meter_m = 1, - decimeter_dm = 1e-1, - centimeter_cm = 1e-2, - millimeter_mm = 1e-3, - ["micrometer_µm"] = 1e-6, - nanometer_nm = 1e-9, - mile_mi = 1609.344, - yard_yd = 0.9144, - foot_ft = 0.3048, - inch_in = 0.0254, - ["nautical.mile_nmi"] = 1852 - }, -weight = { - ton_t = 1e3, - kilogram_kg = 1, - gram_g = 1e-3, - milligram_mg = 1e-6, - ["microgram_µg"] = 1e-9, - ["gross.ton_gt"] = 1016.0469063338, - ["short.ton_st"] = 907.1847489906, - stone_stn = 6.350293358152, - pound_lb = 0.4535923744953, - ounce_oz = 0.028349523084478 - }, -volume = { - ["cubic.meter_cbm"] = 1e3, - liter_l = 1, - milliliter_ml = 1e-3, - ["american.gallon_us.gal"] = 3.78541, - ["american.fluid.quart_us.fl.qt"] = 0.946353, - ["american.fluid.pint_us.fl.pt"] = 0.473176, - ["american.cup_us.cup"] = 0.24, - ["amirican.fluid.ounce_us.fl.oz"] = 0.0295735, - ["american.tablespoon_us.tbsp"] = 0.0147868, - ["american.teaspoon_us.tsp"] = 0.00492892, - ["imperial.gallon_gal"] = 4.54609, - ["imperial.quart_qt"] = 1.13652, - ["imperial.pint_pt"] = 0.568261, - ["imperial.cup_cup"] = 0.284131, - ["imperial.fluid.ounce_fl.oz"] = 0.0284131, - ["british.tablespoon_tbsp"] = 0.0177582, - ["british.teaspoon_tsp"] = 0.00591939, - ["cubic.foot_cbft"] = 28.316846368677, - ["cubic.inch_cbin"] = 0.016387064025439, - ["cubic.yard_cbyd"] = 764.55486927411 - }, -pressure = { - pascal_pa = 1, - atmosphere_at = 101324.99966284, - bar_bar = 1e5, - ["torr.mm.Hg_mm.Hg"] = 133.3223684, - ["pound-force.per.square.inch_psi"] = 6894.76 - }, -square = { - ["square.meter_sqm"] = 1, - ["square.kilometer_sqkm"] = 1e6, - ["square.mile_sqmi"] = 2589988.1005586, - ["square.yard_sqyd"] = 0.83612739236948, - ["square.foot_sqft"] = 0.092903043596609, - ["square.inch_sqin"] = 0.00064516000000257, - hectare_ha = 1e4, - acre_ac = 4046.8564464278, - are_a = 100 - }, -temperature = { - ["celsius_°C"] = "c", - ["fahrenheit_°F"] = "f", - kelvin_K = "k" - }, -energy = { - joule_J = 1, - kilojoule_kJ = 1e3, - calorie_cal = 4.1868, - kilocalorie_kcal = 4186.8, - ["watt-hour_Wh"] = 3600, - ["kilowatt-hour_kWh"] = 3.6e6, - electronvolt_eV = 1.6022e-19, - ["british.thermal.unit_BTU"] = 1055.06, - ["american.therm_us.thm"] = 1.05506e8, - ["foot-pound_ft-lb"] = 1.35582 - }, -power = { - watt_W = 1, - kilowatt_kW = 1e3, - ["metric.ton.cooling_RT"] = 3861.1599472766, - ["metric.horsepower_hp"] = 735.49962489519 - }, -digital = { - bit_b = 0.125, - byte_B = 1, - kilobyte_kB = 1e3, - megabyte_MB = 1e6, - gigabyte_GB = 1e9, - terabyte_TB = 1e12, - kibibyte_KiB = 2^10, - mebibyte_MiB = 2^20, - gibibyte_GiB = 2^30, - tebibyte_TiB = 2^40 - }, + length = { + kilometer_km = 1e3, + meter_m = 1, + decimeter_dm = 1e-1, + centimeter_cm = 1e-2, + millimeter_mm = 1e-3, + ["micrometer_µm"] = 1e-6, + nanometer_nm = 1e-9, + mile_mi = 1609.344, + yard_yd = 0.9144, + foot_ft = 0.3048, + inch_in = 0.0254, + ["nautical.mile_nmi"] = 1852 + }, + weight = { + ton_t = 1e3, + kilogram_kg = 1, + gram_g = 1e-3, + milligram_mg = 1e-6, + ["microgram_µg"] = 1e-9, + ["gross.ton_gt"] = 1016.0469063338, + ["short.ton_st"] = 907.1847489906, + stone_stn = 6.350293358152, + pound_lb = 0.4535923744953, + ounce_oz = 0.028349523084478 + }, + volume = { + ["cubic.meter_cbm"] = 1e3, + liter_l = 1, + milliliter_ml = 1e-3, + ["american.gallon_us.gal"] = 3.78541, + ["american.fluid.quart_us.fl.qt"] = 0.946353, + ["american.fluid.pint_us.fl.pt"] = 0.473176, + ["american.cup_us.cup"] = 0.24, + ["amirican.fluid.ounce_us.fl.oz"] = 0.0295735, + ["american.tablespoon_us.tbsp"] = 0.0147868, + ["american.teaspoon_us.tsp"] = 0.00492892, + ["imperial.gallon_gal"] = 4.54609, + ["imperial.quart_qt"] = 1.13652, + ["imperial.pint_pt"] = 0.568261, + ["imperial.cup_cup"] = 0.284131, + ["imperial.fluid.ounce_fl.oz"] = 0.0284131, + ["british.tablespoon_tbsp"] = 0.0177582, + ["british.teaspoon_tsp"] = 0.00591939, + ["cubic.foot_cbft"] = 28.316846368677, + ["cubic.inch_cbin"] = 0.016387064025439, + ["cubic.yard_cbyd"] = 764.55486927411 + }, + pressure = { + pascal_pa = 1, + atmosphere_at = 101324.99966284, + bar_bar = 1e5, + ["torr.mm.Hg_mm.Hg"] = 133.3223684, + ["pound-force.per.square.inch_psi"] = 6894.76 + }, + square = { + ["square.meter_sqm"] = 1, + ["square.kilometer_sqkm"] = 1e6, + ["square.mile_sqmi"] = 2589988.1005586, + ["square.yard_sqyd"] = 0.83612739236948, + ["square.foot_sqft"] = 0.092903043596609, + ["square.inch_sqin"] = 0.00064516000000257, + hectare_ha = 1e4, + acre_ac = 4046.8564464278, + are_a = 100 + }, + temperature = { + ["celsius_°C"] = "c", + ["fahrenheit_°F"] = "f", + kelvin_K = "k" + }, + energy = { + joule_J = 1, + kilojoule_kJ = 1e3, + calorie_cal = 4.1868, + kilocalorie_kcal = 4186.8, + ["watt-hour_Wh"] = 3600, + ["kilowatt-hour_kWh"] = 3.6e6, + electronvolt_eV = 1.6022e-19, + ["british.thermal.unit_BTU"] = 1055.06, + ["american.therm_us.thm"] = 1.05506e8, + ["foot-pound_ft-lb"] = 1.35582 + }, + power = { + watt_W = 1, + kilowatt_kW = 1e3, + ["metric.ton.cooling_RT"] = 3861.1599472766, + ["metric.horsepower_hp"] = 735.49962489519 + }, + digital = { + bit_b = 0.125, + byte_B = 1, + kilobyte_kB = 1e3, + megabyte_MB = 1e6, + gigabyte_GB = 1e9, + terabyte_TB = 1e12, + kibibyte_KiB = 2^10, + mebibyte_MiB = 2^20, + gibibyte_GiB = 2^30, + tebibyte_TiB = 2^40 + }, -angle = { - gon_g = 0.9, - degree_deg = 1, - radian_rad = 180/math.pi, - minute_min = 1/60, - second_sec = 1/3600 - }, -period = { - second_sec = 1, - minute_min = 60, - hour_h = 3600, - day_d = 86400, - week_w = 604800, - month_m = 30.4167*86400, - year_y = 365*86400, - decade_dec = 3650*86400, - century_c = 36500*86400, - millisecond_ms = 1e-3, - microsecond_mcs = 1e-6, - nanosecond_ns = 1e-9 - } + angle = { + gon_g = 0.9, + degree_deg = 1, + radian_rad = 180/math.pi, + minute_min = 1/60, + second_sec = 1/3600 + }, + period = { + second_sec = 1, + minute_min = 60, + hour_h = 3600, + day_d = 86400, + week_w = 604800, + month_m = 30.4167*86400, + year_y = 365*86400, + decade_dec = 3650*86400, + century_c = 36500*86400, + millisecond_ms = 1e-3, + microsecond_mcs = 1e-6, + nanosecond_ns = 1e-9 + } } diff --git a/scripts.index b/scripts.index deleted file mode 100644 index 7d86012..0000000 --- a/scripts.index +++ /dev/null @@ -1,22 +0,0 @@ -main/battery-widget.lua -main/calendar.lua -main/calendar-search.lua -main/covid-widget.lua -main/dice-widget.lua -main/facts-widget.lua -main/inspiration-quotes-widget.lua -main/kodi-remote-widget.lua -main/public-ip-widget.lua -main/quotes-widget.lua -main/shell-widget.lua -main/sys-info-widget.lua -main/todoist-widget.lua -main/unit-converter.lua -main/uptimerobot-widget.lua -main/widgets-on-off.lua -main/wikipedia-widget.lua -main/year_progress-widget.lua -ru/currency-ru-widget.lua -ru/holydays-ru-widget.lua -ru/isdayoff-ru-widget.lua -ru/quotes-ru-widget.lua diff --git a/scripts.md5 b/scripts.md5 index 4810333..10227aa 100644 --- a/scripts.md5 +++ b/scripts.md5 @@ -1 +1 @@ -403084b6ff55c5c236ed152478991587 +0ae82c0a832c38bd204ab4b8b1f3cafe diff --git a/scripts.zip b/scripts.zip index 8737484..77e2971 100644 Binary files a/scripts.zip and b/scripts.zip differ