1 Commits
Author SHA1 Message Date
simon d53c0762be modified: Makefile
modified:   src/db.c
	new file:   src/shell.c
2024-12-13 19:25:31 +01:00
12 changed files with 33425 additions and 369 deletions

No files matched your search

-1
View File
@@ -1,6 +1,5 @@
testing testing
debugOut debugOut
.idea
# ---> C # ---> C
# Prerequisites # Prerequisites
*.d *.d
-7
View File
@@ -1,7 +0,0 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="StudyPlanner" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true" RUN_PATH="$PROJECT_DIR$/Makefile" EXPLICIT_BUILD_TARGET_NAME="all">
<method v="2">
<option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
</method>
</configuration>
</component>
+10 -6
View File
@@ -1,7 +1,6 @@
#compiler flags #compiler flags
CFLAGS=-Wall -Wextra -g CFLAGS=-Wall -Wextra -g
INCLUDES = -Isrc
#files #files
@@ -14,10 +13,18 @@ CONFIG=src/config.h #config file
#targets #targets
debug: test ui planner db iCal config llist debug: db test ui planner iCal config llist
gcc test.o ui.o planner.o db.o iCal.o llist.o -o debugOut gcc test.o ui.o planner.o db.o iCal.o llist.o -o debugOut
config: $(CONFIG) config: $(CONFIG)
db: $(DBF)
curl -L https://sqlite.org/2024/sqlite-amalgamation-3470200.zip --output src/sqlite.zip
unzip src/sqlite.zip
mv sqlite-amalgamation-3470200/* src/
rm -rf sqlite-amalgamation-3470200
gcc -c $(CFLAGS) $(DBF)
llist: $(LLST) llist: $(LLST)
gcc -c $(CFLAGS) $(LLST) gcc -c $(CFLAGS) $(LLST)
test: src/test.c test: src/test.c
@@ -28,15 +35,12 @@ ui: $(UIF)
gcc -c $(CFLAGS) $(UIF) gcc -c $(CFLAGS) $(UIF)
planner: $(PLF) planner: $(PLF)
gcc -c $(CFLAGS) $(PLF) gcc -c $(CFLAGS) $(PLF)
db: $(DBF)
gcc -c $(CFLAGS) $(DBF)
edit: edit:
nvim $(PLF) Makefile $(LLST) src/test.c nvim $(PLF) Makefile $(LLST) src/test.c
clean: clean:
rm -rf *.o debugOut src/*.gch *.csv *.ics rm -rf *.o debugOut src/*.gch
+44 -83
View File
@@ -1,5 +1,4 @@
/* Create a database and handel it /*
* Created by Jan on 13.12.2024.
* INPUT: query for previous state * INPUT: query for previous state
* linked list of tasks to store * linked list of tasks to store
* *
@@ -10,98 +9,60 @@
* *
*/ */
#include "llist.h" /************************************************************
*Create a database and handel it
*Created by Jan on 13.12.2024.
*
************************************************************/
#include "planner.h" #include "planner.h"
#include <sqlite3.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <time.h> #include <time.h>
/* extern struct llist;
write a complete linkedlist to a task csv file.
*/
void write_linkedlist_to_csv(llist *head, const char *filename) {
// Open file with write permision
FILE *file = fopen(filename, "w");
// if there is no file or a wrong file path you becom an error
if (file == NULL) {
fprintf(stderr, "Could not open file %s\n", filename);
exit(1);
} else { // Initialize a new Database if there no one.
// write the file header void init_db(sqlite3 *db) {
fprintf(file, "TaskName, Created, Deadline, Priority, Spare\n"); const char *sql_LinkedList = "CREATE TABLE LinkedList ("
"id INTEGER PRIMARY KEY AUTOINCREMENT,"
"data TEXT;)";
// Iterate through the linked list and write the data to the CSV // Checks the SQL answer and if it's not ok prints the error code
llist *current = head; char *errmsg = NULL;
Task *task; if (sqlite3_exec(db, sql_LinkedList, NULL, NULL, &errmsg) != SQLITE_OK) {
while (current != NULL) { fprintf(stderr, "Error in creation Table: %s\n", errmsg);
task = current->data; sqlite3_free(errmsg);
// Write the task data to the CSV file
fprintf(file, "%s, %llu, %llu, %d, %llu\n", task->name, task->created,
task->deadline, task->priority, task->spare);
current = current->next;
}
fclose(file); // Close the file
} }
} }
/* // Save a single node of the linkedlist in the database
read a task csv file and write the data in a linked list // node needs to be replaced with the correct name and pointer
*/ void save_node_to_db(sqlite3 *db, Node *node) {
llist *write_csv_to_llist(const char *filename) {
llist *list = NULL; // list to return
// Open file with read permision
FILE *file = fopen(filename, "r");
if (file == NULL) {
fprintf(stderr, "Could not open file %s\n", filename);
char *errmsg = NULL;
sqlite3_stmt *stmt;
const char *sql = "INSERT INTO LinkedList (id, data) VALUES (?, ?);";
if (sqlite3_prepare_v2(db, sql, -1, &stmt, NULL) != SQLITE_OK) {
fprintf(stderr, "Failed to prepare statement: %s\n", sqlite3_errmsg(db));
} else { } else {
char *line = NULL; // Line Buffer sqlite3_bind_int(stmt, 1, node->id); // ? -> node->id
size_t nnread, len; sqlite3_bind_text(stmt, 2, node->data, -1,
int count = 0; // task counter SQLITE_STATIC); // ? -> node->data
getline(&line, &len, file); if (sqlite3_step(stmt) != SQLITE_DONE) {
free(line); fprintf(stderr, "Execution failed: %s\n", sqlite3_errmsg(db));
line = NULL; } else {
printf("Node with ID %d saved.\n", node->id);
while ((nnread = getline(&line, &len, file)) != -1) {
count++;
// remove newline sign
line[strcspn(line, "\n")] = '\0';
// column slice
char *taskname = strtok(line, ",");
char *taskcreation_dateSTR = strtok(NULL, ",");
char *taskdeadline_dateSTR = strtok(NULL, ",");
char *taskprioritySTR = strtok(NULL, ",");
char *taskspareSTR = strtok(NULL, ",");
printf(" Der Name des Task ist %s\n", taskname);
// convert char in integer and date
unsigned long int taskcreation_date =
strtoul(taskcreation_dateSTR, NULL, 10);
unsigned long int taskdeadline_date =
strtoul(taskdeadline_dateSTR, NULL, 10);
unsigned long int taskspare = strtoul(taskspareSTR, NULL, 10);
int priority = atoi(taskprioritySTR);
// create Task
Task *task = newTask(taskname, taskcreation_date, taskdeadline_date,
priority, taskspare);
// Insert task into the linked list
if (list == NULL) {
// If the list is empty, initialize it with the first task
list = llistNew(task, cmpTaskN);
} else {
// Append the task to the linked list
llistAppend(list, task);
}
line = NULL;
} }
fclose(file);
} }
return list; // null on error sqlite3_finalize(stmt);
}
// save a whole linkedlist in the database
// node needs to be replaced with the correct name and pointer
void save_linked_list_to_db(sqlite3 *db, Node *head) {
Node *current = head;
while (current != NULL) {
save_node_to_db(db, current);
current = current->next;
}
} }
+3 -2
View File
@@ -5,5 +5,6 @@
#endif #endif
void write_linkedlist_to_csv(llist *head, const char *filename); extern void init_db(sqlite3 *db);
llist *write_csv_to_llist(const char *filename); extern void save_node_to_db(sqlite3 *db, Node *node);
extern void save_linked_list_to_db(sqlite3* db, Node* head);
+1
View File
@@ -1,4 +1,5 @@
#include "llist.h" #include "llist.h"
#include <asm-generic/errno.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
+4 -78
View File
@@ -15,13 +15,8 @@
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#ifdef _WIN32 const uint intervalLen = 45; // min
#define ctime_r(T, Tm) (localtime_s(Tm, T) ? NULL : Tm) const uint pauseLen = 10; //
#define localtime_r(T, Tm) (localtime_s(Tm, T) ? NULL : Tm)
#endif /* ifdef _WIN32 */
const unsigned int intervalLen = 45; // min
const unsigned int pauseLen = 10; //
const char taskFormat[] = const char taskFormat[] =
"Task { %.64s = {\n created={%lu},\n deadline={%lu},\n " "Task { %.64s = {\n created={%lu},\n deadline={%lu},\n "
@@ -226,7 +221,7 @@ llist *genPlan(llist *head, time_t timeAvail) {
0); // use elem with wighest priority 0); // use elem with wighest priority
} }
llistAppend(events_ll, c); llistAppend(events_ll, c);
printEvent(c); // printEvent(c);
// printEvent((Event *)((events_ll)->next)->data); // printEvent((Event *)((events_ll)->next)->data);
// decrement priority of first elem and resort list // decrement priority of first elem and resort list
@@ -257,9 +252,8 @@ llist *genPlan(llist *head, time_t timeAvail) {
events_ll = events_ll->next; events_ll = events_ll->next;
tmp->next = NULL; tmp->next = NULL;
llistFreeE(tmp); llistFreeE(tmp);
printf("====EVENTSLL:\n");
llistPrintE(events_ll); llistPrintE(events_ll);
printf("====EVENTSLL:\n");
// update prioriteis in original llist // update prioriteis in original llist
for (int i = 0; i < lLen; i++) { for (int i = 0; i < lLen; i++) {
llist *tmp = llistGet(head, sortedPrio + i); llist *tmp = llistGet(head, sortedPrio + i);
@@ -275,71 +269,3 @@ llist *genPlan(llist *head, time_t timeAvail) {
return events_ll; return events_ll;
} }
const char *iCalHeader = "BEGIN:VCALENDAR\r\n"
"VERSION:2.0\r\n"
"PRODID:-//hacksw/handcal//NONSGML v1.0//EN\r\n";
const char *iCalEvent = "BEGIN:VEVENT\r\n"
"UID:%s%d\r\n"
"DTSTAMP:%s\r\n"
"DTSTART:%s\r\n"
"DTEND:%s\r\n"
"SUMMARY:%s\r\n"
"END:VEVENT\r\n";
int exportiCal(llist *events_ll) {
llist *ev_ll = events_ll;
llistPrintE(ev_ll);
printf("%s", iCalHeader);
time_t now = time(NULL);
struct tm lc;
localtime_r(&now, &lc);
// gen filename & open for write
char nameBuf[32];
strftime(nameBuf, 32 - 12, "%F", &lc);
strcat(nameBuf, "dayplan.ics");
FILE *fp = fopen(nameBuf, "w");
if (fp == NULL) {
planLog("fopen failed!!", 1);
return 1;
}
// write iCal header to file
fprintf(fp, "%s", iCalHeader);
// for every event in events_ll create VEVENT str and write to fp
int count = 0;
while (ev_ll != NULL) {
// gen iCal compatible time str
Event *current = ev_ll->data;
struct tm startlc;
struct tm endlc;
localtime_r(&current->plannedStartTime, &startlc);
localtime_r(&current->plannedEndTime, &endlc);
char timeStartBuf[17];
char timeEndBuf[17];
char timeStamp[17];
strftime(timeStamp, 17, "%Y%m%dT%k%M%SZ", &lc);
printf("%s\n", timeStamp);
strftime(timeStartBuf, 17, "%Y%m%dT%k%M%SZ", &startlc);
printf("%s\n", timeStartBuf);
strftime(timeEndBuf, 17, "%Y%m%dT%k%M%SZ", &endlc);
printf("%s\n", timeEndBuf);
fprintf(fp, iCalEvent, current->task->name, count, timeStamp, timeStartBuf,
timeEndBuf, current->task->name);
ev_ll = ev_ll->next;
count += 1;
}
// after all events are written end cal with
// END:VCALENDAR
fprintf(fp, "END:VCALENDAR\r\n");
fclose(fp);
return 0;
}
-3
View File
@@ -77,13 +77,10 @@ Event *newEvent(Task *t, time_t s, time_t e, uint64_t sp);
*/ */
void freeEvent(Event *e); void freeEvent(Event *e);
void llistFreeE(llist *head); void llistFreeE(llist *head);
void llistPrintE(llist *head);
int cmpEvent(const void *a, const void *b); int cmpEvent(const void *a, const void *b);
/* /*
* takes llist of tasks and returns llist of events * takes llist of tasks and returns llist of events
*/ */
llist *genPlan(llist *head, time_t timeAvail); llist *genPlan(llist *head, time_t timeAvail);
int exportiCal(llist *head);
#endif // !PLANNER #endif // !PLANNER
+33362
View File
File diff suppressed because it is too large. Load diff
+1 -1
View File
@@ -9,7 +9,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>
int test() { int main() {
time_t now = time(NULL); time_t now = time(NULL);
-185
View File
@@ -2,189 +2,4 @@
* command line interface for user input * command line interface for user input
* *
*/ */
/* Created by Juergen Buechel, 13.12.2024/
*/
#include "ui.h"
#include "db.h"
#include "llist.h"
#include "planner.h" // for subject and event structs #include "planner.h" // for subject and event structs
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
#ifdef _WIN32
#define localtime_r(T, Tm) (localtime_s(Tm, T) ? NULL : Tm)
#endif
const char *dbName = "db.csv";
int main(void) {
int taskcreation_date = 0;
int taskdeadline_date = 0;
int taskpriority = 0;
int taskspare = 0;
char *taskname = NULL; // taskName Buffer
llist *listT = NULL;
llist *listE = NULL;
int choice = 0, i = 0;
do {
printf(" -1- Neues Fach eingeben\n");
printf(" -2- Verfuegbare Zeit eingeben\n");
printf(" -3- Alle vorhandenen Faecher aufliesten\n");
printf(" -4- Kalenderlink ausgeben\n");
printf(" -5- Faecher Importieren\n");
printf(" -6- Planer beenden\n");
printf(" Waehle die gewuenschte Option aus\n");
volatile int r = scanf("%d", &choice);
if (r != 1) {
printf("Falsche Eingabe\n");
fgetc(stdin);
choice = 0;
continue;
};
taskname = NULL;
size_t nameLen;
size_t nnread;
switch (choice) {
case 1:
printf(" Geben sie das gewünschte Fach ein: \n");
time_t now = time(NULL);
struct tm lc;
localtime_r(&now, &lc);
fgetc(stdin);
nnread = getline(&taskname, &nameLen, stdin);
taskname[nnread - 1] = '\0';
if (nnread < 0) {
printf("Ungültige Eingabe für den Namen.\n");
return -1;
}
printf(" Wie viel Zeit bleibt ihnen (tage bis deadline):\n");
if (scanf("%d", &taskdeadline_date) != 1) {
printf("Ungueltige Eingabe.\n");
return -1;
}
printf(" Gib die Prioritaet des Faches an: \n");
if (scanf("%d", &taskpriority) != 1) {
printf("Ungueltige Eingabe.\n");
return -1;
}
// printf(" Wie viel Zeit habe Sie für dieses Fach: \n");
// if (scanf("%d", &taskspare) != 1) {
// printf("Ungültige Eingabe.\n");
// return -1;
// }
// create deadline timestamp
lc.tm_yday += taskdeadline_date;
time_t deadline = mktime(&lc);
Task *newT = newTask(taskname, now, deadline, taskpriority, 0);
if (listT == NULL) {
listT = llistNew(newT, cmpTaskN);
} else {
llistAppend(listT, newT);
}
break;
case 2:
printf(
"Geben Sie die zur verfuegung stehende Zeit für die Faecher an: \n");
scanf("%d", &taskspare);
// if list exists use it to generate plan
if (listT != NULL) {
struct tm lc;
now = time(NULL);
localtime_r(&now, &lc);
lc.tm_hour += taskspare;
time_t avail = mktime(&lc);
listE = genPlan(listT, avail);
write_linkedlist_to_csv(listT, dbName);
} else {
printf("list is empty!");
return -1;
}
break;
case 3:
if (listT == NULL) {
printf("Die Liste ist leer");
break;
} else {
llistPrintT(listT);
// llist *iterator = list;
// while (iterator != NULL) {
// Task *currentTask = (Task *)(iterator->data); // Cast zu Task
// printf("Fach: %s, Deadline: %ld, Priorität: %d\n",
// currentTask->name, currentTask->deadline,
// currentTask->priority);
// iterator = iterator->next; // Gehe zum nächsten Listenelement
// }
}
break;
// // case 4: iCAl();break;
//
// printf(" Wie viel Zeit bleibt ihnen:\n");
// if (scanf("%d", &taskdeadline_date) != 1) {
// printf("Ungültige Eingabe.\n");
// return -1;
// }
//
// printf(" Gib die Priorität des Faches an: \n");
// if (scanf("%d", &taskpriority) != 1) {
// printf("Ungültige Eingabe.\n");
// return -1;
// }
//
// printf(" Wie viel Zeit habe Sie für dieses Fach: \n");
// if (scanf("%d", &taskspare) != 1) {
// printf("Ungültige Eingabe.\n");
// return -1;
// }
// break;
case 4:
if (listE == NULL || taskspare <= 0) {
printf("vor Export erst task list erstellen, dann verfuegbare zeit "
"eingeben!\n");
break;
}
llistPrintE(listE);
exportiCal(listE);
// printf(
// "Geben Sie die zur verfuegung stehende Zeit für die Fächer an:
// \n");
// scanf("%d", &taskspare);
break;
case 5:
listT = write_csv_to_llist(dbName);
break;
case 6:
printf("Goodbye!\n");
if (listE != NULL)
llistFreeE(listE);
if (listT != NULL)
llistPrintT(listT);
// if (task == NULL) {//task?
// printf("Die Liste ist leer");
// } else {
// llist *iterator = list;
// while (iterator != NULL) {
// Task *currentTask = (Task *)(iterator->data); // Cast zu Task
// printf("Fach: %s, Deadline: %ld, Priorität: %d\n",
// currentTask->name, currentTask->deadline,
// currentTask->priority);
// iterator = iterator->next; // Gehe zum nächsten Listenelement
// }
// }
return EXIT_SUCCESS;
// case 4: iCAl();break;
}
} while (choice < 6);
}
-3
View File
@@ -1,7 +1,4 @@
#ifndef UI #ifndef UI
#define UI #define UI
#endif // !UI #endif // !UI