diff --git a/.gitignore b/.gitignore index 7cb4fc6..ce4daae 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ takl.sqlite3 takl +takl-daemon out .vscode \ No newline at end of file diff --git a/Makefile b/Makefile index 7141cd4..5372826 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,28 @@ -FLAGS = -g -Wall -Wextra +FLAGS = -g -Wall -Wextra -DLOG_USE_COLOR LD_FLAGS = -lsqlite3 $(shell mkdir -p out) +all: takl takl-daemon + + out/%.o: src/%.c $(CC) -c $(FLAGS) $^ -o $@ +out/%.o: src/main/%.c + $(CC) -c $(FLAGS) $^ -o $@ + +out/%.o: src/log/%.c + $(CC) -c $(FLAGS) $^ -o $@ + takl: out/main.o out/db.o out/tasks.o $(CC) $(FLAGS) $(LD_FLAGS) $^ -o $@ +takl-daemon: out/daemon.o out/db.o out/tasks.o out/log.o + $(CC) $(FLAGS) $(LD_FLAGS) $^ -o $@ + install: takl sudo cp takl /usr/bin/takl diff --git a/src/daemon.c b/src/daemon.c new file mode 100644 index 0000000..d201a83 --- /dev/null +++ b/src/daemon.c @@ -0,0 +1,16 @@ +#include +#include + +#include "main/include/colors.h" +#include "main/include/config.h" +#include "main/include/db.h" + +#include "log/log.h" + + + +int main() { + log_info("TaKl " VERSION " -- Daemon started"); + + return 0; +} \ No newline at end of file diff --git a/src/log/log.c b/src/log/log.c new file mode 100644 index 0000000..1a7626e --- /dev/null +++ b/src/log/log.c @@ -0,0 +1,168 @@ +/* + * Copyright (c) 2020 rxi + * + * 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: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include "log.h" + +#define MAX_CALLBACKS 32 + +typedef struct { + log_LogFn fn; + void *udata; + int level; +} Callback; + +static struct { + void *udata; + log_LockFn lock; + int level; + bool quiet; + Callback callbacks[MAX_CALLBACKS]; +} L; + + +static const char *level_strings[] = { + "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "FATAL" +}; + +#ifdef LOG_USE_COLOR +static const char *level_colors[] = { + "\x1b[94m", "\x1b[36m", "\x1b[32m", "\x1b[33m", "\x1b[31m", "\x1b[35m" +}; +#endif + + +static void stdout_callback(log_Event *ev) { + char buf[16]; + buf[strftime(buf, sizeof(buf), "%H:%M:%S", ev->time)] = '\0'; +#ifdef LOG_USE_COLOR + fprintf( + ev->udata, "%s %s%-5s\x1b[0m \x1b[90m%s:%d:\x1b[0m ", + buf, level_colors[ev->level], level_strings[ev->level], + ev->file, ev->line); +#else + fprintf( + ev->udata, "%s %-5s %s:%d: ", + buf, level_strings[ev->level], ev->file, ev->line); +#endif + vfprintf(ev->udata, ev->fmt, ev->ap); + fprintf(ev->udata, "\n"); + fflush(ev->udata); +} + + +static void file_callback(log_Event *ev) { + char buf[64]; + buf[strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", ev->time)] = '\0'; + fprintf( + ev->udata, "%s %-5s %s:%d: ", + buf, level_strings[ev->level], ev->file, ev->line); + vfprintf(ev->udata, ev->fmt, ev->ap); + fprintf(ev->udata, "\n"); + fflush(ev->udata); +} + + +static void lock(void) { + if (L.lock) { L.lock(true, L.udata); } +} + + +static void unlock(void) { + if (L.lock) { L.lock(false, L.udata); } +} + + +const char* log_level_string(int level) { + return level_strings[level]; +} + + +void log_set_lock(log_LockFn fn, void *udata) { + L.lock = fn; + L.udata = udata; +} + + +void log_set_level(int level) { + L.level = level; +} + + +void log_set_quiet(bool enable) { + L.quiet = enable; +} + + +int log_add_callback(log_LogFn fn, void *udata, int level) { + for (int i = 0; i < MAX_CALLBACKS; i++) { + if (!L.callbacks[i].fn) { + L.callbacks[i] = (Callback) { fn, udata, level }; + return 0; + } + } + return -1; +} + + +int log_add_fp(FILE *fp, int level) { + return log_add_callback(file_callback, fp, level); +} + + +static void init_event(log_Event *ev, void *udata) { + if (!ev->time) { + time_t t = time(NULL); + ev->time = localtime(&t); + } + ev->udata = udata; +} + + +void log_log(int level, const char *file, int line, const char *fmt, ...) { + log_Event ev = { + .fmt = fmt, + .file = file, + .line = line, + .level = level, + }; + + lock(); + + if (!L.quiet && level >= L.level) { + init_event(&ev, stderr); + va_start(ev.ap, fmt); + stdout_callback(&ev); + va_end(ev.ap); + } + + for (int i = 0; i < MAX_CALLBACKS && L.callbacks[i].fn; i++) { + Callback *cb = &L.callbacks[i]; + if (level >= cb->level) { + init_event(&ev, cb->udata); + va_start(ev.ap, fmt); + cb->fn(&ev); + va_end(ev.ap); + } + } + + unlock(); +} diff --git a/src/log/log.h b/src/log/log.h new file mode 100644 index 0000000..b1fae24 --- /dev/null +++ b/src/log/log.h @@ -0,0 +1,49 @@ +/** + * Copyright (c) 2020 rxi + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the MIT license. See `log.c` for details. + */ + +#ifndef LOG_H +#define LOG_H + +#include +#include +#include +#include + +#define LOG_VERSION "0.1.0" + +typedef struct { + va_list ap; + const char *fmt; + const char *file; + struct tm *time; + void *udata; + int line; + int level; +} log_Event; + +typedef void (*log_LogFn)(log_Event *ev); +typedef void (*log_LockFn)(bool lock, void *udata); + +enum { LOG_TRACE, LOG_DEBUG, LOG_INFO, LOG_WARN, LOG_ERROR, LOG_FATAL }; + +#define log_trace(...) log_log(LOG_TRACE, __FILE__, __LINE__, __VA_ARGS__) +#define log_debug(...) log_log(LOG_DEBUG, __FILE__, __LINE__, __VA_ARGS__) +#define log_info(...) log_log(LOG_INFO, __FILE__, __LINE__, __VA_ARGS__) +#define log_warn(...) log_log(LOG_WARN, __FILE__, __LINE__, __VA_ARGS__) +#define log_error(...) log_log(LOG_ERROR, __FILE__, __LINE__, __VA_ARGS__) +#define log_fatal(...) log_log(LOG_FATAL, __FILE__, __LINE__, __VA_ARGS__) + +const char* log_level_string(int level); +void log_set_lock(log_LockFn fn, void *udata); +void log_set_level(int level); +void log_set_quiet(bool enable); +int log_add_callback(log_LogFn fn, void *udata, int level); +int log_add_fp(FILE *fp, int level); + +void log_log(int level, const char *file, int line, const char *fmt, ...); + +#endif diff --git a/src/main.c b/src/main.c index 0c45429..1c9ca9f 100644 --- a/src/main.c +++ b/src/main.c @@ -3,10 +3,10 @@ #include #include -#include "include/colors.h" -#include "include/config.h" -#include "include/tasks.h" -#include "include/db.h" +#include "main/include/colors.h" +#include "main/include/config.h" +#include "main/include/tasks.h" +#include "main/include/db.h" void help(char* name) { printf(BLUE "\t-- TaKl " VERSION " --\n" RESET); diff --git a/src/db.c b/src/main/db.c similarity index 100% rename from src/db.c rename to src/main/db.c diff --git a/src/include/colors.h b/src/main/include/colors.h similarity index 100% rename from src/include/colors.h rename to src/main/include/colors.h diff --git a/src/include/config.h b/src/main/include/config.h similarity index 100% rename from src/include/config.h rename to src/main/include/config.h diff --git a/src/include/db.h b/src/main/include/db.h similarity index 100% rename from src/include/db.h rename to src/main/include/db.h diff --git a/src/include/struct.h b/src/main/include/struct.h similarity index 100% rename from src/include/struct.h rename to src/main/include/struct.h diff --git a/src/include/tasks.h b/src/main/include/tasks.h similarity index 100% rename from src/include/tasks.h rename to src/main/include/tasks.h diff --git a/src/tasks.c b/src/main/tasks.c similarity index 100% rename from src/tasks.c rename to src/main/tasks.c