refactor main.c, add json.c

Author: jvon1904

Makefile

@@ -1,5 +1,5 @@
 build:
-	clang main.c -o bin/jdif
+	clang main.c utils.c json.c -o bin/jdif
 
 binary: build
 	sudo cp bin/jdif /usr/local/bin

json.c

@@ -0,0 +1,38 @@
+#include "utils.h"
+#include "json.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+void formatLineAsJson(Line *lin) {
+  String key;
+  String val;
+  initString(&key);
+  initString(&val);
+
+  int k = 1;
+  for (int i = 0; i < lin->len; i++) {
+    int coln = 0;
+    int end = 0;
+    char c = lin->text[i];
+    char next = lin->text[i + 1];
+
+    // Terminate key if sequence ": " is encountered
+    if (k) {
+      if (c == COLN) {
+        k = 0;
+      } else {
+        appendString(&key, c);
+      } 
+    } else {
+      appendString(&val, c);
+    }
+  }
+
+  assignKey(lin, cloneString(&key));
+  appendVal(lin, cloneString(&val));
+  // freeString(&key);
+  // freeString(&val);
+}
+

json.h

@@ -0,0 +1,7 @@
+#ifndef JSON_H
+#define JSON_H
+
+void formatLineAsJson(Line *lin);
+
+#endif
+

main.bak.c

@@ -1,5 +1,7 @@
 #include "utils.h"
+#include "json.h"
 #include <stdio.h>
+#include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -33,20 +35,59 @@ int checkArgs(int argc, char *argv[], int *fopt, FILE **fptr) {
   return 0;
 }
 
-void getLines(int *fopt, FILE *fptr, Document *doc) {
+void getBody(int *fopt, FILE *fptr, Document *doc) {
   int c; // Parsed input character
+
+  while ((c = (*fopt ? fgetc(fptr) : getchar())) != EOF) {
+    appendString(doc->body, c);
+  }
+}
+
+void getLines(Document *doc) {
   Line line;
   initLine(&line);
 
-  while ((c = (*fopt ? fgetc(fptr) : getchar())) != EOF) {
-    if (c == CR) {
-      appendDocumentLine(doc, cloneLine(&line));
-      freeLine(&line);
-      initLine(&line);
+  int go = 1;
+  
+  for (int i = 0; i < doc->body->len; i++) {
+    char c = doc->body->text[i];
+    char next = doc->body->text[i + 1];
+    char nextnext;
+    if (i + 2 < doc->body->len) {
+      nextnext = doc->body->text[i + 2];
     } else {
-      appendLine(&line, c);
+      nextnext = '\0';
+    }
+
+    if (c == '\\' && next == CR && nextnext == SP) {
+      go = 0;
+    } else if (c == CR && next == SP) {
+      go = 0;
+    }
+
+
+    if (go) {
+      if (c == CR) {
+        appendDocumentLine(doc, cloneLine(&line));
+        freeLine(&line);
+        initLine(&line);
+      } else {
+        appendLine(&line, c);
+      }
+    } else {
+      if (c != '\\' && c != CR && c != SP) {
+        appendLine(&line, c);
+        go = 1;
+      }
     }
   }
+
+  if (line.len > 0) {
+    appendDocumentLine(doc, cloneLine(&line));
+    freeLine(&line);
+  } else {
+    freeLine(&line);
+  }
 }
 
 void filterLines(Document *doc, char filtered) {
@@ -65,18 +106,6 @@ void filterLines(Document *doc, char filtered) {
   }
 }
 
-void formatLines(Document, *doc) {
-  Key key;
-  Value value;
-  for (int i = 0; i < doc->llen; i++) {
-    appendKey(&key, '"');
-    for (int j = 0; j < doc->lines[i]->len; j++) {
-
-    }
-    appendKey(&key, '",');
-  }
-}
-
 void getEntries(Document *doc) {
   Entry entry;
   initEntry(&entry);
@@ -86,9 +115,15 @@ void getEntries(Document *doc) {
       freeEntry(&entry);
       initEntry(&entry);
     } else {
+      formatLineAsJson(doc->lines[i]);
       appendEntry(&entry, doc->lines[i]);
     }
   }
+  
+  if (entry.len > 0) {
+    appendDocumentEntry(doc, cloneEntry(&entry));
+    freeEntry(&entry);
+  }
 }
 
 void squashEntries(Document *doc) {
@@ -112,7 +147,13 @@ void printJSON(Document *doc) {
   for (int i = 0; i < doc->elen; i++) {
     printf(IDNT2 "{\n");
     for (int j = 0; j < doc->entries[i]->len; j++) {
-      printf(IDNT4 "%s\n", doc->entries[i]->lines[j]->text);
+      char *closing;
+      if (j == doc->entries[i]->len - 1) {
+        closing = "\n";
+      } else {
+        closing = ",\n";
+      }
+      printf(IDNT4 "\"%s\": \"%s\"%s", doc->entries[i]->lines[j]->key->text, doc->entries[i]->lines[j]->vals[0]->text, closing);
     }
     char *closing;
     if (i == doc->elen - 1) {
@@ -136,9 +177,14 @@ int main(int argc, char *argv[]) {
     return 0;
   }
 
-  getLines(&fopt, fptr, &doc); // Gather input data by lines
+  if (!fopt && isatty(STDIN_FILENO)) {
+      printf("No input provided.\n");
+      return 0;
+  }
+
+  getBody(&fopt, fptr, &doc); // Gather input data by lines
+  getLines(&doc); // Gather input data by lines
   filterLines(&doc, '#'); // Remove all comment lines that start with # character
-  formatLines(&doc); // Format each line into valid JSON
   getEntries(&doc); // Gather lines separated by NLs into entries
   squashEntries(&doc); // Remove all empty entries
   printJSON(&doc); // Output formatted JSON