.gitignore

@@ -1,2 +1,3 @@
+*.o
 kwh-cost
 .vscode

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2024 Alexander "Arav" Andreev <me@arav.su>
+Copyright (c) 2021 Alexander "Arav" Andreev <me@arav.top>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

Makefile

@@ -1,29 +1,30 @@
-TARGET := kwh-cost
+TARGET=kwh-cost
 
-DESTDIR ?=
+CFLAGS=--std=c2x -O3 -Wall -Werror -Wextra -pedantic
-PREFIX ?= /usr/local
 
-CC ?= cc
+SRC_DIR=src
-CFLAGS := -std=c99 -O3 -Wall -Werror -Wextra -pedantic
+OBJ_DIR=obj
 
+DESTDIR=/
 
-.PHONY: clean install uninstall test
+.PHONY: all ${TARGET} clean install uninstall
 
-${TARGET}: ${TARGET}.c
+all: ${TARGET}
-	${CC} ${CFLAGS} $< -o $@
+
+${TARGET}: ${SRC_DIR}/main.c ${SRC_DIR}/main.h
+	${CC} ${CFLAGS} ${LDFLAGS} $< -o $@
 
 clean:
-	rm -f ${TARGET}
+	rm ${TARGET}
 
-install: | ${TARGET}
+install:
-	install -spDm755 ${TARGET} ${DESTDIR}${PREFIX}/bin/${TARGET}
+	install -Dm755 ${TARGET} ${DESTDIR}usr/bin/${TARGET}
-	install -pDm644 LICENSE ${DESTDIR}${PREFIX}/share/licenses/${TARGET}/LICENSE
+	install -Dm644 LICENSE ${DESTDIR}usr/share/licenses/${TARGET}/LICENSE
 
 uninstall:
-	rm -f ${DESTDIR}${PREFIX}/bin/${TARGET}
+	rm -f ${DESTDIR}usr/bin/${TARGET}
-	rm -f ${DESTDIR}${PREFIX}/share/licenses/${TARGET}/LICENSE
+	rm -rf ${DESTDIR}usr/share/licenses/${TARGET}
-	rmdir ${DESTDIR}${PREFIX}/share/licenses/${TARGET}
 
-test: | ${TARGET}
+test:
-	@echo -en "Does input \e[36m\"3.68 120 30d\"\e[0m gives 317.95? "
+	@echo -n "Does input \"3.68 120 30d\" gives 317.95? "
 	@test "${shell ./kwh-cost 3.68 120 30d}" = "317.95" && { echo -e "\e[32mYES\e[0m"; } || { echo -e "\e[31mNO\e[0m"; }

PKGBUILD

@@ -1,20 +1,24 @@
-# Maintainer: Alexander "Arav" Andreev <me@arav.su>
+# Maintainer: Alexander "Arav" Andreev <me@arav.top>
-pkgname=kwh-cost
+pkgname=kwh-cost-git
-pkgver=1.2.0
+pkgver=1.0.0
 pkgrel=1
 pkgdesc="Calculates cost of electricity."
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
-url="https://git.arav.su/Arav/kwh-cost"
+url="https://git.arav.top/Arav/kwh-cost"
 license=('MIT')
-source=("${pkgver}.tar.gz::https://git.arav.su/Arav/kwh-cost/archive/${pkgver}.tar.gz")
+makedepends=('git' 'gcc')
+provides=('kwh-cost')
+conflicts=('kwh-cost')
+options=('strip')
+source=('kwh-cost-git::git+https://git.arav.top/Arav/kwh-cost.git')
 md5sums=('SKIP')
 
 build() {
     cd "$srcdir/$pkgname"
-    make
+    make DESTDIR="$pkgdir/"
 }
 
 package() {
     cd "$srcdir/$pkgname"
-    make DESTDIR="$pkgdir" PREFIX="/usr" install
+    make DESTDIR="$pkgdir/" install
 }

README.md

@@ -8,32 +8,28 @@ Calculates cost of electricity.
 $ kwh-cost [OPTIONS] price wattage interval [interval ..]
 ```
 
-Options are `-v` to show program's version; and `-h` to show usage of a program.
+Options are `-v, --version` to show program's version; and `-h, --help` to show usage of a program.
 
 `price` is a price per kWh. `wattage` is how many Watts being consumed. `interval` is for how long.
 
-`wattage` is in Watts, but it can come with following units: `m`, `k|K`, `M`, `G`, `T`.
+`interval` is in seconds, but you can specify a unit. Units are the following:
-
+`m` for minutes; `h` for hours; and `d` for days. There could be as many `interval`s passed as you need.
-`interval` is in seconds, but the following units are supported: `m|M` for minutes; `h|H` for hours;
-and `d|D` for days. Also, there could be as many `interval`s passed as you need.
 
 Here is an example:
 
 ```console
-$ kwh-cost 4.02 120 30d 2h
+$ kwh-cost 3.83 120 30d 2h
 ```
 
-Will give 348.29.
+Will give 331.83.
+
+P.S.: Yeah, I pay 3.83 rubles per kWh. Which is just $0.05. :)
 
 ## Installation
 
 ### Manually
 
-Just run `make install` to build and copy executable in `/usr/local/bin/`, set a `PREFIX=` variable to change a default `/usr/local` path. Or just run `make` to only build an executable.
+First run `make` to build a program, and then `make install` to copy executable in `/usr/bin/`. Later, use `make uninstall` to delete it, or just delete `/usr/bin/kwh-cost`.
-
-Use `make uninstall` to delete it (don't forget about the `PREFIX=` variable if you previously set it), or just delete `${PREFIX}/bin/kwh-cost` by hand.
-
-A `LICENSE` file is also being copied to `${PREFIX}/share/licenses/kwh-cost/LICENSE`.
 
 ### For ArchLinux
 

kwh-cost.c

@@ -1,113 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define VERSION "1.2.0"
-
-typedef long double   price_t;
-typedef long double   wattage_t;
-typedef unsigned long interval_t;
-
-interval_t interval_to_seconds(const char *const interval) {
-    interval_t intrvl = (interval_t)atol(interval);
-
-    switch (interval[strlen(interval) - 1]) {
-        case 'm':
-        case 'M':
-            return intrvl * 60;
-        case 'h':
-        case 'H':
-            return intrvl * 60 * 60;
-        case 'd':
-        case 'D':
-            return intrvl * 60 * 60 * 24;
-        default:
-            return intrvl;
-    }
-}
-
-wattage_t wattage_to_watts(const char *const wattage) {
-    wattage_t wattg = (wattage_t)atof(wattage);
-
-    switch (wattage[strlen(wattage)-1]) {
-        case 'm':
-            return wattg / 1000.;
-        case 'k':
-        case 'K':
-            return wattg * 1000.;
-        case 'M':
-            return wattg * 1000000.;
-        case 'G':
-            return wattg * 1000000000.;
-        case 'T':
-            return wattg * 1000000000000.;
-        default:
-            return wattg;
-    }
-}
-
-price_t price_kwh_to_wattsecond(const price_t price) {
-    return price / 1000.f / 3600.f;
-}
-
-int parse_arguments(const int argc, const char *const *const argv,
-                    price_t *const price, wattage_t *const wattage, interval_t *const interval) {
-    if (argc < 2) return 1;
-
-    for (int i = 1, pos = 0; i < argc; ++i)
-        if (argv[i][0] == '-') {
-            if (strlen(argv[i]) < 2) return 99;
-            switch (argv[i][1]) {
-                case 'h': return 1;
-                case 'v': return 2;
-                default: return 99;
-            }
-        } else if (argc < 4) {
-            return 1;
-        } else if (pos == 0) {
-            *price = price_kwh_to_wattsecond((price_t)atof(argv[i]));
-            ++pos;
-        } else if (pos == 1) {
-            *wattage = wattage_to_watts(argv[2]);
-            ++pos;
-        } else
-            *interval += interval_to_seconds(argv[i]);
-
-    return 0;
-}
-
-void print_version(void) {
-    fputs("kwh-cost Ver. " VERSION "\n"
-         "Copyright (C) 2021-2024 Alexander \"Arav\" Andreev <me@arav.su>. All rights reserved.\n"
-         "This program is distributed under the terms of MIT+NIGGER license.\n"
-         "A license for this program is placed in /usr/share/licenses/kwh-cost/LICENSE.\n", stderr);
-}
-
-void print_usage(void) {
-    fputs("Usage: kwh-cost [OPTIONS] price wattage interval [interval ...]\n"
-         "Options:\n"
-         "  -h        display this usage information.\n"
-         "  -v        display program version.\n"
-         "Arguments:\n"
-         "  price     price per kWh.\n"
-         "  wattage   power usage in Watts (m, K, M, G, T).\n"
-         "  interval  time interval in seconds (m'inutes, h'ours, d'ays,\n"
-         "            like 5d 3h) during which given power is constantly used.\n"
-         "            All given intervals will be summed up.\n", stderr);
-}
-
-int main(const int argc, const char *const *const argv) {
-    price_t price = 0;
-    wattage_t wattage = 0;
-    interval_t interval = 0;
-
-    switch (parse_arguments(argc, argv, &price, &wattage, &interval)) {
-        case 1: print_usage(); return 0;
-        case 2: print_version(); return 0;
-        case 99: fputs("Unknown flag provided.\n", stderr); print_usage(); return 1;
-    }
-
-    printf("%.2Lf\n", (price * wattage) * interval);
-
-    return 0;
-}

src/main.c

@@ -0,0 +1,89 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "main.h"
+
+int main(int const argc, const char * const * const argv) {
+    price_t price;
+    wattage_t wattage;
+    interval_t interval = 0;
+
+    int res = parse_arguments(argc, argv, &price, &wattage, &interval);
+    if (res != 0) {
+        if (res == 1)
+            print_usage();
+        else if (res == 2)
+            print_version();
+        exit(0);
+    }
+
+    printf("%.2Lf\n", (price * wattage) * interval);
+
+    return 0;
+}
+
+int parse_arguments(const int argc, const char *const *const argv, price_t *const price, wattage_t *const wattage, interval_t *const interval) {
+    if (argc < 2) return 1;
+
+    for (int i = 1, pos = 0; i < argc; ++i)
+        if (argv[i][0] == '-') {
+            if (argv[i][1] == 'h' || argv[i][2] == 'h')
+                return 1;
+            else if (argv[i][1] == 'v' || argv[i][2] == 'v')
+                return 2;
+        } else if (argc < 4) {
+            return 1;
+        } else if (pos == 0) {
+            *price = to_wattspersecond((price_t)atof(argv[i]));
+            ++pos;
+        } else if (pos == 1) {
+            *wattage = (wattage_t)atof(argv[2]);
+            ++pos;
+        } else
+            *interval += (interval_t)interval_to_seconds(argv[i]);
+
+    return 0;
+}
+
+inline interval_t interval_to_seconds(const char * const interval) {
+    interval_t intrvl = (interval_t)atol(interval);
+
+    switch (interval[strlen(interval) - 1]) {
+        case 'm':
+        case 'M':
+            return intrvl * 60;
+        case 'h':
+        case 'H':
+            return intrvl * 60 * 60;
+        case 'd':
+        case 'D':
+            return intrvl * 60 * 60 * 24;
+        default:
+            return intrvl;
+    }
+}
+
+inline price_t to_wattspersecond(const price_t price) {
+    return price / 1000.f / 3600.f;
+}
+
+inline void print_version() {
+    puts("kwh-cost Ver. " VERSION "\n"
+         "Copyright (C) 2021 Alexander \"Arav\" Andreev <me@arav.top>. All rights reserved.\n"
+         "You can see a license for this program in /usr/share/licenses/kwh-cost/LICENSE.");
+}
+
+inline void print_usage() {
+    puts("Usage: kwh-cost [OPTIONS] price wattage interval [interval ...]\n"
+         "Options:\n"
+         "  --help, -h    Display this usage information.\n"
+         "  --version, -v Display program version.\n"
+         "Arguments:\n"
+         "  price    Price per kWh.\n"
+         "  wattage  Specify power usage in Watts.\n"
+         "  interval Time interval in seconds total cost to be calculated for.\n"
+         "           You may specify other time units such as:\n"
+         "           m'inute, h'our, d'ay. Example: 5d 3h.\n"
+         "           All given intervals will be summed up.");
+}

src/main.h

@@ -0,0 +1,18 @@
+#ifndef _MAIN_H_
+#define _MAIN_H_
+
+#define VERSION "1.0.0"
+
+typedef long double   price_t;
+typedef long double   wattage_t;
+typedef unsigned long interval_t;
+
+int parse_arguments(const int argc, const char *const *const argv, price_t *const price, wattage_t *const wattage, interval_t *const interval);
+
+inline interval_t interval_to_seconds(const char * const interval);
+inline price_t    to_wattspersecond(const price_t price);
+
+inline void print_version();
+inline void print_usage();
+
+#endif