From 11405403171e2d09a1691089fda9368e66df8837 Mon Sep 17 00:00:00 2001 From: Evgeny Date: Sat, 22 Oct 2022 14:08:09 +0400 Subject: [PATCH] update scripts.zip --- gen_zip.sh | 1 - main/unit-converter.lua | 244 ++++++++++++++++++++-------------------- scripts.index | 22 ---- scripts.md5 | 2 +- scripts.zip | Bin 24733 -> 24740 bytes 5 files changed, 123 insertions(+), 146 deletions(-) delete mode 100644 scripts.index 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 873748471f803bc23149d89179f14b93e5a68baa..77e2971057923e02df85c2372b233dc9e92fc869 100644 GIT binary patch delta 2786 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 ISO5S30Dh=Eu>b%7